Updated Discovery and RPL setup large & medium size network

RPL Updates

Medium:
imin 128 seconds
imax 1024 seconds
Large:
imin 256 seconds
imax 2048 seconds

Discovery
Medium:
imin 60 seconds
imax 960 seconds
Large:
imin 240 seconds
imax 1536 seconds

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_cfg_settings.c

@@ -390,16 +390,16 @@ static void ws_cfg_network_size_config_set_medium(ws_cfg_nw_size_t *cfg)
     cfg->gen.rpl_selected_parent_max = WS_RPL_SELECTED_PARENT_MAX;
 
     // Configure the Wi-SUN timing trickle parameters
-    cfg->timing.disc_trickle_imin = TRICKLE_IMIN_30_SECS;       // 30 seconds
-    cfg->timing.disc_trickle_imax = TRICKLE_IMIN_30_SECS << 5;  // 960 seconds; 16 minutes
+    cfg->timing.disc_trickle_imin = TRICKLE_IMIN_60_SECS;       // 60 seconds
+    cfg->timing.disc_trickle_imax = TRICKLE_IMIN_60_SECS << 4;      // 960 seconds; 16 minutes
     cfg->timing.disc_trickle_k = 1;
     cfg->timing.pan_timeout = PAN_VERSION_MEDIUM_NETWORK_TIMEOUT;
     cfg->timing.temp_link_min_timeout = WS_NEIGHBOR_TEMPORARY_LINK_MIN_TIMEOUT_SMALL;
     cfg->timing.temp_eapol_min_timeout = WS_EAPOL_TEMPORARY_ENTRY_MEDIUM_TIMEOUT;
 
     // RPL configuration
-    cfg->bbr.dio_interval_min = WS_RPL_DIO_IMIN_MEDIUM;              // 15; 32s
-    cfg->bbr.dio_interval_doublings = WS_RPL_DIO_DOUBLING_MEDIUM;    // 2; 1024s
+    cfg->bbr.dio_interval_min = WS_RPL_DIO_IMIN_MEDIUM;              // 17; 128s
+    cfg->bbr.dio_interval_doublings = WS_RPL_DIO_DOUBLING_MEDIUM;    // 3; 1024s
     cfg->bbr.dio_redundancy_constant = WS_RPL_DIO_REDUNDANCY_MEDIUM; // 10
     cfg->bbr.dag_max_rank_increase = WS_RPL_MAX_HOP_RANK_INCREASE;
     cfg->bbr.min_hop_rank_increase = WS_RPL_MIN_HOP_RANK_INCREASE;
@@ -426,16 +426,16 @@ static void ws_cfg_network_size_config_set_large(ws_cfg_nw_size_t *cfg)
     cfg->gen.rpl_selected_parent_max = WS_RPL_SELECTED_PARENT_MAX;
 
     // Configure the Wi-SUN timing trickle parameters
-    cfg->timing.disc_trickle_imin = TRICKLE_IMIN_60_SECS;       // 60 seconds
-    cfg->timing.disc_trickle_imax = TRICKLE_IMIN_60_SECS << 4;  // 960 seconds; 16 minutes
+    cfg->timing.disc_trickle_imin = TRICKLE_IMIN_60_SECS << 2;       // 240 seconds
+    cfg->timing.disc_trickle_imax = 1536;      // 1536 seconds; 25 minutes
     cfg->timing.disc_trickle_k = 1;
     cfg->timing.pan_timeout = PAN_VERSION_LARGE_NETWORK_TIMEOUT;
     cfg->timing.temp_link_min_timeout = WS_NEIGHBOR_TEMPORARY_LINK_MIN_TIMEOUT_LARGE;
     cfg->timing.temp_eapol_min_timeout = WS_EAPOL_TEMPORARY_ENTRY_LARGE_TIMEOUT;
 
     // RPL configuration
-    cfg->bbr.dio_interval_min = WS_RPL_DIO_IMIN_LARGE;               // 19; 524s, 9min
-    cfg->bbr.dio_interval_doublings = WS_RPL_DIO_DOUBLING_LARGE;     // 1; 1024s, 17min
+    cfg->bbr.dio_interval_min = WS_RPL_DIO_IMIN_LARGE;               // 18; 262s, 4.5min
+    cfg->bbr.dio_interval_doublings = WS_RPL_DIO_DOUBLING_LARGE;     // 3; 2048s, 34min
     cfg->bbr.dio_redundancy_constant = WS_RPL_DIO_REDUNDANCY_LARGE;  // 10
     cfg->bbr.dag_max_rank_increase = WS_RPL_MAX_HOP_RANK_INCREASE;
     cfg->bbr.min_hop_rank_increase = WS_RPL_MIN_HOP_RANK_INCREASE;
@@ -649,8 +649,8 @@ int8_t ws_cfg_phy_set(protocol_interface_info_entry_t *cur, ws_phy_cfg_t *cfg, w
 static int8_t ws_cfg_timing_default_set(ws_timing_cfg_t *cfg)
 {
     // Configure the Wi-SUN timing trickle parameters
-    cfg->disc_trickle_imin = TRICKLE_IMIN_30_SECS;       // 30 seconds
-    cfg->disc_trickle_imax = TRICKLE_IMIN_30_SECS << 5;  // 960 seconds; 16 minutes
+    cfg->disc_trickle_imin = TRICKLE_IMIN_60_SECS;       // 60 seconds
+    cfg->disc_trickle_imax = TRICKLE_IMIN_60_SECS << 4;  // 960 seconds; 16 minutes
     cfg->disc_trickle_k = 1;
     cfg->pan_timeout = PAN_VERSION_MEDIUM_NETWORK_TIMEOUT;
     cfg->temp_link_min_timeout = WS_NEIGHBOR_TEMPORARY_LINK_MIN_TIMEOUT_SMALL;
@@ -727,13 +727,13 @@ int8_t ws_cfg_timing_set(protocol_interface_info_entry_t *cur, ws_timing_cfg_t *
 static int8_t ws_cfg_bbr_default_set(ws_bbr_cfg_t *cfg)
 {
     // Something in between
-    // imin: 15 (32s)
-    // doublings:5 (960s)
+    // imin: 17 (128s)
+    // doublings:3 (1024s)
     // redundancy; 10
-    //ws_bbr_rpl_config(cur, 15, 5, 10, WS_RPL_MAX_HOP_RANK_INCREASE, WS_RPL_MIN_HOP_RANK_INCREASE);
+    //ws_bbr_rpl_config(cur, 17, 3, 10, WS_RPL_MAX_HOP_RANK_INCREASE, WS_RPL_MIN_HOP_RANK_INCREASE);
 
-    cfg->dio_interval_min = 15;        // 32s
-    cfg->dio_interval_doublings = 5;   // 1024s
+    cfg->dio_interval_min = WS_RPL_DIO_IMIN_MEDIUM;           // 128s
+    cfg->dio_interval_doublings = WS_RPL_DIO_DOUBLING_MEDIUM; // 1024s
     cfg->dio_redundancy_constant = 10;
     cfg->dag_max_rank_increase = WS_RPL_MAX_HOP_RANK_INCREASE;
     cfg->min_hop_rank_increase = WS_RPL_MIN_HOP_RANK_INCREASE;

source/6LoWPAN/ws/ws_config.h

@@ -31,12 +31,12 @@
 #define WS_RPL_DIO_DOUBLING_SMALL 2
 #define WS_RPL_DIO_REDUNDANCY_SMALL 0
 
-#define WS_RPL_DIO_IMIN_MEDIUM 15
-#define WS_RPL_DIO_DOUBLING_MEDIUM 5
+#define WS_RPL_DIO_IMIN_MEDIUM 17
+#define WS_RPL_DIO_DOUBLING_MEDIUM 3
 #define WS_RPL_DIO_REDUNDANCY_MEDIUM 10
 
-#define WS_RPL_DIO_IMIN_LARGE 19
-#define WS_RPL_DIO_DOUBLING_LARGE 1
+#define WS_RPL_DIO_IMIN_LARGE 18
+#define WS_RPL_DIO_DOUBLING_LARGE 3
 #define WS_RPL_DIO_REDUNDANCY_LARGE 10 // May need some tuning still
 
 #define WS_RPL_DIO_IMIN_AUTOMATIC 14

test/nanostack/unittest/6LoWPAN/ws_cfg_settings/test_ws_cfg_settings.c

@@ -56,15 +56,15 @@ static const ws_cfg_t ws_cfg_defaults_medium = {
     .phy.operating_class = 2,
     .phy.operating_mode = 3,
 
-    .timing.disc_trickle_imin = 30,           // network size affects
+    .timing.disc_trickle_imin = 60,           // network size affects
     .timing.disc_trickle_imax = 960,          // network size affects
     .timing.disc_trickle_k = 1,               // network size affects
     .timing.pan_timeout = 3840,               // network size affects
     .timing.temp_link_min_timeout = 260,      // network size affects
     .timing.temp_eapol_min_timeout = 330,
 
-    .bbr.dio_interval_min = 15,               // network size affects
-    .bbr.dio_interval_doublings = 5,          // network size affects
+    .bbr.dio_interval_min = 17,               // network size affects
+    .bbr.dio_interval_doublings = 3,          // network size affects
     .bbr.dio_redundancy_constant = 10,        // network size affects
     .bbr.dag_max_rank_increase = 2048,        // network size affects
     .bbr.min_hop_rank_increase = 196,         // network size affects
@@ -194,15 +194,15 @@ static const ws_cfg_t ws_cfg_defaults_large = {
     .phy.operating_class = 2,
     .phy.operating_mode = 3,
 
-    .timing.disc_trickle_imin = 60,           // network size affects
-    .timing.disc_trickle_imax = 960,          // network size affects
+    .timing.disc_trickle_imin = 240,           // network size affects
+    .timing.disc_trickle_imax = 1536,          // network size affects
     .timing.disc_trickle_k = 1,               // network size affects
     .timing.pan_timeout = 5400,               // network size affects
     .timing.temp_link_min_timeout = 520,      // network size affects
     .timing.temp_eapol_min_timeout = 750,
 
-    .bbr.dio_interval_min = 19,               // network size affects
-    .bbr.dio_interval_doublings = 1,          // network size affects
+    .bbr.dio_interval_min = 18,               // network size affects
+    .bbr.dio_interval_doublings = 3,          // network size affects
     .bbr.dio_redundancy_constant = 10,        // network size affects
     .bbr.dag_max_rank_increase = 2048,        // network size affects
     .bbr.min_hop_rank_increase = 196,         // network size affects