#include <parse_string.h>
#include <parse_num.h>
#include <uart.h>
+#include <xbee.h>
+#include <callout.h>
-#include "xbee_atcmd.h"
-#include "xbee_neighbor.h"
-#include "xbee_stats.h"
-#include "xbee_proto.h"
-#include "xbee.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_period_ms = 1000;
static int range_powermask = 0x1F;
-static uint8_t range_power = 0;
+//static uint8_t range_power = 0;
static int range_running = 0;
static uint64_t range_dstaddr = 0xFFFF; /* broadcast by default */
static struct callout range_event;
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;
+ (void)clt;
+ (void)dummy;
+#if 0
uint8_t i, mask;
struct rc_proto_range rangepkt;
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
}
/* this structure is filled when cmd_help is parsed successfully */
static void cmd_sendmsg_parsed(void *parsed_result, void *data)
{
struct cmd_sendmsg_result *res = parsed_result;
+ struct xbee_msg msg;
(void)data;
- xbeeapp_send_msg(res->addr, res->data, strlen(res->data), 1);
+
+ msg.iovlen = 1;
+ msg.iov[0].buf = res->data;
+ msg.iov[0].len = strlen(res->data);
+
+ xbeeapp_send_msg(res->addr, &msg, 1);
}
const char PROGMEM str_sendmsg[] = "sendmsg";
/* ************* */
+/* this structure is filled when cmd_send_hello is parsed successfully */
+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 *use_neigh)
+{
+ struct cmd_send_hello_result *res = parsed_result;
+ uint16_t now, next, diff;
+ uint8_t flags;
+ uint64_t addr;
+
+ if (use_neigh)
+ addr = res->neigh->addr;
+ else
+ addr = res->addr;
+
+ IRQ_LOCK(flags);
+ now = global_ms;
+ IRQ_UNLOCK(flags);
+
+ next = now;
+
+ while (!cmdline_keypressed() && res->count != 0) {
+ IRQ_LOCK(flags);
+ now = global_ms;
+ IRQ_UNLOCK(flags);
+
+ diff = now - next;
+ if (diff < res->period)
+ continue;
+
+ rc_proto_send_hello(addr, res->data, strlen(res->data));
+ next += res->period;
+ res->count--;
+ }
+}
+
+const char PROGMEM str_send_hello[] = "send_hello";
+
+const parse_token_string_t PROGMEM cmd_send_hello_send_hello =
+ TOKEN_STRING_INITIALIZER(struct cmd_send_hello_result, send_hello,
+ str_send_hello);
+
+const parse_token_num_t PROGMEM cmd_send_hello_addr =
+ TOKEN_NUM_INITIALIZER(struct cmd_send_hello_result, addr, UINT64);
+
+const parse_token_num_t PROGMEM cmd_send_hello_period =
+ TOKEN_NUM_INITIALIZER(struct cmd_send_hello_result, period, UINT16);
+
+const parse_token_num_t PROGMEM cmd_send_hello_count =
+ TOKEN_NUM_INITIALIZER(struct cmd_send_hello_result, count, UINT16);
+
+const parse_token_string_t PROGMEM cmd_send_hello_data =
+ TOKEN_STRING_INITIALIZER(struct cmd_send_hello_result, data, NULL);
+
+const char PROGMEM help_send_hello[] =
+ "Send hello msg to a node: addr, period_ms, count, str";
+
+const parse_inst_t PROGMEM cmd_send_hello = {
+ .f = cmd_send_hello_parsed, /* function to call */
+ .data = NULL, /* 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_addr,
+ (PGM_P)&cmd_send_hello_period,
+ (PGM_P)&cmd_send_hello_count,
+ (PGM_P)&cmd_send_hello_data,
+ NULL,
+ },
+};
+
+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 */
struct cmd_sendmsg_name_result {
fixed_string_t sendmsg_name;
static void cmd_sendmsg_name_parsed(void *parsed_result, void *data)
{
struct cmd_sendmsg_name_result *res = parsed_result;
+ struct xbee_msg msg;
(void)data;
- xbeeapp_send_msg(res->neigh->addr, res->data, strlen(res->data), 1);
+
+ msg.iovlen = 1;
+ msg.iov[0].buf = res->data;
+ msg.iov[0].len = strlen(res->data);
+
+ xbeeapp_send_msg(res->neigh->addr, &msg, 1);
}
const parse_token_string_t PROGMEM cmd_sendmsg_name_sendmsg_name =
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;
/**********************************************************/
+/* this structure is filled when cmd_dump_xbee_stats is parsed successfully */
+struct cmd_dump_xbee_stats_result {
+ fixed_string_t arg0;
+};
+
+static void cmd_dump_xbee_stats_parsed(void *parsed_result, void *data)
+{
+ (void)parsed_result;
+ (void)data;
+
+ xbee_dump_stats(xbee_dev);
+}
+
+const char PROGMEM str_dump_xbee_stats_arg0[] = "dump_xbee_stats";
+const parse_token_string_t PROGMEM cmd_dump_xbee_stats_arg0 =
+ TOKEN_STRING_INITIALIZER(struct cmd_dump_xbee_stats_result, arg0,
+ str_dump_xbee_stats_arg0);
+
+const char PROGMEM help_dump_xbee_stats[] = "Test the spi";
+const parse_inst_t PROGMEM cmd_dump_xbee_stats = {
+ .f = cmd_dump_xbee_stats_parsed, /* function to call */
+ .data = NULL, /* 2nd arg of func */
+ .help_str = help_dump_xbee_stats,
+ .tokens = { /* token list, NULL terminated */
+ (PGM_P)&cmd_dump_xbee_stats_arg0,
+ NULL,
+ },
+};
+
+/**********************************************************/
+
/* this structure is filled when cmd_test_eeprom_config is parsed successfully */
struct cmd_test_eeprom_config_result {
fixed_string_t arg0;
&cmd_log_show,
&cmd_log_type,
&cmd_stack_space,
- &cmd_scheduler,
+ &cmd_callout,
&cmd_help,
&cmd_neigh_del,
&cmd_neigh_add,
&cmd_write_u16,
&cmd_write_u32,
&cmd_sendmsg,
+ &cmd_send_hello,
+ &cmd_send_hello_name,
&cmd_sendmsg_name,
&cmd_range,
&cmd_range_period,
&cmd_servo_bypassppm,
&cmd_servo_show,
&cmd_test_spi,
+ &cmd_dump_xbee_stats,
&cmd_test_eeprom_config,
&cmd_eeprom_del,
&cmd_eeprom_add,
git.droids-corp.org / protos / xbee-avr.git / blobdiff