X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fcore%2Fao_monitor.c;h=5a6f61ddf21b093cf6b30b8b8b3437eda21bf9be;hp=aaa6bb8b8fae980e4d01ab6f396bd6a5ac2beff7;hb=badda0d910c56135401dce9adc9e6abebdba2ad7;hpb=cff737c290347b61ba16584880c2f4c436b95042

diff --git a/src/core/ao_monitor.c b/src/core/ao_monitor.c
index aaa6bb8b..5a6f61dd 100644
--- a/src/core/ao_monitor.c
+++ b/src/core/ao_monitor.c
@@ -22,7 +22,11 @@
 #error Must define HAS_MONITOR to 1
 #endif
 
-__xdata uint8_t ao_monitoring;
+#ifndef LEGACY_MONITOR
+#error Must define LEGACY_MONITOR
+#endif
+
+__data uint8_t ao_monitoring;
 __pdata uint8_t ao_monitor_led;
 
 __xdata union ao_monitor ao_monitor_ring[AO_MONITOR_RING];
@@ -37,14 +41,16 @@ ao_monitor_get(void)
 	for (;;) {
 		switch (ao_monitoring) {
 		case 0:
-			ao_sleep(&ao_monitoring);
+			ao_sleep(DATA_TO_XDATA(&ao_monitoring));
 			continue;
+#if LEGACY_MONITOR
 		case AO_MONITORING_ORIG:
 			size = sizeof (struct ao_telemetry_orig_recv);
 			break;
 		case AO_MONITORING_TINY:
 			size = sizeof (struct ao_telemetry_tiny_recv);
 			break;
+#endif
 		default:
 			if (ao_monitoring > AO_MAX_TELEMETRY)
 				ao_monitoring = AO_MAX_TELEMETRY;
@@ -55,19 +61,28 @@ ao_monitor_get(void)
 			continue;
 		ao_monitor_head = ao_monitor_ring_next(ao_monitor_head);
 		ao_wakeup(DATA_TO_XDATA(&ao_monitor_head));
-		ao_led_toggle(ao_monitor_led);
+	}
+}
+
+void
+ao_monitor_blink(void)
+{
+	for (;;) {
+		ao_sleep(DATA_TO_XDATA(&ao_monitor_head));
+		ao_led_for(ao_monitor_led, AO_MS_TO_TICKS(100));
 	}
 }
 
 void
 ao_monitor_put(void)
 {
+#if LEGACY_MONITOR
 	__xdata char callsign[AO_MAX_CALLSIGN+1];
-
+	int16_t rssi;
+#endif
 	uint8_t ao_monitor_tail;
 	uint8_t state;
 	uint8_t sum, byte;
-	int16_t rssi;
 	__xdata union ao_monitor	*m;
 
 #define recv_raw	((m->raw))
@@ -81,12 +96,13 @@ ao_monitor_put(void)
 		m = &ao_monitor_ring[ao_monitor_tail];
 		ao_monitor_tail = ao_monitor_ring_next(ao_monitor_tail);
 		switch (ao_monitoring) {
+#if LEGACY_MONITOR
 		case AO_MONITORING_ORIG:
 			state = recv_orig.telemetry_orig.flight_state;
 
 			/* Typical RSSI offset for 38.4kBaud at 433 MHz is 74 */
 			rssi = (int16_t) (recv_orig.rssi >> 1) - 74;
-			memcpy(callsign, recv_orig.telemetry_orig.callsign, AO_MAX_CALLSIGN);
+			ao_xmemcpy(callsign, recv_orig.telemetry_orig.callsign, AO_MAX_CALLSIGN);
 			if (state > ao_flight_invalid)
 				state = ao_flight_invalid;
 			if (recv_orig.status & PKT_APPEND_STATUS_1_CRC_OK) {
@@ -163,7 +179,7 @@ ao_monitor_put(void)
 
 			/* Typical RSSI offset for 38.4kBaud at 433 MHz is 74 */
 			rssi = (int16_t) (recv_tiny.rssi >> 1) - 74;
-			memcpy(callsign, recv_tiny.telemetry_tiny.callsign, AO_MAX_CALLSIGN);
+			ao_xmemcpy(callsign, recv_tiny.telemetry_tiny.callsign, AO_MAX_CALLSIGN);
 			if (state > ao_flight_invalid)
 				state = ao_flight_invalid;
 			if (recv_tiny.status & PKT_APPEND_STATUS_1_CRC_OK) {
@@ -223,6 +239,7 @@ ao_monitor_put(void)
 				printf("CRC INVALID RSSI %3d\n", rssi);
 			}
 			break;
+#endif /* LEGACY_MONITOR */
 		default:
 			printf ("TELEM %02x", ao_monitoring + 2);
 			sum = 0x5a;
@@ -246,6 +263,7 @@ ao_monitor_put(void)
 
 __xdata struct ao_task ao_monitor_get_task;
 __xdata struct ao_task ao_monitor_put_task;
+__xdata struct ao_task ao_monitor_blink_task;
 
 void
 ao_set_monitor(uint8_t monitoring)
@@ -253,7 +271,7 @@ ao_set_monitor(uint8_t monitoring)
 	if (ao_monitoring)
 		ao_radio_recv_abort();
 	ao_monitoring = monitoring;
-	ao_wakeup(&ao_monitoring);
+	ao_wakeup(DATA_TO_XDATA(&ao_monitoring));
 }
 
 static void
@@ -276,4 +294,6 @@ ao_monitor_init(uint8_t monitor_led, uint8_t monitoring) __reentrant
 	ao_cmd_register(&ao_monitor_cmds[0]);
 	ao_add_task(&ao_monitor_get_task, ao_monitor_get, "monitor_get");
 	ao_add_task(&ao_monitor_put_task, ao_monitor_put, "monitor_put");
+	if (ao_monitor_led)
+		ao_add_task(&ao_monitor_blink_task, ao_monitor_blink, "monitor_blink");
 }