From bd496fae3f0af48b6090f93c07cfe920e93e40fd Mon Sep 17 00:00:00 2001
From: DJ2LS <75909252+DJ2LS@users.noreply.github.com>
Date: Thu, 9 Feb 2023 18:27:06 +0100
Subject: [PATCH] disabled ctest for python 3.12-dev

---
 .github/workflows/ctest.yml |  2 +-
 tnc/data_handler.py         | 29 ++++++++++-------------------
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/ctest.yml b/.github/workflows/ctest.yml
index c671babd..fcba1b26 100644
--- a/.github/workflows/ctest.yml
+++ b/.github/workflows/ctest.yml
@@ -21,7 +21,7 @@ jobs:
           - python-version: "3.9"
           - python-version: "3.10"
           - python-version: "3.11"
-          - python-version: "3.12-dev"
+          #- python-version: "3.12-dev"
 
     steps:
       - uses: actions/checkout@v3
diff --git a/tnc/data_handler.py b/tnc/data_handler.py
index cd2a4a56..be8ba810 100644
--- a/tnc/data_handler.py
+++ b/tnc/data_handler.py
@@ -1066,8 +1066,6 @@ class DATA:
           n_frames_per_burst:int:
 
         """
-        self.arq_file_transfer = True
-
         # set signalling modes we want to listen to
         # we are in an ongoing arq transmission, so we don't need sig0 actually
         modem.RECEIVE_SIG0 = False
@@ -1079,6 +1077,7 @@ class DATA:
         # save len of data_out to TOTAL_BYTES for our statistics --> kBytes
         # static.TOTAL_BYTES = round(len(data_out) / 1024, 2)
         static.TOTAL_BYTES = len(data_out)
+        self.arq_file_transfer = True
         frame_total_size = len(data_out).to_bytes(4, byteorder="big")
 
         # Compress data frame
@@ -1167,9 +1166,6 @@ class DATA:
                 # Payload information
                 payload_per_frame = modem.get_bytes_per_frame(data_mode) - 2
 
-                # Tempbuffer list for storing our data frames
-                tempbuffer = []
-
                 # Append data frames with n_frames_per_burst to tempbuffer
                 # TODO: this part needs a complete rewrite!
                 # n_frames_per_burst = 1 is working
@@ -1195,9 +1191,7 @@ class DATA:
                     )
                     frame = arqheader + extended_data_out
 
-                # Append frame to tempbuffer for transmission
-                tempbuffer.append(frame)
-
+                tempbuffer = [frame]
                 self.log.debug("[TNC] tempbuffer:", tempbuffer=tempbuffer)
                 self.log.info(
                     "[TNC] ARQ | TX | FRAMES",
@@ -1217,11 +1211,12 @@ class DATA:
                 #     threading.Event().wait(0.01)
 
                 # burstacktimeout = time.time() + self.burst_ack_timeout_seconds + 100
-                while static.ARQ_STATE and not (
-                        self.burst_ack
-                        or self.burst_nack
-                        or self.rpt_request_received
-                        or self.data_frame_ack_received
+                while (
+                    static.ARQ_STATE
+                    and not self.burst_ack
+                    and not self.burst_nack
+                    and not self.rpt_request_received
+                    and not self.data_frame_ack_received
                 ):
                     threading.Event().wait(0.01)
 
@@ -1237,10 +1232,6 @@ class DATA:
                 if self.burst_nack:
                     self.burst_nack = False  # reset nack state
 
-                # not yet implemented
-                if self.rpt_request_received:
-                    pass
-
                 if self.data_frame_ack_received:
                     self.log.debug(
                         "[TNC] arq_transmit: Received FRAME ACK. Sending next chunk."
@@ -1266,7 +1257,7 @@ class DATA:
                     maxretries=self.tx_n_max_retries_per_burst,
                     overflows=static.BUFFER_OVERFLOW_COUNTER,
                 )
-                # End of FOR loop
+                        # End of FOR loop
 
             # update buffer position
             bufferposition = bufferposition_end
@@ -1297,7 +1288,7 @@ class DATA:
             if self.data_frame_ack_received and bufferposition > len(data_out):
                 self.log.debug("[TNC] arq_tx: Last fragment sent and acknowledged.")
                 break
-            # GOING TO NEXT ITERATION
+                # GOING TO NEXT ITERATION
 
         if self.data_frame_ack_received:
             # we need to wait until sending "transmitted" state