From 973ee593a3491ee1d123276d0faca2a7dcba44c8 Mon Sep 17 00:00:00 2001 From: DJ2LS Date: Thu, 4 May 2023 15:57:20 +0200 Subject: [PATCH] updated ctests --- test/test_datac13.py | 8 ++++---- test/test_datac13_negative.py | 6 +++--- test/util_datac13.py | 8 ++++---- test/util_datac13_negative.py | 8 ++++---- tnc/static.py | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/test/test_datac13.py b/test/test_datac13.py index e49aa238..083f7336 100644 --- a/test/test_datac13.py +++ b/test/test_datac13.py @@ -48,11 +48,11 @@ def parameters() -> dict: connect_data = {"type": "arq", "command": "connect", "dxcallsign": "ZZ9YY-0"} stop_data = {"type": "arq", "command": "stop_transmission", "dxcallsign": "ZZ9YY-0"} - beacon_timeout = 4 - ping_timeout = 4 + beacon_timeout = 2 + ping_timeout = 2 cq_timeout = 2 - connect_timeout = 4 - stop_timeout = 4 + connect_timeout = 2 + stop_timeout = 2 beacon_tx_check = '"beacon":"transmitting"' cq_tx_check = '"qrv":"received"' diff --git a/test/test_datac13_negative.py b/test/test_datac13_negative.py index 367edf5b..1bfd7702 100644 --- a/test/test_datac13_negative.py +++ b/test/test_datac13_negative.py @@ -38,10 +38,10 @@ def parameters() -> dict: connect_data = {"type": "arq", "command": "connect", "dxcallsign": ""} stop_data = {"type": "arq", "command": "stop_transmission", "dxcallsign": "DD5GG-3"} - beacon_timeout = 1 - ping_timeout = 1 + beacon_timeout = 2 + ping_timeout = 2 connect_timeout = 2 - stop_timeout = 1 + stop_timeout = 2 beacon_tx_check = '"status":"Failed"' ping_tx_check = '"ping","status":"Failed"' diff --git a/test/util_datac13.py b/test/util_datac13.py index 2c1d7368..a3458232 100644 --- a/test/util_datac13.py +++ b/test/util_datac13.py @@ -69,12 +69,12 @@ def t_setup( data_handler.DATA.process_data = t_process_data tnc_data_handler.log = structlog.get_logger(f"station{station}_DATA") # Limit the frame-ack timeout - tnc_data_handler.time_list_low_bw = [3, 1, 1] - tnc_data_handler.time_list_high_bw = [3, 1, 1] - tnc_data_handler.time_list = [3, 1, 1] + tnc_data_handler.time_list_low_bw = [8, 8, 8] + tnc_data_handler.time_list_high_bw = [8, 8, 8] + tnc_data_handler.time_list = [8, 8, 8] # Limit number of retries tnc_data_handler.rx_n_max_retries_per_burst = 4 - ModemParam.tx_delay = 500 # add additional delay time for passing test + ModemParam.tx_delay = 100 # add additional delay time for passing test # Create the modem diff --git a/test/util_datac13_negative.py b/test/util_datac13_negative.py index a6c08620..1ed1b177 100644 --- a/test/util_datac13_negative.py +++ b/test/util_datac13_negative.py @@ -62,12 +62,12 @@ def t_setup( data_handler.DATA.process_data = t_process_data tnc_data_handler.log = structlog.get_logger(f"station{station}_DATA") # Limit the frame-ack timeout - tnc_data_handler.time_list_low_bw = [3, 1, 1] - tnc_data_handler.time_list_high_bw = [3, 1, 1] - tnc_data_handler.time_list = [3, 1, 1] + tnc_data_handler.time_list_low_bw = [8, 8, 8] + tnc_data_handler.time_list_high_bw = [8, 8, 8] + tnc_data_handler.time_list = [8, 8, 8] # Limit number of retries tnc_data_handler.rx_n_max_retries_per_burst = 4 - ModemParam.tx_delay = 500 # add additional delay time for passing test + ModemParam.tx_delay = 100 # add additional delay time for passing test # Create the modem t_modem = modem.RF() orig_tx_func = modem.RF.transmit diff --git a/tnc/static.py b/tnc/static.py index ac197106..255eb1bb 100644 --- a/tnc/static.py +++ b/tnc/static.py @@ -137,7 +137,7 @@ class TNC: transmitting: bool = False low_bandwidth_mode: bool = False enable_fsk: bool = False - respond_to_cq: bool = False + respond_to_cq: bool = True respond_to_call: bool = True # respond to cq, ping, connection request, file request if not in session heard_stations = [] listen: bool = True