Merge branch 'develop' into bugfix/cc13xx/prop-mode-pan-id

arch/cpu/cc26xx-cc13xx/rf-core/ble-cc2650.c

@@ -40,6 +40,9 @@
 #include "dev/radio.h"
 #include "os/dev/ble-hal.h"
 #include "rf-core/ble-hal/ble-hal-cc26xx.h"
+
+#include <stdint.h>
+#include <string.h>
 /*---------------------------------------------------------------------------*/
 #include "sys/log.h"
 #define LOG_MODULE "RADIO"

arch/platform/jn516x/dev/micromac-radio.c

@@ -278,8 +278,7 @@ init(void)
     vMMAC_EnableInterrupts(&radio_interrupt_handler);
   }
   vMMAC_ConfigureRadio();
-  set_channel(current_channel);
-  set_txpower(current_tx_power);
+  set_txpower(current_tx_power); /* it sets also the current_channel */
 
   vMMAC_GetMacAddress(&node_long_address);
   /* Short addresses are disabled by default */
@@ -493,8 +492,7 @@ void
 set_channel(int c)
 {
   current_channel = c;
-  /* will fine tune TX power as well */
-  vMMAC_SetChannel(current_channel);
+  vMMAC_SetChannelAndPower(current_channel, current_tx_power);
 }
 /*---------------------------------------------------------------------------*/
 #if !MICROMAC_RADIO_MAC

examples/ble/ipv6-client/Makefile

@@ -1,10 +0,0 @@
-DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
-CONTIKI_PROJECT=client
-
-all: $(CONTIKI_PROJECT)
-
-
-MAKE_MAC = 		 MAKE_MAC_BLE
-MAKE_NET =     MAKE_NET_IPV6
-CONTIKI = ../../..
-include $(CONTIKI)/Makefile.include

examples/platform-specific/cc26xx/ble-ipv6/Makefile

@@ -0,0 +1,11 @@
+CONTIKI_PROJECT=client
+
+all: $(CONTIKI_PROJECT)
+
+PLATFORMS_ONLY = srf06-cc26xx
+BOARDS_ONLY = launchpad/cc2650 sensortag/cc2650 srf06/cc26xx
+
+MAKE_MAC = MAKE_MAC_BLE
+MAKE_NET = MAKE_NET_IPV6
+CONTIKI = ../../../..
+include $(CONTIKI)/Makefile.include

examples/platform-specific/cc26xx/ble-ipv6/README.md

@@ -37,8 +37,6 @@ The L2CAP LE credit-based flow control support is implemented in `arch/cpu/cc26x
 Besides implementing rudimentary L2CAP support, this module handles fragmentation of large IPv6 packets.
 
 ## Using BLEach
-A simple IPv6-over-BLE UDP-client is included under `examples/platform-specific/cc26xx/cc26xx-ble-client-demo`.
-
 Currently, BLEach is only available for the Texas Instruments CC2650 hardware platform.
 
 The following sections describe how to configure BLEach for IPv6-over-BLE nodes and border routers.

tests/02-compile-arm-ports-01/Makefile

@@ -11,6 +11,8 @@ platform-specific/cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=launchpad/cc2650 \
 platform-specific/cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=launchpad/cc1310 \
 platform-specific/cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=launchpad/cc1350 \
 platform-specific/cc26xx/very-sleepy-demo/srf06-cc26xx \
+platform-specific/cc26xx/ble-ipv6/srf06-cc26xx:BOARD=sensortag/cc2650 \
+nullnet/srf06-cc26xx:BOARD=sensortag/cc2650 \
 rpl-border-router/srf06-cc26xx:BOARD=launchpad/cc2650 \
 sensniff/srf06-cc26xx \
 sensniff/srf06-cc26xx:BOARD=launchpad/cc1310 \
@@ -29,7 +31,6 @@ dev/leds/srf06-cc26xx:BOARD=launchpad/cc1310 \
 dev/leds/srf06-cc26xx:BOARD=launchpad/cc1350 \
 dev/leds/srf06-cc26xx:BOARD=launchpad/cc2650 \
 6tisch/etsi-plugtest-2017/srf06-cc26xx:BOARD=launchpad/cc2650 \
-ble/ipv6-client/srf06-cc26xx:BOARD=launchpad/cc2650 \
 storage/cfs-coffee/cc2538dk \
 sensniff/cc2538dk \
 rpl-udp/cc2538dk \