riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drivers: xbee: switch to xtimer

Browse Source
This commit is contained in:
Kaspar Schleiser 2015-08-14 10:20:58 +02:00
parent 94c5512751
commit c9aa280710
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.dep
View File

@ -22,6 +22,7 @@ endif
ifneq (,$(filter xbee,$(USEMODULE))) ifneq (,$(filter xbee,$(USEMODULE)))
USEMODULE += ieee802154 USEMODULE += ieee802154
USEMODULE += xtimer
endif endif
ifneq (,$(filter gnrc_zep,$(USEMODULE))) ifneq (,$(filter gnrc_zep,$(USEMODULE)))

8
drivers/xbee/xbee.c
View File

@ -23,7 +23,7 @@
#include <string.h> #include <string.h>
#include "xbee.h" #include "xbee.h"
#include "hwtimer.h" #include "xtimer.h"
#include "msg.h" #include "msg.h"
#include "net/eui64.h" #include "net/eui64.h"
#include "net/ieee802154.h" #include "net/ieee802154.h"
@ -455,13 +455,13 @@ int xbee_init(xbee_t *dev, uart_t uart, uint32_t baudrate,
/* if reset pin is connected, do a hardware reset */ /* if reset pin is connected, do a hardware reset */
if (reset_pin != GPIO_UNDEF) { if (reset_pin != GPIO_UNDEF) {
gpio_clear(reset_pin); gpio_clear(reset_pin);
hwtimer_wait(HWTIMER_TICKS(RESET_DELAY)); xtimer_usleep(RESET_DELAY);
gpio_set(reset_pin); gpio_set(reset_pin);
} }
/* put the XBee device into command mode */ /* put the XBee device into command mode */
hwtimer_wait(HWTIMER_TICKS(ENTER_CMD_MODE_DELAY)); xtimer_usleep(ENTER_CMD_MODE_DELAY);
_at_cmd(dev, "+++"); _at_cmd(dev, "+++");
hwtimer_wait(HWTIMER_TICKS(ENTER_CMD_MODE_DELAY)); xtimer_usleep(ENTER_CMD_MODE_DELAY);
/* disable non IEEE802.15.4 extensions */ /* disable non IEEE802.15.4 extensions */
_at_cmd(dev, "ATMM2\r"); _at_cmd(dev, "ATMM2\r");
/* put XBee module in "API mode without escaped characters" */ /* put XBee module in "API mode without escaped characters" */