EU channel plan ids (FAN 1.1) supported (ARMmbed#2668)

Author: Jarkko Paso

CHANGELOG.md

@@ -10,7 +10,7 @@
 
 ### Changes
 * PAN_TIMEOUT for medium sized network changed to 30 minutes.
-* 
+* Updated EU regulatory domain to support (FAN 1.1) channel plan ids.
 
 ### Bug fixes
 * 

source/6LoWPAN/ws/ws_common.c

@@ -93,6 +93,22 @@ int8_t ws_generate_channel_list(uint32_t *channel_mask, uint16_t number_of_chann
                 ws_disable_channels_in_range(channel_mask, number_of_channels, 3, 10);
             }
         }
+    } else if (regulatory_domain == REG_DOMAIN_EU) {
+        if (channel_plan_id == 32) {
+            ws_disable_channels_in_range(channel_mask, number_of_channels, 55, 56);
+            ws_disable_channels_in_range(channel_mask, number_of_channels, 61, 63);
+            ws_disable_channels_in_range(channel_mask, number_of_channels, 65, 66);
+        } else if (channel_plan_id == 33) {
+            ws_disable_channels_in_range(channel_mask, number_of_channels, 27, 28);
+            ws_disable_channels_in_range(channel_mask, number_of_channels, 30, 33);
+        } else if (channel_plan_id == 36) {
+            ws_disable_channels_in_range(channel_mask, number_of_channels, 55, 56);
+            ws_disable_channels_in_range(channel_mask, number_of_channels, 61, 63);
+            ws_disable_channels_in_range(channel_mask, number_of_channels, 65, 66);
+        } else if (channel_plan_id == 37) {
+            ws_disable_channels_in_range(channel_mask, number_of_channels, 27, 28);
+            ws_disable_channels_in_range(channel_mask, number_of_channels, 30, 33);
+        }
     }
     return 0;
 }
@@ -261,20 +277,44 @@ int8_t ws_common_regulatory_domain_config(protocol_interface_info_entry_t *cur,
             return -1;
         }
     } else if (hopping_schdule->regulatory_domain == REG_DOMAIN_EU) {
-        if (hopping_schdule->operating_class == 1) {
-            hopping_schdule->ch0_freq = 8631;
-            hopping_schdule->channel_spacing = CHANNEL_SPACING_100;
-        } else if (hopping_schdule->operating_class == 2) {
-            hopping_schdule->ch0_freq = 8631;
-            hopping_schdule->channel_spacing = CHANNEL_SPACING_200;
-        } else if (hopping_schdule->operating_class == 3) {
-            hopping_schdule->ch0_freq = 8701;
-            hopping_schdule->channel_spacing = CHANNEL_SPACING_100;
-        } else if (hopping_schdule->operating_class == 4) {
-            hopping_schdule->ch0_freq = 8702;
-            hopping_schdule->channel_spacing = CHANNEL_SPACING_200;
+        if (hopping_schdule->channel_plan_id == 255) {
+            if (hopping_schdule->operating_class == 1) {
+                hopping_schdule->ch0_freq = 8631;
+                hopping_schdule->channel_spacing = CHANNEL_SPACING_100;
+            } else if (hopping_schdule->operating_class == 2) {
+                hopping_schdule->ch0_freq = 8631;
+                hopping_schdule->channel_spacing = CHANNEL_SPACING_200;
+            } else if (hopping_schdule->operating_class == 3) {
+                hopping_schdule->ch0_freq = 8701;
+                hopping_schdule->channel_spacing = CHANNEL_SPACING_100;
+            } else if (hopping_schdule->operating_class == 4) {
+                hopping_schdule->ch0_freq = 8702;
+                hopping_schdule->channel_spacing = CHANNEL_SPACING_200;
+            } else {
+                return -1;
+            }
         } else {
-            return -1;
+            if (hopping_schdule->channel_plan_id == 32) {
+                hopping_schdule->ch0_freq = 8631;
+                hopping_schdule->channel_spacing = CHANNEL_SPACING_100;
+            } else if (hopping_schdule->channel_plan_id == 33) {
+                hopping_schdule->ch0_freq = 8631;
+                hopping_schdule->channel_spacing = CHANNEL_SPACING_200;
+            } else if (hopping_schdule->channel_plan_id == 34) {
+                hopping_schdule->ch0_freq = 8701;
+                hopping_schdule->channel_spacing = CHANNEL_SPACING_100;
+            } else if (hopping_schdule->channel_plan_id == 35) {
+                hopping_schdule->ch0_freq = 8702;
+                hopping_schdule->channel_spacing = CHANNEL_SPACING_200;
+            } else if (hopping_schdule->channel_plan_id == 36) {
+                hopping_schdule->ch0_freq = 8631;
+                hopping_schdule->channel_spacing = CHANNEL_SPACING_100;
+            } else if (hopping_schdule->channel_plan_id == 37) {
+                hopping_schdule->ch0_freq = 8631;
+                hopping_schdule->channel_spacing = CHANNEL_SPACING_200;
+            } else {
+                return -1;
+            }
         }
     } else if (hopping_schdule->regulatory_domain == REG_DOMAIN_IN) {
         if (hopping_schdule->operating_class == 1) {
@@ -385,14 +425,30 @@ uint16_t ws_common_channel_number_calc(uint8_t regulatory_domain, uint8_t operat
             return 16;
         }
     } else if (regulatory_domain == REG_DOMAIN_EU) {
-        if (operating_class == 1) {
-            return 69;
-        } else if (operating_class == 2) {
-            return 35;
-        } else if (operating_class == 3) {
-            return 55;
-        } else if (operating_class == 4) {
-            return 27;
+        if (channel_plan_id == 255) {
+            if (operating_class == 1) {
+                return 69;
+            } else if (operating_class == 2) {
+                return 35;
+            } else if (operating_class == 3) {
+                return 55;
+            } else if (operating_class == 4) {
+                return 27;
+            }
+        } else {
+            if (channel_plan_id == 32) {
+                return 69;
+            } else if (channel_plan_id == 33) {
+                return 35;
+            } else if (channel_plan_id == 34) {
+                return 55;
+            } else if (channel_plan_id == 35) {
+                return 27;
+            } else if (channel_plan_id == 36) {
+                return 125;
+            } else if (channel_plan_id == 37) {
+                return 62;
+            }
         }
     } else if (regulatory_domain == REG_DOMAIN_IN) {
         if (operating_class == 1) {