X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao_monitor.c;h=5997d427a4388536687bf1a0c3a4c93238d655bb;hp=3db5e42d8a5563c64af6cdc63b19a5c1eaaa75ee;hb=91b07410122d0eaaf292cdb31c200925d45eaf2c;hpb=306b28f632e21b42ab165e7944283cf9764b590e

diff --git a/ao_monitor.c b/ao_monitor.c
index 3db5e42d..5997d427 100644
--- a/ao_monitor.c
+++ b/ao_monitor.c
@@ -17,17 +17,14 @@
 
 #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;
 
 void
 ao_monitor(void)
 {
 	__xdata struct ao_radio_recv recv;
+	__xdata char callsign[AO_MAX_CALLSIGN+1];
 	uint8_t state;
 
 	for (;;) {
@@ -35,45 +32,64 @@ 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,
-			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 ",
-		       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 %4d 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 fa: %5d ga: %d fv: %7ld fp: %5d gp: %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,
+			       recv.telemetry.flight_accel,
+			       recv.telemetry.ground_accel,
+			       recv.telemetry.flight_vel,
+			       recv.telemetry.flight_pres,
+			       recv.telemetry.ground_pres);
+			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);
 	}
 }
 
 __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                                  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(void)
+ao_monitor_init(uint8_t monitor_led, uint8_t monitoring) __reentrant
 {
-	ao_monitoring = 0;
+	ao_monitor_led = monitor_led;
+	ao_monitoring = monitoring;
 	ao_cmd_register(&ao_monitor_cmds[0]);
 	ao_add_task(&ao_monitor_task, ao_monitor, "monitor");
 }