mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 08:04:33 +00:00
hamlib improvements
own function for every data type
This commit is contained in:
parent
2bb4e4b095
commit
ca7227d7da
4 changed files with 20 additions and 23 deletions
|
@ -42,7 +42,7 @@ if __name__ == '__main__':
|
||||||
static.HAMLIB_DEVICE_NAME = ARGS.hamlib_device_name
|
static.HAMLIB_DEVICE_NAME = ARGS.hamlib_device_name
|
||||||
static.HAMLIB_DEVICE_PORT = ARGS.hamlib_device_port
|
static.HAMLIB_DEVICE_PORT = ARGS.hamlib_device_port
|
||||||
static.HAMLIB_PTT_TYPE = ARGS.hamlib_ptt_type
|
static.HAMLIB_PTT_TYPE = ARGS.hamlib_ptt_type
|
||||||
HAMLIB_PTT_PORT = ARGS.hamlib_ptt_port
|
static.HAMLIB_PTT_PORT = ARGS.hamlib_ptt_port
|
||||||
static.HAMLIB_SERIAL_SPEED = ARGS.hamlib_serialspeed
|
static.HAMLIB_SERIAL_SPEED = ARGS.hamlib_serialspeed
|
||||||
|
|
||||||
# we need to wait until we got all parameters from argparse first before we can load the other modules
|
# we need to wait until we got all parameters from argparse first before we can load the other modules
|
||||||
|
|
17
tnc/modem.py
17
tnc/modem.py
|
@ -169,6 +169,9 @@ class RF():
|
||||||
|
|
||||||
|
|
||||||
# --------------------------------------------START DECODER THREAD
|
# --------------------------------------------START DECODER THREAD
|
||||||
|
self.fft_data = bytes()
|
||||||
|
FFT_THREAD = threading.Thread(target=self.calculate_fft, name="FFT_THREAD")
|
||||||
|
FFT_THREAD.start()
|
||||||
|
|
||||||
AUDIO_THREAD = threading.Thread(target=self.audio, name="AUDIO_THREAD")
|
AUDIO_THREAD = threading.Thread(target=self.audio, name="AUDIO_THREAD")
|
||||||
AUDIO_THREAD.start()
|
AUDIO_THREAD.start()
|
||||||
|
@ -179,14 +182,9 @@ class RF():
|
||||||
WORKER_THREAD = threading.Thread(target=self.worker, name="WORKER_THREAD")
|
WORKER_THREAD = threading.Thread(target=self.worker, name="WORKER_THREAD")
|
||||||
WORKER_THREAD.start()
|
WORKER_THREAD.start()
|
||||||
|
|
||||||
self.fft_data = bytes()
|
|
||||||
FFT_THREAD = threading.Thread(target=self.calculate_fft, name="FFT_THREAD")
|
|
||||||
FFT_THREAD.start()
|
|
||||||
|
|
||||||
|
|
||||||
# --------------------------------------------INIT AND OPEN HAMLIB
|
# --------------------------------------------INIT AND OPEN HAMLIB
|
||||||
self.hamlib = rig.radio()
|
self.hamlib = rig.radio()
|
||||||
self.hamlib.open_rig(devicename=static.HAMLIB_DEVICE_NAME, deviceport=static.HAMLIB_DEVICE_PORT, hamlib_ptt_type='RIG', serialspeed=9600)
|
self.hamlib.open_rig(devicename=static.HAMLIB_DEVICE_NAME, deviceport=static.HAMLIB_DEVICE_PORT, hamlib_ptt_type=static.HAMLIB_PTT_TYPE, serialspeed=static.HAMLIB_SERIAL_SPEED)
|
||||||
|
|
||||||
# --------------------------------------------------------------------------------------------------------
|
# --------------------------------------------------------------------------------------------------------
|
||||||
def audio_callback(self, data_in48k, frame_count, time_info, status):
|
def audio_callback(self, data_in48k, frame_count, time_info, status):
|
||||||
|
@ -673,9 +671,10 @@ class RF():
|
||||||
def update_rig_data(self):
|
def update_rig_data(self):
|
||||||
while True:
|
while True:
|
||||||
time.sleep(0.1)
|
time.sleep(0.1)
|
||||||
(static.HAMLIB_FREQUENCY, static.HAMLIB_MODE, static.HAMLIB_BANDWITH, static.PTT_STATE) = self.hamlib.get_rig_data()
|
#(static.HAMLIB_FREQUENCY, static.HAMLIB_MODE, static.HAMLIB_BANDWITH, static.PTT_STATE) = self.hamlib.get_rig_data()
|
||||||
|
static.HAMLIB_FREQUENCY = self.hamlib.get_frequency()
|
||||||
|
static.HAMLIB_MODE = self.hamlib.get_mode()
|
||||||
|
static.HAMLIB_BANDWITH = self.hamlib.get_bandwith()
|
||||||
|
|
||||||
def calculate_fft(self):
|
def calculate_fft(self):
|
||||||
while True:
|
while True:
|
||||||
|
|
16
tnc/rig.py
16
tnc/rig.py
|
@ -129,18 +129,16 @@ class radio:
|
||||||
structlog.get_logger("structlog").error("[TNC] Hamlib - can't open rig", error=e, e=sys.exc_info()[0])
|
structlog.get_logger("structlog").error("[TNC] Hamlib - can't open rig", error=e, e=sys.exc_info()[0])
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def get_rig_data(self):
|
def get_frequency(self):
|
||||||
|
return int(self.my_rig.get_freq())
|
||||||
|
|
||||||
freq = int(self.my_rig.get_freq())
|
def get_mode(self):
|
||||||
(hamlib_mode, bandwith) = self.my_rig.get_mode()
|
(hamlib_mode, bandwith) = self.my_rig.get_mode()
|
||||||
mode = Hamlib.rig_strrmode(hamlib_mode)
|
return Hamlib.rig_strrmode(hamlib_mode)
|
||||||
ptt = self.get_ptt()
|
|
||||||
if ptt:
|
|
||||||
ptt = True
|
|
||||||
else:
|
|
||||||
ptt = False
|
|
||||||
|
|
||||||
return [freq, mode, bandwith, ptt]
|
def get_bandwith(self):
|
||||||
|
(hamlib_mode, bandwith) = self.my_rig.get_mode()
|
||||||
|
return bandwith
|
||||||
|
|
||||||
def set_mode(self, mode):
|
def set_mode(self, mode):
|
||||||
return 0
|
return 0
|
||||||
|
|
|
@ -39,7 +39,7 @@ PTT_STATE = False
|
||||||
HAMLIB_DEVICE_NAME = 'RIG_MODEL_DUMMY_NOVFO'
|
HAMLIB_DEVICE_NAME = 'RIG_MODEL_DUMMY_NOVFO'
|
||||||
HAMLIB_DEVICE_PORT = '/dev/ttyUSB0'
|
HAMLIB_DEVICE_PORT = '/dev/ttyUSB0'
|
||||||
HAMLIB_SERIAL_SPEED = '9600'
|
HAMLIB_SERIAL_SPEED = '9600'
|
||||||
|
HAMLIB_PTT_PORT = '/dev/ttyUSB0'
|
||||||
|
|
||||||
HAMLIB_FREQUENCY = 0
|
HAMLIB_FREQUENCY = 0
|
||||||
HAMLIB_MODE = ''
|
HAMLIB_MODE = ''
|
||||||
|
|
Loading…
Reference in a new issue