From b46eacc2a7bdcb2fa87f27fd2c4cc9e47a039d72 Mon Sep 17 00:00:00 2001 From: Mika Tervonen Date: Tue, 11 Sep 2018 12:51:07 +0300 Subject: [PATCH] updated channel plan settings Fixed Japan channel count added 250kHZ channel spacing --- nanostack/ws_management_api.h | 1 + source/6LoWPAN/ws/ws_common.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nanostack/ws_management_api.h b/nanostack/ws_management_api.h index 6e502cc0c74..3491a4d5b79 100644 --- a/nanostack/ws_management_api.h +++ b/nanostack/ws_management_api.h @@ -78,6 +78,7 @@ extern "C" { #define CHANNEL_SPACING_400 0x01 // 400 khz #define CHANNEL_SPACING_600 0x02 // 600 khz #define CHANNEL_SPACING_100 0x03 // 100 khz +#define CHANNEL_SPACING_250 0x04 // 250 khz /** * Initialize Wi-SUN stack. diff --git a/source/6LoWPAN/ws/ws_common.c b/source/6LoWPAN/ws/ws_common.c index dd842751b17..cb2f196396e 100644 --- a/source/6LoWPAN/ws/ws_common.c +++ b/source/6LoWPAN/ws/ws_common.c @@ -101,15 +101,15 @@ int8_t ws_common_regulatory_domain_config(protocol_interface_info_entry_t *cur) if(cur->ws_info->hopping_schdule.operating_class == 1) { cur->ws_info->hopping_schdule.ch0_freq = 9206; cur->ws_info->hopping_schdule.channel_spacing = CHANNEL_SPACING_200; - cur->ws_info->hopping_schdule.number_of_channels = 129; + cur->ws_info->hopping_schdule.number_of_channels = 38; } else if(cur->ws_info->hopping_schdule.operating_class == 2) { cur->ws_info->hopping_schdule.ch0_freq = 9209; cur->ws_info->hopping_schdule.channel_spacing = CHANNEL_SPACING_400; - cur->ws_info->hopping_schdule.number_of_channels = 64; + cur->ws_info->hopping_schdule.number_of_channels = 18; } else if(cur->ws_info->hopping_schdule.operating_class == 3) { cur->ws_info->hopping_schdule.ch0_freq = 9208; cur->ws_info->hopping_schdule.channel_spacing = CHANNEL_SPACING_600; - cur->ws_info->hopping_schdule.number_of_channels = 42; + cur->ws_info->hopping_schdule.number_of_channels = 12; } else { return -1; }