Crash_Override/FreeDATA
1
0
Fork 0
mirror of https://github.com/DJ2LS/FreeDATA synced 2024-05-14 08:04:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed fsk mode

Browse source
This commit is contained in:
DJ2LS 2023-03-04 10:59:43 +01:00
parent d0432e6a30
commit e5b420c2bd
6 changed files with 55 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gui/src/index.html
View file

@ -2616,7 +2616,7 @@
class="form-check-input"
type="checkbox"
id="fskModeSwitch"
disabled
/>
<label class="form-check-label" for="fskModeSwitch"
>not available, yet</label

9
tnc/config.ini
View file

@ -10,7 +10,7 @@ ssid_list = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
[AUDIO]
#audio settings
rx = 0
rx = 1
tx = 2
txaudiolevel = 78
auto_tune = False
@ -26,10 +26,11 @@ rigctld_port = 4532
scatter = True
fft = True
narrowband = False
fmin = -50.0
fmax = 50.0
fmin = -250.0
fmax = 250.0
qrv = True
rxbuffersize = 16
explorer = True
explorer = False
stats = False
fsk = True

3
tnc/config.py
View file

@ -75,7 +75,8 @@ class CONFIG:
'qrv': data[15],
'rxbuffersize': data[16],
'explorer': data[17],
'stats': data[19]
'stats': data[19],
'fsk': data[13]
}
try:
with open(self.config_name, 'w') as configfile:

6
tnc/daemon.py
View file

@ -265,6 +265,10 @@ class DAEMON:
if data[20] == "True":
options.append("--stats")
if data[13] == "True":
options.append("--fsk")
# safe data to config file
config.write_entire_config(data)
@ -296,7 +300,7 @@ class DAEMON:
command = []
if sys.platform in ["linux", "darwin"]:
command.append("python3")
command.append("python3.9")
elif sys.platform in ["win32", "win64"]:
command.append("python")

2
tnc/main.py
View file

@ -334,7 +334,7 @@ if __name__ == "__main__":
static.HAMLIB_RIGCTLD_PORT = str(conf.get('RADIO', 'rigctld_port', '4532'))
static.ENABLE_SCATTER = conf.get('TNC', 'scatter', 'True')
static.ENABLE_FFT = conf.get('TNC', 'fft', 'True')
static.ENABLE_FSK = False
static.ENABLE_FSK = conf.get('TNC', 'fsk', 'False')
static.LOW_BANDWIDTH_MODE = conf.get('TNC', 'narrowband', 'False')
static.TUNING_RANGE_FMIN = float(conf.get('TNC', 'fmin', '-50.0'))
static.TUNING_RANGE_FMAX = float(conf.get('TNC', 'fmax', '50.0'))

64
tnc/modem.py
View file

@ -39,14 +39,15 @@ RECEIVE_SIG0 = True
RECEIVE_SIG1 = False
RECEIVE_DATAC1 = False
RECEIVE_DATAC3 = False
RECEIVE_FSK_LDPC_1 = False
# state buffer
SIG0_DATAC0_STATE = []
SIG1_DATAC0_STATE = []
DAT0_DATAC1_STATE = []
DAT0_DATAC3_STATE = []
FSK_LDPC0_STATE = []
FSK_LDPC1_STATE = []
class RF:
"""Class to encapsulate interactions between the audio device and codec2"""
@ -157,6 +158,8 @@ class RF:
self.freedv_datac0_tx = open_codec2_instance(14)
self.freedv_datac1_tx = open_codec2_instance(10)
self.freedv_datac3_tx = open_codec2_instance(12)
self.freedv_ldpc0_tx = open_codec2_instance(200)
self.freedv_ldpc1_tx = open_codec2_instance(201)
# --------------------------------------------CREATE PYAUDIO INSTANCE
if not TESTMODE and not static.AUDIO_ENABLE_TCI:
try:
@ -267,25 +270,7 @@ class RF:
)
fft_thread.start()
audio_thread_sig0_datac0 = threading.Thread(
target=self.audio_sig0_datac0, name="AUDIO_THREAD DATAC0 - 0", daemon=True
)
audio_thread_sig0_datac0.start()
audio_thread_sig1_datac0 = threading.Thread(
target=self.audio_sig1_datac0, name="AUDIO_THREAD DATAC0 - 1", daemon=True
)
audio_thread_sig1_datac0.start()
audio_thread_dat0_datac1 = threading.Thread(
target=self.audio_dat0_datac1, name="AUDIO_THREAD DATAC1", daemon=True
)
audio_thread_dat0_datac1.start()
audio_thread_dat0_datac3 = threading.Thread(
target=self.audio_dat0_datac3, name="AUDIO_THREAD DATAC3", daemon=True
)
audio_thread_dat0_datac3.start()
if static.ENABLE_FSK:
audio_thread_fsk_ldpc0 = threading.Thread(
@ -298,6 +283,28 @@ class RF:
)
audio_thread_fsk_ldpc1.start()
else:
audio_thread_sig0_datac0 = threading.Thread(
target=self.audio_sig0_datac0, name="AUDIO_THREAD DATAC0 - 0", daemon=True
)
audio_thread_sig0_datac0.start()
audio_thread_sig1_datac0 = threading.Thread(
target=self.audio_sig1_datac0, name="AUDIO_THREAD DATAC0 - 1", daemon=True
)
audio_thread_sig1_datac0.start()
audio_thread_dat0_datac1 = threading.Thread(
target=self.audio_dat0_datac1, name="AUDIO_THREAD DATAC1", daemon=True
)
audio_thread_dat0_datac1.start()
audio_thread_dat0_datac3 = threading.Thread(
target=self.audio_dat0_datac3, name="AUDIO_THREAD DATAC3", daemon=True
)
audio_thread_dat0_datac3.start()
hamlib_thread = threading.Thread(
target=self.update_rig_data, name="HAMLIB_THREAD", daemon=True
)
@ -356,6 +363,8 @@ class RF:
(self.sig1_datac0_buffer, RECEIVE_SIG1),
(self.dat0_datac1_buffer, RECEIVE_DATAC1),
(self.dat0_datac3_buffer, RECEIVE_DATAC3),
(self.fsk_ldpc_buffer_0, static.ENABLE_FSK),
(self.fsk_ldpc_buffer_1, static.ENABLE_FSK),
]:
if (
not (data_buffer.nbuffer + length_x) > data_buffer.size
@ -389,9 +398,8 @@ class RF:
(self.sig1_datac0_buffer, RECEIVE_SIG1),
(self.dat0_datac1_buffer, RECEIVE_DATAC1),
(self.dat0_datac3_buffer, RECEIVE_DATAC3),
# Not enabled yet.
# (self.fsk_ldpc_buffer_0, static.ENABLE_FSK),
# (self.fsk_ldpc_buffer_1, static.ENABLE_FSK),
(self.fsk_ldpc_buffer_0, static.ENABLE_FSK),
(self.fsk_ldpc_buffer_1, static.ENABLE_FSK),
]:
if (
not (data_buffer.nbuffer + length_x) > data_buffer.size
@ -509,6 +517,10 @@ class RF:
freedv = self.freedv_datac1_tx
elif mode == 12:
freedv = self.freedv_datac3_tx
elif mode == 200:
freedv = self.freedv_ldpc0_tx
elif mode == 201:
freedv = self.freedv_ldpc1_tx_tx
else:
return False
@ -614,6 +626,8 @@ class RF:
# Re-sample back up to 48k (resampler works on np.int16)
x = np.frombuffer(txbuffer, dtype=np.int16)
# enable / disable AUDIO TUNE Feature / ALC correction
if static.AUDIO_AUTO_TUNE:
if static.HAMLIB_ALC == 0.0:
static.TX_AUDIO_LEVEL = static.TX_AUDIO_LEVEL + 20
@ -897,6 +911,8 @@ class RF:
self.fsk_ldpc_freedv_0,
self.fsk_ldpc_bytes_out_0,
self.fsk_ldpc_bytes_per_frame_0,
FSK_LDPC0_STATE,
"fsk_ldpc0",
)
def audio_fsk_ldpc_1(self) -> None:
@ -907,6 +923,8 @@ class RF:
self.fsk_ldpc_freedv_1,
self.fsk_ldpc_bytes_out_1,
self.fsk_ldpc_bytes_per_frame_1,
FSK_LDPC1_STATE,
"fsk_ldpc1",
)
def worker_transmit(self) -> None: