From 6afff6b455beec403b2ad99b549e0854c0c8e3c1 Mon Sep 17 00:00:00 2001 From: DJ2LS Date: Mon, 8 Apr 2024 15:49:02 +0200 Subject: [PATCH] mode adjustments --- modem/codec2.py | 8 ++++---- modem/demodulator.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modem/codec2.py b/modem/codec2.py index c716df80..e83d06b6 100644 --- a/modem/codec2.py +++ b/modem/codec2.py @@ -585,14 +585,14 @@ data_ofdm_500_config.config.contents.tx_uw = create_tx_uw(16, [1, 1, 0, 0, 1, 0, # ---------------- OFDM 2438 Hz Bandwidth 16200,9720 ---------------# data_ofdm_2438_config = create_default_ofdm_config() data_ofdm_2438_config.config.contents.ns = 5 -data_ofdm_2438_config.config.contents.np = 51 -data_ofdm_2438_config.config.contents.tcp = 0.005 -data_ofdm_2438_config.config.contents.ts = 0.018 +data_ofdm_2438_config.config.contents.np = 52 +data_ofdm_2438_config.config.contents.tcp = 0.004 +data_ofdm_2438_config.config.contents.ts = 0.016 data_ofdm_2438_config.config.contents.rs = 1.0 / data_ofdm_2438_config.config.contents.ts data_ofdm_2438_config.config.contents.nc = 39 data_ofdm_2438_config.config.contents.nuwbits = 24 data_ofdm_2438_config.config.contents.timing_mx_thresh = 0.10 -data_ofdm_2438_config.config.contents.bad_uw_errors = 8 +data_ofdm_2438_config.config.contents.bad_uw_errors = 12 data_ofdm_2438_config.config.contents.amp_est_mode = 0 data_ofdm_2438_config.config.contents.amp_scale = 145E3 data_ofdm_2438_config.config.contents.codename = b"H_16200_9720" diff --git a/modem/demodulator.py b/modem/demodulator.py index 3eec24e0..cf1d6f08 100644 --- a/modem/demodulator.py +++ b/modem/demodulator.py @@ -51,7 +51,7 @@ class Demodulator(): self.MODE_DICT[codec2.FREEDV_MODE.signalling.value]["decode"] = True self.MODE_DICT[codec2.FREEDV_MODE.signalling_ack.value]["decode"] = True self.MODE_DICT[codec2.FREEDV_MODE.data_ofdm_2438.value]["decode"] = True - self.MODE_DICT[codec2.FREEDV_MODE.data_ofdm_500.value]["decode"] = True + #self.MODE_DICT[codec2.FREEDV_MODE.qam16c2.value]["decode"] = True tci_rx_callback_thread = threading.Thread(