From 55fc2d226383f217df73cbbb45aaee56334bd7d3 Mon Sep 17 00:00:00 2001 From: Paul Kronenwetter Date: Sun, 29 May 2022 20:47:04 -0400 Subject: [PATCH] Adjustments to WIP utilities. --- test/util_arq_chat_file_1.py | 14 ++++++-------- test/util_arq_chat_file_2.py | 14 ++++++-------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/test/util_arq_chat_file_1.py b/test/util_arq_chat_file_1.py index 3d0e105b..80241986 100644 --- a/test/util_arq_chat_file_1.py +++ b/test/util_arq_chat_file_1.py @@ -78,16 +78,14 @@ def t_highsnr_arq_short_station1( static.LOW_BANDWIDTH_MODE = lowbwmode static.MYGRID = bytes("AA12aa", "utf-8") static.RESPOND_TO_CQ = True - - mycallsign = bytes(mycall, "utf-8") - mycallsign = helpers.callsign_to_bytes(mycallsign) - static.MYCALLSIGN = helpers.bytes_to_callsign(mycallsign) - static.MYCALLSIGN_CRC = helpers.get_crc_24(static.MYCALLSIGN) - static.MYGRID = bytes("AA12aa", "utf-8") static.SSID_LIST = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] - dxcallsign = bytes(dxcall, "utf-8") - dxcallsign = helpers.callsign_to_bytes(dxcallsign) + mycallsign = helpers.callsign_to_bytes(mycall) + mycallsign = helpers.bytes_to_callsign(mycallsign) + static.MYCALLSIGN = helpers.bytes_to_callsign(mycallsign) + static.MYCALLSIGN_CRC = helpers.get_crc_24(static.MYCALLSIGN) + + dxcallsign = helpers.callsign_to_bytes(dxcall) dxcallsign = helpers.bytes_to_callsign(dxcallsign) static.DXCALLSIGN = dxcallsign static.DXCALLSIGN_CRC = helpers.get_crc_24(static.DXCALLSIGN) diff --git a/test/util_arq_chat_file_2.py b/test/util_arq_chat_file_2.py index 75347504..2fcdd182 100644 --- a/test/util_arq_chat_file_2.py +++ b/test/util_arq_chat_file_2.py @@ -78,16 +78,14 @@ def t_highsnr_arq_short_station2( static.LOW_BANDWIDTH_MODE = lowbwmode static.MYGRID = bytes("AA12aa", "utf-8") static.RESPOND_TO_CQ = True - - mycallsign = bytes(mycall, "utf-8") - mycallsign = helpers.callsign_to_bytes(mycallsign) - static.MYCALLSIGN = helpers.bytes_to_callsign(mycallsign) - static.MYCALLSIGN_CRC = helpers.get_crc_24(static.MYCALLSIGN) - static.MYGRID = bytes("AA12aa", "utf-8") static.SSID_LIST = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] - dxcallsign = bytes(dxcall, "utf-8") - dxcallsign = helpers.callsign_to_bytes(dxcallsign) + mycallsign = helpers.callsign_to_bytes(mycall) + mycallsign = helpers.bytes_to_callsign(mycallsign) + static.MYCALLSIGN = helpers.bytes_to_callsign(mycallsign) + static.MYCALLSIGN_CRC = helpers.get_crc_24(static.MYCALLSIGN) + + dxcallsign = helpers.callsign_to_bytes(dxcall) dxcallsign = helpers.bytes_to_callsign(dxcallsign) static.DXCALLSIGN = dxcallsign static.DXCALLSIGN_CRC = helpers.get_crc_24(static.DXCALLSIGN)