[paparazzi-commits] [5436] Add interface for pressure sensors

[Allen Ibara]

Revision: 5436
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5436
Author:   aibara
Date:     2010-08-17 22:09:59 +0000 (Tue, 17 Aug 2010)
Log Message:
-----------
Add interface for pressure sensors

Modified Paths:
--------------
    paparazzi3/trunk/sw/airborne/fms/fms_spi_autopilot_msg.c
    paparazzi3/trunk/sw/airborne/fms/fms_spi_autopilot_msg.h

Modified: paparazzi3/trunk/sw/airborne/fms/fms_spi_autopilot_msg.c
===================================================================
--- paparazzi3/trunk/sw/airborne/fms/fms_spi_autopilot_msg.c    2010-08-17 
21:38:54 UTC (rev 5435)
+++ paparazzi3/trunk/sw/airborne/fms/fms_spi_autopilot_msg.c    2010-08-17 
22:09:59 UTC (rev 5436)
@@ -50,7 +50,8 @@
 static struct FloatEulers body_to_imu_eulers = LISA_BODY_TO_IMU_EULERS;
 
 static void (* vane_callback)(uint8_t vane_id, float alpha, float beta) = NULL;
-static void (* pressure_callback)(uint8_t pressure_id, uint32_t pressure1, 
uint32_t pressure2) = NULL;
+static void (* pressure_absolute_callback)(uint8_t pressure_id, uint32_t 
pressure) = NULL;
+static void (* pressure_differential_callback)(uint8_t pressure_id, uint32_t 
pressure) = NULL;
 static void (* radio_control_callback)(void) = NULL;
 
 void spi_ap_link_downlink_send(struct DownlinkTransport *tp)
@@ -66,11 +67,16 @@
   vane_callback = vane_cb;
 }
 
-void spi_ap_link_set_pressure_callback(void (* pressure_cb)(uint8_t 
pressure_id, uint32_t pressure1, uint32_t pressure2))
+void spi_ap_link_set_pressure_absolute_callback(void (* 
pressure_absolute_cb)(uint8_t pressure_id, uint32_t pressure))
 {
-  pressure_callback = pressure_cb;
+  pressure_absolute_callback = pressure_absolute_cb;
 }
 
+void spi_ap_link_set_pressure_differential_callback(void (* 
pressure_differential_cb)(uint8_t pressure_id, uint32_t pressure))
+{
+  pressure_differential_callback = pressure_differential_cb;
+}
+
 void spi_ap_link_set_radio_control_callback(void (* radio_control_cb)(void))
 {
   radio_control_callback = radio_control_cb;
@@ -100,12 +106,16 @@
 {
 
   if (msg_up->valid.vane && vane_callback)
-    // FIXME: placeholders since the vane and pressure data fields don't exist 
yet
+    // FIXME: placeholders since the vane data fields don't exist yet
     vane_callback(0, 0., 0.);
 
-  if (msg_up->valid.pressure && pressure_callback)
-    pressure_callback(0, 0, 0);
+  // Fill pressure data
+  if (msg_up->valid.pressure_absolute && pressure_absolute_callback)
+    pressure_absolute_callback(0, msg_up->pressure_absolute);
 
+  if (msg_up->valid.pressure_differential && pressure_differential_callback)
+    pressure_differential_callback(0, msg_up->pressure_differential);
+
   // Fill radio data
   if (msg_up->valid.rc && radio_control_callback) {
     radio_control.values[RADIO_CONTROL_ROLL] = msg_up->rc_roll;

Modified: paparazzi3/trunk/sw/airborne/fms/fms_spi_autopilot_msg.h
===================================================================
--- paparazzi3/trunk/sw/airborne/fms/fms_spi_autopilot_msg.h    2010-08-17 
21:38:54 UTC (rev 5435)
+++ paparazzi3/trunk/sw/airborne/fms/fms_spi_autopilot_msg.h    2010-08-17 
22:09:59 UTC (rev 5436)
@@ -27,7 +27,8 @@
 
 int spi_ap_link_init(void);
 void spi_ap_link_set_vane_callback(void (* vane_cb)(uint8_t vane_id, float 
alpha, float beta));
-void spi_ap_link_set_pressure_callback(void (* pressure_cb)(uint8_t 
pressure_id, uint32_t pressure1, uint32_t pressure2));
+void spi_ap_link_set_pressure_absolute_callback(void (* pressure_cb)(uint8_t 
pressure_id, uint32_t pressure));
+void spi_ap_link_set_pressure_differential_callback(void (* 
pressure_cb)(uint8_t pressure_id, uint32_t pressure));
 void spi_ap_link_set_radio_control_callback(void (* radio_control_cb)(void));
 void spi_ap_link_periodic(void);
 void spi_ap_link_downlink_send(struct DownlinkTransport *tp);