message_definitions: move array test dialect into non-conflicting add…

…ress space
mavlink · Dec 25, 2020 · 2bb3ef9 · 2bb3ef9
1 parent 4a95d95
commit 2bb3ef9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/message_definitions/v1.0/all.xml b/message_definitions/v1.0/all.xml
@@ -12,8 +12,7 @@
   <include>minimal.xml</include>
   <!-- paparazzi.xml: : ERROR: Duplicate message id 180 for SCRIPT_ITEM (paparazzi.xml:9) also used by CAMERA_FEEDBACK (ardupilotmega.xml:1370) -->
   <!-- <include>paparazzi.xml</include> -->
-  <!-- python_array_test.xml: ERROR: Duplicate message id 150 for ARRAY_TEST_0 (python_array_test.xml:6) also used by SENSOR_OFFSETS (ardupilotmega.xml:1101) -->
-  <!-- <include>python_array_test.xml</include> -->
+  <include>python_array_test.xml</include>
   <include>standard.xml</include>
   <!-- test.xml: ERROR: Duplicate message id 0 for TEST_TYPES (test.xml:5) also used by HEARTBEAT (common.xml:3527) -->
   <!-- <include>test.xml</include> -->

diff --git a/message_definitions/v1.0/python_array_test.xml b/message_definitions/v1.0/python_array_test.xml
@@ -3,34 +3,34 @@
 <mavlink>
   <include>common.xml</include>
   <messages>
-    <message id="150" name="ARRAY_TEST_0">
+    <message id="17150" name="ARRAY_TEST_0">
       <description>Array test #0.</description>
       <field type="uint8_t" name="v1">Stub field</field>
       <field type="int8_t[4]" name="ar_i8">Value array</field>
       <field type="uint8_t[4]" name="ar_u8">Value array</field>
       <field type="uint16_t[4]" name="ar_u16">Value array</field>
       <field type="uint32_t[4]" name="ar_u32">Value array</field>
     </message>
-    <message id="151" name="ARRAY_TEST_1">
+    <message id="17151" name="ARRAY_TEST_1">
       <description>Array test #1.</description>
       <field type="uint32_t[4]" name="ar_u32">Value array</field>
     </message>
-    <message id="153" name="ARRAY_TEST_3">
+    <message id="17153" name="ARRAY_TEST_3">
       <description>Array test #3.</description>
       <field type="uint8_t" name="v">Stub field</field>
       <field type="uint32_t[4]" name="ar_u32">Value array</field>
     </message>
-    <message id="154" name="ARRAY_TEST_4">
+    <message id="17154" name="ARRAY_TEST_4">
       <description>Array test #4.</description>
       <field type="uint32_t[4]" name="ar_u32">Value array</field>
       <field type="uint8_t" name="v">Stub field</field>
     </message>
-    <message id="155" name="ARRAY_TEST_5">
+    <message id="17155" name="ARRAY_TEST_5">
       <description>Array test #5.</description>
       <field type="char[5]" name="c1">Value array</field>
       <field type="char[5]" name="c2">Value array</field>
     </message>
-    <message id="156" name="ARRAY_TEST_6">
+    <message id="17156" name="ARRAY_TEST_6">
       <description>Array test #6.</description>
       <field type="uint8_t" name="v1">Stub field</field>
       <field type="uint16_t" name="v2">Stub field</field>
@@ -45,7 +45,7 @@
       <field type="double[2]" name="ar_d">Value array</field>
       <field type="float[2]" name="ar_f">Value array</field>
     </message>
-    <message id="157" name="ARRAY_TEST_7">
+    <message id="17157" name="ARRAY_TEST_7">
       <description>Array test #7.</description>
       <field type="double[2]" name="ar_d">Value array</field>
       <field type="float[2]" name="ar_f">Value array</field>
@@ -57,7 +57,7 @@
       <field type="int8_t[2]" name="ar_i8">Value array</field>
       <field type="char[32]" name="ar_c">Value array</field>
     </message>
-    <message id="158" name="ARRAY_TEST_8">
+    <message id="17158" name="ARRAY_TEST_8">
       <description>Array test #8.</description>
       <field type="uint32_t" name="v3">Stub field</field>
       <field type="double[2]" name="ar_d">Value array</field>