Fix up fancy dbg stuff. Add teleterra initial bits.

[fw/altos] / ao.h

diff --git a/ao.h b/ao.h
index acce918079ad95f683ce6f0f02b1e2c08af581ff..c2e83277ca6e6c3e2320a3ccfd6b5f40de2ad41f 100644 (file)
--- a/ao.h
+++ b/ao.h
@@ -622,6 +622,9 @@ ao_dbg_debug_mode(void);
 void
 ao_dbg_reset(void);
 
+void
+ao_dbg_init(void);
+
 /*
  * ao_serial.c
  */
@@ -685,17 +688,11 @@ ao_gps_init(void);
  * ao_telemetry.c
  */
 
-#define AO_TELEMETRY_SENSOR    1
-#define AO_TELEMETRY_GPS       2
-
 struct ao_telemetry {
-       uint8_t         addr;
-       uint8_t         type;
-       uint8_t         flight_state;
-       union {
-               struct ao_adc           adc;
-               struct ao_gps_data      gps;
-       } u;
+       uint8_t                 addr;
+       uint8_t                 flight_state;
+       struct ao_adc           adc;
+       struct ao_gps_data      gps;
 };
 
 void