Fixed paths in nav_cube.xml module file. Also fixed setter macros in …

…nav_cube.h for offset values (#2609) close #2608
paparazzi · Nov 3, 2020 · 3ced6ff · 3ced6ff
1 parent 9dd0a81
commit 3ced6ff
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/conf/modules/nav_cube.xml b/conf/modules/nav_cube.xml
@@ -9,18 +9,18 @@
   <settings>
     <dl_settings>
       <dl_settings NAME="cube">
-        <dl_setting MIN="0" MAX="360" STEP="1" VAR="cube_alpha"   module="nav_cube" handler="SetAlpha"/>
-        <dl_setting MIN="1" MAX="12"  STEP="1" VAR="cube_sect"    module="nav_cube" handler="SetSect"/>
-        <dl_setting MIN="1" MAX="50"  STEP="1" VAR="cube_grid_x"  module="nav_cube" handler="SetGridX"/>
-        <dl_setting MIN="1" MAX="50"  STEP="1" VAR="cube_grid_z"  module="nav_cube" handler="SetGridZ"/>
-        <dl_setting MIN="-200" MAX="200" STEP="10" VAR="cube_offs_x"  module="nav_cube" handler="SetOffsX"/>
-        <dl_setting MIN="-400" MAX="200" STEP="10" VAR="cube_offs_y"  module="nav_cube" handler="SetOffsY"/>
-        <dl_setting MIN="-200" MAX="200" STEP="10" VAR="cube_offs_z"  module="nav_cube" handler="SetOffsZ"/>
-        <dl_setting MIN="1" MAX="500" STEP="10" VAR="cube_size_x"  module="nav_cube" handler="SetSizeX"/>
-        <dl_setting MIN="1" MAX="500" STEP="10" VAR="cube_size_y"  module="nav_cube" handler="SetSizeY"/>
-        <dl_setting MIN="1" MAX="500" STEP="10" VAR="cube_size_z"  module="nav_cube" handler="SetSizeZ"/>
-        <dl_setting MIN="1" MAX="8"   STEP="1"  VAR="cube_nsect_x" module="nav_cube" handler="SetNSectX"/>
-        <dl_setting MIN="1" MAX="8"   STEP="1"  VAR="cube_nsect_z" module="nav_cube" handler="SetNSectZ"/>
+        <dl_setting MIN="0" MAX="360" STEP="1" VAR="nav_cube.alpha"   module="nav/nav_cube" handler="SetAlpha"/>
+        <dl_setting MIN="1" MAX="12"  STEP="1" VAR="nav_cube.sect"    module="nav/nav_cube" handler="SetSect"/>
+        <dl_setting MIN="1" MAX="50"  STEP="1" VAR="nav_cube.grid_x"  module="nav/nav_cube" handler="SetGridX"/>
+        <dl_setting MIN="1" MAX="50"  STEP="1" VAR="nav_cube.grid_z"  module="nav/nav_cube" handler="SetGridZ"/>
+        <dl_setting MIN="-200" MAX="200" STEP="10" VAR="nav_cube.offset.x"  module="nav/nav_cube" handler="SetOffsX"/>
+        <dl_setting MIN="-400" MAX="200" STEP="10" VAR="nav_cube.offset.y"  module="nav/nav_cube" handler="SetOffsY"/>
+        <dl_setting MIN="-200" MAX="200" STEP="10" VAR="nav_cube.offset.z"  module="nav/nav_cube" handler="SetOffsZ"/>
+        <dl_setting MIN="1" MAX="500" STEP="10" VAR="nav_cube.size.x"  module="nav/nav_cube" handler="SetSizeX"/>
+        <dl_setting MIN="1" MAX="500" STEP="10" VAR="nav_cube.size.y"  module="nav/nav_cube" handler="SetSizeY"/>
+        <dl_setting MIN="1" MAX="500" STEP="10" VAR="nav_cube.size.z"  module="nav/nav_cube" handler="SetSizeZ"/>
+        <dl_setting MIN="1" MAX="8"   STEP="1"  VAR="nav_cube.nsect_x" module="nav/nav_cube" handler="SetNSectX"/>
+        <dl_setting MIN="1" MAX="8"   STEP="1"  VAR="nav_cube.nsect_z" module="nav/nav_cube" handler="SetNSectZ"/>
       </dl_settings>
     </dl_settings>
   </settings>

diff --git a/sw/airborne/modules/nav/nav_cube.h b/sw/airborne/modules/nav/nav_cube.h
@@ -134,9 +134,9 @@ extern bool nav_cube_run(int8_t j, int8_t i,
 #define nav_cube_SetSizeX(i) { nav_cube.size.x=i; }
 #define nav_cube_SetSizeY(i) { nav_cube.size.y=i; }
 #define nav_cube_SetSizeZ(i) { nav_cube.size.z=i; }
-#define nav_cube_SetOffsX(i) { nav_cube.offs.x=i; }
-#define nav_cube_SetOffsY(i) { nav_cube.offs.y=i; }
-#define nav_cube_SetOffsZ(i) { nav_cube.offs.z=i; }
+#define nav_cube_SetOffsX(i) { nav_cube.offset.x=i; }
+#define nav_cube_SetOffsY(i) { nav_cube.offset.y=i; }
+#define nav_cube_SetOffsZ(i) { nav_cube.offset.z=i; }
 #define nav_cube_SetNSectX(i) { nav_cube.nsect_x=i; }
 #define nav_cube_SetNSectZ(i) { nav_cube.nsect_z=i; }