[paparazzi-commits] [6284] removed raw adc airspeed values from generic AIRSPEED message

[Felix Ruess]

Revision: 6284
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=6284
Author:   flixr
Date:     2010-10-27 13:51:35 +0000 (Wed, 27 Oct 2010)
Log Message:
-----------
removed raw adc airspeed values from generic AIRSPEED message

Modified Paths:
--------------
    paparazzi3/trunk/conf/messages.xml
    paparazzi3/trunk/sw/airborne/ap_downlink.h
    paparazzi3/trunk/sw/airborne/csc/csc_telemetry.h

Modified: paparazzi3/trunk/conf/messages.xml
===================================================================
--- paparazzi3/trunk/conf/messages.xml  2010-10-27 13:46:04 UTC (rev 6283)
+++ paparazzi3/trunk/conf/messages.xml  2010-10-27 13:51:35 UTC (rev 6284)
@@ -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"/>

Modified: paparazzi3/trunk/sw/airborne/ap_downlink.h
===================================================================
--- paparazzi3/trunk/sw/airborne/ap_downlink.h  2010-10-27 13:46:04 UTC (rev 
6283)
+++ paparazzi3/trunk/sw/airborne/ap_downlink.h  2010-10-27 13:51:35 UTC (rev 
6284)
@@ -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

Modified: paparazzi3/trunk/sw/airborne/csc/csc_telemetry.h
===================================================================
--- paparazzi3/trunk/sw/airborne/csc/csc_telemetry.h    2010-10-27 13:46:04 UTC 
(rev 6283)
+++ paparazzi3/trunk/sw/airborne/csc/csc_telemetry.h    2010-10-27 13:51:35 UTC 
(rev 6284)
@@ -132,7 +132,7 @@
 
 #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