ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #12894 from mikaleppanen/fea_wisun_nanostack_device_type_config_5_15 

Nanostack: Add config for Wi-SUN device type (Mbed OS 5.15)
pull/12893/head
Martin Kojtal 2020-06-08 09:04:37 +02:00 committed by GitHub
parent 014c926c3b f5bd0a521b
commit a3fdbc7944
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
features/nanostack/mbed-mesh-api/mbed-mesh-api/mesh_interface_types.h
View File

@ -59,7 +59,9 @@ typedef enum {
typedef enum { typedef enum {
MESH_DEVICE_TYPE_THREAD_ROUTER = 0, /*<! Thread router */ MESH_DEVICE_TYPE_THREAD_ROUTER = 0, /*<! Thread router */
MESH_DEVICE_TYPE_THREAD_SLEEPY_END_DEVICE, /*<! Thread Sleepy end device */ MESH_DEVICE_TYPE_THREAD_SLEEPY_END_DEVICE, /*<! Thread Sleepy end device */
MESH_DEVICE_TYPE_THREAD_MINIMAL_END_DEVICE /*<! Thread minimal end device */ MESH_DEVICE_TYPE_THREAD_MINIMAL_END_DEVICE, /*<! Thread minimal end device */
MESH_DEVICE_TYPE_WISUN_ROUTER, /*<! Wi-SUN router */
MESH_DEVICE_TYPE_WISUN_BORDER_ROUTER /*<! Wi-SUN border router */
} mesh_device_type_t; } mesh_device_type_t;
/** /**

4
features/nanostack/mbed-mesh-api/mbed_lib.json
View File

@ -160,6 +160,10 @@
"help": "Unicast dwell interval. Range: 15-255 milliseconds", "help": "Unicast dwell interval. Range: 15-255 milliseconds",
"value": 0 "value": 0
}, },
"wisun-device-type": {
"help": "Supported device operating modes: MESH_DEVICE_TYPE_WISUN_ROUTER, MESH_DEVICE_TYPE_WISUN_BORDER_ROUTER",
"value": "MESH_DEVICE_TYPE_WISUN_ROUTER"
},
"certificate-header": { "certificate-header": {
"help": "File name of the certificate header file (used on include directive)", "help": "File name of the certificate header file (used on include directive)",
"value": null "value": null

7
features/nanostack/mbed-mesh-api/source/wisun_tasklet.c
View File

@ -223,7 +223,12 @@ static void wisun_tasklet_configure_and_connect_to_network(void)
int status; int status;
fhss_timer_t *fhss_timer_ptr = &fhss_functions; fhss_timer_t *fhss_timer_ptr = &fhss_functions;
wisun_tasklet_data_ptr->operating_mode = NET_6LOWPAN_ROUTER; if (MBED_CONF_MBED_MESH_API_WISUN_DEVICE_TYPE == MESH_DEVICE_TYPE_WISUN_BORDER_ROUTER) {
wisun_tasklet_data_ptr->operating_mode = NET_6LOWPAN_BORDER_ROUTER;
} else {
wisun_tasklet_data_ptr->operating_mode = NET_6LOWPAN_ROUTER;
}
wisun_tasklet_data_ptr->operating_mode_extension = NET_6LOWPAN_WS; wisun_tasklet_data_ptr->operating_mode_extension = NET_6LOWPAN_WS;
arm_nwk_interface_configure_6lowpan_bootstrap_set( arm_nwk_interface_configure_6lowpan_bootstrap_set(