Skip to content

Commit e3dc8bb

Browse files
wb2oszwb2osz
committed
New "-g" option for direwolf and atest to force G3RUH modem and override
default for the speed. atest -h will display frame as hexadecimal bytes.
1 parent c7dcfd1 commit e3dc8bb

17 files changed

+778
-362
lines changed

‎Makefile.linux

+10-5
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,7 @@ install-rpi :
735735
# Combine some unit tests into a single regression sanity check.
736736

737737

738-
check : dtest ttest tttexttest pftest tlmtest lltest enctest kisstest pad2test xidtest dtmftest check-modem1200 check-modem300 check-modem9600 check-modem19200 check-modem2400 check-modem4800
738+
check : dtest ttest tttexttest pftest tlmtest lltest enctest kisstest pad2test xidtest dtmftest check-modem1200 check-modem300 check-modem9600 check-modem19200 check-modem2400 check-modem2400-g check-modem4800
739739

740740
# Can we encode and decode at popular data rates?
741741

@@ -753,14 +753,14 @@ check-modem300 : gen_packets atest
753753

754754
check-modem9600 : gen_packets atest
755755
./gen_packets -B9600 -n 100 -o /tmp/test96.wav
756-
./atest -B9600 -F0 -L50 -G54 /tmp/test96.wav
757-
./atest -B9600 -F1 -L55 -G59 /tmp/test96.wav
756+
./atest -B9600 -F0 -L61 -G65 /tmp/test96.wav
757+
./atest -B9600 -F1 -L62 -G66 /tmp/test96.wav
758758
rm /tmp/test96.wav
759759

760760
check-modem19200 : gen_packets atest
761761
./gen_packets -r 96000 -B19200 -n 100 -o /tmp/test19.wav
762-
./atest -B19200 -F0 -L55 -G59 /tmp/test19.wav
763-
./atest -B19200 -F1 -L60 -G64 /tmp/test19.wav
762+
./atest -B19200 -F0 -L60 -G64 /tmp/test19.wav
763+
./atest -B19200 -F1 -L64 -G68 /tmp/test19.wav
764764
rm /tmp/test19.wav
765765

766766
check-modem2400 : gen_packets atest
@@ -769,6 +769,11 @@ check-modem2400 : gen_packets atest
769769
./atest -B2400 -F1 -L80 -G87 /tmp/test24.wav
770770
rm /tmp/test24.wav
771771

772+
check-modem2400-g : gen_packets atest
773+
./gen_packets -B2400 -g -n 100 -o /tmp/test24-g.wav
774+
./atest -B2400 -g -F0 -L99 -G100 /tmp/test24-g.wav
775+
rm /tmp/test24-g.wav
776+
772777
check-modem4800 : gen_packets atest
773778
./gen_packets -B2400 -n 100 -o /tmp/test48.wav
774779
./atest -B2400 -F0 -L70 -G79 /tmp/test48.wav

‎Makefile.win

+29-11
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#
1717

1818

19-
all : direwolf decode_aprs text2tt tt2text ll2utm utm2ll aclients log2gpx gen_packets atest ttcalc tnctest kissutil
19+
all : direwolf decode_aprs text2tt tt2text ll2utm utm2ll aclients log2gpx gen_packets atest ttcalc tnctest tnctest-issue-132 kissutil
2020

2121

2222
# People say we need -mthreads option for threads to work properly.
@@ -197,11 +197,11 @@ gen_packets : gen_packets.o ax25_pad.o hdlc_send.o fcs_calc.o gen_tone.o morse.
197197
$(CC) $(CFLAGS) -o $@ $^
198198

199199

200-
# Connected mode packet application server.
201200

202-
appserver : appserver.o textcolor.o ax25_pad.o fcs_calc.o misc.a
203-
$(CC) $(CFLAGS) -o $@ $^ -lwinmm -lws2_32
201+
# Connected mode sample applications for talking to network TNC with AGW protocol.
204202

203+
appserver : appserver.o agwlib.o dwsock.o textcolor.o dtime_now.o misc.a
204+
$(CC) $(CFLAGS) -o $@ $^ -lwinmm -lws2_32
205205

206206

207207
# ------------------------------------------- Libraries --------------------------------------------
@@ -277,7 +277,7 @@ strlcat.o : misc/strlcat.c
277277

278278
# Combine some unit tests into a single regression sanity check.
279279

280-
check : dtest ttest tttexttest pftest tlmtest lltest enctest kisstest pad2test xidtest dtmftest check-modem1200 check-modem300 check-modem9600 check-modem19200 check-modem2400 check-modem4800
280+
check : dtest ttest tttexttest pftest tlmtest lltest enctest kisstest pad2test xidtest dtmftest check-modem1200 check-modem300 check-modem9600 check-modem19200 check-modem2400 check-modem2400-g check-modem4800
281281

282282
# Can we encode and decode at popular data rates?
283283
# Verify that single bit fixup increases the count.
@@ -305,8 +305,8 @@ check-modem9600 : gen_packets atest
305305
sleep 1
306306
gen_packets -B9600 -n 100 -o test96.wav
307307
sleep 1
308-
atest -B9600 -F0 -L50 -G54 test96.wav
309-
atest -B9600 -F1 -L55 -G59 test96.wav
308+
atest -B9600 -F0 -L61 -G65 test96.wav
309+
atest -B9600 -F1 -L62 -G66 test96.wav
310310
sleep 1
311311
rm test96.wav
312312

@@ -319,8 +319,8 @@ check-modem19200 : gen_packets atest
319319
sleep 1
320320
gen_packets -r 96000 -B19200 -n 100 -o test19.wav
321321
sleep 1
322-
atest -B19200 -F0 -L55 -G59 test19.wav
323-
atest -B19200 -F1 -L60 -G64 test19.wav
322+
atest -B19200 -F0 -L60 -G64 test19.wav
323+
atest -B19200 -F1 -L64 -G68 test19.wav
324324
sleep 1
325325
rm test19.wav
326326

@@ -332,6 +332,13 @@ check-modem2400 : gen_packets atest
332332
sleep 1
333333
rm test24.wav
334334

335+
check-modem2400-g : gen_packets atest
336+
gen_packets -B2400 -g -n 100 -o test24-g.wav
337+
sleep 1
338+
atest -B2400 -g -F0 -L99 -G100 test24-g.wav
339+
sleep 1
340+
rm test24-g.wav
341+
335342
check-modem4800 : gen_packets atest
336343
gen_packets -B4800 -n 100 -o test48.wav
337344
sleep 1
@@ -467,6 +474,9 @@ dtmftest : dtmf.c textcolor.o
467474
tnctest : tnctest.c textcolor.o dtime_now.o serial_port.o misc.a
468475
$(CC) $(CFLAGS) -o $@ $^ -lwinmm -lws2_32
469476

477+
tnctest-issue-132 : tnctest-issue-132.c textcolor.o dtime_now.o serial_port.o misc.a
478+
$(CC) $(CFLAGS) -o $@ $^ -lwinmm -lws2_32
479+
470480

471481
# For tweaking the demodulator.
472482

@@ -481,7 +491,7 @@ testagc : atest.c demod.c dsp.c demod_afsk.c demod_psk.c demod_9600.o fsk_demod_
481491
dwgpsnmea.o dwgps.o serial_port.o tt_text.o dtime_now.o regex.a misc.a
482492
rm -f atest.exe
483493
$(CC) $(CFLAGS) -o atest $^
484-
./atest -P GGG- -F 0 ../02_Track_2.wav | grep "packets decoded in" >atest.out
494+
./atest -P H+ -F 0 ../01_Track_1.wav ../02_Track_2.wav | grep "packets decoded in" >atest.out
485495
echo " " > tune.h
486496

487497

@@ -509,6 +519,8 @@ testagc96 : atest.c fsk_fast_filter.h tune.h demod.c demod_afsk.c demod_psk.c de
509519
rm -f atest96.exe
510520
$(CC) $(CFLAGS) -o atest96 $^
511521
./atest96 -B 9600 ../walkabout9600c.wav | grep "packets decoded in" >atest.out
522+
#./atest96 -B 9600 ../walkabout9600c.wav noisy96.wav zzz16.wav zzz16.wav zzz16.wav zzz8.wav zzz8.wav zzz8.wav | grep "packets decoded in" >atest.out
523+
#./atest96 -B 9600 zzz16.wav zzz8.wav | grep "packets decoded in" >atest.out
512524
#./atest96 -B 9600 noisy96.wav | grep "packets decoded in" >atest.out
513525
#./atest96 -B 9600 19990303_0225_9600_8bis_22kHz.wav | grep "packets decoded in" >atest.out
514526
#./atest96 -B 9600 19990303_0225_9600_16bit_22kHz.wav | grep "packets decoded in" >atest.out
@@ -561,10 +573,15 @@ aclients : aclients.c ax25_pad.c fcs_calc.c textcolor.c misc.a regex.a
561573

562574
# Note: kiss_frame.c has conditional compilation on KISSUTIL.
563575

564-
kissutil : kissutil.c kiss_frame.c ax25_pad.o fcs_calc.o textcolor.o serial_port.o sock.o dtime_now.o misc.a regex.a
576+
kissutil : kissutil.c kiss_frame.c ax25_pad.o fcs_calc.o textcolor.o serial_port.o dwsock.o dtime_now.o misc.a regex.a
565577
$(CC) $(CFLAGS) -DKISSUTIL -o $@ $^ -lwinmm -lws2_32
566578

567579

580+
mqtest : aprsmsg.c kiss_frame.c encode_aprs.o ax25_pad.o fcs_calc.o textcolor.o serial_port.o dwsock.o dtime_now.o latlong.o misc.a regex.a
581+
$(CC) $(CFLAGS) -DMQTEST -DKISSUTIL -o $@ $^ -lwinmm -lws2_32
582+
583+
584+
568585
# Touch Tone to Speech sample application.
569586

570587
ttcalc : ttcalc.o ax25_pad.o fcs_calc.o textcolor.o misc.a regex.a
@@ -585,6 +602,7 @@ walk96 : walk96.c dwgps.o dwgpsnmea.o kiss_frame.o \
585602

586603

587604

605+
588606
#--------------------------------------------------------------
589607

590608

0 commit comments

Comments
 (0)