mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 08:04:33 +00:00
added bandwith and mode reading
This commit is contained in:
parent
08f73d0382
commit
52c27c7276
3 changed files with 13 additions and 4 deletions
9
modem.py
9
modem.py
|
@ -399,8 +399,8 @@ class RF():
|
||||||
while static.FREEDV_RECEIVE == True:
|
while static.FREEDV_RECEIVE == True:
|
||||||
time.sleep(0.01)
|
time.sleep(0.01)
|
||||||
|
|
||||||
# lets update the frequency
|
# lets get the frequency, mode and bandwith
|
||||||
static.HAMLIB_FREQUENCY = int(self.my_rig.get_freq())
|
self.get_radio_stats()
|
||||||
|
|
||||||
# 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):
|
||||||
|
@ -563,6 +563,11 @@ class RF():
|
||||||
except:
|
except:
|
||||||
static.SNR = 0
|
static.SNR = 0
|
||||||
|
|
||||||
|
def get_radio_stats(self):
|
||||||
|
static.HAMLIB_FREQUENCY = int(self.my_rig.get_freq())
|
||||||
|
(hamlib_mode, static.HAMLIB_BANDWITH) = self.my_rig.get_mode()
|
||||||
|
static.HAMLIB_MODE = Hamlib.rig_strrmode(hamlib_mode)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
4
sock.py
4
sock.py
|
@ -189,7 +189,9 @@ class CMDTCPRequestHandler(socketserver.BaseRequestHandler):
|
||||||
"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)
|
"FREQUENCY" : str(static.HAMLIB_FREQUENCY),
|
||||||
|
"MODE" : str(static.HAMLIB_MODE),
|
||||||
|
"BANDWITH" : str(static.HAMLIB_BANDWITH)
|
||||||
}
|
}
|
||||||
|
|
||||||
jsondata = json.dumps(output)
|
jsondata = json.dumps(output)
|
||||||
|
|
|
@ -54,6 +54,8 @@ HAMLIB_DEVICE_ID = 0
|
||||||
HAMLIB_DEVICE_PORT = '/dev/ttyUSB0'
|
HAMLIB_DEVICE_PORT = '/dev/ttyUSB0'
|
||||||
|
|
||||||
HAMLIB_FREQUENCY = 0
|
HAMLIB_FREQUENCY = 0
|
||||||
|
HAMLIB_MODE = ''
|
||||||
|
HAMLIB_BANDWITH = 0
|
||||||
# -------------------------
|
# -------------------------
|
||||||
# FreeDV Defaults
|
# FreeDV Defaults
|
||||||
FREEDV_RECEIVE = True
|
FREEDV_RECEIVE = True
|
||||||
|
|
Loading…
Reference in a new issue