removed raw adc airspeed values from generic AIRSPEED message

This commit is contained in:
Felix Ruess
2010-10-27 13:51:35 +00:00
parent 0800c2efbe
commit 1ea52abbea
3 changed files with 3 additions and 4 deletions
-1
View File
@@ -377,7 +377,6 @@
</message>
<message name="AIRSPEED" id="54">
<field name="adc" type="uint16"/>
<field name="airspeed" type="float" unit="m/s"/>
<field name="airspeed_sp" type="float" unit="m/s"/>
<field name="airspeed_cnt" type="float" unit="m/s"/>
+2 -2
View File
@@ -195,9 +195,9 @@
#endif
#ifdef MEASURE_AIRSPEED
#define PERIODIC_SEND_AIRSPEED(_chan) DOWNLINK_SEND_AIRSPEED (_chan, &adc_airspeed_val,&estimator_airspeed,&estimator_airspeed,&estimator_airspeed,&estimator_airspeed)
#define PERIODIC_SEND_AIRSPEED(_chan) DOWNLINK_SEND_AIRSPEED (_chan, &estimator_airspeed, &estimator_airspeed, &estimator_airspeed, &estimator_airspeed)
#elif defined USE_AIRSPEED
#define PERIODIC_SEND_AIRSPEED(_chan) DOWNLINK_SEND_AIRSPEED (_chan, &adc_airspeed_val,&estimator_airspeed,&v_ctl_auto_airspeed_setpoint,&v_ctl_auto_airspeed_controlled,&v_ctl_auto_groundspeed_setpoint)
#define PERIODIC_SEND_AIRSPEED(_chan) DOWNLINK_SEND_AIRSPEED (_chan, &estimator_airspeed, &v_ctl_auto_airspeed_setpoint, &v_ctl_auto_airspeed_controlled, &v_ctl_auto_groundspeed_setpoint)
#else
#define PERIODIC_SEND_AIRSPEED(_chan) {}
#endif
+1 -1
View File
@@ -132,7 +132,7 @@ DOWNLINK_SEND_INS3(_chan, \
#ifdef USE_AIRSPEED
#include "estimator.h"
#define PERIODIC_SEND_AIRSPEED(_chan) { float empty; DOWNLINK_SEND_AIRSPEED (_chan, &adc_airspeed_val,&estimator_airspeed,&empty,&empty,&empty,&empty) }
#define PERIODIC_SEND_AIRSPEED(_chan) { float empty; DOWNLINK_SEND_AIRSPEED (_chan, &estimator_airspeed,&empty,&empty,&empty,&empty) }
#else
#define PERIODIC_SEND_AIRSPEED(_chan) {}
#endif