[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paparazzi-commits] [6022] rename BOOZ_STATUS to ROTORCRAFT_STATUS
|
From: |
Felix Ruess |
|
Subject: |
[paparazzi-commits] [6022] rename BOOZ_STATUS to ROTORCRAFT_STATUS |
|
Date: |
Tue, 28 Sep 2010 19:01:11 +0000 |
Revision: 6022
http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=6022
Author: flixr
Date: 2010-09-28 19:01:10 +0000 (Tue, 28 Sep 2010)
Log Message:
-----------
rename BOOZ_STATUS to ROTORCRAFT_STATUS
Modified Paths:
--------------
paparazzi3/trunk/conf/messages.xml
paparazzi3/trunk/conf/telemetry/booz.xml
paparazzi3/trunk/conf/telemetry/booz_minimal.xml
paparazzi3/trunk/conf/telemetry/telemetry_booz2.xml
paparazzi3/trunk/conf/telemetry/telemetry_booz2_flixr.xml
paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/telemetry.h
paparazzi3/trunk/sw/ground_segment/tmtc/booz_server.ml
Modified: paparazzi3/trunk/conf/messages.xml
===================================================================
--- paparazzi3/trunk/conf/messages.xml 2010-09-28 19:01:02 UTC (rev 6021)
+++ paparazzi3/trunk/conf/messages.xml 2010-09-28 19:01:10 UTC (rev 6022)
@@ -1586,7 +1586,7 @@
<!--229 is free -->
<!--230 is free -->
- <message name="BOOZ_STATUS" id="231">
+ <message name="ROTORCRAFT_STATUS" id="231">
<field name="link_imu_nb_err" type="uint32"/>
<field name="blmc_nb_err" type="uint8"/>
<field name="rc_status" type="uint8" values="OK|LOST|REALLY_LOST"/>
Modified: paparazzi3/trunk/conf/telemetry/booz.xml
===================================================================
--- paparazzi3/trunk/conf/telemetry/booz.xml 2010-09-28 19:01:02 UTC (rev
6021)
+++ paparazzi3/trunk/conf/telemetry/booz.xml 2010-09-28 19:01:10 UTC (rev
6022)
@@ -6,7 +6,7 @@
<process name="Controller">
<mode name="default">
<message name="ALIVE" period="5."/>
- <message name="BOOZ_STATUS" period=".5"/>
+ <message name="ROTORCRAFT_STATUS" period=".5"/>
<!-- <message name="RC" period="0.5"/> -->
<!-- <message name="BOOZ_FD" period="0.05"/> -->
<!-- <message name="BOOZ_DEBUG" period="0.25"/> -->
Modified: paparazzi3/trunk/conf/telemetry/booz_minimal.xml
===================================================================
--- paparazzi3/trunk/conf/telemetry/booz_minimal.xml 2010-09-28 19:01:02 UTC
(rev 6021)
+++ paparazzi3/trunk/conf/telemetry/booz_minimal.xml 2010-09-28 19:01:10 UTC
(rev 6022)
@@ -7,7 +7,7 @@
<mode name="default">
<message name="DL_VALUE" period="2.1"/>
- <message name="BOOZ_STATUS" period="1.4"/>
+ <message name="ROTORCRAFT_STATUS" period="1.4"/>
<message name="BOOZ2_FP" period="1.2"/>
<message name="ALIVE" period="2.1"/>
<message name="INS_REF" period="10.1"/>
@@ -17,7 +17,7 @@
<mode name="alternate">
<message name="DL_VALUE" period="1.1"/>
- <message name="BOOZ_STATUS" period="1.2"/>
+ <message name="ROTORCRAFT_STATUS" period="1.2"/>
<message name="BOOZ2_FP" period="0.25"/>
<message name="ALIVE" period="2.1"/>
<message name="INS_REF" period="5.1"/>
Modified: paparazzi3/trunk/conf/telemetry/telemetry_booz2.xml
===================================================================
--- paparazzi3/trunk/conf/telemetry/telemetry_booz2.xml 2010-09-28 19:01:02 UTC
(rev 6021)
+++ paparazzi3/trunk/conf/telemetry/telemetry_booz2.xml 2010-09-28 19:01:10 UTC
(rev 6022)
@@ -7,7 +7,7 @@
<mode name="default">
<message name="DL_VALUE" period="1.1"/>
- <message name="BOOZ_STATUS" period="1.2"/>
+ <message name="ROTORCRAFT_STATUS" period="1.2"/>
<message name="BOOZ2_FP" period="0.25"/>
<message name="ALIVE" period="2.1"/>
<message name="INS_REF" period="5.1"/>
@@ -23,11 +23,11 @@
<message name="PPM" period="0.5"/>
<message name="RC" period="0.5"/>
<message name="BOOZ2_RADIO_CONTROL" period="0.5"/>
- <message name="BOOZ_STATUS" period="1"/>
+ <message name="ROTORCRAFT_STATUS" period="1"/>
</mode>
<mode name="raw_sensors">
- <message name="BOOZ_STATUS" period="1.2"/>
+ <message name="ROTORCRAFT_STATUS" period="1.2"/>
<message name="DL_VALUE" period="0.5"/>
<message name="ALIVE" period="2.1"/>
<message name="IMU_ACCEL_RAW" period=".05"/>
@@ -37,7 +37,7 @@
</mode>
<mode name="scaled_sensors">
- <message name="BOOZ_STATUS" period="1.2"/>
+ <message name="ROTORCRAFT_STATUS" period="1.2"/>
<message name="DL_VALUE" period="0.5"/>
<message name="ALIVE" period="2.1"/>
<message name="BOOZ2_GYRO" period=".075"/>
@@ -46,7 +46,7 @@
</mode>
<mode name="ahrs">
- <message name="BOOZ_STATUS" period="1.2"/>
+ <message name="ROTORCRAFT_STATUS" period="1.2"/>
<message name="DL_VALUE" period="0.5"/>
<message name="ALIVE" period="2.1"/>
<!-- <message name="BOOZ2_ALIGNER" period=".1"/> -->
@@ -57,14 +57,14 @@
</mode>
<mode name="rate_loop">
- <message name="BOOZ_STATUS" period="1.2"/>
+ <message name="ROTORCRAFT_STATUS" period="1.2"/>
<message name="DL_VALUE" period="0.5"/>
<message name="ALIVE" period="2.1"/>
<message name="BOOZ2_RATE_LOOP" period=".02"/>
</mode>
<mode name="attitude_loop">
- <message name="BOOZ_STATUS" period="1.2"/>
+ <message name="ROTORCRAFT_STATUS" period="1.2"/>
<message name="DL_VALUE" period="0.5"/>
<message name="ALIVE" period="0.9"/>
<message name="BOOZ2_STAB_ATTITUDE" period=".03"/>
@@ -72,7 +72,7 @@
</mode>
<mode name="vert_loop">
- <message name="BOOZ_STATUS" period="1.2"/>
+ <message name="ROTORCRAFT_STATUS" period="1.2"/>
<message name="DL_VALUE" period="0.5"/>
<message name="ALIVE" period="0.9"/>
<message name="VFF" period=".05"/>
@@ -89,7 +89,7 @@
<message name="HFF_DBG" period=".2"/>
<!--<message name="BOOZ2_STAB_ATTITUDE_REF" period=".4"/>-->
<message name="BOOZ2_FP" period="0.8"/>
- <message name="BOOZ_STATUS" period="1.2"/>
+ <message name="ROTORCRAFT_STATUS" period="1.2"/>
<message name="ROTORCRAFT_NAV_STATUS" period="1.6"/>
<message name="HFF_GPS" period=".03"/>
<message name="INS_REF" period="5.1"/>
@@ -101,7 +101,7 @@
</mode>
<mode name="hs_att_roll">
- <message name="BOOZ_STATUS" period="1.2"/>
+ <message name="ROTORCRAFT_STATUS" period="1.2"/>
<message name="ALIVE" period="0.9"/>
<message name="DL_VALUE" period="0.5"/>
<!-- <message name="BOOZ2_STAB_ATTITUDE_HS_ROLL" period="0.02"/> -->
@@ -109,7 +109,7 @@
<mode name="tune_hover">
<message name="DL_VALUE" period="1.1"/>
- <message name="BOOZ_STATUS" period="1.2"/>
+ <message name="ROTORCRAFT_STATUS" period="1.2"/>
<message name="ALIVE" period="2.1"/>
<!--<message name="BOOZ2_SONAR" period="0.1"/>-->
<!--<message name="BOOZ2_TUNE_HOVER" period=".1"/>-->
Modified: paparazzi3/trunk/conf/telemetry/telemetry_booz2_flixr.xml
===================================================================
--- paparazzi3/trunk/conf/telemetry/telemetry_booz2_flixr.xml 2010-09-28
19:01:02 UTC (rev 6021)
+++ paparazzi3/trunk/conf/telemetry/telemetry_booz2_flixr.xml 2010-09-28
19:01:10 UTC (rev 6022)
@@ -7,7 +7,7 @@
<mode name="default">
<message name="DL_VALUE" period="1.1"/>
- <message name="BOOZ_STATUS" period="1.2"/>
+ <message name="ROTORCRAFT_STATUS" period="1.2"/>
<message name="BOOZ2_FP" period="0.25"/>
<message name="ALIVE" period="2.1"/>
<message name="INS_REF" period="5.1"/>
@@ -22,11 +22,11 @@
<message name="PPM" period="0.5"/>
<message name="RC" period="0.5"/>
<message name="BOOZ2_RADIO_CONTROL" period="0.5"/>
- <message name="BOOZ_STATUS" period="1"/>
+ <message name="ROTORCRAFT_STATUS" period="1"/>
</mode>
<mode name="raw_sensors">
- <message name="BOOZ_STATUS" period="1.2"/>
+ <message name="ROTORCRAFT_STATUS" period="1.2"/>
<message name="DL_VALUE" period="0.5"/>
<message name="ALIVE" period="2.1"/>
<message name="IMU_ACCEL_RAW" period=".05"/>
@@ -36,7 +36,7 @@
</mode>
<mode name="scaled_sensors">
- <message name="BOOZ_STATUS" period="1.2"/>
+ <message name="ROTORCRAFT_STATUS" period="1.2"/>
<message name="DL_VALUE" period="0.5"/>
<message name="ALIVE" period="2.1"/>
<message name="BOOZ2_GYRO" period=".075"/>
@@ -45,7 +45,7 @@
</mode>
<mode name="ahrs">
- <message name="BOOZ_STATUS" period="1.2"/>
+ <message name="ROTORCRAFT_STATUS" period="1.2"/>
<message name="DL_VALUE" period="0.5"/>
<message name="ALIVE" period="2.1"/>
<!-- <message name="BOOZ2_ALIGNER" period=".1"/> -->
@@ -56,14 +56,14 @@
</mode>
<mode name="rate_loop">
- <message name="BOOZ_STATUS" period="1.2"/>
+ <message name="ROTORCRAFT_STATUS" period="1.2"/>
<message name="DL_VALUE" period="0.5"/>
<message name="ALIVE" period="2.1"/>
<message name="BOOZ2_RATE_LOOP" period=".05"/>
</mode>
<mode name="attitude_loop">
- <message name="BOOZ_STATUS" period="1.2"/>
+ <message name="ROTORCRAFT_STATUS" period="1.2"/>
<message name="DL_VALUE" period="0.5"/>
<message name="ALIVE" period="0.9"/>
<message name="BOOZ2_STAB_ATTITUDE" period=".1"/>
@@ -71,7 +71,7 @@
</mode>
<mode name="vert_loop">
- <message name="BOOZ_STATUS" period="1.2"/>
+ <message name="ROTORCRAFT_STATUS" period="1.2"/>
<message name="DL_VALUE" period="0.5"/>
<message name="ALIVE" period="0.9"/>
<message name="VFF" period=".1"/>
@@ -88,7 +88,7 @@
<message name="HFF_DBG" period=".2"/>
<!--<message name="BOOZ2_STAB_ATTITUDE_REF" period=".4"/>-->
<message name="BOOZ2_FP" period="0.8"/>
- <message name="BOOZ_STATUS" period="1.2"/>
+ <message name="ROTORCRAFT_STATUS" period="1.2"/>
<message name="ROTORCRAFT_NAV_STATUS" period="1.6"/>
<message name="HFF_GPS" period=".1"/>
<message name="INS_REF" period="5.1"/>
@@ -100,7 +100,7 @@
</mode>
<mode name="hs_att_roll">
- <message name="BOOZ_STATUS" period="1.2"/>
+ <message name="ROTORCRAFT_STATUS" period="1.2"/>
<message name="ALIVE" period="0.9"/>
<message name="DL_VALUE" period="0.5"/>
<!-- <message name="BOOZ2_STAB_ATTITUDE_HS_ROLL" period="0.02"/> -->
@@ -108,7 +108,7 @@
<mode name="tune_hover">
<message name="DL_VALUE" period="1.1"/>
- <message name="BOOZ_STATUS" period="1.2"/>
+ <message name="ROTORCRAFT_STATUS" period="1.2"/>
<message name="ALIVE" period="2.1"/>
<!--<message name="BOOZ2_SONAR" period="0.1"/>-->
<!--<message name="BOOZ2_TUNE_HOVER" period=".1"/>-->
Modified: paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/telemetry.h
===================================================================
--- paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/telemetry.h
2010-09-28 19:01:02 UTC (rev 6021)
+++ paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/telemetry.h
2010-09-28 19:01:10 UTC (rev 6022)
@@ -56,10 +56,10 @@
extern uint8_t telemetry_mode_Main_DefaultChannel;
#ifdef USE_GPS
-#define PERIODIC_SEND_BOOZ_STATUS(_chan) { \
+#define PERIODIC_SEND_ROTORCRAFT_STATUS(_chan) {
\
uint32_t imu_nb_err = 0; \
uint8_t _twi_blmc_nb_err = 0; \
- DOWNLINK_SEND_BOOZ_STATUS(_chan, \
+ DOWNLINK_SEND_ROTORCRAFT_STATUS(_chan,
\
&imu_nb_err, \
&_twi_blmc_nb_err, \
&radio_control.status, \
@@ -74,11 +74,11 @@
); \
}
#else /* !USE_GPS */
-#define PERIODIC_SEND_BOOZ_STATUS(_chan) { \
+#define PERIODIC_SEND_ROTORCRAFT_STATUS(_chan) {
\
uint32_t imu_nb_err = 0; \
uint8_t twi_blmc_nb_err = 0; \
uint8_t fix = BOOZ2_GPS_FIX_NONE; \
- DOWNLINK_SEND_BOOZ_STATUS(_chan, \
+ DOWNLINK_SEND_ROTORCRAFT_STATUS(_chan,
\
&imu_nb_err, \
&twi_blmc_nb_err, \
&radio_control.status, \
Modified: paparazzi3/trunk/sw/ground_segment/tmtc/booz_server.ml
===================================================================
--- paparazzi3/trunk/sw/ground_segment/tmtc/booz_server.ml 2010-09-28
19:01:02 UTC (rev 6021)
+++ paparazzi3/trunk/sw/ground_segment/tmtc/booz_server.ml 2010-09-28
19:01:10 UTC (rev 6022)
@@ -180,7 +180,7 @@
a.flight_time <- ivalue "flight_time";
if a.gspeed > 3. && a.ap_mode = _AUTO2 then
Wind.update ac_name a.gspeed a.course
- | "BOOZ_STATUS" ->
+ | "ROTORCRAFT_STATUS" ->
a.fbw.rc_status <- get_rc_status (ivalue "rc_status");
a.gps_mode <- check_index (ivalue "gps_status") gps_modes
"GPS_MODE";
a.ap_mode <- check_index (get_pprz_mode (ivalue "ap_mode"))
ap_modes "BOOZ_AP_MODE";
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [paparazzi-commits] [6022] rename BOOZ_STATUS to ROTORCRAFT_STATUS,
Felix Ruess <=