[paparazzi-commits] [6027] rename messages BOOZ2_VERT_LOOP and BOOZ2_HOVER_LOOP to VERT_LOOP/ HOVER_LOOP

[Felix Ruess]

Revision: 6027
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=6027
Author:   flixr
Date:     2010-09-28 19:01:51 +0000 (Tue, 28 Sep 2010)
Log Message:
-----------
rename messages BOOZ2_VERT_LOOP and BOOZ2_HOVER_LOOP to VERT_LOOP/HOVER_LOOP

Modified Paths:
--------------
    paparazzi3/trunk/conf/messages.xml
    paparazzi3/trunk/conf/telemetry/telemetry_booz2.xml
    paparazzi3/trunk/conf/telemetry/telemetry_booz2_flixr.xml
    paparazzi3/trunk/sw/airborne/booz/test/test_vg_adpt.c
    paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/telemetry.h

Modified: paparazzi3/trunk/conf/messages.xml
===================================================================
--- paparazzi3/trunk/conf/messages.xml  2010-09-28 19:01:45 UTC (rev 6026)
+++ paparazzi3/trunk/conf/messages.xml  2010-09-28 19:01:51 UTC (rev 6027)
@@ -943,7 +943,7 @@
     <field name="sp_pos_e" type="int32"/>
   </message>
 
-  <message name="BOOZ2_VERT_LOOP" id="145">
+  <message name="VERT_LOOP" id="145">
     <field name="z_sp"      type="int32" alt_unit="m"    
alt_unit_coef="0.0039063"/>
     <field name="zd_sp"     type="int32" alt_unit="m"    
alt_unit_coef="0.0000019"/>
     <field name="est_z"     type="int32" alt_unit="m"    
alt_unit_coef="0.0039063"/>
@@ -962,7 +962,7 @@
   </message>
 
 
-  <message name="BOOZ2_HOVER_LOOP" id="146">
+  <message name="HOVER_LOOP" id="146">
     <field name="sp_x"      type="int32" alt_unit="m"    
alt_unit_coef="0.0039063"/>
     <field name="sp_y"      type="int32" alt_unit="m"    
alt_unit_coef="0.0039063"/>
     <field name="est_x"     type="int32" alt_unit="m"    
alt_unit_coef="0.0039063"/>

Modified: paparazzi3/trunk/conf/telemetry/telemetry_booz2.xml
===================================================================
--- paparazzi3/trunk/conf/telemetry/telemetry_booz2.xml 2010-09-28 19:01:45 UTC 
(rev 6026)
+++ paparazzi3/trunk/conf/telemetry/telemetry_booz2.xml 2010-09-28 19:01:51 UTC 
(rev 6027)
@@ -76,7 +76,7 @@
       <message name="DL_VALUE"                period="0.5"/>
       <message name="ALIVE"                   period="0.9"/>
       <message name="VFF"               period=".05"/>
-      <message name="BOOZ2_VERT_LOOP"         period=".05"/>
+      <message name="VERT_LOOP"         period=".05"/>
 <!--      <message name="BOOZ2_CMD"               period=".05"/> -->
       <message name="INS"               period=".05"/>
       <message name="INS_REF"           period="5.1"/>
@@ -84,7 +84,7 @@
 
     <mode name="h_loop">
       <message name="ALIVE"                   period="0.9"/>
-      <message name="BOOZ2_HOVER_LOOP"        period="0.062"/>
+      <message name="HOVER_LOOP"        period="0.062"/>
       <message name="STAB_ATTITUDE"     period=".4"/>
       <message name="HFF_DBG"           period=".2"/>
       <!--<message name="STAB_ATTITUDE_REF" period=".4"/>-->

Modified: paparazzi3/trunk/conf/telemetry/telemetry_booz2_flixr.xml
===================================================================
--- paparazzi3/trunk/conf/telemetry/telemetry_booz2_flixr.xml   2010-09-28 
19:01:45 UTC (rev 6026)
+++ paparazzi3/trunk/conf/telemetry/telemetry_booz2_flixr.xml   2010-09-28 
19:01:51 UTC (rev 6027)
@@ -75,7 +75,7 @@
       <message name="DL_VALUE"                period="0.5"/>
       <message name="ALIVE"                   period="0.9"/>
       <message name="VFF"               period=".1"/>
-      <message name="BOOZ2_VERT_LOOP"         period=".1"/>
+      <message name="VERT_LOOP"         period=".1"/>
 <!--      <message name="BOOZ2_CMD"               period=".05"/> -->
       <message name="INS"               period=".2"/>
       <message name="INS_REF"           period="5.1"/>
@@ -83,7 +83,7 @@
 
     <mode name="h_loop">
       <message name="ALIVE"                   period="0.9"/>
-      <message name="BOOZ2_HOVER_LOOP"        period="0.1"/>
+      <message name="HOVER_LOOP"        period="0.1"/>
       <message name="STAB_ATTITUDE"     period=".4"/>
       <message name="HFF_DBG"           period=".2"/>
       <!--<message name="STAB_ATTITUDE_REF" period=".4"/>-->

Modified: paparazzi3/trunk/sw/airborne/booz/test/test_vg_adpt.c
===================================================================
--- paparazzi3/trunk/sw/airborne/booz/test/test_vg_adpt.c       2010-09-28 
19:01:45 UTC (rev 6026)
+++ paparazzi3/trunk/sw/airborne/booz/test/test_vg_adpt.c       2010-09-28 
19:01:51 UTC (rev 6027)
@@ -94,7 +94,7 @@
   size_t read;
   n_dat = 0;
   while ((read = getline(&line, &len, fp)) != -1 && n_dat< NB_STEP) {
-    if (sscanf(line, "%lf %*d BOOZ2_VERT_LOOP %d %d %d %d %d %d %d %d %d %d %d 
%d %d %d",
+    if (sscanf(line, "%lf %*d VERT_LOOP %d %d %d %d %d %d %d %d %d %d %d %d %d 
%d",
            &time[n_dat],
            &z_sp[n_dat], &zd_sp[n_dat],
            &est_z[n_dat], &est_zd[n_dat], &est_zdd[n_dat],

Modified: paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/telemetry.h
===================================================================
--- paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/telemetry.h       
2010-09-28 19:01:45 UTC (rev 6026)
+++ paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/telemetry.h       
2010-09-28 19:01:51 UTC (rev 6027)
@@ -603,8 +603,8 @@
 
 
 
-#define PERIODIC_SEND_BOOZ2_VERT_LOOP(_chan) {                         \
-    DOWNLINK_SEND_BOOZ2_VERT_LOOP(_chan,                               \
+#define PERIODIC_SEND_VERT_LOOP(_chan) {                               \
+    DOWNLINK_SEND_VERT_LOOP(_chan,                             \
                                  &guidance_v_z_sp,             \
                                  &guidance_v_zd_sp,            \
                                  &ins_ltp_pos.z,                       \
@@ -622,8 +622,8 @@
                                  &guidance_v_delta_t);         \
   }
 
-#define PERIODIC_SEND_BOOZ2_HOVER_LOOP(_chan) {                                
\
-    DOWNLINK_SEND_BOOZ2_HOVER_LOOP(_chan,                              \
+#define PERIODIC_SEND_HOVER_LOOP(_chan) {                              \
+    DOWNLINK_SEND_HOVER_LOOP(_chan,                            \
                                   &guidance_h_pos_sp.x,                \
                                   &guidance_h_pos_sp.y,                \
                                   &ins_ltp_pos.x,                      \