From f758e10a357d8ba67967614d47a3070b367820b9 Mon Sep 17 00:00:00 2001 From: dj2ls Date: Wed, 15 Jun 2022 10:54:34 +0200 Subject: [PATCH] removed static.INFO fields --- tnc/data_handler.py | 29 ----------------------------- tnc/sock.py | 1 - 2 files changed, 30 deletions(-) diff --git a/tnc/data_handler.py b/tnc/data_handler.py index a5680492..4ebf328d 100644 --- a/tnc/data_handler.py +++ b/tnc/data_handler.py @@ -528,7 +528,6 @@ class DATA: static.TNC_STATE = "BUSY" static.ARQ_STATE = True - # static.INFO.append("ARQ;RECEIVING") # Update data_channel timestamp self.data_channel_last_received = int(time.time()) @@ -754,7 +753,6 @@ class DATA: dxgrid=str(static.DXGRID, "UTF-8"), data=base64_data, ) - # static.INFO.append("ARQ;RECEIVING;SUCCESS") self.log.info( "[TNC] ARQ | RX | SENDING DATA FRAME ACK", @@ -777,7 +775,6 @@ class DATA: ) else: - # static.INFO.append("ARQ;RECEIVING;FAILED") self.send_data_to_socket_queue( freedata="tnc-message", @@ -833,7 +830,6 @@ class DATA: # static.TOTAL_BYTES = round(len(data_out) / 1024, 2) static.TOTAL_BYTES = len(data_out) frame_total_size = len(data_out).to_bytes(4, byteorder="big") - # static.INFO.append("ARQ;TRANSMITTING") self.send_data_to_socket_queue( freedata="tnc-message", @@ -1049,7 +1045,6 @@ class DATA: percent=static.ARQ_TRANSMISSION_PERCENT, bytesperminute=static.ARQ_BYTES_PER_MINUTE, ) - # static.INFO.append("ARQ;TRANSMITTING;SUCCESS") self.log.info( "[TNC] ARQ | TX | DATA TRANSMITTED!", @@ -1067,7 +1062,6 @@ class DATA: percent=static.ARQ_TRANSMISSION_PERCENT, bytesperminute=static.ARQ_BYTES_PER_MINUTE, ) - # static.INFO.append("ARQ;TRANSMITTING;FAILED") self.log.info( "[TNC] ARQ | TX | TRANSMISSION FAILED OR TIME OUT!", @@ -1195,7 +1189,6 @@ class DATA: percent=static.ARQ_TRANSMISSION_PERCENT, bytesperminute=static.ARQ_BYTES_PER_MINUTE, ) - # static.INFO.append("ARQ;TRANSMITTING;FAILED") # Update data_channel timestamp self.arq_session_last_received = int(time.time()) @@ -1390,7 +1383,6 @@ class DATA: + "]", state=static.ARQ_SESSION_STATE, ) - # static.INFO.append("ARQ;SESSION;CLOSE") self.send_data_to_socket_queue( freedata="tnc-message", @@ -1433,7 +1425,6 @@ class DATA: + "]", state=static.ARQ_SESSION_STATE, ) - # static.INFO.append("ARQ;SESSION;CLOSE") self.send_data_to_socket_queue( freedata="tnc-message", @@ -1584,7 +1575,6 @@ class DATA: while not static.ARQ_STATE: time.sleep(0.01) for attempt in range(self.data_channel_max_retries): - # static.INFO.append("DATACHANNEL;OPENING") self.send_data_to_socket_queue( freedata="tnc-message", @@ -1611,7 +1601,6 @@ class DATA: return True # `data_channel_max_retries` attempts have been sent. Aborting attempt & cleaning up - # static.INFO.append("DATACHANNEL;FAILED") self.log.debug( "[TNC] arq_open_data_channel:", transmission_uuid=self.transmission_uuid @@ -1655,7 +1644,6 @@ class DATA: """ self.arq_file_transfer = True self.is_IRS = True - # static.INFO.append("DATACHANNEL;RECEIVEDOPENER") self.send_data_to_socket_queue( freedata="tnc-message", arq="transmission", @@ -1760,7 +1748,6 @@ class DATA: """ protocol_version = int.from_bytes(bytes(data_in[13:14]), "big") if protocol_version == static.ARQ_PROTOCOL_VERSION: - # static.INFO.append("DATACHANNEL;OPEN") self.send_data_to_socket_queue( freedata="tnc-message", arq="transmission", @@ -1805,7 +1792,6 @@ class DATA: else: static.TNC_STATE = "IDLE" static.ARQ_STATE = False - # static.INFO.append("PROTOCOL;VERSION_MISMATCH") self.send_data_to_socket_queue( freedata="tnc-message", arq="transmission", @@ -1831,7 +1817,6 @@ class DATA: static.DXCALLSIGN = dxcallsign static.DXCALLSIGN_CRC = helpers.get_crc_24(static.DXCALLSIGN) - # static.INFO.append("PING;SENDING") self.send_data_to_socket_queue( freedata="tnc-message", ping="transmitting", @@ -1879,8 +1864,6 @@ class DATA: static.HAMLIB_FREQUENCY, ) - # static.INFO.append("PING;RECEIVING") - self.send_data_to_socket_queue( freedata="tnc-message", ping="received", @@ -1953,8 +1936,6 @@ class DATA: static.HAMLIB_FREQUENCY, ) - # static.INFO.append("PING;RECEIVEDACK") - self.log.info( "[TNC] PING ACK [" + str(self.mycallsign, "UTF-8") @@ -1980,7 +1961,6 @@ class DATA: static.TNC_STATE = "IDLE" static.ARQ_STATE = False - # static.INFO.append("TRANSMISSION;STOPPED") self.send_data_to_socket_queue( freedata="tnc-message", arq="transmission", @@ -1995,7 +1975,6 @@ class DATA: self.log.warning("[TNC] Stopping transmission!") static.TNC_STATE = "IDLE" static.ARQ_STATE = False - # static.INFO.append("TRANSMISSION;STOPPED") self.send_data_to_socket_queue( freedata="tnc-message", arq="transmission", @@ -2026,7 +2005,6 @@ class DATA: and not self.arq_file_transfer and not static.BEACON_PAUSE ): - # static.INFO.append("BEACON;SENDING") self.send_data_to_socket_queue( freedata="tnc-message", beacon="transmitting", @@ -2082,7 +2060,6 @@ class DATA: dxgrid=str(dxgrid, "UTF-8"), snr=str(static.SNR), ) - # static.INFO.append("BEACON;RECEIVING") self.log.info( "[TNC] BEACON RCVD [" @@ -2106,7 +2083,6 @@ class DATA: Transmit a CQ """ self.log.info("[TNC] CQ CQ CQ") - # static.INFO.append("CQ;SENDING") self.send_data_to_socket_queue( freedata="tnc-message", cq="transmitting", @@ -2140,7 +2116,6 @@ class DATA: self.log.debug("[TNC] received_cq:", dxcallsign=dxcallsign) dxgrid = bytes(helpers.decode_grid(data_in[7:11]), "UTF-8") - # static.INFO.append("CQ;RECEIVING") self.send_data_to_socket_queue( freedata="tnc-message", cq="received", @@ -2180,7 +2155,6 @@ class DATA: # duration, plus overhead. Set the wait interval to be random between 0 and 2s # in 0.5s increments. helpers.wait(randrange(0, 20, 5) / 10.0) - # static.INFO.append("QRV;SENDING") self.send_data_to_socket_queue( freedata="tnc-message", qrv="transmitting", @@ -2216,7 +2190,6 @@ class DATA: freedata="tnc-message", qrv="received", ) - # static.INFO.append("QRV;RECEIVING") self.log.info( "[TNC] QRV RCVD [" @@ -2518,7 +2491,6 @@ class DATA: + str(static.DXCALLSIGN, "UTF-8") + "]" ) - # static.INFO.append("ARQ;RECEIVING;FAILED") self.send_data_to_socket_queue( freedata="tnc-message", arq="transmission", @@ -2547,7 +2519,6 @@ class DATA: + str(static.DXCALLSIGN, "UTF-8") + "]" ) - # static.INFO.append("ARQ;SESSION;TIMEOUT") self.send_data_to_socket_queue( freedata="tnc-message", arq="session", diff --git a/tnc/sock.py b/tnc/sock.py index a71ffc49..4b01cc13 100644 --- a/tnc/sock.py +++ b/tnc/sock.py @@ -467,7 +467,6 @@ def send_tnc_state(): "arq_compression_factor": str(static.ARQ_COMPRESSION_FACTOR), "arq_transmission_percent": str(static.ARQ_TRANSMISSION_PERCENT), "total_bytes": str(static.TOTAL_BYTES), - "info": static.INFO, "beacon_state": str(static.BEACON_STATE), "stations": [], "mycallsign": str(static.MYCALLSIGN, encoding),