Merge pull request #6406 from kYc0o/xbee_fixes

Xbee fixes

drivers/xbee/xbee.c

@@ -41,11 +41,11 @@
 /**
  * @brief   Delay when entering command mode, must be > 1s
  */
-#define ENTER_CMD_MODE_DELAY        (1100U * 1000U)
+#define ENTER_CMD_MODE_DELAY        (1100UL * US_PER_MS)
 /**
  * @brief   Delay when resetting the device, 10ms
  */
-#define RESET_DELAY                 (10U * 1000U)
+#define RESET_DELAY                 (10UL * US_PER_MS)
 
 /**
  * @brief   Timeout for receiving AT command response

examples/gnrc_minimal/Makefile

@@ -13,15 +13,15 @@ BOARD_INSUFFICIENT_MEMORY := chronos msb-430 msb-430h
 #USEMODULE += xbee
 
 ## set default UART to use in case none was defined
-#XBEE_UART ?= "UART_NUMOF-1"
+#XBEE_UART ?= "1"
 
 ## export UART to params file
 #CFLAGS += -DXBEE_UART=$(XBEE_UART)
 
-## add current directory to the include path. Putting it in CFLAGS will make
-## it go to the beginning, before the standard includes.
-## That way xbee_params.h get's included and auto configuration can pick it up.
-#CFLAGS += -I$(CURDIR)
+# Comment this out to disable code in RIOT that does safety checking
+# which is not needed in a production environment but helps in the
+# development process:
+CFLAGS += -DDEVELHELP
 
 # Include packages that pull up and auto-init the link layer.
 # NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present

tests/driver_xbee/Makefile

@@ -16,11 +16,19 @@ USEMODULE += shell
 USEMODULE += shell_commands
 
 # set default UART to use in case none was defined
-XBEE_UART ?= "UART_NUMOF-1"
+XBEE_UART ?= "1"
 
 # export UART to params file
 CFLAGS += -DXBEE_UART=$(XBEE_UART)
 
+# No need of big buffer for this test
+CFLAGS += -DGNRC_PKTBUF_SIZE=512
+
+# Comment this out to disable code in RIOT that does safety checking
+# which is not needed in a production environment but helps in the
+# development process:
+CFLAGS += -DDEVELHELP
+
 # add current directory to the include path. Putting it in CFLAGS will make
 # it go to the beginning, before the standard includes.
 # That way xbee_params.h get's included and auto configuration can pick it up.