IOTTHD-1028: thread config update

Author: Kari Severinkangas

features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed_lib.json

@@ -11,14 +11,17 @@
         "6lowpan-nd-psk-key": "{0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf}",
         "6lowpan-nd-sec-level": 5,
         "6lowpan-nd-device-type": "NET_6LOWPAN_ROUTER",
-        "thread-pskd": "\"Secret password\"",
+        "thread-pskd": "\"abcdefghijklmno\"",
         "thread-config-channel-mask": "0x7fff800",
         "thread-config-channel-page": 0,
-        "thread-config-channel": 12,
-        "thread-config-panid": "0xDEFA",
-        "thread-master-key": "{0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff}",
-        "thread-config-ml-prefix": "{0xfd, 0x00, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00}",
-        "thread-config-pskc": "{0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff}",
+        "thread-config-channel": 22,
+        "thread-config-panid": "0x0700",
+        "thread-config-network-name": "\"Thread Network\"",
+        "thread-config-commissioning-dataset-timestamp": "0x00000001",
+        "thread-config-extended-panid": "{0xf1, 0xb5, 0xa1, 0xb2,0xc4, 0xd5, 0xa1, 0xbd }",
+        "thread-master-key": "{0x10, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff}",
+        "thread-config-ml-prefix": "{0xfd, 0x0, 0x0d, 0xb8, 0x0, 0x0, 0x0, 0x0}",
+        "thread-config-pskc": "{0xc8, 0xa6, 0x2e, 0xae, 0xf3, 0x68, 0xf3, 0x46, 0xa9, 0x9e, 0x57, 0x85, 0x98, 0x9d, 0x1c, 0xd0}",
         "thread-device-type": "MESH_DEVICE_TYPE_THREAD_ROUTER"
     }
 }

features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/include/static_config.h

@@ -156,34 +156,56 @@ extern "C" {
 #elif defined MBED_CONF_MBED_MESH_API_THREAD_CONFIG_PANID
 #define MBED_MESH_API_THREAD_CONFIG_PANID MBED_CONF_MBED_MESH_API_THREAD_CONFIG_PANID
 #else
-#define MBED_MESH_API_THREAD_CONFIG_PANID 0xDEFA // 57082
+#define MBED_MESH_API_THREAD_CONFIG_PANID 0x0700 // 57082
 #endif
 
+// extended PANID
+#if defined MBED_CONF_MBED_MESH_API_THREAD_CONFIG_EXTENDED_PANID
+#define MBED_MESH_API_THREAD_CONFIG_EXTENDED_PANID MBED_CONF_MBED_MESH_API_THREAD_CONFIG_EXTENDED_PANID
+#else
+#define MBED_MESH_API_THREAD_CONFIG_EXTENDED_PANID {0xf1, 0xb5, 0xa1, 0xb2,0xc4, 0xd5, 0xa1, 0xbd }
+#endif
+
+// network name
+#if defined MBED_CONF_MBED_MESH_API_THREAD_CONFIG_NETWORK_NAME
+#define MBED_MESH_API_THREAD_CONFIG_NETWORK_NAME MBED_CONF_MBED_MESH_API_THREAD_CONFIG_NETWORK_NAME
+#else
+#define MBED_MESH_API_THREAD_CONFIG_NETWORK_NAME "Thread Network" // 57082
+#endif
+
+// commissioning dataset timestamp
+#if defined MBED_CONF_MBED_MESH_API_THREAD_CONFIG_COMMISSIONING_DATASET_TIMESTAMP
+#define MBED_MESH_API_THREAD_CONFIG_COMMISSIONING_DATASET_TIMESTAMP MBED_CONF_MBED_MESH_API_THREAD_CONFIG_COMMISSIONING_DATASET_TIMESTAMP
+#else
+#define MBED_MESH_API_THREAD_CONFIG_COMMISSIONING_DATASET_TIMESTAMP 0X1 // 57082
+#endif
+
+
 #ifdef YOTTA_CFG_MBED_MESH_API_THREAD_MASTER_KEY
 #define MBED_MESH_API_THREAD_MASTER_KEY YOTTA_CFG_MBED_MESH_API_THREAD_MASTER_KEY
 #elif defined MBED_CONF_MBED_MESH_API_THREAD_MASTER_KEY
 #define MBED_MESH_API_THREAD_MASTER_KEY MBED_CONF_MBED_MESH_API_THREAD_MASTER_KEY
 #else
-#define MBED_MESH_API_THREAD_MASTER_KEY {0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff}
+#define MBED_MESH_API_THREAD_MASTER_KEY {0x10, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff}
 #endif
 
 #ifdef YOTTA_CFG_MBED_MESH_API_THREAD_CONFIG_ML_PREFIX
 #define MBED_MESH_API_THREAD_CONFIG_ML_PREFIX YOTTA_CFG_MBED_MESH_API_THREAD_CONFIG_ML_PREFIX
 #elif defined MBED_CONF_MBED_MESH_API_THREAD_CONFIG_ML_PREFIX
 #define MBED_MESH_API_THREAD_CONFIG_ML_PREFIX MBED_CONF_MBED_MESH_API_THREAD_CONFIG_ML_PREFIX
 #else
-#define MBED_MESH_API_THREAD_CONFIG_ML_PREFIX {0xfd, 0x00, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00}
+#define MBED_MESH_API_THREAD_CONFIG_ML_PREFIX {0xfd, 0x0, 0x0d, 0xb8, 0x0, 0x0, 0x0, 0x0}
 #endif
 
 #ifdef YOTTA_CFG_MBED_MESH_API_THREAD_CONFIG_PSKC
 #define MBED_MESH_API_THREAD_CONFIG_PSKC YOTTA_CFG_MBED_MESH_API_THREAD_CONFIG_PSKC
 #elif defined MBED_CONF_MBED_MESH_API_THREAD_CONFIG_PSKC
 #define MBED_MESH_API_THREAD_CONFIG_PSKC MBED_CONF_MBED_MESH_API_THREAD_CONFIG_PSKC
 #else
-#define MBED_MESH_API_THREAD_CONFIG_PSKC {0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff}
+#define MBED_MESH_API_THREAD_CONFIG_PSKC {0xc8, 0xa6, 0x2e, 0xae, 0xf3, 0x68, 0xf3, 0x46, 0xa9, 0x9e, 0x57, 0x85, 0x98, 0x9d, 0x1c, 0xd0}
 #endif
 
 #ifdef __cplusplus
 }
 #endif
-#endif /* __INCLUDE_STATIC_CONFIG__ */
+#endif /* __INCLUDE_STATIC_CONFIG__ */