Fix up fancy dbg stuff. Add teleterra initial bits.

[fw/altos] / ao_monitor.c

diff --git a/ao_monitor.c b/ao_monitor.c
index 1c2d127457ebc8a5fba5cc220b42ec571a45a5e1..f3c1fe7d43ae0a1436815404c483b7d5ceeac5b0 100644 (file)
--- a/ao_monitor.c
+++ b/ao_monitor.c
@@ -45,21 +45,15 @@ ao_monitor(void)
                        ao_state_names[state]);
                if (!(recv.status & PKT_APPEND_STATUS_1_CRC_OK))
                        printf("CRC INVALID ");
-               switch (recv.telemetry.type) {
-               case AO_TELEMETRY_SENSOR:
-                       printf("%5u a: %d p: %d t: %d v: %d d: %d m: %d\n",
-                              recv.telemetry.u.adc.tick,
-                              recv.telemetry.u.adc.accel,
-                              recv.telemetry.u.adc.pres,
-                              recv.telemetry.u.adc.temp,
-                              recv.telemetry.u.adc.v_batt,
-                              recv.telemetry.u.adc.sense_d,
-                              recv.telemetry.u.adc.sense_m);
-                       break;
-               case AO_TELEMETRY_GPS:
-                       ao_gps_print(&recv.telemetry.u.gps);
-                       break;
-               }
+               printf("%5u a: %d p: %d t: %d v: %d d: %d m: %d\n",
+                      recv.telemetry.adc.tick,
+                      recv.telemetry.adc.accel,
+                      recv.telemetry.adc.pres,
+                      recv.telemetry.adc.temp,
+                      recv.telemetry.adc.v_batt,
+                      recv.telemetry.adc.sense_d,
+                      recv.telemetry.adc.sense_m);
+               ao_gps_print(&recv.telemetry.gps);
                ao_usb_flush();
        }
 }