Enable radio monitor by default in teleterra, teledongle and tidongle

[fw/altos] / ao_monitor.c

diff --git a/ao_monitor.c b/ao_monitor.c
index e05e84d89be7acc8fa91bda7fb91543898ca2c4f..6aed581a69b1f6d71a1b597923860f31428c728e 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;
 
@@ -55,6 +50,7 @@ ao_monitor(void)
                               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);
                }
@@ -65,24 +61,30 @@ ao_monitor(void)
 
 __xdata struct ao_task ao_monitor_task;
 
+void
+ao_set_monitor(uint8_t monitoring)
+{
+       ao_monitoring = monitoring;
+       ao_wakeup(&ao_monitoring);
+}
+
 static void
-ao_set_monitor(void)
+set_monitor(void)
 {
        ao_cmd_hex();
-       ao_monitoring = ao_cmd_lex_i != 0;
-       ao_wakeup(&ao_monitoring);
+       ao_set_monitor(ao_cmd_lex_i != 0);
 }
 
 __code struct ao_cmds ao_monitor_cmds[] = {
-       { 'm',  ao_set_monitor,         "m <0 off, 1 on>                    Enable/disable radio monitoring" },
-       { 0,    ao_set_monitor, NULL },
+       { 'm',  set_monitor,    "m <0 off, 1 on>                    Enable/disable radio monitoring" },
+       { 0,    set_monitor,    NULL },
 };
 
 void
-ao_monitor_init(uint8_t monitor_led)
+ao_monitor_init(uint8_t monitor_led, uint8_t monitoring) __reentrant
 {
        ao_monitor_led = monitor_led;
-       ao_monitoring = 0;
+       ao_monitoring = monitoring;
        ao_cmd_register(&ao_monitor_cmds[0]);
        ao_add_task(&ao_monitor_task, ao_monitor, "monitor");
 }