add a command to dump xbee stats

[protos/xbee-avr.git] / main.c

diff --git a/main.c b/main.c
index 0e52717..7dc45bb 100644 (file)
--- a/main.c
+++ b/main.c
@@ -26,7 +26,7 @@
  */
 
 /* fuses:
- * avrdude -p atmega1284p -P usb -c avrispmkii -U lfuse:w:0xff:m -U hfuse:w:0x99:m -U efuse:w:0xff:m
+ * avrdude -p atmega1284p -P usb -c avrispmkii -U lfuse:w:0xff:m -U hfuse:w:0x91:m -U efuse:w:0xff:m
  */
 
 #include <aversive.h>
@@ -52,6 +52,8 @@
 #include <rdline.h>
 #include <timer.h>
 
+#include "eeprom_config.h"
+#include "beep.h"
 #include "main.h"
 
 struct xbeeboard xbeeboard;
@@ -201,15 +203,16 @@ static int dump_atcmd(struct xbee_ctx *ctx, struct xbee_atresp_hdr *frame,
        result = (void *)frame->data;
        len -= offsetof(struct xbee_atresp_hdr, data);
        if (cmd.flags & XBEE_ATCMD_F_PARAM_U8 && len == sizeof(uint8_t))
-               printf_P(PSTR("<%s> is 0x%x\r\n"), atcmd_str, result->u8);
+               printf_P(PSTR("<%s> is 0x%x (%d)\r\n"), atcmd_str, result->u8,
+                        result->u8);
        else if (cmd.flags & XBEE_ATCMD_F_PARAM_U16 && len == sizeof(uint16_t))
-               printf_P(PSTR("<%s> is 0x%x\r\n"),
+               printf_P(PSTR("<%s> is 0x%x (%d)\r\n"),
                         atcmd_str,
-                        ntohs(result->u16));
+                        ntohs(result->u16), ntohs(result->u16));
        else if (cmd.flags & XBEE_ATCMD_F_PARAM_U32 && len == sizeof(uint32_t))
-               printf_P(PSTR("<%s> is 0x%"PRIx32"\r\n"),
+               printf_P(PSTR("<%s> is 0x%"PRIx32" (%"PRIu32")\r\n"),
                         atcmd_str,
-                        ntohl(result->u32));
+                        ntohl(result->u32), ntohs(result->u32));
        else if (cmd.flags & XBEE_ATCMD_F_PARAM_S16 && len == sizeof(int16_t))
                printf_P(PSTR("<%s> is %d\r\n"), atcmd_str, ntohs(result->s16));
        else if (len == 0)
@@ -235,6 +238,7 @@ int xbee_recv_data(struct xbee_recv_hdr *recvframe, unsigned len)
                return -1;
 
        switch (rch->type) {
+#if 0
                case RC_PROTO_TYPE_CHANNEL: {
                        struct rc_proto_channel *rcc =
                                (struct rc_proto_channel *) recvframe->data;
@@ -246,7 +250,7 @@ int xbee_recv_data(struct xbee_recv_hdr *recvframe, unsigned len)
                        val += 512;
                        spi_servo_set(0, val);
                        break;
-                                 }
+               }
                case RC_PROTO_TYPE_RANGE: {
                        struct rc_proto_range *rcr =
                                (struct rc_proto_range *) recvframe->data;
@@ -261,6 +265,7 @@ int xbee_recv_data(struct xbee_recv_hdr *recvframe, unsigned len)
 
                        break;
                }
+#endif
                default:
                        return -1;
        }
@@ -269,7 +274,7 @@ int xbee_recv_data(struct xbee_recv_hdr *recvframe, unsigned len)
 }
 
 /* socat /dev/ttyUSB0,raw,echo=0,b115200 /dev/ttyACM1,raw,echo=0,b115200 */
-void xbee_rx(struct xbee_dev *dev, int channel, int type,
+void xbeeapp_rx(struct xbee_dev *dev, int channel, int type,
             void *frame, unsigned len, void *opaque)
 {
        struct xbee_ctx *ctx = opaque;
@@ -375,7 +380,7 @@ static int xbeeapp_send(struct xbee_ctx *ctx, int type, void *buf, unsigned len,
 
        /* register a channel */
        channel = xbee_register_channel(xbee_dev, XBEE_CHANNEL_ANY,
-                                       xbee_rx, NULL);
+                                       xbeeapp_rx, NULL);
        if (channel < 0) {
                printf_P(PSTR("cannot send: no free channel\r\n"));
                return -1;
@@ -393,8 +398,7 @@ static int xbeeapp_send(struct xbee_ctx *ctx, int type, void *buf, unsigned len,
                hexdump("xmit frame", buf, len);
 
        /* transmit the frame on this channel */
-       ret = xbee_proto_xmit(xbee_dev, channel, type, buf,
-                             len);
+       ret = xbee_tx(xbee_dev, channel, type, buf, len);
        if (ret < 0) {
                printf_P(PSTR("cannot send\r\n"));
                xbee_unregister_channel(xbee_dev, channel);
@@ -572,7 +576,7 @@ void xbee_mainloop(void)
                else {
                        if (xbee_cmdline_input_enabled)
                                cmdline_poll();
-                       xbee_proto_rx(xbee_dev);
+                       xbee_rx(xbee_dev);
                }
        }
 }
@@ -588,6 +592,8 @@ static void main_timer_interrupt(void)
        static uint16_t cycles;
        static uint8_t cpt;
 
+       cpt++;
+
        /* interrupt every 2048 cycles */
        cycles += 2048;
        if (cycles >= 12000) {
@@ -601,6 +607,11 @@ static void main_timer_interrupt(void)
        else
                LED1_OFF();
 
+       if (cpt & beep_mask)
+               BUZZER_ON();
+       else
+               BUZZER_OFF();
+
        /* call scheduler every 682us with interrupt unlocked */
        sei();
        if ((cpt & 0x3) == 0)
@@ -614,7 +625,7 @@ int main(void)
        int8_t err;
        struct xbee_dev dev;
 
-       DDRA = 0x07; /* LEDs */
+       DDRA = 0x07 /* LEDs */ | 0x10 /* buzzer */;
 
        uart_init();
        uart_register_rx_event(CMDLINE_UART, emergency);
@@ -627,6 +638,7 @@ int main(void)
 
        cmdline_init();
        spi_servo_init();
+       beep_init();
 
        printf_P(PSTR("\r\n"));
        rdline_newline(&xbeeboard.rdl, xbeeboard.prompt);
@@ -647,13 +659,13 @@ int main(void)
 
        /* register default channel with a callback */
        if (xbee_register_channel(xbee_dev, XBEE_DEFAULT_CHANNEL,
-                                 xbee_rx, NULL) < 0) {
+                                 xbeeapp_rx, NULL) < 0) {
                fprintf(stderr, "cannot register default channel\n");
                return -1;
        }
-
        sei();
 
+       eeprom_load_config();
        xbee_mainloop();
        return 0;
 }