Skip to content

Commit 4f1918c

Browse files
wb2oszwb2osz
committed
Add 2400 & 4800 PSK modems. New functions to handle frames besides UI.
1 parent ccae752 commit 4f1918c

38 files changed

+3501
-464
lines changed

‎CHANGES.md

+32-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,36 @@
11

22
# Revision History #
33

4+
----------
5+
6+
## Version 1.4 -- Development snapshot B -- April 2016 ##
7+
8+
### New Features: ###
9+
10+
- 2400 & 4800 bps PSK modems. See ***2400-4800-PSK-for-APRS-Packet-Radio.pdf*** in the doc directory for discussion.
11+
12+
13+
- The top speed of 9600 bps has been increased to 38400. You will need a sound card capable of 96k or 192k samples per second for the higher rates. Radios must also have adequate bandwidth. See ***Going-beyond-9600-baud.pdf*** in the doc directory for more details.
14+
15+
16+
### Bugs Fixed: ###
17+
18+
- Sometimes kissattach would have an issue with the Dire Wolf pseudo terminal. This showed up most often on Raspbian but sometimes occurred with other versions of Linux.
19+
20+
*kissattach: Error setting line discipline: TIOCSETD: Device or resource busy
21+
Are you sure you have enabled MKISS support in the kernel
22+
or, if you made it a module, that the module is loaded?*
23+
24+
25+
- Sometimes writes to a pseudo terminal would block causing the received
26+
frame processing thread to hang. The first thing you will notice is that
27+
received frames are not being printed. After a while this message will appear:
28+
29+
*Received frame queue is out of control. Length=... Reader thread is probably
30+
frozen. This can be caused by using a pseudo terminal (direwolf -p) where
31+
another application is not reading the frames from the other side.*
32+
33+
434
----------
535

636
## Version 1.3 -- Beta Test -- March 2016 ##
@@ -61,7 +91,7 @@ such as PowerPC or MIPS.
6191

6292
- Improved decoder performance.
6393
Over 1000 error-free frames decoded from WA8LMF TNC Test CD.
64-
See "A-Better-APRS-Packet-Demodulator.pdf" for details.
94+
See ***A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf*** for details.
6595

6696
- Up to 3 soundcards and 6 radio channels can be handled at the same time.
6797

@@ -272,8 +302,7 @@ to rebuild it from source.
272302

273303
### New Features: ###
274304

275-
- Added APRStt gateway capability. For details, see:
276-
**APRStt-Implementation-Notes.pdf**
305+
- Added APRStt gateway capability. For details, see ***APRStt-Implementation-Notes.pdf***
277306

278307

279308
-----------

‎Makefile.linux

+55-20
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ z := $(notdir ${CURDIR})
228228

229229

230230

231-
direwolf : direwolf.o config.o recv.o demod.o dsp.o demod_afsk.o demod_9600.o hdlc_rec.o \
231+
direwolf : direwolf.o config.o recv.o demod.o dsp.o demod_afsk.o demod_psk.o demod_9600.o hdlc_rec.o \
232232
hdlc_rec2.o multi_modem.o redecode.o rdq.o rrbb.o dlq.o \
233233
fcs_calc.o ax25_pad.o \
234234
decode_aprs.o symbols.o server.o kiss.o kissnet.o kiss_frame.o hdlc_send.o fcs_calc.o \
@@ -248,15 +248,18 @@ endif
248248

249249
# Optimization for slow processors.
250250

251-
demod.o : fsk_fast_filter.h
251+
demod.o : fsk_fast_filter.h
252252

253253
demod_afsk.o : fsk_fast_filter.h
254254

255255

256-
fsk_fast_filter.h : demod_afsk.c
257-
$(CC) $(CFLAGS) -o gen_fff -DGEN_FFF demod_afsk.c dsp.c textcolor.c $(LDFLAGS)
256+
fsk_fast_filter.h : gen_fff
258257
./gen_fff > fsk_fast_filter.h
259258

259+
gen_fff : demod_afsk.c dsp.c textcolor.c
260+
echo " " > tune.h
261+
$(CC) $(CFLAGS) -DGEN_FFF -o $@ $^ $(LDFLAGS)
262+
260263

261264
#
262265
# The destination field is often used to identify the manufacturer/model.
@@ -327,7 +330,7 @@ gen_packets : gen_packets.c ax25_pad.c hdlc_send.c fcs_calc.c gen_tone.c morse.c
327330

328331
# Unit test for AFSK demodulator
329332

330-
atest : atest.c demod.o demod_afsk.o demod_9600.o \
333+
atest : atest.c demod.o demod_afsk.o demod_psk.o demod_9600.o \
331334
dsp.o hdlc_rec.o hdlc_rec2.o multi_modem.o rrbb.o \
332335
fcs_calc.o ax25_pad.o decode_aprs.o dwgpsnmea.o \
333336
dwgps.o dwgpsd.o serial_port.o telemetry.o latlong.o symbols.o tt_text.o textcolor.o \
@@ -585,15 +588,15 @@ install-rpi : dw-start.sh
585588
# Combine some unit tests into a single regression sanity check.
586589

587590

588-
check : dtest ttest tttexttest pftest tlmtest lltest enctest kisstest check-modem1200 check-modem300 check-modem9600
591+
check : dtest ttest tttexttest pftest tlmtest lltest enctest kisstest pad2test check-modem1200 check-modem300 check-modem9600 check-modem19200 check-modem2400 check-modem4800
589592

590593
# Can we encode and decode at popular data rates?
591594

592595
check-modem1200 : gen_packets atest
593-
./gen_packets -n 100 -o /tmp/test1.wav
594-
./atest -F0 -PE -L70 -G71 /tmp/test1.wav
595-
./atest -F1 -PE -L73 -G75 /tmp/test1.wav
596-
#rm /tmp/test1.wav
596+
./gen_packets -n 100 -o /tmp/test12.wav
597+
./atest -F0 -PE -L63 -G71 /tmp/test12.wav
598+
./atest -F1 -PE -L70 -G75 /tmp/test12.wav
599+
rm /tmp/test12.wav
597600

598601
check-modem300 : gen_packets atest
599602
./gen_packets -B300 -n 100 -o /tmp/test3.wav
@@ -602,11 +605,28 @@ check-modem300 : gen_packets atest
602605
rm /tmp/test3.wav
603606

604607
check-modem9600 : gen_packets atest
605-
./gen_packets -B9600 -n 100 -o /tmp/test9.wav
606-
./atest -B9600 -F0 -L57 -G59 /tmp/test9.wav
607-
./atest -B9600 -F1 -L66 -G67 /tmp/test9.wav
608-
rm /tmp/test9.wav
609-
608+
./gen_packets -B9600 -n 100 -o /tmp/test96.wav
609+
./atest -B9600 -F0 -L57 -G61 /tmp/test96.wav
610+
./atest -B9600 -F1 -L64 -G67 /tmp/test96.wav
611+
rm /tmp/test96.wav
612+
613+
check-modem19200 : gen_packets atest
614+
./gen_packets -r 96000 -B19200 -n 100 -o /tmp/test19.wav
615+
./atest -B19200 -F0 -L62 -G64 /tmp/test19.wav
616+
./atest -B19200 -F1 -L69 -G71 /tmp/test19.wav
617+
rm /tmp/test19.wav
618+
619+
check-modem2400 : gen_packets atest
620+
./gen_packets -B2400 -n 100 -o /tmp/test24.wav
621+
./atest -B2400 -F0 -L70 -G78 /tmp/test24.wav
622+
./atest -B2400 -F1 -L80 -G87 /tmp/test24.wav
623+
rm /tmp/test24.wav
624+
625+
check-modem4800 : gen_packets atest
626+
./gen_packets -B2400 -n 100 -o /tmp/test48.wav
627+
./atest -B2400 -F0 -L70 -G79 /tmp/test48.wav
628+
./atest -B2400 -F1 -L80 -G90 /tmp/test48.wav
629+
rm /tmp/test48.wav
610630

611631

612632
# Unit test for inner digipeater algorithm
@@ -679,6 +699,14 @@ kisstest : kiss_frame.c
679699
./kisstest
680700
rm kisstest
681701

702+
# Unit test for constructing frames besides UI.
703+
704+
.PHONY: pad2test
705+
pad2test : ax25_pad2.c ax25_pad.c fcs_calc.o textcolor.o misc.a
706+
$(CC) $(CFLAGS) -DPAD2TEST -o $@ $^ $(LDFLAGS)
707+
./pad2test
708+
rm pad2test
709+
682710

683711

684712
# ----------------------------- Manual tests and experiments ---------------------------
@@ -694,19 +722,27 @@ itest : igate.c textcolor.c ax25_pad.c fcs_calc.c textcolor.o misc.a
694722
# Unit test for UDP reception with AFSK demodulator.
695723
# Temporary during development. Might not be useful anymore.
696724

697-
udptest : udp_test.c demod.o dsp.o demod_afsk.o demod_9600.o hdlc_rec.o hdlc_rec2.o multi_modem.o rrbb.o \
725+
udptest : udp_test.c demod.o dsp.o demod_afsk.o demod_psk.o demod_9600.o hdlc_rec.o hdlc_rec2.o multi_modem.o rrbb.o \
698726
fcs_calc.o ax25_pad.o decode_aprs.o symbols.o textcolor.o misc.a
699727
$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
700728
./udptest
701729

702730
# For demodulator tweaking experiments.
703731
# Dependencies of demod*.c, rather than .o, are intentional.
704732

705-
demod.o : tune.h
733+
demod.o : tune.h
734+
706735
demod_afsk.o : tune.h
736+
707737
demod_9600.o : tune.h
708738

709-
testagc : atest.c demod.c dsp.c demod_afsk.c demod_9600.c hdlc_rec.o hdlc_rec2.o multi_modem.o rrbb.o \
739+
demod_psk.o : tune.h
740+
741+
tune.h :
742+
echo " " > tune.h
743+
744+
745+
testagc : atest.c demod.c dsp.c demod_afsk.c demod_psk.c demod_9600.c hdlc_rec.o hdlc_rec2.o multi_modem.o rrbb.o \
710746
fcs_calc.o ax25_pad.o decode_aprs.o telemetry.o latlong.o symbols.o tune.h textcolor.o misc.a
711747
$(CC) $(CFLAGS) -o atest $^ $(LDFLAGS)
712748
./atest 02_Track_2.wav | grep "packets decoded in" > atest.out
@@ -757,8 +793,7 @@ dist-src : README.md CHANGES.md
757793

758794
.PHONY: clean
759795
clean :
760-
rm -f $(APPS) fsk_fast_filter.h *.o *.a direwolf.desktop
761-
echo " " > tune.h
796+
rm -f $(APPS) gen_fff tune.h fsk_fast_filter.h *.o *.a direwolf.desktop
762797

763798

764799
depend : $(wildcard *.c)

‎Makefile.macosx

+26-16
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@
2424
# 3. Removed fsk_fast_filter.h from atest receipe, clang compiler was having
2525
# a hissy fit. Not check with GCC.
2626

27-
all : direwolf decode_aprs text2tt tt2text ll2utm utm2ll aclients atest log2gpx gen_packets ttcalc direwolf.conf
28-
@echo " "
27+
APPS := direwolf decode_aprs text2tt tt2text ll2utm utm2ll aclients atest log2gpx gen_packets ttcalc
28+
29+
all : $(APPS) direwolf.desktop direwolf.conf @echo " "
2930
@echo "Next step install with: "
3031
@echo " "
3132
@echo " sudo make install"
@@ -221,7 +222,7 @@ z := $(notdir ${CURDIR})
221222
# Main application.
222223

223224
direwolf : direwolf.o aprs_tt.o audio_portaudio.o audio_stats.o ax25_pad.o beacon.o \
224-
config.o decode_aprs.o dedupe.o demod_9600.o demod_afsk.o \
225+
config.o decode_aprs.o dedupe.o demod_9600.o demod_afsk.o demod_psk.o \
225226
demod.o digipeater.o dlq.o dsp.o dtime_now.o dtmf.o dwgps.o \
226227
encode_aprs.o encode_aprs.o fcs_calc.o fcs_calc.o gen_tone.o \
227228
geotranz.a hdlc_rec.o hdlc_rec2.o hdlc_send.o igate.o kiss_frame.o \
@@ -234,15 +235,20 @@ direwolf : direwolf.o aprs_tt.o audio_portaudio.o audio_stats.o ax25_pad.o beaco
234235

235236
# Optimization for slow processors.
236237

237-
demod.o : fsk_fast_filter.h
238+
demod.o : fsk_fast_filter.h
238239

239240
demod_afsk.o : fsk_fast_filter.h
240241

241242

242-
fsk_fast_filter.h : demod_afsk.c
243-
$(CC) $(CFLAGS) -o gen_fff -DGEN_FFF demod_afsk.c dsp.c textcolor.c -lm
243+
fsk_fast_filter.h : gen_fff
244244
./gen_fff > fsk_fast_filter.h
245245

246+
gen_fff : demod_afsk.c dsp.c textcolor.c
247+
echo " " > tune.h
248+
$(CC) $(CFLAGS) -DGEN_FFF -o $@ $^ $(LDFLAGS)
249+
250+
251+
246252
# UTM, USNG, MGRS conversions.
247253

248254
geotranz.a : error_string.o mgrs.o polarst.o tranmerc.o ups.o usng.o utm.o
@@ -392,10 +398,6 @@ install : $(APPS) direwolf.conf tocalls.txt symbols-new.txt symbolsX.txt dw-icon
392398

393399
# These would be done as ordinary user.
394400

395-
# The Raspberry Pi has ~/Desktop but Ubuntu does not.
396-
397-
# TODO: Handle Linux variations correctly.
398-
399401

400402
.PHONY: install-conf
401403
install-conf : direwolf.conf
@@ -406,7 +408,7 @@ install-conf : direwolf.conf
406408

407409
# Separate application to decode raw data.
408410

409-
decode_aprs : decode_aprs.c dwgpsnmea.o dwgps.o serial_port.o symbols.o ax25_pad.o textcolor.o fcs_calc.o latlong.o log.o telemetry.o tt_text.o
411+
decode_aprs : decode_aprs.c dwgpsnmea.o dwgps.o dwgpsd.o serial_port.o symbols.o ax25_pad.o textcolor.o fcs_calc.o latlong.o log.o telemetry.o tt_text.o
410412
$(CC) $(CFLAGS) -DDECAMAIN -o $@ $^ -lm
411413

412414
# Convert between text and touch tone representation.
@@ -438,22 +440,30 @@ log2gpx : log2gpx.c
438440
gen_packets : gen_packets.c ax25_pad.c hdlc_send.c fcs_calc.c gen_tone.c morse.c textcolor.c dsp.c
439441
$(CC) $(CFLAGS) -o $@ $^ $(LDLIBS) -lm
440442

441-
demod.o : tune.h
443+
demod.o : tune.h
444+
442445
demod_afsk.o : tune.h
446+
443447
demod_9600.o : tune.h
444448

449+
demod_psk.o : tune.h
450+
451+
tune.h :
452+
echo " " > tune.h
453+
454+
445455
testagc : atest.c demod.c dsp.c demod_afsk.c demod_9600.c hdlc_rec.c hdlc_rec2.o multi_modem.o rrbb.o \
446456
fcs_calc.c ax25_pad.c decode_aprs.c telemetry.c latlong.c symbols.c tune.h textcolor.c
447457
$(CC) $(CFLAGS) -o atest $^ -lm
448458
./atest 02_Track_2.wav | grep "packets decoded in" > atest.out
449459

450460

451-
# Unit test for AFSK demodulator
461+
# Unit test for demodulators
452462

453-
atest : atest.c demod.c dsp.c demod_afsk.c demod_9600.c hdlc_rec.c hdlc_rec2.o multi_modem.o rrbb.o \
463+
atest : atest.c demod.c dsp.c demod_afsk.c demod_psk.c demod_9600.c hdlc_rec.c hdlc_rec2.o multi_modem.o rrbb.o \
454464
fcs_calc.c ax25_pad.c decode_aprs.c dwgpsnmea.o dwgps.o serial_port.o telemetry.c latlong.c symbols.c textcolor.c tt_text.c
455465
$(CC) $(CFLAGS) -o $@ $^ -lm
456-
#atest : atest.c fsk_fast_filter.h demod.c dsp.c demod_afsk.c demod_9600.c hdlc_rec.c hdlc_rec2.o multi_modem.o rrbb.o \
466+
#atest : atest.c fsk_fast_filter.h demod.c dsp.c demod_afsk.c demod_psk.c demod_9600.c hdlc_rec.c hdlc_rec2.o multi_modem.o rrbb.o \
457467
# fcs_calc.c ax25_pad.c decode_aprs.c dwgpsnmea.o dwgps.o serial_port.o telemetry.c latlong.c symbols.c textcolor.c tt_text.c
458468
# $(CC) $(CFLAGS) -o $@ $^ -lm
459469

@@ -513,7 +523,7 @@ depend : $(wildcard *.c)
513523

514524
.PHONY: clean
515525
clean :
516-
rm -f direwolf decode_aprs text2tt tt2text ll2utm utm2ll aclients atest log2gpx gen_packets ttcalc \
526+
rm -f $(APPS) gen_fff \
517527
fsk_fast_filter.h *.o *.a use_this_sdk
518528
echo " " > tune.h
519529

0 commit comments

Comments
 (0)