Merge pull request #160 from ARMmbed/jenkinsconfig

Wi-SUN configuration for CI build

Author: Jarno Lämsä

Jenkinsfile

@@ -33,7 +33,8 @@ def toolchains = [
 def configurations = [
   LOWPAN: "6lowpan_Atmel_RF.json",
   THREAD: "Thread_Atmel_RF.json",
-  THREAD_SLIP: "Thread_SLIP_Atmel_RF.json"
+  THREAD_SLIP: "Thread_SLIP_Atmel_RF.json",
+  WI_SUN: "Wisun_Stm_s2lp_RF.json"
   ]
 
 def stepsForParallel = [:]
@@ -48,8 +49,8 @@ for (int i = 0; i < targets.size(); i++) {
       def configurationLabel = configurations.keySet().asList().get(k)
       def configurationFile = configurations.get(configurationLabel)
       def stepName = "${target} ${configurationLabel} ${toolchain}"
-      // SLIP configuration exist only for K64F based Raspberry HAT
-      if (configurationLabel == "THREAD_SLIP" && target != "K64F") {
+      // SLIP configuration exist only for K64F based Raspberry HAT and Wi-SUN configuration exist only for K64F
+      if ((configurationLabel == "THREAD_SLIP" || configurationLabel == "WI_SUN") && target != "K64F") {
         continue;
       }
       stepsForParallel[stepName] = buildStep(target, compilerLabel, configurationFile, configurationLabel, toolchain)

configs/Wisun_Stm_s2lp_RF.json

@@ -43,7 +43,7 @@
         "operating-mode": 255,
         "uc-fixed-channel": "0xffff",
         "bc-fixed-channel": "0xffff",
-        "network-name": "\"ARM-WS-TESTING\""
+        "network-name": "\"Wi-SUN Network\""
     },
     "target_overrides": {
         "*": {

source/borderrouter_ws.c

@@ -112,8 +112,6 @@ typedef struct {
 } ws_config_t;
 static ws_config_t ws_conf;
 
-static const char default_network_name[] = "ARM-WS-TESTING";
-
 static void mesh_network_up()
 {
     tr_debug("Create Mesh Interface");
@@ -175,13 +173,8 @@ static void eth_network_data_init()
 
 void load_config(void)
 {
-#ifdef MBED_CONF_APP_NETWORK_NAME
     ws_conf.network_name = malloc(sizeof(MBED_CONF_APP_NETWORK_NAME) + 1);
     strcpy(ws_conf.network_name, MBED_CONF_APP_NETWORK_NAME);
-#else
-    ws_conf.network_name = malloc(sizeof(default_network_name) + 1);
-    strcpy(ws_conf.network_name, default_network_name);
-#endif //MBED_CONF_APP_NETWORK_NAME
 #ifdef MBED_CONF_APP_REGULATORY_DOMAIN
     ws_conf.regulatory_domain = MBED_CONF_APP_REGULATORY_DOMAIN;
 #else