Move "external" dialects to be normal dialects (mavlink#1761)

mavlink · Jan 12, 2022 · ae531d9 · ae531d9
1 parent 00a3f8e
commit ae531d9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 35 deletions.
diff --git a/external/dialects/README.md b/external/dialects/README.md
diff --git a/external/dialects/AVSSUAS.xml → message_definitions/v1.0/AVSSUAS.xml b/external/dialects/AVSSUAS.xml → message_definitions/v1.0/AVSSUAS.xml
@@ -6,7 +6,7 @@
 <!-- email contact: [email protected] [email protected]-->
 <!-- mavlink messenger ID range: 60050 - 60099,  mavlink command ID range: 60050 - 60099-->
 <mavlink>
-  <include>../../message_definitions/v1.0/common.xml</include>
+  <include>common.xml</include>
   <version>1</version>
   <dialect>1</dialect>
   <enums>

diff --git a/message_definitions/v1.0/all.xml b/message_definitions/v1.0/all.xml
@@ -19,16 +19,15 @@
   <include>test.xml</include>
   <include>ualberta.xml</include>
   <include>uAvionix.xml</include>
-  <!-- external dialects -->
   <!-- storm32.xml range of IDs:
     messages: 60000 - 60049
     commands: 60000 - 60049
   -->
-  <include>../../external/dialects/storm32.xml</include>
+  <include>storm32.xml</include>
   <!-- AVSSUAS.xml range of IDs:
     messages: 60050 - 60099 
     commands: 60050 - 60099
   -->
-  <include>../../external/dialects/AVSSUAS.xml</include>
+  <include>AVSSUAS.xml</include>
   <messages/>
 </mavlink>
diff --git a/external/dialects/storm32.xml → message_definitions/v1.0/storm32.xml b/external/dialects/storm32.xml → message_definitions/v1.0/storm32.xml
@@ -18,7 +18,7 @@ Documentation:
 <mavlink>
   <!-- For ArduPilot, comment out the <include> and include storm32.xml in ardupilotmega.xml (common.xml doesn't yet work in stable branches)
     This makes it possible that ArduPilot's build system can handle it without modifications. -->
-  <include>../../message_definitions/v1.0/ardupilotmega.xml</include>
+  <include>ardupilotmega.xml</include>
   <version>1</version>
   <dialect>0</dialect>
   <!--