Merge pull request #2021 from ARMmbed/fhss_synch_fix

ws FHSS synch fix

Author: Juha Heiskanen

source/Service_Libs/fhss/fhss_ws.c

@@ -395,6 +395,8 @@ static int16_t fhss_ws_synch_state_set_callback(const fhss_api_t *api, fhss_stat
             fhss_ws_start_timer(fhss_structure, MS_TO_US(fhss_structure->ws->fhss_configuration.fhss_uc_dwell_interval), fhss_unicast_handler);
             fhss_structure->ws->unicast_timer_running = true;
         }
+    } else if (fhss_state == FHSS_UNSYNCHRONIZED) {
+        fhss_structure->ws->synchronization_time = 0;
     }
 
     fhss_structure->fhss_state = fhss_state;
@@ -794,7 +796,11 @@ int fhss_ws_set_parent(fhss_structure_t *fhss_structure, const uint8_t eui64[8],
     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_set_txrx_slot_length(fhss_structure);
-    fhss_structure->ws->bc_slot = bc_timing_info->broadcast_slot + slots_since_reception;
+    if (fhss_structure->ws->fhss_configuration.ws_bc_channel_function == WS_FIXED_CHANNEL) {
+        fhss_structure->ws->bc_slot = 0;
+    } else {
+        fhss_structure->ws->bc_slot = bc_timing_info->broadcast_slot + slots_since_reception;
+    }
     if (fhss_structure->ws->fhss_configuration.ws_bc_channel_function == WS_TR51CF) {
         fhss_structure->ws->bc_slot %= fhss_structure->number_of_channels;
     }