X-Git-Url: http://git.droids-corp.org/?p=protos%2Fxbee-avr.git;a=blobdiff_plain;f=main.c;h=7dc45bb4cfd41f7c55c5df669ee575498d732935;hp=20e26b01ab166dd77e65198e63eb17b50378c738;hb=c552a01853bea12a3cd44e35be8c0df49ed7d7d0;hpb=21d10011bc4b009d7a09131b955953fa7aba3815

diff --git a/main.c b/main.c
index 20e26b0..7dc45bb 100644
--- 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>
@@ -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))
-		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)
@@ -237,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;
@@ -263,6 +265,7 @@ int xbee_recv_data(struct xbee_recv_hdr *recvframe, unsigned len)
 
 			break;
 		}
+#endif
 		default:
 			return -1;
 	}
@@ -271,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;
@@ -377,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;
@@ -395,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);
@@ -574,7 +576,7 @@ void xbee_mainloop(void)
 		else {
 			if (xbee_cmdline_input_enabled)
 				cmdline_poll();
-			xbee_proto_rx(xbee_dev);
+			xbee_rx(xbee_dev);
 		}
 	}
 }
@@ -657,7 +659,7 @@ 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;
 	}