mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 08:04:33 +00:00
first test with additional radio parameters
This commit is contained in:
parent
ff5eea3c63
commit
d54416fc8d
5 changed files with 71 additions and 1 deletions
|
@ -968,7 +968,10 @@ class RF:
|
||||||
static.HAMLIB_MODE = self.hamlib.get_mode()
|
static.HAMLIB_MODE = self.hamlib.get_mode()
|
||||||
static.HAMLIB_BANDWIDTH = self.hamlib.get_bandwidth()
|
static.HAMLIB_BANDWIDTH = self.hamlib.get_bandwidth()
|
||||||
static.HAMLIB_STATUS = self.hamlib.get_status()
|
static.HAMLIB_STATUS = self.hamlib.get_status()
|
||||||
|
static.HAMLIB_ALC = self.hamlib.get_alc()
|
||||||
|
static.HAMLIB_RF = self.hamlib.get_level()
|
||||||
|
static.HAMLIB_SWR = self.hamlib.get_swr()
|
||||||
|
print(f"ALC: {static.HAMLIB_ALC}, RF: {static.HAMLIB_RF}, SWR: {static.HAMLIB_SWR}")
|
||||||
def calculate_fft(self) -> None:
|
def calculate_fft(self) -> None:
|
||||||
"""
|
"""
|
||||||
Calculate an average signal strength of the channel to assess
|
Calculate an average signal strength of the channel to assess
|
||||||
|
|
|
@ -34,6 +34,9 @@ class radio:
|
||||||
self.bandwidth = ''
|
self.bandwidth = ''
|
||||||
self.frequency = ''
|
self.frequency = ''
|
||||||
self.mode = ''
|
self.mode = ''
|
||||||
|
self.alc = ''
|
||||||
|
self.swr = ''
|
||||||
|
self.rf = ''
|
||||||
|
|
||||||
def open_rig(
|
def open_rig(
|
||||||
self,
|
self,
|
||||||
|
@ -199,6 +202,52 @@ class radio:
|
||||||
""" """
|
""" """
|
||||||
return "connected" if self.data_connected and self.ptt_connected else "unknown/disconnected"
|
return "connected" if self.data_connected and self.ptt_connected else "unknown/disconnected"
|
||||||
|
|
||||||
|
def get_level(self):
|
||||||
|
try:
|
||||||
|
data = self.send_data_command(b"l RF", True)
|
||||||
|
data = data.split(b"\n")
|
||||||
|
rf = data[0].decode("utf-8")
|
||||||
|
if 'RPRT' not in rf:
|
||||||
|
try:
|
||||||
|
rf = int(rf)
|
||||||
|
except ValueError:
|
||||||
|
self.rf = str(rf)
|
||||||
|
|
||||||
|
return self.rf
|
||||||
|
except Exception:
|
||||||
|
return self.rf
|
||||||
|
|
||||||
|
def get_swr(self):
|
||||||
|
try:
|
||||||
|
data = self.send_data_command(b"l SWR", True)
|
||||||
|
data = data.split(b"\n")
|
||||||
|
swr = data[0].decode("utf-8")
|
||||||
|
if 'RPRT' not in swr:
|
||||||
|
try:
|
||||||
|
swr = int(swr)
|
||||||
|
except ValueError:
|
||||||
|
self.swr = str(swr)
|
||||||
|
|
||||||
|
return self.swr
|
||||||
|
except Exception:
|
||||||
|
return self.swr
|
||||||
|
|
||||||
|
def get_alc(self):
|
||||||
|
try:
|
||||||
|
data = self.send_data_command(b"l ALC", True)
|
||||||
|
data = data.split(b"\n")
|
||||||
|
print(data)
|
||||||
|
alc = data[0].decode("utf-8")
|
||||||
|
if 'RPRT' not in alc:
|
||||||
|
try:
|
||||||
|
alc = int(alc)
|
||||||
|
except ValueError:
|
||||||
|
self.alc = str(alc)
|
||||||
|
|
||||||
|
return self.alc
|
||||||
|
except Exception:
|
||||||
|
return self.alc
|
||||||
|
|
||||||
def get_mode(self):
|
def get_mode(self):
|
||||||
""" """
|
""" """
|
||||||
try:
|
try:
|
||||||
|
|
|
@ -26,6 +26,18 @@ class radio:
|
||||||
""" """
|
""" """
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
def get_level(self):
|
||||||
|
""" """
|
||||||
|
return None
|
||||||
|
|
||||||
|
def get_alc(self):
|
||||||
|
""" """
|
||||||
|
return None
|
||||||
|
|
||||||
|
def get_swr(self):
|
||||||
|
""" """
|
||||||
|
return None
|
||||||
|
|
||||||
def get_bandwidth(self):
|
def get_bandwidth(self):
|
||||||
""" """
|
""" """
|
||||||
return None
|
return None
|
||||||
|
|
|
@ -653,6 +653,9 @@ def send_tnc_state():
|
||||||
"audio_dbfs": str(static.AUDIO_DBFS),
|
"audio_dbfs": str(static.AUDIO_DBFS),
|
||||||
"snr": str(static.SNR),
|
"snr": str(static.SNR),
|
||||||
"frequency": str(static.HAMLIB_FREQUENCY),
|
"frequency": str(static.HAMLIB_FREQUENCY),
|
||||||
|
"rf_level": str(static.HAMLIB_RF),
|
||||||
|
"swr": str(static.HAMLIB_SWR),
|
||||||
|
"alc": str(static.HAMLIB_ALC),
|
||||||
"speed_level": str(static.ARQ_SPEED_LEVEL),
|
"speed_level": str(static.ARQ_SPEED_LEVEL),
|
||||||
"mode": str(static.HAMLIB_MODE),
|
"mode": str(static.HAMLIB_MODE),
|
||||||
"bandwidth": str(static.HAMLIB_BANDWIDTH),
|
"bandwidth": str(static.HAMLIB_BANDWIDTH),
|
||||||
|
|
|
@ -64,6 +64,9 @@ HAMLIB_STATUS: str = "unknown/disconnected"
|
||||||
HAMLIB_FREQUENCY: int = 0
|
HAMLIB_FREQUENCY: int = 0
|
||||||
HAMLIB_MODE: str = ""
|
HAMLIB_MODE: str = ""
|
||||||
HAMLIB_BANDWIDTH: int = 0
|
HAMLIB_BANDWIDTH: int = 0
|
||||||
|
HAMLIB_RF: int = 0
|
||||||
|
HAMLIB_ALC: int = 0
|
||||||
|
HAMLIB_SWR: int = 0
|
||||||
# -------------------------
|
# -------------------------
|
||||||
# FreeDV Defaults
|
# FreeDV Defaults
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue