yotta defines removed. minor edits on thread conf.

Author: Kari Severinkangas

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

@@ -22,9 +22,7 @@
 extern "C" {
 #endif
 
-#ifdef YOTTA_CFG_MBED_MESH_API_HEAP_SIZE
-#define MBED_MESH_API_HEAP_SIZE YOTTA_CFG_MBED_MESH_API_HEAP_SIZE
-#elif defined MBED_CONF_MBED_MESH_API_HEAP_SIZE
+#if defined MBED_CONF_MBED_MESH_API_HEAP_SIZE
 #define MBED_MESH_API_HEAP_SIZE MBED_CONF_MBED_MESH_API_HEAP_SIZE
 #else
 #define MBED_MESH_API_HEAP_SIZE 32500
@@ -42,59 +40,45 @@ extern "C" {
  * Possible channels are 0,1,2,3,4,5,6,9,10, see arm_hal_phy.h for details
  */
 
-#ifdef YOTTA_CFG_MBED_MESH_API_6LOWPAN_ND_CHANNEL_PAGE
-#define MBED_MESH_API_6LOWPAN_ND_CHANNEL_PAGE YOTTA_CFG_MBED_MESH_API_6LOWPAN_ND_CHANNEL_PAGE
-#elif defined MBED_CONF_MBED_MESH_API_6LOWPAN_ND_CHANNEL_PAGE
+#if defined MBED_CONF_MBED_MESH_API_6LOWPAN_ND_CHANNEL_PAGE
 #define MBED_MESH_API_6LOWPAN_ND_CHANNEL_PAGE MBED_CONF_MBED_MESH_API_6LOWPAN_ND_CHANNEL_PAGE
 #else
 #define MBED_MESH_API_6LOWPAN_ND_CHANNEL_PAGE 0
 #endif
 
-#ifdef YOTTA_CFG_MBED_MESH_API_6LOWPAN_ND_CHANNEL
-#define MBED_MESH_API_6LOWPAN_ND_CHANNEL YOTTA_CFG_MBED_MESH_API_6LOWPAN_ND_CHANNEL
-#elif defined MBED_CONF_MBED_MESH_API_6LOWPAN_ND_CHANNEL
+#if defined MBED_CONF_MBED_MESH_API_6LOWPAN_ND_CHANNEL
 #define MBED_MESH_API_6LOWPAN_ND_CHANNEL MBED_CONF_MBED_MESH_API_6LOWPAN_ND_CHANNEL
 #else
 #define MBED_MESH_API_6LOWPAN_ND_CHANNEL 0
 #endif
 
-#ifdef YOTTA_CFG_MBED_MESH_API_6LOWPAN_ND_CHANNEL_MASK
-#define MBED_MESH_API_6LOWPAN_ND_CHANNEL_MASK YOTTA_CFG_MBED_MESH_API_6LOWPAN_ND_CHANNEL_MASK
-#elif defined MBED_CONF_MBED_MESH_API_6LOWPAN_ND_CHANNEL_MASK
+#if defined MBED_CONF_MBED_MESH_API_6LOWPAN_ND_CHANNEL_MASK
 #define MBED_MESH_API_6LOWPAN_ND_CHANNEL_MASK MBED_CONF_MBED_MESH_API_6LOWPAN_ND_CHANNEL_MASK
 #elif defined MBED_MESH_API_6LOWPAN_ND_CHANNEL
 #define MBED_MESH_API_6LOWPAN_ND_CHANNEL_MASK (1<<MBED_MESH_API_6LOWPAN_ND_CHANNEL)
 #else
-#define MBED_MESH_API_6LOWPAN_ND_CHANNEL_MASK (1<<12) // Why 12? Why not default channel value?
+#define MBED_MESH_API_6LOWPAN_ND_CHANNEL_MASK (1<<12)
 #endif
 
-#ifdef YOTTA_CFG_MBED_MESH_API_6LOWPAN_ND_SECURITY_MODE
-#define MBED_MESH_API_6LOWPAN_ND_SECURITY_MODE YOTTA_CFG_MBED_MESH_API_6LOWPAN_ND_SECURITY_MODE
-#elif defined MBED_CONF_MBED_MESH_API_6LOWPAN_ND_SECURITY_MODE
+#if defined MBED_CONF_MBED_MESH_API_6LOWPAN_ND_SECURITY_MODE
 #define MBED_MESH_API_6LOWPAN_ND_SECURITY_MODE MBED_CONF_MBED_MESH_API_6LOWPAN_ND_SECURITY_MODE
 #else
 #define MBED_MESH_API_6LOWPAN_ND_SECURITY_MODE NONE
 #endif
 
-#ifdef YOTTA_CFG_MBED_MESH_API_6LOWPAN_ND_PSK_KEY_ID
-#define MBED_MESH_API_6LOWPAN_ND_PSK_KEY_ID YOTTA_CFG_MBED_MESH_API_6LOWPAN_ND_PSK_KEY_ID
-#elif defined MBED_CONF_MBED_MESH_API_6LOWPAN_ND_PSK_KEY_ID
+#if defined MBED_CONF_MBED_MESH_API_6LOWPAN_ND_PSK_KEY_ID
 #define MBED_MESH_API_6LOWPAN_ND_PSK_KEY_ID MBED_CONF_MBED_MESH_API_6LOWPAN_ND_PSK_KEY_ID
 #else
 #define MBED_MESH_API_6LOWPAN_ND_PSK_KEY_ID 1
 #endif
 
-#ifdef YOTTA_CFG_MBED_MESH_API_6LOWPAN_ND_PSK_KEY
-#define MBED_MESH_API_6LOWPAN_ND_PSK_KEY YOTTA_CFG_MBED_MESH_API_6LOWPAN_ND_PSK_KEY
-#elif defined MBED_CONF_MBED_MESH_API_6LOWPAN_ND_PSK_KEY
+#if defined MBED_CONF_MBED_MESH_API_6LOWPAN_ND_PSK_KEY
 #define MBED_MESH_API_6LOWPAN_ND_PSK_KEY MBED_CONF_MBED_MESH_API_6LOWPAN_ND_PSK_KEY
 #else
 #define MBED_MESH_API_6LOWPAN_ND_PSK_KEY {0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf}
 #endif
 
-#ifdef YOTTA_CFG_MBED_MESH_API_6LOWPAN_ND_SEC_LEVEL
-#define MBED_MESH_API_6LOWPAN_ND_SEC_LEVEL YOTTA_CFG_MBED_MESH_API_6LOWPAN_ND_SEC_LEVEL
-#elif defined MBED_CONF_MBED_MESH_API_6LOWPAN_ND_SEC_LEVEL
+#if defined MBED_CONF_MBED_MESH_API_6LOWPAN_ND_SEC_LEVEL
 #define MBED_MESH_API_6LOWPAN_ND_SEC_LEVEL MBED_CONF_MBED_MESH_API_6LOWPAN_ND_SEC_LEVEL
 #else
 #define MBED_MESH_API_6LOWPAN_ND_SEC_LEVEL 5
@@ -108,55 +92,43 @@ extern "C" {
 
 /* Thread configuration */
 // PSKd, must be longer than 6
-#ifdef YOTTA_CFG_MBED_MESH_API_THREAD_PSKD
-#define MBED_MESH_API_THREAD_PSKD YOTTA_CFG_MBED_MESH_API_THREAD_PSKD
-#elif defined MBED_CONF_MBED_MESH_API_THREAD_PSKD
+#if defined MBED_CONF_MBED_MESH_API_THREAD_PSKD
 #define MBED_MESH_API_THREAD_PSKD MBED_CONF_MBED_MESH_API_THREAD_PSKD
 #else
-#define MBED_MESH_API_THREAD_PSKD "Secret password"
+#define MBED_MESH_API_THREAD_PSKD "abcdefghijklmno"
 #endif
 
 // Operating mode, values: Router, SED
-#ifdef YOTTA_CFG_MBED_MESH_API_THREAD_DEVICE_TYPE
-#define MBED_MESH_API_THREAD_DEVICE_TYPE YOTTA_CFG_MBED_MESH_API_THREAD_DEVICE_TYPE
-#elif defined MBED_CONF_MBED_MESH_API_THREAD_DEVICE_TYPE
+#if defined MBED_CONF_MBED_MESH_API_THREAD_DEVICE_TYPE
 #define MBED_MESH_API_THREAD_DEVICE_TYPE MBED_CONF_MBED_MESH_API_THREAD_DEVICE_TYPE
 #else
 #define MBED_MESH_API_THREAD_DEVICE_TYPE MESH_DEVICE_TYPE_THREAD_ROUTER
 #endif
 
 // channel mask, enable all channels
-#ifdef YOTTA_CFG_MBED_MESH_API_THREAD_CONFIG_CHANNEL_MASK
-#define MBED_MESH_API_THREAD_CONFIG_CHANNEL_MASK YOTTA_CFG_MBED_MESH_API_THREAD_CONFIG_CHANNEL_MASK
-#elif defined MBED_CONF_MBED_MESH_API_THREAD_CONFIG_CHANNEL_MASK
+#if defined MBED_CONF_MBED_MESH_API_THREAD_CONFIG_CHANNEL_MASK
 #define MBED_MESH_API_THREAD_CONFIG_CHANNEL_MASK MBED_CONF_MBED_MESH_API_THREAD_CONFIG_CHANNEL_MASK
 #else
 #define MBED_MESH_API_THREAD_CONFIG_CHANNEL_MASK 0x07fff800
 #endif
 
-#ifdef YOTTA_CFG_MBED_MESH_API_THREAD_CONFIG_CHANNEL_PAGE
-#define MBED_MESH_API_THREAD_CONFIG_CHANNEL_PAGE YOTTA_CFG_MBED_MESH_API_THREAD_CONFIG_CHANNEL_PAGE
-#elif defined MBED_CONF_MBED_MESH_API_THREAD_CONFIG_CHANNEL_PAGE
+#if defined MBED_CONF_MBED_MESH_API_THREAD_CONFIG_CHANNEL_PAGE
 #define MBED_MESH_API_THREAD_CONFIG_CHANNEL_PAGE MBED_CONF_MBED_MESH_API_THREAD_CONFIG_CHANNEL_PAGE
 #else
 #define MBED_MESH_API_THREAD_CONFIG_CHANNEL_PAGE 0
 #endif
 
-#ifdef YOTTA_CFG_MBED_MESH_API_THREAD_CONFIG_CHANNEL
-#define MBED_MESH_API_THREAD_CONFIG_CHANNEL YOTTA_CFG_MBED_MESH_API_THREAD_CONFIG_CHANNEL
-#elif defined MBED_CONF_MBED_MESH_API_THREAD_CONFIG_CHANNEL
+#if defined MBED_CONF_MBED_MESH_API_THREAD_CONFIG_CHANNEL
 #define MBED_MESH_API_THREAD_CONFIG_CHANNEL MBED_CONF_MBED_MESH_API_THREAD_CONFIG_CHANNEL
 #else
-#define MBED_MESH_API_THREAD_CONFIG_CHANNEL 12
+#define MBED_MESH_API_THREAD_CONFIG_CHANNEL 22
 #endif
 
 // Default PANID
-#ifdef YOTTA_CFG_MBED_MESH_API_THREAD_CONFIG_PANID
-#define MBED_MESH_API_THREAD_CONFIG_PANID YOTTA_CFG_MBED_MESH_API_THREAD_CONFIG_PANID
-#elif defined MBED_CONF_MBED_MESH_API_THREAD_CONFIG_PANID
+#if 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 0x0700 // 57082
+#define MBED_MESH_API_THREAD_CONFIG_PANID 0x0700
 #endif
 
 // extended PANID
@@ -170,36 +142,30 @@ extern "C" {
 #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
+#define MBED_MESH_API_THREAD_CONFIG_NETWORK_NAME "Thread Network"
 #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
+#define MBED_MESH_API_THREAD_CONFIG_COMMISSIONING_DATASET_TIMESTAMP 0X1
 #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
+#if 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 {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
+#if 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, 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
+#if 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 {0xc8, 0xa6, 0x2e, 0xae, 0xf3, 0x68, 0xf3, 0x46, 0xa9, 0x9e, 0x57, 0x85, 0x98, 0x9d, 0x1c, 0xd0}