[ArDrone] Navdata decoder update (incl sonar)

paparazzi · Sep 22, 2013 · 70ab7eb · 70ab7eb
1 parent f652bae
commit 70ab7eb
Show file tree

Hide file tree

Showing 6 changed files with 163 additions and 152 deletions.
diff --git a/conf/messages.xml b/conf/messages.xml
@@ -48,6 +48,7 @@
      <field name="my" type="int16" />
      <field name="mz" type="int16" />
      <field name="chksum" type="uint16" />
+     <field name="checksum_errors" type="uint32" />
    </message>
 
    <message name="ATTITUDE" id="6">
@@ -626,7 +627,11 @@
     <field name="GX3_chksm"	type="uint16"/>
   </message>
 
- <!-- 74 is free -->
+  <message name="EXPLAIN" id="74">
+    <field name="type" type="uint8" values="NAME|SETTING|WAYPOINT|BLOCK|IMAV2013"/>
+    <field name="id" type="uint8"/>
+    <field name="string" type="uint8[]"/>
+  </message>
 
   <message name="VIDEO_TELEMETRY" id="75">
     <field name="blob_x1" 	type="int32" 	unit="pixels"/>

diff --git a/sw/airborne/boards/ardrone/electrical_raw.c b/sw/airborne/boards/ardrone/electrical_raw.c
@@ -69,7 +69,8 @@ int fd;
 
 void electrical_init(void) {
   // First we try to kill the program.elf if it is running (done here because initializes first)
-  system("killall -9 program.elf");
+  int ret = system("killall -9 program.elf");
+  (void) ret;
 
   // Initialize 12c device for power
   fd = open( "/dev/i2c-1", O_RDWR );