frequency to sock command TNC_STATE

This commit is contained in:
DJ2LS 2021-05-29 22:18:11 +02:00 committed by GitHub
parent 3575a51398
commit 08f73d0382
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 3 deletions

View file

@ -80,7 +80,7 @@ class RF():
self.my_rig.set_conf("rig_pathname", static.HAMLIB_DEVICE_PORT)
self.my_rig.set_conf("retry", "5")
self.my_rig.set_conf("serial_speed", "19200")
self.my_rig.set_conf("serial_speed", "9600")
#self.my_rig.set_conf("dtr_state", "OFF")
#my_rig.set_conf("rts_state", "OFF")
@ -120,7 +120,7 @@ class RF():
self.my_rig.open()
except:
print("can't open rig")
@ -398,6 +398,9 @@ class RF():
while static.FREEDV_RECEIVE == True:
time.sleep(0.01)
# lets update the frequency
static.HAMLIB_FREQUENCY = int(self.my_rig.get_freq())
# 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):
@ -427,6 +430,7 @@ class RF():
self.calculate_snr(freedv)
# CHECK IF FRAMETYPE IS BETWEEN 10 and 50 ------------------------
frametype = int.from_bytes(bytes(bytes_out[:1]), "big")
frame = frametype - 10
@ -558,3 +562,11 @@ class RF():
static.SNR = round(modem_stats_snr,1)
except:
static.SNR = 0

View file

@ -188,7 +188,8 @@ class CMDTCPRequestHandler(socketserver.BaseRequestHandler):
"ARQ_STATE": str(static.ARQ_STATE),
"AUDIO_RMS": str(static.AUDIO_RMS),
"BER": str(static.BER),
"SNR": str(static.SNR)
"SNR": str(static.SNR),
"FREQUENCY" : str(static.HAMLIB_FREQUENCY)
}
jsondata = json.dumps(output)

View file

@ -52,6 +52,8 @@ PTT_STATE = False
HAMLIB_DEVICE_ID = 0
HAMLIB_DEVICE_PORT = '/dev/ttyUSB0'
HAMLIB_FREQUENCY = 0
# -------------------------
# FreeDV Defaults
FREEDV_RECEIVE = True