WS: Store RF configuration

Author: Jarkko Paso

nanostack/platform/arm_hal_phy.h

@@ -131,6 +131,7 @@ typedef enum phy_modulation_e {
     M_OQPSK,    ///< OQPSK
     M_BPSK,     ///< BPSK
     M_GFSK,     ///< GFSK
+    M_2FSK,     ///< 2FSK
     M_UNDEFINED ///< UNDEFINED
 } phy_modulation_e;
 

source/6LoWPAN/ws/ws_common.c

@@ -74,11 +74,11 @@ int8_t ws_common_regulatory_domain_config(protocol_interface_info_entry_t *cur)
         } else if (cur->ws_info->hopping_schdule.operating_class == 3) {
             cur->ws_info->hopping_schdule.ch0_freq = 8701;
             cur->ws_info->hopping_schdule.channel_spacing = CHANNEL_SPACING_100;
-            cur->ws_info->hopping_schdule.number_of_channels = 59;
+            cur->ws_info->hopping_schdule.number_of_channels = 55;
         } else if (cur->ws_info->hopping_schdule.operating_class == 4) {
-            cur->ws_info->hopping_schdule.ch0_freq = 8701;
+            cur->ws_info->hopping_schdule.ch0_freq = 8702;
             cur->ws_info->hopping_schdule.channel_spacing = CHANNEL_SPACING_200;
-            cur->ws_info->hopping_schdule.number_of_channels = 30;
+            cur->ws_info->hopping_schdule.number_of_channels = 27;
         } else {
             return -1;
         }
@@ -132,9 +132,51 @@ int8_t ws_common_regulatory_domain_config(protocol_interface_info_entry_t *cur)
     // Note: doesn't work for Brazil region
     ws_generate_channel_list(cur->ws_info->hopping_schdule.channel_mask, cur->ws_info->hopping_schdule.number_of_channels, cur->ws_info->hopping_schdule.regulatory_domain);
 
+
+    phy_rf_channel_configuration_s rf_configs;
+    rf_configs.channel_0_center_frequency = (uint32_t)cur->ws_info->hopping_schdule.ch0_freq*100000;
+    if (CHANNEL_SPACING_100 == cur->ws_info->hopping_schdule.channel_spacing) {
+        rf_configs.channel_spacing = 100000;
+    } else if (CHANNEL_SPACING_200 == cur->ws_info->hopping_schdule.channel_spacing) {
+        rf_configs.channel_spacing = 200000;
+    } else if (CHANNEL_SPACING_250 == cur->ws_info->hopping_schdule.channel_spacing) {
+        rf_configs.channel_spacing = 250000;
+    } else if (CHANNEL_SPACING_400 == cur->ws_info->hopping_schdule.channel_spacing) {
+        rf_configs.channel_spacing = 400000;
+    } else if (CHANNEL_SPACING_600 == cur->ws_info->hopping_schdule.channel_spacing) {
+        rf_configs.channel_spacing = 600000;
+    }
+
+    if (OPERATING_MODE_1a == cur->ws_info->hopping_schdule.operating_mode) {
+        rf_configs.datarate = 50000;
+        rf_configs.modulation_index = MODULATION_INDEX_0_5;
+    } else if (OPERATING_MODE_1b == cur->ws_info->hopping_schdule.operating_mode) {
+        rf_configs.datarate = 50000;
+        rf_configs.modulation_index = MODULATION_INDEX_1_0;
+    } else if (OPERATING_MODE_2a == cur->ws_info->hopping_schdule.operating_mode) {
+        rf_configs.datarate = 100000;
+        rf_configs.modulation_index = MODULATION_INDEX_0_5;
+    } else if (OPERATING_MODE_2b == cur->ws_info->hopping_schdule.operating_mode) {
+        rf_configs.datarate = 100000;
+        rf_configs.modulation_index = MODULATION_INDEX_1_0;
+    } else if (OPERATING_MODE_3 == cur->ws_info->hopping_schdule.operating_mode) {
+        rf_configs.datarate = 150000;
+        rf_configs.modulation_index = MODULATION_INDEX_0_5;
+    } else if (OPERATING_MODE_4a == cur->ws_info->hopping_schdule.operating_mode) {
+        rf_configs.datarate = 200000;
+        rf_configs.modulation_index = MODULATION_INDEX_0_5;
+    } else if (OPERATING_MODE_4b == cur->ws_info->hopping_schdule.operating_mode) {
+        rf_configs.datarate = 200000;
+        rf_configs.modulation_index = MODULATION_INDEX_1_0;
+    } else if (OPERATING_MODE_5 == cur->ws_info->hopping_schdule.operating_mode) {
+        rf_configs.datarate = 300000;
+        rf_configs.modulation_index = MODULATION_INDEX_0_5;
+    }
+
     mlme_set_t set_request;
     // Set RF configuration
-    phy_rf_channel_configuration_s rf_configs;
+    rf_configs.number_of_channels = cur->ws_info->hopping_schdule.number_of_channels;
+    rf_configs.modulation = M_2FSK;
     set_request.attr = macRfConfiguration;
     set_request.value_pointer = &rf_configs;
     set_request.value_size = sizeof(phy_rf_channel_configuration_s);

test/nanostack/unittest/mac/mac_mlme/test_mac_mlme.c

@@ -569,7 +569,7 @@ bool test_mac_mlme_set_req()
     uint8_t val[1];
     set.value_pointer = &val;
 
-    set.attr = 0xfb;
+    set.attr = 0xf0;
     set.value_size = 0;
     if (-1 != mac_mlme_set_req(&setup, &set)) {
         return false;