Merge pull request #2046 from ARMmbed/iotthd-3260

Wi-sun dicovery trickle update

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -672,7 +672,8 @@ static int8_t ws_bootstrap_up(protocol_interface_info_entry_t *cur)
         return -3;
     }
 
-
+    //Enable Power bootup timer setup
+    cur->ws_info->power_up_setup = true;
     // Save FHSS api
     cur->ws_info->fhss_api = ns_sw_mac_get_fhss_api(cur->mac_api);
 
@@ -1955,7 +1956,12 @@ static void ws_bootstrap_start_discovery(protocol_interface_info_entry_t *cur)
     // Reset advertisement solicit trickle to start discovering network
     cur->ws_info->trickle_pas_running = true;
     trickle_start(&cur->ws_info->trickle_pan_advertisement_solicit, &cur->ws_info->trickle_params_pan_discovery);
-    trickle_inconsistent_heard(&cur->ws_info->trickle_pan_advertisement_solicit, &cur->ws_info->trickle_params_pan_discovery);
+    if (cur->ws_info->power_up_setup) {
+        cur->ws_info->power_up_setup = false;
+        tr_debug("PAS init I %u and t %u", cur->ws_info->trickle_pan_advertisement_solicit.I, cur->ws_info->trickle_pan_advertisement_solicit.t);
+    } else {
+        trickle_inconsistent_heard(&cur->ws_info->trickle_pan_advertisement_solicit, &cur->ws_info->trickle_params_pan_discovery);
+    }
 
     // Discovery statemachine is checkked after two trickle interval
     cur->bootsrap_state_machine_cnt = 2 * cur->ws_info->trickle_params_pan_discovery.Imin + randLIB_get_8bit() % 50;

source/6LoWPAN/ws/ws_common.h

@@ -79,6 +79,7 @@ typedef struct ws_info_s {
     bool trickle_pa_running: 1;
     bool trickle_pcs_running: 1;
     bool trickle_pc_running: 1;
+    bool power_up_setup: 1;
     // default fhss parameters for this device
     uint8_t fhss_uc_dwell_interval;
     uint8_t fhss_bc_dwell_interval;