[modules] geo_mag: move WMM2010 model to math/pprz_geodetic_wmm2010

paparazzi · Oct 5, 2012 · 01d80d3 · 01d80d3
1 parent 065fe11
commit 01d80d3
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/conf/modules/geo_mag.xml b/conf/modules/geo_mag.xml
@@ -15,7 +15,9 @@
   <event fun="geo_mag_event()"/><!---->
   <makefile>
     <file name="geo_mag.c"/>
-    <file name="wmm2010.c"/>
     <define name="USE_GEO_MAG"/>
+    <raw>
+      $(TARGET).srcs += math/pprz_geodetic_wmm2010.c
+    </raw>
   </makefile>
 </module>
diff --git a/sw/airborne/modules/geo_mag/wmm2010.c → sw/airborne/math/pprz_geodetic_wmm2010.c b/sw/airborne/modules/geo_mag/wmm2010.c → sw/airborne/math/pprz_geodetic_wmm2010.c
@@ -7,7 +7,7 @@
  */
 
 #include "std.h"
-#include "wmm2010.h"
+#include "math/pprz_geodetic_wmm2010.h"
 
 const double gh1[MAXCOEFF] = {
 0.0,-29496.6,-1586.3,4944.4,

diff --git a/sw/airborne/modules/geo_mag/wmm2010.h → sw/airborne/math/pprz_geodetic_wmm2010.h b/sw/airborne/modules/geo_mag/wmm2010.h → sw/airborne/math/pprz_geodetic_wmm2010.h
diff --git a/sw/airborne/modules/geo_mag/geo_mag.c b/sw/airborne/modules/geo_mag/geo_mag.c
@@ -7,7 +7,7 @@
  */
 
 #include "modules/geo_mag/geo_mag.h"
-#include "modules/geo_mag/wmm2010.h"
+#include "math/pprz_geodetic_wmm2010.h"
 #include "math/pprz_algebra_double.h"
 #include "subsystems/gps.h"
 #include "autopilot.h"

diff --git a/sw/airborne/modules/geo_mag/geo_mag.h b/sw/airborne/modules/geo_mag/geo_mag.h
@@ -10,7 +10,6 @@
 #define GEO_MAG_H
 
 #include "std.h"
-#include "wmm2010.h"
 
 struct GeoMagVect {
   double x;