X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao_monitor.c;h=17eee5a3e52b1c1d819daf5c0e5b9c66d8071691;hp=845b63bf624840e0ea4914fc7f98d0fec0fe87d9;hb=a12edbfe21fe27a9efbf87bacda9ab4806256e2b;hpb=b32f2f0090ff967edac07ae4d7a9895ed0b96d31

diff --git a/ao_monitor.c b/ao_monitor.c
index 845b63bf..17eee5a3 100644
--- 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,14 +37,17 @@ 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 %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: %d p: %d t: %d v: %d d: %d m: %d ",
+		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,
@@ -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);
 	}
 }
 
@@ -67,13 +72,14 @@ ao_set_monitor(void)
 }
 
 __code struct ao_cmds ao_monitor_cmds[] = {
-	{ 'M',	ao_set_monitor,	"M                                  Enable/disable radio monitoring" },
+	{ 'm',	ao_set_monitor,		"m <0 off, 1 on>                    Enable/disable radio monitoring" },
 	{ 0,	ao_set_monitor,	NULL },
 };
 
 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");