-
+
diff --git a/test/test_tx.py b/test/test_tx.py
index bffe1ae6..0aa65aef 100644
--- a/test/test_tx.py
+++ b/test/test_tx.py
@@ -19,7 +19,7 @@ parser.add_argument('--bursts', dest="N_BURSTS", default=1, type=int)
parser.add_argument('--framesperburst', dest="N_FRAMES_PER_BURST", default=1, type=int)
parser.add_argument('--delay', dest="DELAY_BETWEEN_BURSTS", default=500, type=int,
help="delay between bursts in ms")
-parser.add_argument('--mode', dest="FREEDV_MODE", type=str, choices=['datac0', 'datac1', 'datac3'])
+parser.add_argument('--mode', dest="FREEDV_MODE", type=str, choices=['datac0', 'datac1', 'datac3', 'fsk_ldpc'])
parser.add_argument('--audiodev', dest="AUDIO_OUTPUT_DEVICE", default=-1, type=int,
help="audio output device number to use, use -2 to automatically select a loopback device")
parser.add_argument('--list', dest="LIST", action="store_true", help="list audio devices by number and exit")
@@ -86,18 +86,63 @@ if args.TESTFRAMES:
else:
data_out = b'HELLO WORLD!'
-
# ----------------------------------------------------------------
+class ADVANCED(ctypes.Structure):
+ """ """
+ _fields_ = [
+ ("interleave_frames", ctypes.c_int),
+ ("M", ctypes.c_int),
+ ("Rs", ctypes.c_int),
+ ("Fs", ctypes.c_int),
+ ("first_tone", ctypes.c_int),
+ ("tone_spacing", ctypes.c_int),
+ ("codename", ctypes.c_char_p),
+ ]
+adv = ADVANCED()
+adv.interleave_frames = 0 # max amplitude
+adv.M = 2 # number of fsk tones 2/4
+adv.Rs = 100 # symbol rate
+adv.Fs = 8000 # sample rate
+adv.first_tone = 1500 # first tone freq
+adv.tone_spacing = 200 # shift between tones
+'''
+HRA_112_112 rate 0.50 (224,112) # BPF: 14
+HRA_56_56 rate 0.50 (112,56) # BPF: 7, geht nicht
+H_2064_516_sparse rate 0.80 (2580,2064) #BPF: 258,
+HRAb_396_504 rate 0.79 (504,396) # BPF: 49, geht nicht payload !== %8
+H_256_768_22 rate 0.33 (768,256) # BPF: 32, geht --> geht gut
+H_256_512_4 rate 0.50 (512,256) # BPF: 32, geht
+HRAa_1536_512 rate 0.75 (2048,1536) #BPF: 192, geht nicht
+H_128_256_5 rate 0.50 (256,128) # BPF: 16, geht nicht
+H_4096_8192_3d rate 0.50 (8192,4096) # BPF: 512, geht nicht
+H_16200_9720 rate 0.60 (16200,9720) # BPF: 1215
+H_1024_2048_4f rate 0.50 (2048,1024) # BPF: 128, geht nicht
+'''
-# open codec2 instance
-freedv = cast(codec2.api.freedv_open(MODE), c_void_p)
+adv.codename = 'H_256_512_4'.encode('utf-8') # code word
+
+
+if MODE == 9:
+ # open codec2 advanced instance for ldpc codes
+ print(f"adv.interleave_frames {adv.interleave_frames}")
+ print(f"adv.M {adv.M}")
+ print(f"adv.Rs {adv.Rs}")
+ print(f"adv.Fs {adv.Fs}")
+ print(f"adv.first_tone {adv.first_tone}")
+ print(f"adv.tone_spacing {adv.tone_spacing}")
+ print(f"adv.codename {adv.codename}")
+ #freedv = codec2.api.freedv_open_advanced(MODE, pointer(adv))
+ freedv = cast(codec2.api.freedv_open_advanced(MODE, ctypes.byref(adv)), c_void_p)
+else:
+ # open codec2 instance
+ freedv = cast(codec2.api.freedv_open(MODE), c_void_p)
# get number of bytes per frame for mode
bytes_per_frame = int(codec2.api.freedv_get_bits_per_modem_frame(freedv)/8)
payload_bytes_per_frame = bytes_per_frame -2
-
+print(bytes_per_frame)
# init buffer for data
n_tx_modem_samples = codec2.api.freedv_get_n_tx_modem_samples(freedv)
mod_out = create_string_buffer(n_tx_modem_samples * 2)
@@ -110,7 +155,6 @@ mod_out_preamble = create_string_buffer(n_tx_preamble_modem_samples * 2)
n_tx_postamble_modem_samples = codec2.api.freedv_get_n_tx_postamble_modem_samples(freedv)
mod_out_postamble = create_string_buffer(n_tx_postamble_modem_samples * 2)
-
# create buffer for data
buffer = bytearray(payload_bytes_per_frame) # use this if CRC16 checksum is required ( DATA1-3)
buffer[:len(data_out)] = data_out # set buffersize to length of data which will be send
@@ -127,8 +171,8 @@ for i in range(1,N_BURSTS+1):
# write preamble to txbuffer
codec2.api.freedv_rawdatapreambletx(freedv, mod_out_preamble)
- txbuffer = bytes(mod_out_preamble)
-
+ #txbuffer = bytes(mod_out_preamble)
+ txbuffer = bytes()
# create modulaton for N = FRAMESPERBURST and append it to txbuffer
for n in range(1,N_FRAMES_PER_BURST+1):
@@ -136,12 +180,11 @@ for i in range(1,N_BURSTS+1):
codec2.api.freedv_rawdatatx(freedv,mod_out,data) # modulate DATA and save it into mod_out pointer
txbuffer += bytes(mod_out)
-
print(f"TX BURST: {i}/{N_BURSTS} FRAME: {n}/{N_FRAMES_PER_BURST}", file=sys.stderr)
# append postamble to txbuffer
codec2.api.freedv_rawdatapostambletx(freedv, mod_out_postamble)
- txbuffer += bytes(mod_out_postamble)
+ #txbuffer += bytes(mod_out_postamble)
# append a delay between bursts as audio silence
samples_delay = int(MODEM_SAMPLE_RATE*DELAY_BETWEEN_BURSTS)
diff --git a/tnc/audio.py b/tnc/audio.py
index 4f685302..baa2be0a 100644
--- a/tnc/audio.py
+++ b/tnc/audio.py
@@ -93,6 +93,10 @@ def fetch_audio_devices(input_devices, output_devices):
#input_devices = []
#output_devices = []
'''
+ sd._terminate()
+ sd._initialize()
+
+
devices = sd.query_devices(device=None, kind=None)
index = 0
for device in devices:
@@ -117,4 +121,4 @@ def fetch_audio_devices(input_devices, output_devices):
if maxOutputChannels > 0:
output_devices.append({"id": index, "name": str(name)})
index += 1
- #p.terminate()
+
diff --git a/tnc/static.py b/tnc/static.py
index bd1c8b83..4f7c2815 100644
--- a/tnc/static.py
+++ b/tnc/static.py
@@ -8,7 +8,7 @@ Here we are saving application wide variables and stats, which have to be access
Not nice, suggestions are appreciated :-)
"""
-VERSION = '0.2.1-alpha'
+VERSION = '0.3.0-alpha'
# DAEMON
DAEMONPORT = 3001
@@ -73,7 +73,7 @@ AUDIO_INPUT_DEVICES = []
AUDIO_OUTPUT_DEVICES = []
AUDIO_INPUT_DEVICE = -2
AUDIO_OUTPUT_DEVICE = -2
-BUFFER_OVERFLOW_COUNTER = [0,0,0]
+BUFFER_OVERFLOW_COUNTER = [0,0,0,0,0]
AUDIO_RMS = 0
FFT = [0]