FreeDV
/
FreeDATA
mirror of https://github.com/DJ2LS/FreeDATA.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixing demodulatior

pull/939/head
DJ2LS 2025-03-29 15:52:48 +01:00
parent cf7d9fe306
commit 39eabd9451
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
freedata_server/codec2.py
View File

@ -576,13 +576,13 @@ def create_default_fsk_config():
) )
data_vhf_1_config = 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.M = 4
data_vhf_1_config.Rs = 1000 data_vhf_1_config.Rs = 200
data_vhf_1_config.Fs = 8000 data_vhf_1_config.Fs = 8000
data_vhf_1_config.first_tone = 1150 data_vhf_1_config.first_tone = 1500
data_vhf_1_config.tone_spacing = 200 data_vhf_1_config.tone_spacing = 400
data_vhf_1_config.codename = "H_1024_2048_4f".encode("utf-8") data_vhf_1_config.codename = "H_256_512_4".encode("utf-8")
# ---------------- OFDM 500 Hz Bandwidth ---------------# # ---------------- OFDM 500 Hz Bandwidth ---------------#

3
freedata_server/demodulator.py
View File

@ -6,7 +6,7 @@ import threading
import audio import audio
import itertools import itertools
from freedata_server.codec2 import FREEDV_MODE from codec2 import (FREEDV_MODE)
TESTMODE = False TESTMODE = False
@ -58,6 +58,7 @@ class Demodulator():
# enable decoding of signalling modes # enable decoding of signalling modes
self.MODE_DICT[codec2.FREEDV_MODE.signalling.value]["decode"] = True 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.signalling_ack.value]["decode"] = True
self.MODE_DICT[codec2.FREEDV_MODE.data_vhf_1.value]["decode"] = True
def init_codec2(self): def init_codec2(self):

10
freedata_server/modulator.py
View File

@ -2,7 +2,7 @@ import ctypes
import codec2 import codec2
import structlog import structlog
from codec2 import FREEDV_MODE from codec2 import FREEDV_MODE
from freedata_server.codec2 import FREEDV_ADVANCED_FSK from codec2 import FREEDV_ADVANCED_FSK
class Modulator: class Modulator:
@ -239,11 +239,11 @@ class Modulator:
# Create modulation for all frames in the list # Create modulation for all frames in the list
for frame in frames: for frame in frames:
if self.MODE not in [FREEDV_MODE.data_vhf_1]: #if self.MODE not in [FREEDV_MODE.data_vhf_1]:
txbuffer = self.transmit_add_preamble(txbuffer, freedv) txbuffer = self.transmit_add_preamble(txbuffer, freedv)
txbuffer = self.transmit_create_frame(txbuffer, freedv, frame) txbuffer = self.transmit_create_frame(txbuffer, freedv, frame)
if self.MODE not in [FREEDV_MODE.data_vhf_1]: #if self.MODE not in [FREEDV_MODE.data_vhf_1]:
txbuffer = self.transmit_add_postamble(txbuffer, freedv) txbuffer = self.transmit_add_postamble(txbuffer, freedv)
# Add delay to end of frames # Add delay to end of frames
txbuffer = self.transmit_add_silence(txbuffer, repeat_delay) txbuffer = self.transmit_add_silence(txbuffer, repeat_delay)