These ground loads want to monitor the radio constantly, and not require use
of the 'm' command before listening.
Signed-off-by: Keith Packard <keithp@keithp.com>
#include <string.h>
#include "cc1111.h"
#include <string.h>
#include "cc1111.h"
+#define TRUE 1
+#define FALSE 0
+
/* Convert a __data pointer into an __xdata pointer */
#define DATA_TO_XDATA(a) ((void __xdata *) ((uint8_t) (a) | 0xff00))
/* Convert a __data pointer into an __xdata pointer */
#define DATA_TO_XDATA(a) ((void __xdata *) ((uint8_t) (a) | 0xff00))
-ao_monitor_init(uint8_t led);
+ao_set_monitor(uint8_t monitoring);
+
+void
+ao_monitor_init(uint8_t led, uint8_t monitoring) __reentrant;
__xdata struct ao_task ao_monitor_task;
__xdata struct ao_task ao_monitor_task;
+void
+ao_set_monitor(uint8_t monitoring)
+{
+ ao_monitoring = monitoring;
+ ao_wakeup(&ao_monitoring);
+}
+
- 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[] = {
}
__code struct ao_cmds ao_monitor_cmds[] = {
- { 'm', ao_set_monitor, "m <0 off, 1 on> 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 },
-ao_monitor_init(uint8_t monitor_led)
+ao_monitor_init(uint8_t monitor_led, uint8_t monitoring) __reentrant
{
ao_monitor_led = monitor_led;
{
ao_monitor_led = monitor_led;
+ ao_monitoring = monitoring;
ao_cmd_register(&ao_monitor_cmds[0]);
ao_add_task(&ao_monitor_task, ao_monitor, "monitor");
}
ao_cmd_register(&ao_monitor_cmds[0]);
ao_add_task(&ao_monitor_task, ao_monitor, "monitor");
}
ao_timer_init();
ao_cmd_init();
ao_usb_init();
ao_timer_init();
ao_cmd_init();
ao_usb_init();
- ao_monitor_init(AO_LED_GREEN);
+ ao_monitor_init(AO_LED_GREEN, TRUE);
ao_rssi_init(AO_LED_RED);
ao_radio_init();
ao_dbg_init();
ao_rssi_init(AO_LED_RED);
ao_radio_init();
ao_dbg_init();
ao_usb_init();
ao_serial_init();
ao_gps_init();
ao_usb_init();
ao_serial_init();
ao_gps_init();
- ao_monitor_init(AO_LED_GREEN);
- ao_monitor_init(AO_LED_RED);
+ ao_monitor_init(AO_LED_GREEN, TRUE);
ao_radio_init();
ao_dbg_init();
ao_config_init();
ao_radio_init();
ao_dbg_init();
ao_config_init();
ao_timer_init();
ao_cmd_init();
ao_usb_init();
ao_timer_init();
ao_cmd_init();
ao_usb_init();
- ao_monitor_init(AO_LED_RED);
+ ao_monitor_init(AO_LED_RED, TRUE);
ao_rssi_init(AO_LED_RED);
ao_radio_init();
ao_dbg_init();
ao_rssi_init(AO_LED_RED);
ao_radio_init();
ao_dbg_init();