Randomize channel used in fixed channel

All devices randomize the fixed channel that is used
Channel is set to MAC meaning devices are now on different channel

Only call trickle inconsistents if timer is running

Remove extra traces from llc and ETX

Author: Mika Tervonen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -336,7 +336,9 @@ static void ws_bootstrap_pan_advertisement_analyse_active(struct protocol_interf
     if (pan_information->routing_cost <= cur->ws_info->pan_information.routing_cost) {
         trickle_consistent_heard(&cur->ws_info->trickle_pan_advertisement);
     } else {
-        trickle_inconsistent_heard(&cur->ws_info->trickle_pan_advertisement,&trickle_params_pan_discovery);
+        if (trickle_running(&cur->ws_info->trickle_pan_advertisement,&trickle_params_pan_discovery)) {
+            trickle_inconsistent_heard(&cur->ws_info->trickle_pan_advertisement,&trickle_params_pan_discovery);
+        }
     }
 
 }
@@ -465,7 +467,9 @@ static void ws_bootstrap_pan_advertisement_solicit_analyse(struct protocol_inter
      * An inconsistent transmission is defined as:
      * A PAN Advertisement Solicit with NETNAME-IE matching that of the receiving node.
      */
-    trickle_inconsistent_heard(&cur->ws_info->trickle_pan_advertisement,&trickle_params_pan_discovery);
+    if (trickle_running(&cur->ws_info->trickle_pan_advertisement,&trickle_params_pan_discovery)) {
+        trickle_inconsistent_heard(&cur->ws_info->trickle_pan_advertisement,&trickle_params_pan_discovery);
+    }
     /*
      *  A consistent transmission is defined as
      *  a PAN Advertisement Solicit with NETNAME-IE / Network Name matching that configured on the receiving node.
@@ -540,7 +544,9 @@ static void ws_bootstrap_pan_config_analyse(struct protocol_interface_info_entry
         common_serial_number_greater_16(cur->ws_info->pan_information.pan_version, pan_version)) {
         // received version is lower se we need to reset the trickle
         tr_info("older pan version heard");
-        trickle_inconsistent_heard(&cur->ws_info->trickle_pan_config,&trickle_params_pan_discovery);
+        if (trickle_running(&cur->ws_info->trickle_pan_config,&trickle_params_pan_discovery)) {
+            trickle_inconsistent_heard(&cur->ws_info->trickle_pan_config,&trickle_params_pan_discovery);
+        }
         return;
     }
     trickle_consistent_heard(&cur->ws_info->trickle_pan_config);
@@ -626,7 +632,9 @@ static void ws_bootstrap_pan_config_solicit_analyse(struct protocol_interface_in
      *  A PAN Configuration Solicit with a PAN-ID matching that of the receiving node and
      *  a NETNAME-IE / Network Name matching the network name configured on the receiving
      */
-    trickle_inconsistent_heard(&cur->ws_info->trickle_pan_config,&trickle_params_pan_discovery);
+    if (trickle_running(&cur->ws_info->trickle_pan_config,&trickle_params_pan_discovery)) {
+        trickle_inconsistent_heard(&cur->ws_info->trickle_pan_config,&trickle_params_pan_discovery);
+    }
 }
 static bool ws_bootstrap_network_found(protocol_interface_info_entry_t *cur)
 {
@@ -907,7 +915,7 @@ static void ws_bootstrap_fhss_activate(protocol_interface_info_entry_t *cur)
     tr_debug("MAC init");
     mac_helper_pib_boolean_set(cur, macRxOnWhenIdle, true);
     cur->lowpan_info &=  ~INTERFACE_NWK_CONF_MAC_RX_OFF_IDLE;
-    ws_bootstrap_mac_activate(cur, 11, cur->ws_info->network_pan_id, true);
+    ws_bootstrap_mac_activate(cur, cur->ws_info->hopping_schdule.fixed_channel, cur->ws_info->network_pan_id, true);
     return;
 }
 
@@ -1032,6 +1040,7 @@ static void ws_bootstrap_network_discovery_configure(protocol_interface_info_ent
     cur->ws_info->hopping_schdule.fhss_bc_dwell_interval = 200;
     // By default, uses fixed channel
     cur->ws_info->hopping_schdule.channel_function = WS_FIXED_CHANNEL;
+    cur->ws_info->hopping_schdule.fixed_channel = randLIB_get_random_in_range(11,25);
 
     //Set Network names, Pan information configure, hopping schedule & GTKHash
     ws_llc_set_network_name(cur, (uint8_t*)cur->ws_info->network_name, strlen(cur->ws_info->network_name));

source/6LoWPAN/ws/ws_common.c

@@ -17,6 +17,7 @@
 #include <string.h>
 #include "nsconfig.h"
 #include "ns_types.h"
+#include "randLIB.h"
 #include <ns_list.h>
 #include <nsdynmemLIB.h>
 #include "NWK_INTERFACE/Include/protocol.h"
@@ -151,6 +152,7 @@ int8_t ws_common_allocate_and_init(protocol_interface_info_entry_t *cur)
     cur->ws_info->hopping_schdule.fhss_bc_dwell_interval = 200;
     // By default, uses fixed channel
     cur->ws_info->hopping_schdule.channel_function = WS_FIXED_CHANNEL;
+    cur->ws_info->hopping_schdule.fixed_channel = randLIB_get_random_in_range(11,25);
 
     return 0;
 }

source/6LoWPAN/ws/ws_llc_data_service.c

@@ -488,7 +488,7 @@ static void ws_llc_mac_indication_cb(const mac_api_t* api, const mcps_data_ind_t
 
         //Refresh Neighbor if unicast
         if (ws_utt.message_type == WS_FT_DATA && data->DstAddrMode && addr_check_broadcast(data->DstAddr, data->DstAddrMode)) {
-            tr_debug("Refresh neigh index %u", neighbor_info.neighbor->index);
+            //tr_debug("Refresh neigh index %u", neighbor_info.neighbor->index);
             mac_neighbor_table_neighbor_refresh(interface->mac_parameters->mac_neighbor_table, neighbor_info.neighbor, neighbor_info.neighbor->link_lifetime);
             etx_lqi_dbm_update(interface->id, data->mpduLinkQuality, data->signal_dbm, neighbor_info.neighbor->index);
         }

source/Service_Libs/etx/etx.c

@@ -216,7 +216,7 @@ uint16_t etx_read(int8_t interface_id, addrtype_t addr_type, const uint8_t *addr
         attribute_index = neigh_table_ptr->attribute_index;
     }
 
-    tr_debug("Etx Read from atribute %u", attribute_index);
+    //tr_debug("Etx Read from atribute %u", attribute_index);
 
     etx_storage_t * entry = etx_storage_entry_get(interface_id, attribute_index);
 
@@ -227,7 +227,7 @@ uint16_t etx_read(int8_t interface_id, addrtype_t addr_type, const uint8_t *addr
     uint16_t etx  = etx_current_calc(entry->etx, entry->accumulated_failures);
     etx >>= 4;
 
-    tr_debug("Etx value %u", etx);
+    //tr_debug("Etx value %u", etx);
 
     return etx;
 }