Use 16-bit flite voice (which appears to have changed symbols recently)

[fw/altos] / src / ao_monitor.c

diff --git a/src/ao_monitor.c b/src/ao_monitor.c
index cd0d693eacdef675659ef9162c15608197736f6f..f2f3fc2e39650b98482dd44eff84f11881db3bbe 100644 (file)
--- a/src/ao_monitor.c
+++ b/src/ao_monitor.c
@@ -37,10 +37,11 @@ ao_monitor(void)
                if (state > ao_flight_invalid)
                        state = ao_flight_invalid;
                if (recv.status & PKT_APPEND_STATUS_1_CRC_OK) {
-                       printf("VERSION %d CALL %s SERIAL %3d RSSI %4d STATUS %02x STATE %7s ",
+                       printf("VERSION %d CALL %s SERIAL %3d FLIGHT %5u RSSI %4d STATUS %02x STATE %7s ",
                               AO_TELEMETRY_VERSION,
                               callsign,
                               recv.telemetry.addr,
+                              recv.telemetry.flight,
                               (int) recv.rssi - 74, recv.status,
                               ao_state_names[state]);
                        printf("%5u a: %5d p: %5d t: %5d v: %5d d: %5d m: %5d "
@@ -79,7 +80,8 @@ ao_set_monitor(uint8_t monitoring)
 {
        ao_monitoring = monitoring;
        ao_wakeup(&ao_monitoring);
-       ao_radio_abort();
+       if (!ao_monitoring)
+               ao_radio_abort();
 }
 
 static void