X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao_monitor.c;h=f2f3fc2e39650b98482dd44eff84f11881db3bbe;hp=5997d427a4388536687bf1a0c3a4c93238d655bb;hb=6251e89c6eea655769f77bc18e98e79c99cf3cad;hpb=17d2432a8b9c15963cd3b821f025ad33972ef477

diff --git a/src/ao_monitor.c b/src/ao_monitor.c
index 5997d427..f2f3fc2e 100644
--- a/src/ao_monitor.c
+++ b/src/ao_monitor.c
@@ -30,18 +30,22 @@ ao_monitor(void)
 	for (;;) {
 		__critical while (!ao_monitoring)
 			ao_sleep(&ao_monitoring);
-		ao_radio_recv(&recv);
+		if (!ao_radio_recv(&recv))
+			continue;
 		state = recv.telemetry.flight_state;
 		memcpy(callsign, recv.telemetry.callsign, AO_MAX_CALLSIGN);
 		if (state > ao_flight_invalid)
 			state = ao_flight_invalid;
 		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 ",
+			printf("VERSION %d CALL %s SERIAL %3d FLIGHT %5u RSSI %4d STATUS %02x STATE %7s ",
+			       AO_TELEMETRY_VERSION,
+			       callsign,
+			       recv.telemetry.addr,
+			       recv.telemetry.flight,
+			       (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 a+: %5d a-: %5d ",
 			       recv.telemetry.adc.tick,
 			       recv.telemetry.adc.accel,
 			       recv.telemetry.adc.pres,
@@ -53,8 +57,13 @@ ao_monitor(void)
 			       recv.telemetry.ground_accel,
 			       recv.telemetry.flight_vel,
 			       recv.telemetry.flight_pres,
-			       recv.telemetry.ground_pres);
+			       recv.telemetry.ground_pres,
+			       recv.telemetry.accel_plus_g,
+			       recv.telemetry.accel_minus_g);
 			ao_gps_print(&recv.telemetry.gps);
+			putchar(' ');
+			ao_gps_tracking_print(&recv.telemetry.gps_tracking);
+			putchar('\n');
 			ao_rssi_set((int) recv.rssi - 74);
 		} else {
 			printf("CRC INVALID RSSI %3d\n", (int) recv.rssi - 74);
@@ -71,6 +80,8 @@ ao_set_monitor(uint8_t monitoring)
 {
 	ao_monitoring = monitoring;
 	ao_wakeup(&ao_monitoring);
+	if (!ao_monitoring)
+		ao_radio_abort();
 }
 
 static void