modified Wi-SUN tasklet to return success when calling connet twice

Mika Tervonen · Mika Tervonen · commit 8167e53319c9 · 2019-09-25T11:34:36.000+03:00
Modified flagging of mesh APIs to not use internal RF chip flag
changed default mesh interface to NULL instead of Thread
Added some extra traces for Wi-SUN
diff --git a/features/nanostack/mbed-mesh-api/source/LoWPANNDInterface.cpp b/features/nanostack/mbed-mesh-api/source/LoWPANNDInterface.cpp
@@ -171,7 +171,7 @@ bool LoWPANNDInterface::getRouterIpAddress(char *address, int8_t len)
 }
 
 #define LOWPAN 0x2345
-#if MBED_CONF_NSAPI_DEFAULT_MESH_TYPE == LOWPAN && DEVICE_802_15_4_PHY
+#if MBED_CONF_NSAPI_DEFAULT_MESH_TYPE == LOWPAN
 MBED_WEAK MeshInterface *MeshInterface::get_target_default_instance()
 {
     static bool inited;
diff --git a/features/nanostack/mbed-mesh-api/source/MeshInterfaceNanostack.cpp b/features/nanostack/mbed-mesh-api/source/MeshInterfaceNanostack.cpp
@@ -230,7 +230,7 @@ nsapi_error_t InterfaceNanostack::set_file_system_root_path(const char *root_pat
     return MESH_ERROR_UNKNOWN;
 }
 
-#if !DEVICE_802_15_4_PHY
+#ifndef MBED_CONF_NSAPI_DEFAULT_MESH_TYPE
 MBED_WEAK MeshInterface *MeshInterface::get_target_default_instance()
 {
     return NULL;
diff --git a/features/nanostack/mbed-mesh-api/source/ThreadInterface.cpp b/features/nanostack/mbed-mesh-api/source/ThreadInterface.cpp
@@ -261,7 +261,7 @@ mesh_error_t Nanostack::ThreadInterface::device_pskd_set(const char *pskd)
 }
 
 #define THREAD 0x2345
-#if MBED_CONF_NSAPI_DEFAULT_MESH_TYPE == THREAD && DEVICE_802_15_4_PHY
+#if MBED_CONF_NSAPI_DEFAULT_MESH_TYPE == THREAD
 
 MBED_WEAK MeshInterface *MeshInterface::get_target_default_instance()
 {
diff --git a/features/nanostack/mbed-mesh-api/source/WisunInterface.cpp b/features/nanostack/mbed-mesh-api/source/WisunInterface.cpp
@@ -248,7 +248,7 @@ mesh_error_t WisunInterface::remove_trusted_certificates(void)
 }
 
 #define WISUN 0x2345
-#if MBED_CONF_NSAPI_DEFAULT_MESH_TYPE == WISUN && DEVICE_802_15_4_PHY
+#if MBED_CONF_NSAPI_DEFAULT_MESH_TYPE == WISUN
 MBED_WEAK MeshInterface *MeshInterface::get_target_default_instance()
 {
     static bool inited;
diff --git a/features/nanostack/nanostack-interface/Nanostack.cpp b/features/nanostack/nanostack-interface/Nanostack.cpp
@@ -116,7 +116,7 @@ nsapi_error_t map_mesh_error(mesh_error_t err)
         case MESH_ERROR_PARAM:
             return NSAPI_ERROR_PARAMETER;
         case MESH_ERROR_STATE:
-            return NSAPI_ERROR_DEVICE_ERROR;
+            return NSAPI_ERROR_IS_CONNECTED;
         default:
             return NSAPI_ERROR_DEVICE_ERROR;
     }
diff --git a/features/netsocket/mbed_lib.json b/features/netsocket/mbed_lib.json
@@ -40,7 +40,7 @@
         },
         "default-mesh-type": {
             "help": "Configuration type for MeshInterface::get_default_instance(). [LOWPAN/THREAD/WISUN]",
-            "value": "THREAD"
+            "value": null
         },
         "dns-response-wait-time": {
             "help": "How long the DNS translator waits for a reply from a server in milliseconds",

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ bool LoWPANNDInterface::getRouterIpAddress(char *address, int8_t len)`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`#define LOWPAN 0x2345`
`174`		`-#if MBED_CONF_NSAPI_DEFAULT_MESH_TYPE == LOWPAN && DEVICE_802_15_4_PHY`
	`174`	`+#if MBED_CONF_NSAPI_DEFAULT_MESH_TYPE == LOWPAN`
`175`	`175`	`MBED_WEAK MeshInterface *MeshInterface::get_target_default_instance()`
`176`	`176`	`{`
`177`	`177`	`static bool inited;`
Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@ nsapi_error_t InterfaceNanostack::set_file_system_root_path(const char *root_pat`
`230`	`230`	`return MESH_ERROR_UNKNOWN;`
`231`	`231`	`}`
`232`	`232`
`233`		`-#if !DEVICE_802_15_4_PHY`
	`233`	`+#ifndef MBED_CONF_NSAPI_DEFAULT_MESH_TYPE`
`234`	`234`	`MBED_WEAK MeshInterface *MeshInterface::get_target_default_instance()`
`235`	`235`	`{`
`236`	`236`	`return NULL;`
Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ mesh_error_t Nanostack::ThreadInterface::device_pskd_set(const char *pskd)`
`261`	`261`	`}`
`262`	`262`
`263`	`263`	`#define THREAD 0x2345`
`264`		`-#if MBED_CONF_NSAPI_DEFAULT_MESH_TYPE == THREAD && DEVICE_802_15_4_PHY`
	`264`	`+#if MBED_CONF_NSAPI_DEFAULT_MESH_TYPE == THREAD`
`265`	`265`
`266`	`266`	`MBED_WEAK MeshInterface *MeshInterface::get_target_default_instance()`
`267`	`267`	`{`
Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ mesh_error_t WisunInterface::remove_trusted_certificates(void)`
`248`	`248`	`}`
`249`	`249`
`250`	`250`	`#define WISUN 0x2345`
`251`		`-#if MBED_CONF_NSAPI_DEFAULT_MESH_TYPE == WISUN && DEVICE_802_15_4_PHY`
	`251`	`+#if MBED_CONF_NSAPI_DEFAULT_MESH_TYPE == WISUN`
`252`	`252`	`MBED_WEAK MeshInterface *MeshInterface::get_target_default_instance()`
`253`	`253`	`{`
`254`	`254`	`static bool inited;`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ nsapi_error_t map_mesh_error(mesh_error_t err)`
`116`	`116`	`case MESH_ERROR_PARAM:`
`117`	`117`	`return NSAPI_ERROR_PARAMETER;`
`118`	`118`	`case MESH_ERROR_STATE:`
`119`		`- return NSAPI_ERROR_DEVICE_ERROR;`
	`119`	`+ return NSAPI_ERROR_IS_CONNECTED;`
`120`	`120`	`default:`
`121`	`121`	`return NSAPI_ERROR_DEVICE_ERROR;`
`122`	`122`	`}`