Transmit computed ground pressure and acceleration values

[fw/altos] / ao.h

diff --git a/ao.h b/ao.h
index 96dd02d00509ae52761ebe13c718cd5530ff298b..411b950deb23c2e22bd26c2155825863d3609862 100644 (file)
--- a/ao.h
+++ b/ao.h
@@ -23,6 +23,9 @@
 #include <string.h>
 #include "cc1111.h"
 
+#define TRUE 1
+#define FALSE 0
+
 /* Convert a __data pointer into an __xdata pointer */
 #define DATA_TO_XDATA(a)       ((void __xdata *) ((uint8_t) (a) | 0xff00))
 
@@ -565,6 +568,7 @@ extern __pdata enum ao_flight_state ao_flight_state;
 extern __pdata uint16_t                        ao_flight_tick;
 extern __pdata int16_t                 ao_flight_accel;
 extern __pdata int16_t                 ao_flight_pres;
+extern __pdata int32_t                 ao_flight_vel;
 extern __pdata int16_t                 ao_ground_pres;
 extern __pdata int16_t                 ao_ground_accel;
 extern __pdata int16_t                 ao_min_pres;
@@ -720,6 +724,11 @@ ao_gps_report_init(void);
 struct ao_telemetry {
        uint8_t                 addr;
        uint8_t                 flight_state;
+       int16_t                 flight_accel;
+       int16_t                 ground_accel;
+       int32_t                 flight_vel;
+       int16_t                 flight_pres;
+       int16_t                 ground_pres;
        struct ao_adc           adc;
        struct ao_gps_data      gps;
        char                    callsign[AO_MAX_CALLSIGN];
@@ -775,7 +784,10 @@ void
 ao_monitor(void);
 
 void
-ao_monitor_init(uint8_t led);
+ao_set_monitor(uint8_t monitoring);
+
+void
+ao_monitor_init(uint8_t led, uint8_t monitoring) __reentrant;
 
 /*
  * ao_stdio.c