[paparazzi-commits] [4630] add ref to rate loop message

[Felix Ruess]

Revision: 4630
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4630
Author:   flixr
Date:     2010-03-05 00:27:25 +0000 (Fri, 05 Mar 2010)
Log Message:
-----------
add ref to rate loop message

Modified Paths:
--------------
    paparazzi3/trunk/conf/messages.xml
    paparazzi3/trunk/sw/airborne/booz/booz2_telemetry.h

Modified: paparazzi3/trunk/conf/messages.xml
===================================================================
--- paparazzi3/trunk/conf/messages.xml  2010-03-05 00:27:19 UTC (rev 4629)
+++ paparazzi3/trunk/conf/messages.xml  2010-03-05 00:27:25 UTC (rev 4630)
@@ -803,12 +803,21 @@
  </message>
 
  <message name="BOOZ2_RATE_LOOP" id="136">   
-   <field name="spp" type="int32"/>
-   <field name="spq" type="int32"/>
-   <field name="spr" type="int32"/>
-   <field name="delta_a" type="int32"/>
-   <field name="delta_e" type="int32"/>
-   <field name="delta_r" type="int32"/>
+   <field name="sp_p" type="int32"/>
+   <field name="sp_q" type="int32"/>
+   <field name="sp_r" type="int32"/>
+   <field name="ref_p" type="int32"/>
+   <field name="ref_q" type="int32"/>
+   <field name="ref_r" type="int32"/>
+   <field name="refdot_p" type="int32"/>
+   <field name="refdot_q" type="int32"/>
+   <field name="refdot_r" type="int32"/>
+   <field name="ff_p" type="int32"/>
+   <field name="ff_q" type="int32"/>
+   <field name="ff_r" type="int32"/>
+   <field name="fb_p" type="int32"/>
+   <field name="fb_q" type="int32"/>
+   <field name="fb_r" type="int32"/>
    <field name="delta_t" type="int32"/>
  </message>
 

Modified: paparazzi3/trunk/sw/airborne/booz/booz2_telemetry.h
===================================================================
--- paparazzi3/trunk/sw/airborne/booz/booz2_telemetry.h 2010-03-05 00:27:19 UTC 
(rev 4629)
+++ paparazzi3/trunk/sw/airborne/booz/booz2_telemetry.h 2010-03-05 00:27:25 UTC 
(rev 4630)
@@ -167,15 +167,24 @@
   }
 
 #include "booz_stabilization.h"
-#define PERIODIC_SEND_BOOZ2_RATE_LOOP(_chan) {                             \
-    DOWNLINK_SEND_BOOZ2_RATE_LOOP(_chan,                                   \
-                                 &booz_stabilization_rate_sp.p,            \
-                                 &booz_stabilization_rate_sp.q,            \
-                                 &booz_stabilization_rate_sp.r,            \
-                                 &booz_stabilization_cmd[COMMAND_ROLL],    \
-                                 &booz_stabilization_cmd[COMMAND_PITCH],   \
-                                 &booz_stabilization_cmd[COMMAND_YAW],     \
-                                 &booz_stabilization_cmd[COMMAND_THRUST]); \
+#define PERIODIC_SEND_BOOZ2_RATE_LOOP(_chan) {                          \
+    DOWNLINK_SEND_BOOZ2_RATE_LOOP(_chan,                                \
+                                  &booz_stabilization_rate_sp.p,        \
+                                  &booz_stabilization_rate_sp.q,        \
+                                  &booz_stabilization_rate_sp.r,        \
+                                  &booz_stabilization_rate_ref.p,      \
+                                  &booz_stabilization_rate_ref.q,       \
+                                  &booz_stabilization_rate_ref.r,       \
+                                  &booz_stabilization_rate_refdot.p,       \
+                                  &booz_stabilization_rate_refdot.q,       \
+                                  &booz_stabilization_rate_refdot.r,       \
+                                  &booz_stabilization_rate_ff_cmd.p,    \
+                                  &booz_stabilization_rate_ff_cmd.q,    \
+                                  &booz_stabilization_rate_ff_cmd.r,    \
+                                  &booz_stabilization_rate_fb_cmd.p,    \
+                                  &booz_stabilization_rate_fb_cmd.q,    \
+                                  &booz_stabilization_rate_fb_cmd.r,    \
+                                  &booz_stabilization_cmd[COMMAND_THRUST]); \
   }
 
 #ifdef STABILISATION_ATTITUDE_TYPE_INT