From 59404404b85c265e9ea2fcbfbf5847612b241dbb Mon Sep 17 00:00:00 2001
From: DJ2LS <75909252+DJ2LS@users.noreply.github.com>
Date: Sat, 7 Aug 2021 11:14:49 +0200
Subject: [PATCH] less terminal output

---
 tnc/daemon.py |  4 ++--
 tnc/modem.py  | 26 ++++++++------------------
 tnc/sock.py   |  4 ++--
 3 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/tnc/daemon.py b/tnc/daemon.py
index 1c882016..4031bde4 100644
--- a/tnc/daemon.py
+++ b/tnc/daemon.py
@@ -78,7 +78,7 @@ class CMDTCPRequestHandler(socketserver.BaseRequestHandler):
             
             try:
                 received_json = json.loads(data)
-                print(received_json)
+                #print(received_json)
 
             except:
                 received_json = ''
@@ -102,7 +102,7 @@ class CMDTCPRequestHandler(socketserver.BaseRequestHandler):
             #print(received_json["type"])
             #print(received_json["command"]) 
             try:
-                print(static.TNCSTARTED)
+                #print(static.TNCSTARTED)
 
 
 
diff --git a/tnc/modem.py b/tnc/modem.py
index 2ebbf559..7d505794 100644
--- a/tnc/modem.py
+++ b/tnc/modem.py
@@ -438,6 +438,9 @@ class RF():
             # lets get the frequency, mode and bandwith
             self.get_radio_stats()
             
+            # lets get scatter data
+            self.get_scatter(freedv)
+            
             # demod loop         
             while (static.CHANNEL_STATE == 'RECEIVING_DATA' and static.ARQ_DATA_CHANNEL_MODE == mode) or (static.CHANNEL_STATE == 'RECEIVING_SIGNALLING' and static.FREEDV_SIGNALLING_MODE == mode):
                 time.sleep(0.01)
@@ -452,7 +455,7 @@ class RF():
                 
                 data_in = self.stream_rx.read(nin, exception_on_overflow=False)
                 
-                self.calculate_fft(data_in)
+                #self.calculate_fft(data_in)
                 
                 
                 data_in = audioop.ratecv(data_in,2,1,static.AUDIO_SAMPLE_RATE_RX, static.MODEM_SAMPLE_RATE, None) 
@@ -463,7 +466,7 @@ class RF():
                 #print("listening-" + str(mode) + " - " + "nin: " + str(nin) + " - " + str(self.c_lib.freedv_get_rx_status(freedv)))
 
                 self.calculate_snr(freedv)
-                self.get_scatter(freedv)
+                
                 # forward data only if broadcast or we are the receiver
                 # bytes_out[1:2] == callsign check for signalling frames, bytes_out[6:7] == callsign check for data frames, bytes_out[1:2] == b'\x01' --> broadcasts like CQ
                 # we could also create an own function, which returns True. In this case we could add callsign blacklists and so on
@@ -587,33 +590,20 @@ class RF():
     def get_scatter(self, freedv):
         modemStats = MODEMSTATS()
         self.c_lib.freedv_get_modem_extended_stats.restype = None
-        #c_lib.freedv_get_modem_extended_stats.argtypes = c_void_p, [MODEMSTATS]
-        #c_lib.freedv_get_modem_extended_stats(freedv, modemStats)
         self.c_lib.freedv_get_modem_extended_stats(freedv, ctypes.byref(modemStats))
-        print("Nc: " + str(modemStats.Nc))
-        #print("snr_est: " + str(modemStats.snr_est))
-        print("nr: " + str(modemStats.nr))
-        #data = []
-#MODEM_STATS_NR_MAX = 320
-#MODEM_STATS_NC_MAX = 51
         
         scatterdata = []
         for i in range(MODEM_STATS_NC_MAX):
-            for j in range(MODEM_STATS_NR_MAX):
-
-                #xsymbols = modemStats.rx_symbols[i][j]
-                #xsymbols = modemStats.rx_symbols[i][::2]
-                #ysymbols = modemStats.rx_symbols[i][j+1]
-                
+            for j in range(MODEM_STATS_NR_MAX):    
                 #check if odd or not to get every 2nd item for x
                 if (j % 2) == 0: 
                     xsymbols = modemStats.rx_symbols[i][j]
                     ysymbols = modemStats.rx_symbols[i][j+1]   
-                     
+                    # check if value 0.0 or has real data
                     if xsymbols != 0.0 and ysymbols != 0.0:
                         scatterdata.append({"x" : xsymbols, "y" : ysymbols })
         
-        # only append scatter data if new data arrived 
+        # only append scatter data if new data arrived
         if scatterdata != static.SCATTER:
             static.SCATTER = scatterdata
             
diff --git a/tnc/sock.py b/tnc/sock.py
index 83e3234c..6452fe99 100644
--- a/tnc/sock.py
+++ b/tnc/sock.py
@@ -42,7 +42,7 @@ class CMDTCPRequestHandler(socketserver.BaseRequestHandler):
                     break
             data = data[:-1]  # remove b'\n'
             data = str(data, 'utf-8')
-            print(data)
+            #print(data)
             
             if len(data) > 0:
                 socketTimeout = time.time() + static.SOCKET_TIMEOUT
@@ -207,7 +207,7 @@ class CMDTCPRequestHandler(socketserver.BaseRequestHandler):
                     self.request.sendall(bytes(jsondata, encoding))
 
                 if received_json["type"] == 'GET' and received_json["command"] == 'TNC_STATE':
-                    print(static.SCATTER)
+                    #print(static.SCATTER)
                     output = {
                         "COMMAND": "TNC_STATE",
                         "PTT_STATE": str(static.PTT_STATE),