Fix up fancy dbg stuff. Add teleterra initial bits.

The dbg stuff needed a bit of help to actually walk the tables; it appears
that complex expressions confuse sdcc.

This also adds primitive teleterra bits, but no UI, etc.

Signed-off-by: Keith Packard <keithp@keithp.com>

1 files changed, 7 insertions, 10 deletions

diff --git a/ao.h b/ao.h
index acce9180..c2e83277 100644
--- 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