FHSS_WS: Fixed reading unicast remaining slots (ARMmbed#2408)

* FHSS_WS: Fixed reading unicast remaining slots

* Unit test: Fixed FHSS WS tests

Author: Jarkko Paso

source/Service_Libs/fhss/fhss_ws.c

@@ -417,7 +417,10 @@ static uint32_t fhss_ws_calculate_ufsi(fhss_structure_t *fhss_structure, uint32_
         cur_slot = fhss_structure->number_of_uc_channels;
     }
     cur_slot--;
-    uint32_t remaining_time_ms = US_TO_MS(get_remaining_slots_us(fhss_structure, fhss_unicast_handler, MS_TO_US(fhss_structure->ws->fhss_configuration.fhss_uc_dwell_interval)));
+    uint32_t remaining_time_ms = 0;
+    if (fhss_structure->ws->unicast_timer_running == true) {
+        remaining_time_ms = US_TO_MS(get_remaining_slots_us(fhss_structure, fhss_unicast_handler, MS_TO_US(dwell_time) - NS_TO_US(dwell_time * fhss_structure->ws->drift_per_millisecond_ns)));
+    }
     uint32_t time_to_tx = 0;
     uint32_t cur_time = fhss_structure->callbacks.read_timestamp(fhss_structure->fhss_api);
     if (cur_time < tx_time) {

test/nanostack/unittest/service_libs/fhss_ws/test_fhss_ws.c

@@ -138,6 +138,11 @@ static fhss_api_t *test_generate_fhss_api(void)
     fhss_common_stub.fhss_struct.ws->fhss_configuration.fhss_broadcast_interval = 1000;
     fhss_common_stub.fhss_struct.ws->get_neighbor_info = &app_get_neighbor_info;
     fhss_common_stub.fhss_struct.number_of_channels = 50;
+    fhss_common_stub.fhss_struct.number_of_uc_channels = 50;
+    fhss_common_stub.fhss_struct.ws->fhss_configuration.unicast_channel_mask[1] = 0x0003ffff;
+    fhss_common_stub.fhss_struct.ws->fhss_configuration.unicast_channel_mask[0] = 0xffffffff;
+    fhss_common_stub.fhss_struct.ws->fhss_configuration.channel_mask[1] = 0x0003ffff;
+    fhss_common_stub.fhss_struct.ws->fhss_configuration.channel_mask[0] = 0xffffffff;
     fhss_common_stub.fhss_struct.rx_channel = DEFAULT_CHANNEL;
     fhss_common_stub.fhss_struct.fhss_state = FHSS_UNSYNCHRONIZED;
     fhss_common_stub.fhss_struct.own_hop = 0xff;
@@ -273,6 +278,7 @@ bool test_fhss_ws_tx_handle_callback()
     memset(&neighbor_info, 0, sizeof(fhss_ws_neighbor_timing_info_t));
     // Test direct hash channel function
     neighbor_info.uc_timing_info.unicast_channel_function = WS_DH1CF;
+    neighbor_info.uc_timing_info.unicast_number_of_channels = fhss_common_stub.fhss_struct.number_of_channels;
     if (fhss_common_stub.fhss_struct.fhss_api->tx_handle(api, DEFAULT_IS_BC_DEST, dest_address, DEFAULT_FRAME_TYPE, DEFAULT_FRAME_LENGTH, DEFAULT_PHY_HEAD_LENGTH, DEFAULT_PHY_TAIL_LENGTH, DEFAULT_TX_TIME) != 0) {
         return false;
     }
@@ -332,6 +338,7 @@ bool test_fhss_ws_check_tx_conditions_callback()
     fhss_common_stub.fhss_struct.own_hop = 0;
     fhss_common_stub.fhss_struct.ws->fhss_configuration.fhss_broadcast_interval = 800;
     fhss_common_stub.fhss_struct.ws->fhss_configuration.fhss_bc_dwell_interval = 200;
+    fhss_common_stub.fhss_struct.ws->txrx_slot_length_ms = 100;
     fhss_platform_stub.remaining_slots_value = 550000;
     if (fhss_common_stub.fhss_struct.fhss_api->check_tx_conditions(api, DEFAULT_IS_BC_DEST, DEFAULT_HANDLE, DEFAULT_FRAME_TYPE, DEFAULT_FRAME_LENGTH, DEFAULT_PHY_HEAD_LENGTH, DEFAULT_PHY_TAIL_LENGTH) != true) {
         return false;
@@ -356,6 +363,7 @@ bool test_fhss_ws_check_tx_conditions_callback()
     fhss_common_stub.fhss_struct.own_hop = 2;
     fhss_common_stub.fhss_struct.ws->fhss_configuration.fhss_broadcast_interval = 1000;
     fhss_common_stub.fhss_struct.ws->fhss_configuration.fhss_bc_dwell_interval = 250;
+    fhss_common_stub.fhss_struct.ws->txrx_slot_length_ms = 125;
     fhss_platform_stub.remaining_slots_value = 700000;
     if (fhss_common_stub.fhss_struct.fhss_api->check_tx_conditions(api, DEFAULT_IS_BC_DEST, DEFAULT_HANDLE, DEFAULT_FRAME_TYPE, DEFAULT_FRAME_LENGTH, DEFAULT_PHY_HEAD_LENGTH, DEFAULT_PHY_TAIL_LENGTH) != true) {
         return false;
@@ -398,6 +406,7 @@ bool test_fhss_ws_data_tx_done_callback()
 bool test_fhss_ws_data_tx_fail_callback()
 {
     fhss_api_t *api = test_generate_fhss_api();
+    fhss_common_stub.fhss_struct.ws->fhss_configuration.config_parameters.number_of_channel_retries = 4;
     // Test when FHSS struct not found
     disable_fhss_struct();
     if (fhss_common_stub.fhss_struct.fhss_api->data_tx_fail(api, DEFAULT_HANDLE, DEFAULT_FRAME_TYPE, DEFAULT_BAD_CHANNEL) != false) {
@@ -457,6 +466,7 @@ bool test_fhss_ws_write_synch_info_callback()
     fhss_api_t *api = test_generate_fhss_api();
     fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_uc_channel_function = WS_TR51CF;
     fhss_common_stub.fhss_struct.rx_channel = 0;
+    fhss_common_stub.fhss_struct.ws->unicast_timer_running = true;
     uint8_t synch_info[100] = {0x05, 0x15, 0x02, 0x00, 0x00, 0x00, 0x00, 0x05, 0x15, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x3f};
     // Test when FHSS struct not found
     disable_fhss_struct();
@@ -556,12 +566,13 @@ bool test_fhss_ws_get_retry_period_callback()
     // Test when own hop not set
     fhss_common_stub.fhss_struct.ws->is_on_bc_channel = false;
     fhss_common_stub.fhss_struct.own_hop = 0xff;
-    if (fhss_common_stub.fhss_struct.fhss_api->get_retry_period(api, NULL, 0) != 0) {
+    if (fhss_common_stub.fhss_struct.fhss_api->get_retry_period(api, NULL, 0) != 100000) {
         return false;
     }
     // Test when on broadcast channel
     fhss_common_stub.fhss_struct.ws->is_on_bc_channel = true;
     fhss_common_stub.fhss_struct.own_hop = 1;
+    fhss_common_stub.fhss_struct.ws->broadcast_timer_running = true;
     if (fhss_common_stub.fhss_struct.fhss_api->get_retry_period(api, NULL, 0) != 0) {
         return false;
     }
@@ -655,7 +666,7 @@ bool test_fhss_ws_update_uc_channel_callback()
     // We do not want to start broadcast timer
     fhss_common_stub.fhss_struct.ws->fhss_configuration.fhss_bc_dwell_interval = 0;
     fhss_common_stub.fhss_struct.ws->fhss_configuration.fhss_broadcast_interval = 0;
-    fhss_common_stub.fhss_struct.ws->uc_slot = fhss_common_stub.fhss_struct.number_of_channels - 1;
+    fhss_common_stub.fhss_struct.ws->uc_slot = fhss_common_stub.fhss_struct.number_of_uc_channels - 1;
 
     // Test fixed channel
     enable_fhss_struct();