git.droids-corp.org
/
protos
/
xbee-avr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add a command to dump xbee stats
[protos/xbee-avr.git]
/
main.c
diff --git
a/main.c
b/main.c
index
d12ed7a
..
7dc45bb
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-25,6
+25,10
@@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+/* fuses:
+ * 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>
#include <aversive/queue.h>
#include <aversive/endian.h>
#include <aversive.h>
#include <aversive/queue.h>
#include <aversive/endian.h>
@@
-48,16
+52,8
@@
#include <rdline.h>
#include <timer.h>
#include <rdline.h>
#include <timer.h>
-#include "xbee_neighbor.h"
-#include "xbee_atcmd.h"
-#include "xbee_stats.h"
-#include "xbee_buf.h"
-#include "xbee_proto.h"
-#include "xbee.h"
-#include "cmdline.h"
-#include "callout.h"
-#include "rc_proto.h"
-#include "spi_servo.h"
+#include "eeprom_config.h"
+#include "beep.h"
#include "main.h"
struct xbeeboard xbeeboard;
#include "main.h"
struct xbeeboard xbeeboard;
@@
-114,6
+110,8
@@
static void hexdump(const char *title, const void *buf, unsigned int len)
static int parse_xmit_status(struct xbee_ctx *ctx,
struct xbee_xmit_status_hdr *frame, unsigned len)
{
static int parse_xmit_status(struct xbee_ctx *ctx,
struct xbee_xmit_status_hdr *frame, unsigned len)
{
+ (void)len;
+
if (ctx == NULL) {
printf_P(PSTR("no context\r\n"));
return -1;
if (ctx == NULL) {
printf_P(PSTR("no context\r\n"));
return -1;
@@
-144,7
+142,7
@@
static int dump_atcmd(struct xbee_ctx *ctx, struct xbee_atresp_hdr *frame,
unsigned len)
{
char atcmd_str[3];
unsigned len)
{
char atcmd_str[3];
-
struct xbee_atcmd_pgm
*cmd_pgm;
+
const struct xbee_atcmd
*cmd_pgm;
struct xbee_atcmd cmd;
union {
uint8_t u8;
struct xbee_atcmd cmd;
union {
uint8_t u8;
@@
-205,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))
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))
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,
atcmd_str,
- ntohs(result->u16));
+ ntohs(result->u16)
, ntohs(result->u16)
);
else if (cmd.flags & XBEE_ATCMD_F_PARAM_U32 && len == sizeof(uint32_t))
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,
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)
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)
@@
-228,17
+227,30
@@
static int dump_atcmd(struct xbee_ctx *ctx, struct xbee_atresp_hdr *frame,
int xbee_recv_data(struct xbee_recv_hdr *recvframe, unsigned len)
{
int xbee_recv_data(struct xbee_recv_hdr *recvframe, unsigned len)
{
-
int datalen = len - sizeof(*recvframe)
;
+
unsigned int datalen
;
struct rc_proto_hdr *rch = (struct rc_proto_hdr *) &recvframe->data;
struct rc_proto_hdr *rch = (struct rc_proto_hdr *) &recvframe->data;
+ if (len < sizeof(*recvframe))
+ return -1;
+
+ datalen = len - sizeof(*recvframe);
if (datalen < sizeof(struct rc_proto_hdr))
return -1;
switch (rch->type) {
if (datalen < sizeof(struct rc_proto_hdr))
return -1;
switch (rch->type) {
- case RC_PROTO_TYPE_CHANNEL:
+#if 0
+ case RC_PROTO_TYPE_CHANNEL: {
+ struct rc_proto_channel *rcc =
+ (struct rc_proto_channel *) recvframe->data;
+ int16_t val;
if (datalen != sizeof(struct rc_proto_channel))
return -1;
if (datalen != sizeof(struct rc_proto_channel))
return -1;
+ val = ntohs(rcc->axis[0]);
+ val >>= 6;
+ val += 512;
+ spi_servo_set(0, val);
break;
break;
+ }
case RC_PROTO_TYPE_RANGE: {
struct rc_proto_range *rcr =
(struct rc_proto_range *) recvframe->data;
case RC_PROTO_TYPE_RANGE: {
struct rc_proto_range *rcr =
(struct rc_proto_range *) recvframe->data;
@@
-253,6
+265,7
@@
int xbee_recv_data(struct xbee_recv_hdr *recvframe, unsigned len)
break;
}
break;
}
+#endif
default:
return -1;
}
default:
return -1;
}
@@
-261,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 */
}
/* 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 xbee
app
_rx(struct xbee_dev *dev, int channel, int type,
void *frame, unsigned len, void *opaque)
{
struct xbee_ctx *ctx = opaque;
void *frame, unsigned len, void *opaque)
{
struct xbee_ctx *ctx = opaque;
@@
-367,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,
/* register a channel */
channel = xbee_register_channel(xbee_dev, XBEE_CHANNEL_ANY,
- xbee_rx, NULL);
+ xbee
app
_rx, NULL);
if (channel < 0) {
printf_P(PSTR("cannot send: no free channel\r\n"));
return -1;
if (channel < 0) {
printf_P(PSTR("cannot send: no free channel\r\n"));
return -1;
@@
-385,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 */
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);
if (ret < 0) {
printf_P(PSTR("cannot send\r\n"));
xbee_unregister_channel(xbee_dev, channel);
@@
-478,6
+490,9
@@
static void evt_timeout(struct callout_manager *cm, struct callout *clt,
{
struct xbee_ctx *ctx = arg;
{
struct xbee_ctx *ctx = arg;
+ (void)cm;
+ (void)clt;
+
printf_P(PSTR("Timeout\r\n"));
/* restart command line */
printf_P(PSTR("Timeout\r\n"));
/* restart command line */
@@
-500,7
+515,6
@@
void xbee_unload_timeout(struct xbee_ctx *ctx)
void bootloader(void)
{
void bootloader(void)
{
-#ifndef USE_USB
#define BOOTLOADER_ADDR 0x3f000
if (pgm_read_byte_far(BOOTLOADER_ADDR) == 0xff) {
printf_P(PSTR("Bootloader is not present\r\n"));
#define BOOTLOADER_ADDR 0x3f000
if (pgm_read_byte_far(BOOTLOADER_ADDR) == 0xff) {
printf_P(PSTR("Bootloader is not present\r\n"));
@@
-512,23
+526,18
@@
void bootloader(void)
TIMSK1 = 0;
TIMSK2 = 0;
TIMSK3 = 0;
TIMSK1 = 0;
TIMSK2 = 0;
TIMSK3 = 0;
- TIMSK4 = 0;
- TIMSK5 = 0;
EIMSK = 0;
UCSR0B = 0;
UCSR1B = 0;
EIMSK = 0;
UCSR0B = 0;
UCSR1B = 0;
- UCSR2B = 0;
- UCSR3B = 0;
SPCR = 0;
TWCR = 0;
ACSR = 0;
ADCSRA = 0;
SPCR = 0;
TWCR = 0;
ACSR = 0;
ADCSRA = 0;
- EIND = 1;
- __asm__ __volatile__ ("ldi r31,0xf8\n");
- __asm__ __volatile__ ("ldi r30,0x00\n");
- __asm__ __volatile__ ("eijmp\n");
-#endif
+ /* XXX */
+ /* __asm__ __volatile__ ("ldi r31,0xf8\n"); */
+ /* __asm__ __volatile__ ("ldi r30,0x00\n"); */
+ /* __asm__ __volatile__ ("eijmp\n"); */
}
void xbee_mainloop(void)
}
void xbee_mainloop(void)
@@
-547,6
+556,11
@@
void xbee_mainloop(void)
/* from cmdline to xbee */
c = cmdline_dev_recv(NULL);
if (c == 4) { /* CTRL-d */
/* from cmdline to xbee */
c = cmdline_dev_recv(NULL);
if (c == 4) { /* CTRL-d */
+ xbee_dev_send('A', NULL);
+ xbee_dev_send('T', NULL);
+ xbee_dev_send('C', NULL);
+ xbee_dev_send('N', NULL);
+ xbee_dev_send('\n', NULL);
xbee_raw = 0;
rdline_newline(&xbeeboard.rdl,
xbeeboard.prompt);
xbee_raw = 0;
rdline_newline(&xbeeboard.rdl,
xbeeboard.prompt);
@@
-562,14
+576,8
@@
void xbee_mainloop(void)
else {
if (xbee_cmdline_input_enabled)
cmdline_poll();
else {
if (xbee_cmdline_input_enabled)
cmdline_poll();
- xbee_
proto_
rx(xbee_dev);
+ xbee_rx(xbee_dev);
}
}
-
-#ifdef USE_USB
- CDC_Device_USBTask(&VirtualSerial1_CDC_Interface);
- CDC_Device_USBTask(&VirtualSerial2_CDC_Interface);
- USB_USBTask();
-#endif
}
}
}
}
@@
-579,54
+587,48
@@
static uint16_t get_time_ms(void)
return global_ms;
}
return global_ms;
}
-static void do_led_blink(struct callout_manager *cm,
- struct callout *clt, void *dummy)
+static void main_timer_interrupt(void)
{
{
- static uint8_t a = 0;
+ static uint16_t cycles;
+ static uint8_t cpt;
+
+ cpt++;
-#ifdef USE_USB
- if (a & 1)
- LEDs_SetAllLEDs(0);
+ /* interrupt every 2048 cycles */
+ cycles += 2048;
+ if (cycles >= 12000) {
+ cycles -= 12000;
+ global_ms ++;
+ }
+
+ /* LED blink */
+ if (global_ms & 0x80)
+ LED1_ON();
else
else
- LEDs_SetAllLEDs(0xff);
-#else
- /* XXX */
-#endif
- a++;
-}
+ LED1_OFF();
-
static void increment_ms(void *dummy
)
-{
- global_ms++;
-}
+
if (cpt & beep_mask
)
+ BUZZER_ON();
+ else
+ BUZZER_OFF();
-static void main_timer_interrupt(void)
-{
- static uint8_t cpt = 0;
- cpt++;
+ /* call scheduler every 682us with interrupt unlocked */
sei();
if ((cpt & 0x3) == 0)
scheduler_interrupt();
}
sei();
if ((cpt & 0x3) == 0)
scheduler_interrupt();
}
-/** Main program entry point. This routine contains the overall program flow, including initial
- * setup of all components and the main program loop.
- */
int main(void)
{
int main(void)
{
- struct callout t1;
+
//
struct callout t1;
FILE *xbee_file;
int8_t err;
struct xbee_dev dev;
FILE *xbee_file;
int8_t err;
struct xbee_dev dev;
- spi_servo_init();
-#ifdef USE_USB
- SetupHardware();
+ DDRA = 0x07 /* LEDs */ | 0x10 /* buzzer */;
- LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
-#else
uart_init();
uart_init();
-#endif
+ uart_register_rx_event(CMDLINE_UART, emergency);
fdevopen(cmdline_dev_send, cmdline_dev_recv);
xbee_file = fdevopen(xbee_dev_send, xbee_dev_recv);
fdevopen(cmdline_dev_send, cmdline_dev_recv);
xbee_file = fdevopen(xbee_dev_send, xbee_dev_recv);
@@
-634,17
+636,15
@@
int main(void)
timer_init();
timer0_register_OV_intr(main_timer_interrupt);
timer_init();
timer0_register_OV_intr(main_timer_interrupt);
- scheduler_add_periodical_event_priority(increment_ms, NULL,
- 1000L / SCHEDULER_UNIT,
- LED_PRIO);
cmdline_init();
cmdline_init();
-#ifndef USE_USB
- /* in usb mode, it's done in usb callback */
+ spi_servo_init();
+ beep_init();
+
printf_P(PSTR("\r\n"));
rdline_newline(&xbeeboard.rdl, xbeeboard.prompt);
printf_P(PSTR("\r\n"));
rdline_newline(&xbeeboard.rdl, xbeeboard.prompt);
-#endif
+
callout_manager_init(&cm, get_time_ms);
callout_manager_init(&cm, get_time_ms);
- callout_reset(&cm, &t1, 500, PERIODICAL, do_led_blink, NULL);
+
//
callout_reset(&cm, &t1, 500, PERIODICAL, do_led_blink, NULL);
/* initialize libxbee */
err = xbee_init();
/* initialize libxbee */
err = xbee_init();
@@
-659,12
+659,13
@@
int main(void)
/* register default channel with a callback */
if (xbee_register_channel(xbee_dev, XBEE_DEFAULT_CHANNEL,
/* register default channel with a callback */
if (xbee_register_channel(xbee_dev, XBEE_DEFAULT_CHANNEL,
- xbee_rx, NULL) < 0) {
+ xbee
app
_rx, NULL) < 0) {
fprintf(stderr, "cannot register default channel\n");
return -1;
}
fprintf(stderr, "cannot register default channel\n");
return -1;
}
-
sei();
sei();
+
+ eeprom_load_config();
xbee_mainloop();
return 0;
}
xbee_mainloop();
return 0;
}