Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-27 17:06:31 +08:00
Code Issues Actions 31 Packages Projects Releases Wiki Activity

[fixedwing] remove useless MEASURE_AIRSPEED flag

Browse Source
This commit is contained in:
Felix Ruess
2015-02-12 13:12:29 +01:00
parent 7118b437fb
commit 8eb1aebd7c
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/airframes/ENAC/fixed-wing/jp.xml
-1
View File
@@ -11,7 +11,6 @@
<configure name="ADC_AIRSPEED" value="ADC_1"/> <configure name="ADC_AIRSPEED" value="ADC_1"/>
<define name="AIRSPEED_ADC_QUADRATIC_SCALE" value="0.5"/> <define name="AIRSPEED_ADC_QUADRATIC_SCALE" value="0.5"/>
<define name="AIRSPEED_ADC_BIAS" value="430"/> <define name="AIRSPEED_ADC_BIAS" value="430"/>
<define name="MEASURE_AIRSPEED"/>
</load> </load>
<load name="gps_ubx_ucenter.xml"/> <load name="gps_ubx_ucenter.xml"/>
<!--load name="sys_mon.xml"/--> <!--load name="sys_mon.xml"/-->
sw/airborne/firmwares/fixedwing/autopilot.c
+4 -4
View File
@@ -150,13 +150,13 @@ static void send_desired(struct transport_tx *trans, struct link_device *dev)
static void send_airspeed(struct transport_tx *trans __attribute__((unused)), static void send_airspeed(struct transport_tx *trans __attribute__((unused)),
struct link_device *dev __attribute__((unused))) struct link_device *dev __attribute__((unused)))
{ {
#ifdef MEASURE_AIRSPEED #if USE_AIRSPEED
float *airspeed = stateGetAirspeed_f();
pprz_msg_send_AIRSPEED(trans, dev, AC_ID, airspeed, airspeed, airspeed, airspeed);
#elif USE_AIRSPEED
pprz_msg_send_AIRSPEED(trans, dev, AC_ID, pprz_msg_send_AIRSPEED(trans, dev, AC_ID,
stateGetAirspeed_f(), &v_ctl_auto_airspeed_setpoint, stateGetAirspeed_f(), &v_ctl_auto_airspeed_setpoint,
&v_ctl_auto_airspeed_controlled, &v_ctl_auto_groundspeed_setpoint); &v_ctl_auto_airspeed_controlled, &v_ctl_auto_groundspeed_setpoint);
#else
float zero = 0;
pprz_msg_send_AIRSPEED(trans, dev, AC_ID, stateGetAirspeed_f(), &zero, &zero, &zero);
#endif #endif
} }