Split out ao_state_names to separate file

[fw/altos] / ao_monitor.c

diff --git a/ao_monitor.c b/ao_monitor.c
index 17eee5a3e52b1c1d819daf5c0e5b9c66d8071691..2f6584bc3dc29f7d37e9ea8d42b5ca787d12c32b 100644 (file)
--- a/ao_monitor.c
+++ b/ao_monitor.c
@@ -17,11 +17,6 @@
 
 #include "ao.h"
 
-const char const * const ao_state_names[] = {
-       "startup", "idle", "pad", "boost", "coast",
-       "apogee", "drogue", "main", "landed", "invalid"
-};
-
 __xdata uint8_t ao_monitoring;
 __pdata uint8_t ao_monitor_led;
 
@@ -40,22 +35,25 @@ ao_monitor(void)
                memcpy(callsign, recv.telemetry.callsign, AO_MAX_CALLSIGN);
                if (state > ao_flight_invalid)
                        state = ao_flight_invalid;
-               printf ("CALL %s SERIAL %3d RSSI %3d STATUS %02x STATE %7s ",
-                       callsign,
-                       recv.telemetry.addr,
-                       (int) recv.rssi - 74, recv.status,
-                       ao_state_names[state]);
-               if (!(recv.status & PKT_APPEND_STATUS_1_CRC_OK))
-                       printf("CRC INVALID ");
-               printf("%5u a: %5d p: %5d t: %5d v: %5d d: %5d m: %5d ",
-                      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);
+               if (recv.status & PKT_APPEND_STATUS_1_CRC_OK) {
+                       printf ("CALL %s SERIAL %3d RSSI %3d STATUS %02x STATE %7s ",
+                               callsign,
+                               recv.telemetry.addr,
+                               (int) recv.rssi - 74, recv.status,
+                               ao_state_names[state]);
+                       printf("%5u a: %5d p: %5d t: %5d v: %5d d: %5d m: %5d ",
+                              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_rssi_set((int) recv.rssi - 74);
+               } else {
+                       printf("CRC INVALID RSSI %3d\n", (int) recv.rssi - 74);
+               }
                ao_usb_flush();
                ao_led_toggle(ao_monitor_led);
        }