Skip to content
Snippets Groups Projects
Commit deeb514d authored by Martine Lenders's avatar Martine Lenders
Browse files

Merge pull request #2836 from haukepetersen/opt_xbee

drivers/xbee: misc fixes 
parents d274fc4a 727ddb9d
No related branches found
No related tags found
No related merge requests found
...@@ -67,12 +67,12 @@ ...@@ -67,12 +67,12 @@
/** /**
* @brief Default PAN ID used after initialization * @brief Default PAN ID used after initialization
*/ */
#define XBEE_DEFAULT_PANID (0x0001) #define XBEE_DEFAULT_PANID (0x0023)
/** /**
* @brief Default channel used after initialization * @brief Default channel used after initialization
*/ */
#define XBEE_DEFAULT_CHANNEL (11U) #define XBEE_DEFAULT_CHANNEL (17U)
/** /**
* @brief States of the internal FSM for handling incoming UART frames * @brief States of the internal FSM for handling incoming UART frames
......
...@@ -558,7 +558,7 @@ static int _send(ng_netdev_t *netdev, ng_pktsnip_t *pkt) ...@@ -558,7 +558,7 @@ static int _send(ng_netdev_t *netdev, ng_pktsnip_t *pkt)
dev->tx_buf[1] = (uint8_t)((size + 11) >> 8); dev->tx_buf[1] = (uint8_t)((size + 11) >> 8);
dev->tx_buf[2] = (uint8_t)(size + 11); dev->tx_buf[2] = (uint8_t)(size + 11);
dev->tx_buf[3] = API_ID_TX_LONG_ADDR; dev->tx_buf[3] = API_ID_TX_LONG_ADDR;
memcpy(dev->tx_buf + 11, ng_netif_hdr_get_dst_addr(hdr), 8); memcpy(dev->tx_buf + 5, ng_netif_hdr_get_dst_addr(hdr), 8);
pos = 13; pos = 13;
} }
/* set options */ /* set options */
...@@ -696,7 +696,7 @@ static void _isr_event(ng_netdev_t *netdev, uint32_t event_type) ...@@ -696,7 +696,7 @@ static void _isr_event(ng_netdev_t *netdev, uint32_t event_type)
/* allocate and fill interface header */ /* allocate and fill interface header */
pkt_head = ng_pktbuf_add(NULL, NULL, pkt_head = ng_pktbuf_add(NULL, NULL,
sizeof(ng_netif_hdr_t) + (2 * addr_len), sizeof(ng_netif_hdr_t) + (2 * addr_len),
NG_NETTYPE_UNDEF); NG_NETTYPE_NETIF);
if (pkt_head == NULL) { if (pkt_head == NULL) {
DEBUG("xbee: Error allocating netif header in packet buffer on RX\n"); DEBUG("xbee: Error allocating netif header in packet buffer on RX\n");
dev->rx_count = 0; dev->rx_count = 0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment