@@ -301,7 +301,7 @@ bool test_fhss_ws_check_tx_conditions_callback()
301
301
return false;
302
302
}
303
303
// Test broadcast destination on unicast channel
304
- fhss_common_stub .fhss_struct .ws -> fhss_configuration .ws_channel_function = WS_TR51CF ;
304
+ fhss_common_stub .fhss_struct .ws -> fhss_configuration .ws_uc_channel_function = WS_TR51CF ;
305
305
if (fhss_common_stub .fhss_struct .fhss_api -> check_tx_conditions (api , true, DEFAULT_HANDLE , DEFAULT_FRAME_TYPE , DEFAULT_FRAME_LENGTH , DEFAULT_PHY_HEAD_LENGTH , DEFAULT_PHY_TAIL_LENGTH ) != false) {
306
306
return false;
307
307
}
@@ -386,7 +386,7 @@ bool test_fhss_ws_data_tx_done_callback()
386
386
// Test when FHSS struct can be found
387
387
enable_fhss_struct ();
388
388
fhss_common_stub .fhss_struct .fhss_state = FHSS_SYNCHRONIZED ;
389
- fhss_common_stub .fhss_struct .ws -> fhss_configuration .ws_channel_function = WS_TR51CF ;
389
+ fhss_common_stub .fhss_struct .ws -> fhss_configuration .ws_uc_channel_function = WS_TR51CF ;
390
390
fhss_common_stub .fhss_struct .fhss_api -> data_tx_done (api , DEFAULT_WAITING_ACK , DEFAULT_TX_COMPLETED , DEFAULT_HANDLE );
391
391
392
392
return true;
@@ -452,7 +452,7 @@ bool test_fhss_ws_synch_state_set_callback()
452
452
bool test_fhss_ws_write_synch_info_callback ()
453
453
{
454
454
fhss_api_t * api = test_generate_fhss_api ();
455
- fhss_common_stub .fhss_struct .ws -> fhss_configuration .ws_channel_function = WS_TR51CF ;
455
+ fhss_common_stub .fhss_struct .ws -> fhss_configuration .ws_uc_channel_function = WS_TR51CF ;
456
456
fhss_common_stub .fhss_struct .rx_channel = 0 ;
457
457
uint8_t synch_info [100 ] = {0x05 , 0x15 , 0x02 , 0x00 , 0x00 , 0x00 , 0x00 , 0x05 , 0x15 , 0x01 , 0x04 , 0x00 , 0x00 , 0x00 , 0x00 , 0x3f };
458
458
// Test when FHSS struct not found
@@ -561,28 +561,28 @@ bool test_fhss_ws_update_uc_channel_callback()
561
561
return false;
562
562
}
563
563
// Test setting TR51 unicast channel
564
- fhss_common_stub .fhss_struct .ws -> fhss_configuration .ws_channel_function = WS_TR51CF ;
564
+ fhss_common_stub .fhss_struct .ws -> fhss_configuration .ws_uc_channel_function = WS_TR51CF ;
565
565
fhss_common_stub .fhss_struct .fhss_api -> synch_state_set (api , DEFAULT_FHSS_STATE , DEFAULT_PANID );
566
566
if ((3 != fhss_callbacks_stub .uint8_value ) || (fhss_common_stub .fhss_struct .ws -> uc_slot != 0 )) {
567
567
return false;
568
568
}
569
569
// Test setting direct hash unicast channel
570
- fhss_common_stub .fhss_struct .ws -> fhss_configuration .ws_channel_function = WS_DH1CF ;
570
+ fhss_common_stub .fhss_struct .ws -> fhss_configuration .ws_uc_channel_function = WS_DH1CF ;
571
571
fhss_common_stub .fhss_struct .fhss_api -> synch_state_set (api , DEFAULT_FHSS_STATE , DEFAULT_PANID );
572
572
if ((1 != fhss_callbacks_stub .uint8_value ) || (fhss_common_stub .fhss_struct .ws -> uc_slot != 1 )) {
573
573
return false;
574
574
}
575
575
// Test setting vendor defined unicast channel
576
576
fhss_common_stub .fhss_struct .ws -> fhss_configuration .vendor_defined_cf = app_channel_function ;
577
- fhss_common_stub .fhss_struct .ws -> fhss_configuration .ws_channel_function = WS_VENDOR_DEF_CF ;
577
+ fhss_common_stub .fhss_struct .ws -> fhss_configuration .ws_uc_channel_function = WS_VENDOR_DEF_CF ;
578
578
fhss_common_stub .fhss_struct .fhss_api -> synch_state_set (api , DEFAULT_FHSS_STATE , DEFAULT_PANID );
579
579
if ((VENDOR_CHANNEL != fhss_callbacks_stub .uint8_value ) || (fhss_common_stub .fhss_struct .ws -> uc_slot != 1 )) {
580
580
return false;
581
581
}
582
582
// Test changing unicast channel when broadcast channel is active
583
583
api = test_generate_fhss_api ();
584
584
enable_fhss_struct ();
585
- fhss_common_stub .fhss_struct .ws -> fhss_configuration .ws_channel_function = WS_TR51CF ;
585
+ fhss_common_stub .fhss_struct .ws -> fhss_configuration .ws_uc_channel_function = WS_TR51CF ;
586
586
fhss_common_stub .fhss_struct .fhss_api -> synch_state_set (api , DEFAULT_FHSS_STATE , DEFAULT_PANID );
587
587
if ((3 != fhss_common_stub .fhss_struct .rx_channel ) || (3 == fhss_callbacks_stub .uint8_value )) {
588
588
return false;
@@ -597,7 +597,7 @@ bool test_fhss_unicast_handler()
597
597
fhss_common_stub .fhss_struct .ws -> fhss_configuration .fhss_bc_dwell_interval = 0 ;
598
598
fhss_common_stub .fhss_struct .ws -> fhss_configuration .fhss_broadcast_interval = 0 ;
599
599
fhss_common_stub .fhss_struct .ws -> uc_slot = fhss_common_stub .fhss_struct .number_of_channels - 1 ;
600
- fhss_common_stub .fhss_struct .ws -> fhss_configuration .ws_channel_function = WS_TR51CF ;
600
+ fhss_common_stub .fhss_struct .ws -> fhss_configuration .ws_uc_channel_function = WS_TR51CF ;
601
601
602
602
// Call state set just to get fhss_stub.callback
603
603
enable_fhss_struct ();
@@ -629,7 +629,7 @@ bool test_fhss_ws_set_parent()
629
629
}
630
630
631
631
// Test success
632
- fhss_common_stub .fhss_struct .ws -> fhss_configuration .ws_channel_function = WS_TR51CF ;
632
+ fhss_common_stub .fhss_struct .ws -> fhss_configuration .ws_uc_channel_function = WS_TR51CF ;
633
633
bc_timing_info .broadcast_channel_function = WS_TR51CF ;
634
634
bc_timing_info .broadcast_dwell_interval = 250 ;
635
635
bc_timing_info .broadcast_interval = 1000 ;
0 commit comments