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
parse rx hello frames
[protos/xbee-avr.git]
/
main.c
diff --git
a/main.c
b/main.c
index
c6f13e3
..
c3511b5
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-203,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)
@@
-265,6
+266,16
@@
int xbee_recv_data(struct xbee_recv_hdr *recvframe, unsigned len)
break;
}
#endif
break;
}
#endif
+ case RC_PROTO_HELLO: {
+ struct rc_proto_hello *rch =
+ (struct rc_proto_hello *) recvframe->data;
+
+ if (xbee_debug)
+ printf_P(PSTR("recv hello len=%d\r\n"),
+ rch->datalen);
+
+ break;
+ }
default:
return -1;
}
default:
return -1;
}
@@
-273,11
+284,11
@@
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
xbeeapp_rx(struct xbee_dev *dev, int channel, int type,
+
int8_t
xbeeapp_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;
- int
do_hexdump = xbee_hexdump
;
+ int
8_t ret = 0
;
if (xbee_debug)
printf_P(PSTR("type=0x%x, channel=%d, ctx=%p\r\n"),
if (xbee_debug)
printf_P(PSTR("type=0x%x, channel=%d, ctx=%p\r\n"),
@@
-319,24
+330,28
@@
void xbeeapp_rx(struct xbee_dev *dev, int channel, int type,
/* this answer contains an atcmd answer at offset 10 */
if (dump_atcmd(ctx, frame + 10, len - 10) < 0)
/* this answer contains an atcmd answer at offset 10 */
if (dump_atcmd(ctx, frame + 10, len - 10) < 0)
- do_hexdump = 1;
+ ret = -1;
+
break;
}
case XBEE_TYPE_ATRESP: {
if (dump_atcmd(ctx, frame, len) < 0)
break;
}
case XBEE_TYPE_ATRESP: {
if (dump_atcmd(ctx, frame, len) < 0)
- do_hexdump = 1;
+ ret = -1;
+
break;
}
case XBEE_TYPE_XMIT_STATUS: {
if (parse_xmit_status(ctx, frame, len) < 0)
break;
}
case XBEE_TYPE_XMIT_STATUS: {
if (parse_xmit_status(ctx, frame, len) < 0)
- do_hexdump = 1;
+ ret = -1;
+
break;
}
case XBEE_TYPE_RECV: {
if (xbee_recv_data(frame, len) < 0)
break;
}
case XBEE_TYPE_RECV: {
if (xbee_recv_data(frame, len) < 0)
- do_hexdump = 1;
+ ret = -1;
+
break;
}
break;
}
@@
-349,11
+364,13
@@
void xbeeapp_rx(struct xbee_dev *dev, int channel, int type,
case XBEE_TYPE_NODE_ID:
default:
printf_P(PSTR("Invalid frame\r\n"));
case XBEE_TYPE_NODE_ID:
default:
printf_P(PSTR("Invalid frame\r\n"));
-
do_hexdump =
1;
+
ret = -
1;
break;
}
break;
}
- if (do_hexdump)
+ if (ret < 0)
+ hexdump("undecoded rx frame", frame, len);
+ else if (xbee_hexdump)
hexdump("undecoded rx frame", frame, len);
/* restart command line if it was a blocking query */
hexdump("undecoded rx frame", frame, len);
/* restart command line if it was a blocking query */
@@
-639,9
+656,6
@@
int main(void)
spi_servo_init();
beep_init();
spi_servo_init();
beep_init();
- printf_P(PSTR("\r\n"));
- rdline_newline(&xbeeboard.rdl, xbeeboard.prompt);
-
callout_manager_init(&cm, get_time_ms);
//callout_reset(&cm, &t1, 500, PERIODICAL, do_led_blink, NULL);
callout_manager_init(&cm, get_time_ms);
//callout_reset(&cm, &t1, 500, PERIODICAL, do_led_blink, NULL);
@@
-665,6
+679,10
@@
int main(void)
sei();
eeprom_load_config();
sei();
eeprom_load_config();
+
+ printf_P(PSTR("\r\n"));
+ rdline_newline(&xbeeboard.rdl, xbeeboard.prompt);
+
xbee_mainloop();
return 0;
}
xbee_mainloop();
return 0;
}