@@ -21,13 +21,24 @@ all : direwolf decode_aprs text2tt tt2text ll2utm utm2ll aclients log2gpx gen_pa
21
21
22
22
# People say we need -mthreads option for threads to work properly.
23
23
# They also say it creates a dependency on mingwm10.dll but I'm not seeing that.
24
+ # Maybe that is for pthreads. We are using the Windows threads.
25
+
26
+ # -Ofast was added in gcc 4.6 which was the MinGW version back in 2012.
24
27
25
28
CC := gcc
26
29
CFLAGS := -Wall -Ofast -march=pentium3 -msse -Iregex -Iutm -Igeotranz -mthreads -DUSE_REGEX_STATIC
30
+ #CFLAGS := -Wall -march=pentium3 -msse -Iregex -Iutm -Igeotranz -mthreads -DUSE_REGEX_STATIC
27
31
AR := ar
28
32
29
33
CFLAGS += -g
30
34
35
+ # For version 1.4, we upgrade from 4.6.2 to 4.9.3.
36
+
37
+ # gcc 4.8 adds these. Try them just for fun.
38
+ # No, it needs libasan which is not on Windows.
39
+ #CFLAGS += -fsanitize=address -fno-omit-frame-pointer
40
+
41
+
31
42
# TODO: Development in progress. Don't try using yet.
32
43
#CFLAGS += -DNEW14
33
44
@@ -78,13 +89,13 @@ demod_psk.o : fsk_demod_state.h
78
89
# later ax25_link.o
79
90
80
91
direwolf : direwolf.o config.o recv.o demod.o dsp.o demod_afsk.o demod_psk.o demod_9600.o hdlc_rec.o \
81
- hdlc_rec2.o multi_modem.o redecode.o rdq.o rrbb.o dlq.o \
92
+ hdlc_rec2.o multi_modem.o rdq.o rrbb.o dlq.o \
82
93
fcs_calc.o ax25_pad.o ax25_pad2.o \
83
94
decode_aprs.o symbols.o server.o kiss.o kissnet.o kiss_frame.o hdlc_send.o fcs_calc.o \
84
95
gen_tone.o morse.o audio_win.o audio_stats.o digipeater.o pfilter.o dedupe.o tq.o xmit.o \
85
96
ptt.o beacon.o dwgps.o encode_aprs.o latlong.o textcolor.o \
86
97
dtmf.o aprs_tt.o tt_user.o tt_text.o igate.o waypoint.o serial_port.o log.o telemetry.o \
87
- dwgps.o dwgpsnmea.o dtime_now.o \
98
+ dwgps.o dwgpsnmea.o dtime_now.o mheard.o \
88
99
dw-icon.o regex.a misc.a geotranz.a
89
100
$(CC) $(CFLAGS) -o $@ $^ -lwinmm -lws2_32
90
101
@@ -269,16 +280,16 @@ check-modem300 : gen_packets atest
269
280
check-modem9600 : gen_packets atest
270
281
gen_packets -B9600 -n 100 -o test96.wav
271
282
sleep 1
272
- atest -B9600 -F0 -L57 -G62 test96.wav
273
- atest -B9600 -F1 -L65 -G67 test96.wav
283
+ atest -B9600 -F0 -L50 -G54 test96.wav
284
+ atest -B9600 -F1 -L55 -G59 test96.wav
274
285
sleep 1
275
286
rm test96.wav
276
287
277
288
check-modem19200 : gen_packets atest
278
289
gen_packets -r 96000 -B19200 -n 100 -o test19.wav
279
290
sleep 1
280
- atest -B19200 -F0 -L63 -G64 test19.wav
281
- atest -B19200 -F1 -L69 -G70 test19.wav
291
+ atest -B19200 -F0 -L55 -G59 test19.wav
292
+ atest -B19200 -F1 -L60 -G64 test19.wav
282
293
sleep 1
283
294
rm test19.wav
284
295
@@ -288,15 +299,15 @@ check-modem2400 : gen_packets atest
288
299
atest -B2400 -F0 -L70 -G78 test24.wav
289
300
atest -B2400 -F1 -L80 -G87 test24.wav
290
301
sleep 1
291
- # rm test24.wav
302
+ rm test24.wav
292
303
293
304
check-modem4800 : gen_packets atest
294
305
gen_packets -B4800 -n 100 -o test48.wav
295
306
sleep 1
296
307
atest -B4800 -F0 -L70 -G74 test48.wav
297
308
atest -B4800 -F1 -L79 -G84 test48.wav
298
309
sleep 1
299
- # rm test48.wav
310
+ rm test48.wav
300
311
301
312
302
313
# Unit test for demodulators
@@ -305,7 +316,7 @@ atest : atest.c fsk_fast_filter.h demod.c demod_afsk.c demod_psk.c demod_9600.c
305
316
dsp.o hdlc_rec.o hdlc_rec2.o multi_modem.o \
306
317
rrbb.o fcs_calc.o ax25_pad.o decode_aprs.o \
307
318
dwgpsnmea.o dwgps.o serial_port.o latlong.c \
308
- symbols.c tt_text.c textcolor.c telemetry.c \
319
+ symbols.c tt_text.c textcolor.c telemetry.c dtime_now.o \
309
320
misc.a regex.a
310
321
echo " " > tune.h
311
322
$(CC) $(CFLAGS) -o $@ $^
@@ -314,7 +325,7 @@ atest : atest.c fsk_fast_filter.h demod.c demod_afsk.c demod_psk.c demod_9600.c
314
325
#atest za100.wav
315
326
316
327
atest9 : atest.c demod.c dsp.c demod_afsk.c demod_psk.c demod_9600.c hdlc_rec.c hdlc_rec2.c multi_modem.c \
317
- rrbb.c fcs_calc.c ax25_pad.c decode_aprs.c latlong.c symbols.c textcolor.c telemetry.c misc.a regex.a \
328
+ rrbb.c fcs_calc.c ax25_pad.c decode_aprs.c latlong.c symbols.c textcolor.c telemetry.c dtime_now.o misc.a regex.a \
318
329
fsk_fast_filter.h
319
330
echo " " > tune.h
320
331
$(CC) $(CFLAGS) -o $@ $^
@@ -415,7 +426,7 @@ demod_psk.o : tune.h
415
426
testagc : atest.c demod.c dsp.c demod_afsk.c demod_psk.c demod_9600.o fsk_demod_agc.h \
416
427
hdlc_rec.o hdlc_rec2.o multi_modem.o \
417
428
rrbb.o fcs_calc.o ax25_pad.o decode_aprs.o latlong.o symbols.o textcolor.o telemetry.o \
418
- dwgpsnmea.o dwgps.o serial_port.o tt_text.o regex.a misc.a
429
+ dwgpsnmea.o dwgps.o serial_port.o tt_text.o dtime_now.o regex.a misc.a
419
430
rm -f atest.exe
420
431
$(CC) $(CFLAGS) -o atest $^
421
432
./atest -P GGG- -F 0 ../02_Track_2.wav | grep "packets decoded in" >atest.out
@@ -426,7 +437,7 @@ noisy3.wav : gen_packets
426
437
./gen_packets -B 300 -n 100 -o noisy3.wav
427
438
428
439
testagc3 : atest.c demod.c dsp.c demod_afsk.c demod_psk.c demod_9600.c hdlc_rec.c hdlc_rec2.c multi_modem.c \
429
- rrbb.c fcs_calc.c ax25_pad.c decode_aprs.c latlong.c symbols.c textcolor.c telemetry.c regex.a misc.a \
440
+ rrbb.c fcs_calc.c ax25_pad.c decode_aprs.c latlong.c symbols.c textcolor.c telemetry.c dtime_now.o regex.a misc.a \
430
441
tune.h
431
442
rm -f atest3.exe
432
443
$(CC) $(CFLAGS) -o atest3 $^
@@ -437,20 +448,27 @@ testagc3 : atest.c demod.c dsp.c demod_afsk.c demod_psk.c demod_9600.c hdlc_rec.
437
448
noisy96.wav : gen_packets
438
449
./gen_packets -B 9600 -n 100 -o noisy96.wav
439
450
440
- testagc96 : atest.c demod.c dsp.c demod_afsk.c demod_psk.c demod_9600.c hdlc_rec.c hdlc_rec2.c multi_modem.c \
441
- rrbb.c fcs_calc.c ax25_pad.c decode_aprs.c latlong.c symbols.c textcolor.c telemetry.c regex.a misc.a \
442
- tune.h
443
- rm -f atest9.exe
444
- $(CC) $(CFLAGS) -o atest9 $^
445
- ./atest9 -B 9600 ../walkabout9600.wav | grep "packets decoded in" >atest.out
446
- #./atest9 -B 9600 noisy96.wav | grep "packets decoded in" >atest.out
451
+ testagc96 : atest.c fsk_fast_filter.h tune.h demod.c demod_afsk.c demod_psk.c demod_9600.c \
452
+ dsp.o hdlc_rec.o hdlc_rec2.o multi_modem.o \
453
+ rrbb.o fcs_calc.o ax25_pad.o decode_aprs.o \
454
+ dwgpsnmea.o dwgps.o serial_port.o latlong.o \
455
+ symbols.o tt_text.o textcolor.o telemetry.o dtime_now.o \
456
+ misc.a regex.a
457
+ rm -f atest96.exe
458
+ $(CC) $(CFLAGS) -o atest96 $^
459
+ ./atest96 -B 9600 ../walkabout9600c.wav | grep "packets decoded in" >atest.out
460
+ #./atest96 -B 9600 noisy96.wav | grep "packets decoded in" >atest.out
461
+ #./atest96 -B 9600 19990303_0225_9600_8bis_22kHz.wav | grep "packets decoded in" >atest.out
462
+ #./atest96 -B 9600 19990303_0225_9600_16bit_22kHz.wav | grep "packets decoded in" >atest.out
463
+ #./atest96 -B 9600 -P + z8-22k.wav| grep "packets decoded in" >atest.out
464
+ #./atest96 -B 9600 test9600.wav | grep "packets decoded in" >atest.out
447
465
echo " " > tune.h
448
466
449
467
testagc24 : atest.c fsk_fast_filter.h tune.h demod.c demod_afsk.c demod_psk.c demod_9600.c \
450
468
dsp.o hdlc_rec.o hdlc_rec2.o multi_modem.o \
451
469
rrbb.o fcs_calc.o ax25_pad.o decode_aprs.o \
452
470
dwgpsnmea.o dwgps.o serial_port.o latlong.o \
453
- symbols.o tt_text.o textcolor.o telemetry.o \
471
+ symbols.o tt_text.o textcolor.o telemetry.o dtime_now.o \
454
472
misc.a regex.a
455
473
rm -f atest24.exe
456
474
sleep 1
@@ -462,7 +480,7 @@ testagc48 : atest.c fsk_fast_filter.h tune.h demod.c demod_afsk.c demod_psk.c de
462
480
dsp.o hdlc_rec.o hdlc_rec2.o multi_modem.o \
463
481
rrbb.o fcs_calc.o ax25_pad.o decode_aprs.o \
464
482
dwgpsnmea.o dwgps.o serial_port.o latlong.o \
465
- symbols.o tt_text.o textcolor.o telemetry.o \
483
+ symbols.o tt_text.o textcolor.o telemetry.o dtime_now.o \
466
484
misc.a regex.a
467
485
rm -f atest48.exe
468
486
sleep 1
@@ -570,67 +588,6 @@ dist-win : direwolf.exe decode_aprs.exe text2tt.exe tt2text.exe ll2utm.exe utm2l
570
588
dwespeak.bat \
571
589
telemetry-toolkit/*
572
590
573
- .PHONY: dist-src
574
- dist-src : README.md CHANGES.md \
575
- doc/User-Guide.pdf \
576
- doc/Raspberry-Pi-APRS.pdf \
577
- doc/Raspberry-Pi-APRS-Tracker.pdf \
578
- doc/APRStt-Implementation-Notes.pdf \
579
- doc/APRS-Telemetry-Toolkit.pdf \
580
- dw-start.sh dwespeak.bat dwespeak.sh \
581
- tocalls.txt symbols-new.txt symbolsX.txt direwolf.spec
582
- rm -f fsk_fast_filter.h
583
- echo " " > tune.h
584
- rm -f ../$z-src.zip
585
- dos2unix generic.conf
586
- dos2unix Makefile
587
- dos2unix Makefile.linux
588
- dos2unix Makefile.macosx
589
- dos2unix telemetry-toolkit/telem-balloon.conf
590
- dos2unix telemetry-toolkit/telem-balloon.pl
591
- dos2unix telemetry-toolkit/telem-bits.pl
592
- dos2unix telemetry-toolkit/telem-data.pl
593
- dos2unix telemetry-toolkit/telem-data91.pl
594
- dos2unix telemetry-toolkit/telem-eqns.pl
595
- dos2unix telemetry-toolkit/telem-m0xer-3.txt
596
- dos2unix telemetry-toolkit/telem-parm.pl
597
- dos2unix telemetry-toolkit/telem-unit.pl
598
- dos2unix telemetry-toolkit/telem-volts.py
599
- dos2unix telemetry-toolkit/telem-volts.conf
600
- (cd .. ; zip $z-src.zip \
601
- $z/README.md \
602
- $z/CHANGES.md \
603
- $z/LICENSE* \
604
- $z/doc/User-Guide.pdf \
605
- $z/doc/Raspberry-Pi-APRS.pdf \
606
- $z/doc/Raspberry-Pi-APRS-Tracker.pdf \
607
- $z/doc/APRStt-Implementation-Notes.pdf \
608
- $z/doc/APRS-Telemetry-Toolkit.pdf \
609
- $z/Makefile.win $z/Makefile.linux $z/Makefile.macosx $z/Makefile \
610
- $z/*.c $z/*.h \
611
- $z/regex/* $z/misc/* $z/geotranz/* \
612
- $z/man1/* \
613
- $z/generic.conf \
614
- $z/tocalls.txt $z/symbols-new.txt $z/symbolsX.txt \
615
- $z/dw-icon.png $z/dw-icon.rc $z/dw-icon.ico \
616
- $z/dw-start.sh $z/direwolf.spec \
617
- $z/dwespeak.bat $z/dwespeak.sh \
618
- $z/telemetry-toolkit/* )
619
- unix2dos Makefile
620
- unix2dos Makefile.linux
621
- unix2dos Makefile.macosx
622
- unix2dos telemetry-toolkit/telem-balloon.conf
623
- unix2dos telemetry-toolkit/telem-balloon.pl
624
- dos2unix telemetry-toolkit/telem-bits.pl
625
- unix2dos telemetry-toolkit/telem-data.pl
626
- unix2dos telemetry-toolkit/telem-data91.pl
627
- unix2dos telemetry-toolkit/telem-eqns.pl
628
- unix2dos telemetry-toolkit/telem-m0xer-3.txt
629
- unix2dos telemetry-toolkit/telem-parm.pl
630
- unix2dos telemetry-toolkit/telem-unit.pl
631
- unix2dos telemetry-toolkit/telem-volts.py
632
- unix2dos telemetry-toolkit/telem-volts.conf
633
-
634
591
635
592
# Reminders if pdf files are not up to date.
636
593
0 commit comments