#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];
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;
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))
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) {
ao_gps_print(&recv_orig.telemetry_orig.gps);
ao_gps_tracking_print(&recv_orig.telemetry_orig.gps_tracking);
putchar('\n');
+#if HAS_RSSI
ao_rssi_set(rssi);
+#endif
} else {
printf("CRC INVALID RSSI %3d\n", rssi);
}
/* 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) {
recv_tiny.telemetry_tiny.flight_vel,
recv_tiny.telemetry_tiny.flight_pres);
#endif
+#if HAS_RSSI
ao_rssi_set(rssi);
+#endif
} else {
printf("CRC INVALID RSSI %3d\n", rssi);
}
break;
+#endif /* LEGACY_MONITOR */
default:
printf ("TELEM %02x", ao_monitoring + 2);
sum = 0x5a;
printf("%02x", byte);
}
printf("%02x\n", sum);
+#if HAS_RSSI
+ if (recv_raw.packet[ao_monitoring + 1] & PKT_APPEND_STATUS_1_CRC_OK) {
+ rssi = ((int16_t) recv_raw.packet[ao_monitoring] >> 1) - 74;
+ ao_rssi_set(rssi);
+ }
+#endif
break;
}
ao_usb_flush();
__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)
if (ao_monitoring)
ao_radio_recv_abort();
ao_monitoring = monitoring;
- ao_wakeup(&ao_monitoring);
+ ao_wakeup(DATA_TO_XDATA(&ao_monitoring));
}
static void
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");
}