From 34294d26357091ecb42f8860e2c929647a74d11d Mon Sep 17 00:00:00 2001
From: Corvus Corax <corvuscorax@cybertrench.com>
Date: Mon, 20 May 2013 10:35:54 +0200
Subject: [PATCH] Magneto to Mag fix

---
 flight/modules/StateEstimation/stateestimation.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/flight/modules/StateEstimation/stateestimation.c b/flight/modules/StateEstimation/stateestimation.c
index 5b2171c55..1ecdf7e1b 100644
--- a/flight/modules/StateEstimation/stateestimation.c
+++ b/flight/modules/StateEstimation/stateestimation.c
@@ -33,7 +33,7 @@
 
 #include <gyrosensor.h>
 #include <accelsensor.h>
-#include <magnetosensor.h>
+#include <magsensor.h>
 #include <barosensor.h>
 #include <airspeedsensor.h>
 #include <gpsposition.h>
@@ -41,7 +41,7 @@
 
 #include <gyrostate.h>
 #include <accelstate.h>
-#include <magnetostate.h>
+#include <magstate.h>
 #include <barostate.h>
 #include <airspeedstate.h>
 #include <positionstate.h>
@@ -198,7 +198,7 @@ int32_t StateEstimationInitialize(void)
 
     GyroSensorConnectCallback(&sensorUpdatedCb);
     AccelSensorConnectCallback(&sensorUpdatedCb);
-    MagnetoSensorConnectCallback(&sensorUpdatedCb);
+    MagSensorConnectCallback(&sensorUpdatedCb);
     BaroSensorConnectCallback(&sensorUpdatedCb);
     AirspeedSensorConnectCallback(&sensorUpdatedCb);
     GPSPositionConnectCallback(&sensorUpdatedCb);
@@ -322,7 +322,7 @@ static void StateEstimationCb(void)
     }
     SANITYCHECK3(GyroSensor, gyr, x, y, z);
     SANITYCHECK3(AccelSensor, acc, x, y, z);
-    SANITYCHECK3(MagnetoSensor, mag, x, y, z);
+    SANITYCHECK3(MagSensor, mag, x, y, z);
     SANITYCHECK3(GPSVelocity, vel, North, East, Down);
 #define SANITYCHECK1(sensorname, shortname, a1, EXTRACHECK) \
     if (ISSET(states.updated, shortname##_UPDATED)) { \
@@ -377,7 +377,7 @@ static void StateEstimationCb(void)
     }
     STORE3(GyroState, gyr, x, y, z);
     STORE3(AccelState, acc, x, y, z);
-    STORE3(MagnetoState, mag, x, y, z);
+    STORE3(MagState, mag, x, y, z);
     STORE3(PositionState, pos, North, East, Down);
     STORE3(VelocityState, vel, North, East, Down);
 #define STORE2(statename, shortname, a1, a2) \
@@ -449,7 +449,7 @@ static void sensorUpdatedCb(UAVObjEvent *ev)
         updatedSensors |= acc_UPDATED;
     }
 
-    if (ev->obj == MagnetoSensorHandle()) {
+    if (ev->obj == MagSensorHandle()) {
         updatedSensors |= mag_UPDATED;
     }