#include <parse_num.h>
#include <uart.h>
#include <xbee.h>
+#include <callout.h>
-#include "callout.h"
#include "parse_atcmd.h"
#include "parse_neighbor.h"
#include "parse_monitor.h"
#include "spi_servo.h"
#include "rc_proto.h"
+#include "xbee_user.h"
#include "main.h"
#include "cmdline.h"
#include "beep.h"
extern const parse_inst_t PROGMEM cmd_log_show;
extern const parse_inst_t PROGMEM cmd_log_type;
extern const parse_inst_t PROGMEM cmd_stack_space;
-extern const parse_inst_t PROGMEM cmd_scheduler;
+extern const parse_inst_t PROGMEM cmd_callout;
static int monitor_period_ms = 1000;
static int monitor_running = 0;
if (range_cur_count == 0) {
range_running = 0;
- return;
+ callout_stop(cm, clt);
}
callout_reschedule(cm, clt, range_period_ms);
}
range_cur_count = range_count;
callout_init(&range_event, range_cb, NULL, 0);
- callout_schedule(&cm, &range_event, 0); /* immediate */
+ callout_schedule(&xbeeboard.mainloop_cm,
+ &range_event, 0); /* immediate */
range_running = 1;
}
else if (!strcmp(res->action, "end")) {
return;
}
range_running = 0;
- callout_stop(&cm, &range_event);
+ callout_stop(&xbeeboard.mainloop_cm, &range_event);
}
}
return;
}
callout_init(&monitor_event, monitor_cb, NULL, 0);
- callout_schedule(&cm, &monitor_event, 0); /* immediate */
+ callout_schedule(&xbeeboard.mainloop_cm,
+ &monitor_event, 0); /* immediate */
monitor_running = 1;
monitor_current = LIST_FIRST(&xbee_monitor_list);
printf_P(PSTR("monitor cb: %S %s\r\n"),
return;
}
monitor_running = 0;
- callout_stop(&cm, &monitor_event);
+ callout_stop(&xbeeboard.mainloop_cm, &monitor_event);
}
}
monitor_count --;
if (monitor_count == 0) {
printf_P(PSTR("Disable monitoring, no more event\r\n"));
- callout_stop(&cm, &monitor_event);
+ callout_stop(&xbeeboard.mainloop_cm, &monitor_event);
monitor_running = 0;
return;
}
{
(void)parsed_result;
(void)data;
+
+ if (range_running || monitor_running) {
+ printf_P(PSTR("stop running range or monitor first\r\n"));
+ return;
+ }
printf_P(PSTR("switched to raw mode, CTRL-D to exit\r\n"));
rdline_stop(&xbeeboard.rdl); /* don't display prompt when return */
xbee_raw = 1;
&cmd_log_show,
&cmd_log_type,
&cmd_stack_space,
- &cmd_scheduler,
+ &cmd_callout,
&cmd_help,
&cmd_neigh_del,
&cmd_neigh_add,