Wi-sun trigle timer update:

Added more resolution to trigle.

Change-Id: Icc0841d30fdb3f2242cbe4b7988c5c9bfee93207

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -63,9 +63,11 @@
 
 #ifdef HAVE_WS
 
+#define TRIGLE_IMIN_60_SECS (60 * 10) //
+
 static const trickle_params_t trickle_params_pan_discovery = {
-    .Imin = 60,         /* 60 second; ticks are 1s */
-    .Imax = 60 << 4,      /* 960 seconds 16 min*/
+    .Imin = TRIGLE_IMIN_60_SECS,         /* 60 second; ticks are 1s */
+    .Imax = TRIGLE_IMIN_60_SECS << 4,      /* 960 seconds 16 min*/
     .k = 1,             /* 1 */
     .TimerExpirations = TRICKLE_EXPIRATIONS_INFINITE
 };
@@ -425,7 +427,7 @@ static void ws_bootstrap_pan_advertisement_analyse(struct protocol_interface_inf
 
             if(ws_neighbor_class_rssi_from_dbm_calculate(data->signal_dbm) < (CAND_PARENT_THRESHOLD + CAND_PARENT_HYSTERISIS)) {
                 // First neighbor is too low we need to wait one extra trickle
-                cur->bootsrap_state_machine_cnt += trickle_params_pan_discovery.Imin*10 + randLIB_get_8bit() % 50;
+                cur->bootsrap_state_machine_cnt += trickle_params_pan_discovery.Imin + randLIB_get_8bit() % 50;
             }
         }
 
@@ -1120,7 +1122,7 @@ static void ws_bootstrap_start_discovery(protocol_interface_info_entry_t *cur)
     trickle_inconsistent_heard(&cur->ws_info->trickle_pan_advertisement_solicit, &trickle_params_pan_discovery);
 
     // Discovery statemachine is checkked after two trickle interval
-    cur->bootsrap_state_machine_cnt = 2*trickle_params_pan_discovery.Imin*10 + randLIB_get_8bit() % 50;
+    cur->bootsrap_state_machine_cnt = 2*trickle_params_pan_discovery.Imin + randLIB_get_8bit() % 50;
 }
 // Start configuration learning
 static void ws_bootstrap_start_configuration_learn(protocol_interface_info_entry_t *cur)
@@ -1418,7 +1420,7 @@ void ws_bootstrap_network_scan_process(protocol_interface_info_entry_t *cur)
 
     if (!ws_bootstrap_network_found(cur)) {
         // Next check will be after one trickle
-        cur->bootsrap_state_machine_cnt += trickle_params_pan_discovery.Imin*10 + randLIB_get_8bit() % 50;
+        cur->bootsrap_state_machine_cnt += trickle_params_pan_discovery.Imin + randLIB_get_8bit() % 50;
         return;
     }
     tr_info("select network");
@@ -1524,34 +1526,41 @@ void ws_bootstrap_state_machine(protocol_interface_info_entry_t *cur)
 
     }
 }
-void ws_bootstrap_seconds_timer(protocol_interface_info_entry_t *cur, uint32_t seconds)
+
+void ws_bootstrap_trigle_timer(protocol_interface_info_entry_t *cur, uint16_t ticks)
 {
-    if(trickle_timer(&cur->ws_info->trickle_pan_advertisement_solicit, &trickle_params_pan_discovery, seconds)) {
+    if(trickle_timer(&cur->ws_info->trickle_pan_advertisement_solicit, &trickle_params_pan_discovery, ticks)) {
         // send PAN advertisement solicit
         tr_info("Send PAN advertisement Solicit");
         ws_bootstrap_pan_advert_solicit(cur);
     }
-    if(trickle_timer(&cur->ws_info->trickle_pan_config_solicit, &trickle_params_pan_discovery, seconds)) {
+    if(trickle_timer(&cur->ws_info->trickle_pan_config_solicit, &trickle_params_pan_discovery, ticks)) {
         // send PAN Configuration solicit
         if (cur->ws_info->pas_requests > PCS_MAX) {
             // if MAX PCS sent restart discovery
+            tr_debug("Restart???");
             ws_bootstrap_event_discovery_start(cur);
             return;
         }
         tr_info("Send PAN configuration Solicit");
         cur->ws_info->pas_requests++;
         ws_bootstrap_pan_config_solicit(cur);
     }
-    if(trickle_timer(&cur->ws_info->trickle_pan_advertisement, &trickle_params_pan_discovery, seconds)) {
+    if(trickle_timer(&cur->ws_info->trickle_pan_advertisement, &trickle_params_pan_discovery, ticks)) {
         // send PAN advertisement
         tr_info("Send PAN advertisement");
         ws_bootstrap_pan_advert(cur);
     }
-    if(trickle_timer(&cur->ws_info->trickle_pan_config, &trickle_params_pan_discovery, seconds)) {
+    if(trickle_timer(&cur->ws_info->trickle_pan_config, &trickle_params_pan_discovery, ticks)) {
         // send PAN Configuration
         tr_info("Send PAN configuration");
         ws_bootstrap_pan_config(cur);
     }
+}
+
+
+void ws_bootstrap_seconds_timer(protocol_interface_info_entry_t *cur, uint32_t seconds)
+{
     if (cur->ws_info->pan_version_timeout_timer){
         // PAN version timer running
         if (cur->ws_info->pan_version_timeout_timer > seconds ) {

source/6LoWPAN/ws/ws_bootstrap.h

@@ -50,6 +50,8 @@ void ws_bootstrap_configuration_trickle_reset(protocol_interface_info_entry_t *c
 
 void ws_bootstrap_seconds_timer(protocol_interface_info_entry_t *cur, uint32_t seconds);
 
+void ws_bootstrap_trigle_timer(protocol_interface_info_entry_t *cur, uint16_t ticks);
+
 #else
 
 #define ws_bootstrap_init(interface_id, bootstrap_mode) (-1)

source/6LoWPAN/ws/ws_common.c

@@ -165,6 +165,12 @@ void ws_common_seconds_timer(protocol_interface_info_entry_t *cur, uint32_t seco
     ws_bootstrap_seconds_timer(cur, seconds);
 }
 
+void ws_common_fast_timer(protocol_interface_info_entry_t *cur, uint16_t ticks)
+{
+    ws_bootstrap_trigle_timer(cur, ticks);
+}
+
+
 void ws_common_neighbor_update(protocol_interface_info_entry_t *cur, const uint8_t *ll_address)
 {
     //Neighbor connectected update

source/6LoWPAN/ws/ws_common.h

@@ -70,13 +70,16 @@ int8_t ws_common_allocate_and_init(protocol_interface_info_entry_t *cur);
 
 void ws_common_seconds_timer(protocol_interface_info_entry_t *cur, uint32_t seconds);
 
+void ws_common_fast_timer(protocol_interface_info_entry_t *cur, uint16_t ticks);
+
 void ws_common_neighbor_update(protocol_interface_info_entry_t *cur, const uint8_t *ll_address);
 
 #define ws_info(cur) ((cur)->ws_info)
 #else
 #define ws_info(cur) ((ws_info_t *) NULL)
 #define ws_common_seconds_timer(cur, seconds)
 #define ws_common_neighbor_update(cur, ll_address) ((void) 0)
+#define ws_common_fast_timer(cur, ticks) ((void) 0)
 
 
 #endif //HAVE_WS

source/NWK_INTERFACE/protocol_core.c

@@ -312,6 +312,8 @@ void core_timer_event_handle(uint16_t ticksUpdate)
                 nd_object_timer(cur,ticksUpdate);
                 if (thread_info(cur)) {
                     thread_timer(cur, ticksUpdate);
+                } else if (ws_info(cur)) {
+                    ws_common_fast_timer(cur, ticksUpdate);
                 }
                 lowpan_context_timer(&cur->lowpan_contexts, ticksUpdate);
             }