From b2938be9d5cc4edb4c7327d3893eebc9dfba34ac Mon Sep 17 00:00:00 2001
From: OpenUAS <noreply@openuas.org>
Date: Mon, 8 Dec 2014 22:41:21 +0100
Subject: [PATCH 1/2] Fix for magneto fix that still kept hanging sometimes

---
 sw/airborne/boards/ardrone/navdata.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/sw/airborne/boards/ardrone/navdata.c b/sw/airborne/boards/ardrone/navdata.c
index 244ddbbed0..079a5c70fa 100644
--- a/sw/airborne/boards/ardrone/navdata.c
+++ b/sw/airborne/boards/ardrone/navdata.c
@@ -332,6 +332,7 @@ static void mag_freeze_check(void) {
 
         // do the navboard reset via GPIOs
         gpio_clear(ARDRONE_GPIO_PORT, ARDRONE_GPIO_PIN_NAVDATA);
+        usleep(20000); //Otherwise set sometime does not work
         gpio_set(ARDRONE_GPIO_PORT, ARDRONE_GPIO_PIN_NAVDATA);
 
         //// wait 20ms to retrieve data
@@ -339,7 +340,12 @@ static void mag_freeze_check(void) {
 
         //// restart acquisition
         cmd = 0x01;
-        navdata_write(&cmd, 1);
+        usleep(5000);
+        for (int i=0;i<10;i++)
+        {
+          usleep(1000);
+          navdata_write(&cmd, 1);
+        }
       }
 
       MagFreezeCounter = 0; // reset counter back to zero
@@ -499,6 +505,7 @@ void navdata_update()
   // Check if initialized
   if (!nav_port.isInitialized) {
     navdata_init();
+    mag_freeze_check();
     return;
   }
 

From 3d3795116fbd89e7ab4d3b9bb238c42bcdca43e6 Mon Sep 17 00:00:00 2001
From: Gautier Hattenberger <gautier.hattenberger@enac.fr>
Date: Wed, 10 Dec 2014 17:35:58 +0100
Subject: [PATCH 2/2] [ardrone2] count imu_lost and report filter status

---
 conf/telemetry/default_ardrone.xml    | 1 +
 conf/telemetry/default_rotorcraft.xml | 1 +
 sw/airborne/boards/ardrone/navdata.c  | 4 +++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/conf/telemetry/default_ardrone.xml b/conf/telemetry/default_ardrone.xml
index 2cdc68e548..c34b303145 100644
--- a/conf/telemetry/default_ardrone.xml
+++ b/conf/telemetry/default_ardrone.xml
@@ -19,6 +19,7 @@
       <message name="I2C_ERRORS"             period="4.1"/>
       <message name="UART_ERRORS"            period="3.1"/>
       <message name="DATALINK_REPORT"        period="5.1"/>
+      <message name="STATE_FILTER_STATUS"    period="3.2"/>
     </mode>
 
     <mode name="ppm">
diff --git a/conf/telemetry/default_rotorcraft.xml b/conf/telemetry/default_rotorcraft.xml
index b83f9e86d5..b23c636ecf 100644
--- a/conf/telemetry/default_rotorcraft.xml
+++ b/conf/telemetry/default_rotorcraft.xml
@@ -21,6 +21,7 @@
       <message name="SUPERBITRF"             period="3"/>
       <message name="ENERGY"                 period="2.5"/>
       <message name="DATALINK_REPORT"        period="5.1"/>
+      <message name="STATE_FILTER_STATUS"    period="3.2"/>
     </mode>
 
     <mode name="ppm">
diff --git a/sw/airborne/boards/ardrone/navdata.c b/sw/airborne/boards/ardrone/navdata.c
index 079a5c70fa..949f80f972 100644
--- a/sw/airborne/boards/ardrone/navdata.c
+++ b/sw/airborne/boards/ardrone/navdata.c
@@ -58,6 +58,7 @@ static int nav_fd = 0;
 measures_t navdata;
 
 static int imu_lost = 0;
+static int imu_lost_counter = 0;
 
 /** Sonar offset.
  *  Offset value in ADC
@@ -158,7 +159,7 @@ static void send_filter_status(struct transport_tx *trans, struct link_device *d
   uint8_t mde = 3;
   if (ahrs.status == AHRS_UNINIT) mde = 2;
   if (imu_lost) mde = 5;
-  uint16_t val = 0;
+  uint16_t val = imu_lost_counter;
   pprz_msg_send_STATE_FILTER_STATUS(trans, dev, AC_ID, &mde, &val);
 }
 
@@ -317,6 +318,7 @@ static void mag_freeze_check(void) {
       printf("Mag needs resetting, Values are frozen!!! %d , %d \n", LastMagValue, navdata.mx);
       // set imu_lost flag
       imu_lost = 1;
+      imu_lost_counter++;
 
       if (mag_freeze_retry < MAG_FREEZE_MAX_RETRY) {
         printf("Setting GPIO 177 to reset PIC Navigation Board \n");