Crash_Override/FreeDATA
1
0
Fork 0
mirror of https://github.com/DJ2LS/FreeDATA synced 2024-05-14 08:04:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

less terminal output

Browse source
This commit is contained in:
DJ2LS 2021-08-07 11:14:49 +02:00 committed by GitHub
parent c2f82fe46c
commit 59404404b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tnc/daemon.py
View file

@ -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)

26
tnc/modem.py
View file

@ -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

4
tnc/sock.py
View file

@ -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),