FHSS: WS bootstrap to start broadcast schedule

Author: Jarkko Paso

source/6LoWPAN/ws/ws_bootstrap.c

@@ -513,8 +513,8 @@ static void ws_bootstrap_pan_config_analyse(struct protocol_interface_info_entry
     cur->ws_info->hopping_schdule.fhss_bc_dwell_interval = ws_bs_ie.dwell_interval;
 
     cur->ws_info->hopping_schdule.channel_function = ws_bs_ie.channel_function;
-    // TODO: Restart unicast schedule if configuration changed, start broadcast schedule (FHSS)
-
+    // TODO: Restart unicast schedule if configuration changed
+    ns_fhss_ws_set_parent(cur->ws_info->fhss_api, neighbor->mac64, &ws_neighbor->fhss_data.bc_timing_info);
 
     if (!cur->ws_info->configuration_learned) {
         // Generate own hopping schedules Follow first parent broadcast and plans and also use same unicast dwell

source/MAC/IEEE802_15_4/mac_mcps_sap.c

@@ -1507,7 +1507,7 @@ void mcps_sap_pd_req_queue_write(protocol_interface_rf_mac_setup_s *rf_mac_setup
         if ((rf_mac_setup->macBroadcastDisabled == true) && !mac_is_ack_request_set(buffer)) {
             goto push_to_queue;
         }
-        if (rf_mac_setup->fhss_api) {
+        if (rf_mac_setup->fhss_api && (buffer->asynch_request == false)) {
             if (rf_mac_setup->fhss_api->check_tx_conditions(rf_mac_setup->fhss_api, !mac_is_ack_request_set(buffer),
             	buffer->msduHandle, mac_convert_frame_type_to_fhss(buffer->fcf_dsn.frametype), buffer->mac_payload_length,
             	rf_mac_setup->dev_driver->phy_driver->phy_header_length, rf_mac_setup->dev_driver->phy_driver->phy_tail_length) == false) {

source/MAC/IEEE802_15_4/mac_pd_sap.c

@@ -340,7 +340,9 @@ static int8_t mac_data_interface_tx_done_cb(protocol_interface_rf_mac_setup_s *r
         if (rf_ptr->mac_tx_result == MAC_TX_DONE) {
             tx_is_done = true;
         }
-        rf_ptr->fhss_api->data_tx_done(rf_ptr->fhss_api, waiting_ack, tx_is_done, rf_ptr->active_pd_data_request->msduHandle);
+        if (rf_ptr->active_pd_data_request->asynch_request == false) {
+            rf_ptr->fhss_api->data_tx_done(rf_ptr->fhss_api, waiting_ack, tx_is_done, rf_ptr->active_pd_data_request->msduHandle);
+        }
     }
     return 0;
 }

source/Service_Libs/fhss/fhss_ws.c

@@ -107,10 +107,13 @@ static void fhss_broadcast_handler(const fhss_api_t *fhss_api, uint16_t delay)
     if (!fhss_structure) {
         return;
     }
+    // TODO: check parent broadcast timing constantly and calculate drift error
     if (fhss_structure->ws->is_on_bc_channel == false) {
         fhss_start_timer(fhss_structure, fhss_structure->ws->fhss_configuration.fhss_bc_dwell_interval*1000, fhss_broadcast_handler);
         fhss_structure->ws->is_on_bc_channel = true;
         next_channel = fhss_ws_calc_bc_channel(fhss_structure);
+        // TODO: Randomize polling TX queue when on broadcast channel
+        fhss_structure->callbacks.tx_poll(fhss_structure->fhss_api);
     } else {
         uint32_t timeout = (fhss_structure->ws->fhss_configuration.fhss_broadcast_interval - fhss_structure->ws->fhss_configuration.fhss_bc_dwell_interval) * 1000;
         fhss_start_timer(fhss_structure, timeout, fhss_broadcast_handler);
@@ -252,7 +255,7 @@ static int fhss_ws_tx_handle_callback(const fhss_api_t *api, bool is_broadcast_a
     if (!fhss_structure) {
         return -1;
     }
-    if (is_broadcast_addr) {
+    if (is_broadcast_addr || (fhss_structure->ws->is_on_bc_channel == true)) {
         return 0;
     }
     if (fhss_structure->fhss_state == FHSS_SYNCHRONIZED) {
@@ -288,13 +291,22 @@ static int fhss_ws_tx_handle_callback(const fhss_api_t *api, bool is_broadcast_a
 
 static bool fhss_ws_check_tx_conditions_callback(const fhss_api_t *api, bool is_broadcast_addr, uint8_t handle, int frame_type, uint16_t frame_length, uint8_t phy_header_length, uint8_t phy_tail_length)
 {
-    (void) api;
-    (void) is_broadcast_addr;
     (void) handle;
     (void) frame_type;
     (void) frame_length;
     (void) phy_header_length;
     (void) phy_tail_length;
+    fhss_structure_t *fhss_structure = fhss_get_object_with_api(api);
+    if (!fhss_structure) {
+        return true;
+    }
+    if (fhss_structure->ws->fhss_configuration.ws_channel_function == WS_FIXED_CHANNEL) {
+        return true;
+    }
+    // Do not allow broadcast destination on unicast channel
+    if (is_broadcast_addr && (fhss_structure->ws->is_on_bc_channel == false)) {
+        return false;
+    }
     return true;
 }
 
@@ -421,6 +433,16 @@ int fhss_ws_set_parent(fhss_structure_t *fhss_structure, const uint8_t eui64[8],
     if (!fhss_structure->ws) {
         return -1;
     }
+    if (fhss_structure->ws->fhss_configuration.ws_channel_function == WS_FIXED_CHANNEL) {
+        return 0;
+    }
+    // Start broadcast schedule when BC intervals are known
+    if (bc_timing_info->broadcast_interval && bc_timing_info->broadcast_dwell_interval) {
+        fhss_start_timer(fhss_structure, (bc_timing_info->broadcast_interval-bc_timing_info->broadcast_interval_offset)*1000, fhss_broadcast_handler);
+        fhss_structure->ws->fhss_configuration.fhss_bc_dwell_interval = bc_timing_info->broadcast_dwell_interval;
+        fhss_structure->ws->fhss_configuration.fhss_broadcast_interval = bc_timing_info->broadcast_interval;
+        fhss_structure->ws->bc_slot = bc_timing_info->broadcast_slot;
+    }
     //TODO: support multiple parents
     fhss_structure->ws->parent_bc_info = bc_timing_info;
     return 0;