From 85e289f83b11feae31f060bd0d50a6f58b3b71c8 Mon Sep 17 00:00:00 2001 From: DJ2LS Date: Thu, 4 May 2023 16:47:33 +0200 Subject: [PATCH] updated ctests --- test/test_datac13.py | 10 +++++----- test/test_datac13_negative.py | 8 ++++---- test/util_datac13.py | 2 +- test/util_datac13_negative.py | 2 +- tnc/data_handler.py | 5 ++++- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/test/test_datac13.py b/test/test_datac13.py index 083f7336..4cb3131b 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 = 2 - ping_timeout = 2 - cq_timeout = 2 - connect_timeout = 2 - stop_timeout = 2 + beacon_timeout = 1 + ping_timeout = 1 + cq_timeout = 1 + connect_timeout = 1 + stop_timeout = 1 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 1bfd7702..699fd487 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 = 2 - ping_timeout = 2 - connect_timeout = 2 - stop_timeout = 2 + beacon_timeout = 1 + ping_timeout = 1 + connect_timeout = 1 + stop_timeout = 1 beacon_tx_check = '"status":"Failed"' ping_tx_check = '"ping","status":"Failed"' diff --git a/test/util_datac13.py b/test/util_datac13.py index a3458232..9efe2828 100644 --- a/test/util_datac13.py +++ b/test/util_datac13.py @@ -74,7 +74,7 @@ def t_setup( 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 = 100 # add additional delay time for passing test + ModemParam.tx_delay = 50 # 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 1ed1b177..882acc98 100644 --- a/test/util_datac13_negative.py +++ b/test/util_datac13_negative.py @@ -67,7 +67,7 @@ def t_setup( 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 = 100 # add additional delay time for passing test + ModemParam.tx_delay = 50 # add additional delay time for passing test # Create the modem t_modem = modem.RF() orig_tx_func = modem.RF.transmit diff --git a/tnc/data_handler.py b/tnc/data_handler.py index 709e56fa..4c1f337a 100644 --- a/tnc/data_handler.py +++ b/tnc/data_handler.py @@ -2931,7 +2931,10 @@ class DATA: self.log.info("[TNC] ENABLE FSK", state=TNC.enable_fsk) self.enqueue_frame_for_tx([qrv_frame], c2_mode=FREEDV_MODE.fsk_ldpc_0.value) else: - self.enqueue_frame_for_tx([qrv_frame], c2_mode=FREEDV_MODE.sig0.value, copies=1, repeat_delay=0) + if TESTMODE: + self.enqueue_frame_for_tx([qrv_frame], c2_mode=FREEDV_MODE.sig0.value, copies=2, repeat_delay=0) + else: + self.enqueue_frame_for_tx([qrv_frame], c2_mode=FREEDV_MODE.sig0.value, copies=1, repeat_delay=0) def received_qrv(self, data_in: bytes) -> None: """