mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 08:04:33 +00:00
frequency to sock command TNC_STATE
This commit is contained in:
parent
3575a51398
commit
08f73d0382
3 changed files with 18 additions and 3 deletions
14
modem.py
14
modem.py
|
@ -80,7 +80,7 @@ class RF():
|
||||||
self.my_rig.set_conf("rig_pathname", static.HAMLIB_DEVICE_PORT)
|
self.my_rig.set_conf("rig_pathname", static.HAMLIB_DEVICE_PORT)
|
||||||
|
|
||||||
self.my_rig.set_conf("retry", "5")
|
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")
|
#self.my_rig.set_conf("dtr_state", "OFF")
|
||||||
#my_rig.set_conf("rts_state", "OFF")
|
#my_rig.set_conf("rts_state", "OFF")
|
||||||
|
@ -399,6 +399,9 @@ class RF():
|
||||||
while static.FREEDV_RECEIVE == True:
|
while static.FREEDV_RECEIVE == True:
|
||||||
time.sleep(0.01)
|
time.sleep(0.01)
|
||||||
|
|
||||||
|
# lets update the frequency
|
||||||
|
static.HAMLIB_FREQUENCY = int(self.my_rig.get_freq())
|
||||||
|
|
||||||
# demod loop
|
# 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):
|
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)
|
time.sleep(0.01)
|
||||||
|
@ -427,6 +430,7 @@ class RF():
|
||||||
|
|
||||||
self.calculate_snr(freedv)
|
self.calculate_snr(freedv)
|
||||||
|
|
||||||
|
|
||||||
# CHECK IF FRAMETYPE IS BETWEEN 10 and 50 ------------------------
|
# CHECK IF FRAMETYPE IS BETWEEN 10 and 50 ------------------------
|
||||||
frametype = int.from_bytes(bytes(bytes_out[:1]), "big")
|
frametype = int.from_bytes(bytes(bytes_out[:1]), "big")
|
||||||
frame = frametype - 10
|
frame = frametype - 10
|
||||||
|
@ -558,3 +562,11 @@ class RF():
|
||||||
static.SNR = round(modem_stats_snr,1)
|
static.SNR = round(modem_stats_snr,1)
|
||||||
except:
|
except:
|
||||||
static.SNR = 0
|
static.SNR = 0
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
3
sock.py
3
sock.py
|
@ -188,7 +188,8 @@ class CMDTCPRequestHandler(socketserver.BaseRequestHandler):
|
||||||
"ARQ_STATE": str(static.ARQ_STATE),
|
"ARQ_STATE": str(static.ARQ_STATE),
|
||||||
"AUDIO_RMS": str(static.AUDIO_RMS),
|
"AUDIO_RMS": str(static.AUDIO_RMS),
|
||||||
"BER": str(static.BER),
|
"BER": str(static.BER),
|
||||||
"SNR": str(static.SNR)
|
"SNR": str(static.SNR),
|
||||||
|
"FREQUENCY" : str(static.HAMLIB_FREQUENCY)
|
||||||
}
|
}
|
||||||
|
|
||||||
jsondata = json.dumps(output)
|
jsondata = json.dumps(output)
|
||||||
|
|
|
@ -52,6 +52,8 @@ PTT_STATE = False
|
||||||
|
|
||||||
HAMLIB_DEVICE_ID = 0
|
HAMLIB_DEVICE_ID = 0
|
||||||
HAMLIB_DEVICE_PORT = '/dev/ttyUSB0'
|
HAMLIB_DEVICE_PORT = '/dev/ttyUSB0'
|
||||||
|
|
||||||
|
HAMLIB_FREQUENCY = 0
|
||||||
# -------------------------
|
# -------------------------
|
||||||
# FreeDV Defaults
|
# FreeDV Defaults
|
||||||
FREEDV_RECEIVE = True
|
FREEDV_RECEIVE = True
|
||||||
|
|
Loading…
Reference in a new issue