xbee_atcmd: add atcmd callback on response

[protos/xbee.git] / main.c

diff --git a/main.c b/main.c
index 52c0d80..4847d11 100644 (file)
--- a/main.c
+++ b/main.c
@@ -41,6 +41,7 @@
 #include <time.h>
 #include <netinet/in.h>
 #include <sys/queue.h>
+#include <linux/joystick.h>
 
 #include <getopt.h>
 
@@ -57,6 +58,7 @@
 #include "xbee_buf.h"
 #include "xbee_proto.h"
 #include "xbee.h"
+#include "joystick.h"
 #include "main.h"
 
 #define TIMEOUT_US 1000000
@@ -75,6 +77,7 @@ struct xbee_dev *xbee_dev;
 
 /* events */
 static struct event stdin_read_event, xbee_read_event;
+static struct event joystick_read_event;
 
 static struct cmdline *xbee_cl;
 
@@ -85,6 +88,8 @@ int xbee_raw = 0;
 int xbee_hexdump = 0;
 int xbee_debug = 0;
 FILE *xbee_logfile;
+static char *joystick_devname = NULL;
+struct joystick_info joyinfo;
 
 void xbeeapp_log(int always_on_stdout, const char *fmt, ...)
 {
@@ -238,6 +243,10 @@ static int dump_atcmd(struct xbee_ctx *ctx, struct xbee_atresp_hdr *frame,
        /* dump frame */
        if (atcmd_frame_status(frame, len) == 0) {
 
+               /* callback */
+               if (ctx->func != NULL)
+                       ctx->func(frame, len, ctx->arg);
+
                if (len == sizeof(struct xbee_atresp_hdr))
                        xbeeapp_log(ctx->foreground, "<%s>: ok\n",
                                    ctx->atcmd_query->name);
@@ -325,7 +334,7 @@ void xbee_rx(struct xbee_dev *dev, int channel, int type,
                        if (recvlen >= strlen("range") &&
                            !strncmp((char *)recvframe->data,
                                     "range", strlen("range"))) {
-                               xbeeapp_send_atcmd("DB", NULL, 0, 0);
+                               xbeeapp_send_atcmd("DB", NULL, 0, 0, NULL, NULL);
                                on_stdout = 0;
                        }
                        hexdump(on_stdout, "rx data", recvframe->data,
@@ -410,8 +419,10 @@ static int xbeeapp_send(struct xbee_ctx *ctx, int type, void *buf, unsigned len,
 
 /* send an AT command with parameters filled by caller. Disable
  * command line until we get the answer or until a timeout occurs */
-int xbeeapp_send_atcmd(const char *atcmd_str, void *param, unsigned param_len,
-                      int foreground)
+int xbeeapp_send_atcmd(const char *atcmd_str,
+                      void *param, unsigned param_len, int foreground,
+                      int (*func)(void *frame, unsigned len, void *arg),
+                      void *arg)
 {
        struct xbee_ctx *ctx;
        struct xbee_atcmd *cmd;
@@ -436,6 +447,8 @@ int xbeeapp_send_atcmd(const char *atcmd_str, void *param, unsigned param_len,
        memset(ctx, 0, sizeof(*ctx));
        ctx->type = ATCMD;
        ctx->atcmd_query = cmd;
+       ctx->func = func;
+       ctx->arg = arg;
 
        memcpy(&frame.atcmd.cmd, atcmd_str, 2);
        memcpy(&frame.buf, param, param_len);
@@ -696,7 +709,7 @@ parse_args(int argc, char **argv)
 
        argvopt = argv;
 
-       while ((opt = getopt_long(argc, argvopt, "hd:s:",
+       while ((opt = getopt_long(argc, argvopt, "hd:s:j:",
                                  lgopts, &option_index)) != EOF) {
 
                switch (opt) {
@@ -718,6 +731,10 @@ parse_args(int argc, char **argv)
                        xbee_raw = 1;
                        break;
 
+               case 'j':
+                       joystick_devname = optarg;
+                       break;
+
                /* long options */
                case 0:
                        /* if (!strcmp(lgopts[option_index].name, "option")) */
@@ -764,6 +781,17 @@ int main(int argc, char **argv)
        if (err < 0)
                return -1;
 
+       /* init joystick */
+       if (joystick_devname != NULL) {
+               if (joystick_init(joystick_devname, &joyinfo) < 0) {
+                       fprintf(stderr, "error in joystick init\n");
+                       return -1;
+               }
+               event_set(&joystick_read_event, joyinfo.fd, EV_READ | EV_PERSIST,
+                         joystick_input, &joyinfo);
+               event_add(&joystick_read_event, NULL);
+       }
+
        /* open xbee device */
        xbee_dev = xbee_open(xbee_devname, xbee_baud);
        if (xbee_dev == NULL)