Add RDF beacon and callsign to telemetry

[fw/altos] / ao_monitor.c

diff --git a/ao_monitor.c b/ao_monitor.c
index 845b63bf624840e0ea4914fc7f98d0fec0fe87d9..d62f69da371a2c098b3737e5ee339bbe65c7131d 100644 (file)
--- a/ao_monitor.c
+++ b/ao_monitor.c
@@ -23,11 +23,13 @@ const char const * const ao_state_names[] = {
 };
 
 __xdata uint8_t ao_monitoring;
+__pdata uint8_t ao_monitor_led;
 
 void
 ao_monitor(void)
 {
        __xdata struct ao_radio_recv recv;
+       __xdata char callsign[AO_MAX_CALLSIGN+1];
        uint8_t state;
 
        for (;;) {
@@ -35,10 +37,13 @@ ao_monitor(void)
                        ao_sleep(&ao_monitoring);
                ao_radio_recv(&recv);
                state = recv.telemetry.flight_state;
+               memcpy(callsign, recv.telemetry.callsign, AO_MAX_CALLSIGN);
                if (state > ao_flight_invalid)
                        state = ao_flight_invalid;
-               printf ("SERIAL %3d RSSI %3d STATUS %02x STATE %s ",
-                       recv.telemetry.addr, recv.rssi, recv.status,
+               printf ("CALL %s SERIAL %3d RSSI %3d STATUS %02x STATE %s ",
+                       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 ");
@@ -52,7 +57,7 @@ ao_monitor(void)
                       recv.telemetry.adc.sense_m);
                ao_gps_print(&recv.telemetry.gps);
                ao_usb_flush();
-               ao_led_for(AO_LED_GREEN, AO_MS_TO_TICKS(10));
+               ao_led_toggle(ao_monitor_led);
        }
 }
 
@@ -72,8 +77,9 @@ __code struct ao_cmds ao_monitor_cmds[] = {
 };
 
 void
-ao_monitor_init(void)
+ao_monitor_init(uint8_t monitor_led)
 {
+       ao_monitor_led = monitor_led;
        ao_monitoring = 0;
        ao_cmd_register(&ao_monitor_cmds[0]);
        ao_add_task(&ao_monitor_task, ao_monitor, "monitor");