#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;
static int range_count = 100;
static int range_cur_count = 0;
-static void monitor_cb(struct callout_manager *cm,
+static void monitor_cb(struct callout_mgr *cm,
struct callout *clt, void *dummy)
{
(void)clt;
xbeeapp_send_atcmd(monitor_current->atcmd, NULL, 0, 0, NULL, NULL);
monitor_current = LIST_NEXT(monitor_current, next);
- callout_reset(cm, &monitor_event,
- monitor_period_ms / monitor_count,
- SINGLE, monitor_cb, NULL);
+ callout_reschedule(cm, clt, monitor_period_ms / monitor_count);
}
-static void range_cb(struct callout_manager *cm,
+static void range_cb(struct callout_mgr *cm,
struct callout *clt, void *dummy)
{
(void)cm;
if (range_cur_count == 0) {
range_running = 0;
- return;
+ callout_stop(cm, clt);
}
- callout_reset(cm, &range_event,
- range_period_ms,
- SINGLE, range_cb, NULL);
+ callout_reschedule(cm, clt, range_period_ms);
#endif
}
struct cmd_send_hello_result {
fixed_string_t send_hello;
uint64_t addr;
+ struct xbee_neigh *neigh;
uint16_t period;
uint16_t count;
fixed_string_t data;
};
/* function called when cmd_send_hello is parsed successfully */
-static void cmd_send_hello_parsed(void *parsed_result, void *data)
+static void cmd_send_hello_parsed(void *parsed_result, void *use_neigh)
{
struct cmd_send_hello_result *res = parsed_result;
uint16_t now, next, diff;
uint8_t flags;
+ uint64_t addr;
- (void)data;
+ if (use_neigh)
+ addr = res->neigh->addr;
+ else
+ addr = res->addr;
IRQ_LOCK(flags);
now = global_ms;
next = now;
- while (!cmdline_keypressed() || res->count == 0) {
+ while (!cmdline_keypressed() && res->count != 0) {
IRQ_LOCK(flags);
now = global_ms;
IRQ_UNLOCK(flags);
if (diff < res->period)
continue;
- rc_proto_send_hello(res->addr, res->data, strlen(res->data));
+ rc_proto_send_hello(addr, res->data, strlen(res->data));
next += res->period;
+ res->count--;
}
}
},
};
+const parse_token_neighbor_t PROGMEM cmd_send_hello_neigh =
+ TOKEN_NEIGHBOR_INITIALIZER(struct cmd_send_hello_result, neigh,
+ &xbee_dev);
+
+const parse_inst_t PROGMEM cmd_send_hello_name = {
+ .f = cmd_send_hello_parsed, /* function to call */
+ .data = (void *)1, /* 2nd arg of func */
+ .help_str = help_send_hello,
+ .tokens = { /* token list, NULL terminated */
+ (PGM_P)&cmd_send_hello_send_hello,
+ (PGM_P)&cmd_send_hello_neigh,
+ (PGM_P)&cmd_send_hello_period,
+ (PGM_P)&cmd_send_hello_count,
+ (PGM_P)&cmd_send_hello_data,
+ NULL,
+ },
+};
+
/* ************* */
/* this structure is filled when cmd_sendmsg_name is parsed successfully */
return;
}
range_cur_count = range_count;
- callout_init(&range_event);
- callout_reset(&cm, &range_event, 0,
- SINGLE, range_cb, NULL);
+ callout_init(&range_event, range_cb, NULL, 0);
+ 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);
}
}
printf_P(PSTR("no regs to be monitored\r\n"));
return;
}
- callout_init(&monitor_event);
- callout_reset(&cm, &monitor_event, 0, SINGLE, monitor_cb, NULL);
+ callout_init(&monitor_event, monitor_cb, NULL, 0);
+ 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,
&cmd_write_u32,
&cmd_sendmsg,
&cmd_send_hello,
+ &cmd_send_hello_name,
&cmd_sendmsg_name,
&cmd_range,
&cmd_range_period,