diff --git a/freedata_server/codec2.py b/freedata_server/codec2.py index 1e74ba08..846e7251 100644 --- a/freedata_server/codec2.py +++ b/freedata_server/codec2.py @@ -576,13 +576,13 @@ def create_default_fsk_config(): ) data_vhf_1_config = create_default_fsk_config() -data_vhf_1_config.interleave_frames = 0 +data_vhf_1_config.interleave_frames = 1 data_vhf_1_config.M = 4 -data_vhf_1_config.Rs = 1000 +data_vhf_1_config.Rs = 200 data_vhf_1_config.Fs = 8000 -data_vhf_1_config.first_tone = 1150 -data_vhf_1_config.tone_spacing = 200 -data_vhf_1_config.codename = "H_1024_2048_4f".encode("utf-8") +data_vhf_1_config.first_tone = 1500 +data_vhf_1_config.tone_spacing = 400 +data_vhf_1_config.codename = "H_256_512_4".encode("utf-8") # ---------------- OFDM 500 Hz Bandwidth ---------------# diff --git a/freedata_server/demodulator.py b/freedata_server/demodulator.py index 2c57bee6..3e7f4cd0 100644 --- a/freedata_server/demodulator.py +++ b/freedata_server/demodulator.py @@ -6,7 +6,7 @@ import threading import audio import itertools -from freedata_server.codec2 import FREEDV_MODE +from codec2 import (FREEDV_MODE) TESTMODE = False @@ -58,6 +58,7 @@ class Demodulator(): # enable decoding of signalling modes 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_vhf_1.value]["decode"] = True def init_codec2(self): diff --git a/freedata_server/modulator.py b/freedata_server/modulator.py index 9d7fdef6..45166338 100644 --- a/freedata_server/modulator.py +++ b/freedata_server/modulator.py @@ -2,7 +2,7 @@ import ctypes import codec2 import structlog from codec2 import FREEDV_MODE -from freedata_server.codec2 import FREEDV_ADVANCED_FSK +from codec2 import FREEDV_ADVANCED_FSK class Modulator: @@ -239,11 +239,11 @@ class Modulator: # Create modulation for all frames in the list for frame in frames: - if self.MODE not in [FREEDV_MODE.data_vhf_1]: - txbuffer = self.transmit_add_preamble(txbuffer, freedv) + #if self.MODE not in [FREEDV_MODE.data_vhf_1]: + txbuffer = self.transmit_add_preamble(txbuffer, freedv) txbuffer = self.transmit_create_frame(txbuffer, freedv, frame) - if self.MODE not in [FREEDV_MODE.data_vhf_1]: - txbuffer = self.transmit_add_postamble(txbuffer, freedv) + #if self.MODE not in [FREEDV_MODE.data_vhf_1]: + txbuffer = self.transmit_add_postamble(txbuffer, freedv) # Add delay to end of frames txbuffer = self.transmit_add_silence(txbuffer, repeat_delay)