New kissutil application.

Author: wb2osz

Makefile.linux

@@ -4,8 +4,7 @@
 
 
 
-
-APPS := direwolf decode_aprs text2tt tt2text ll2utm utm2ll aclients atest log2gpx gen_packets ttcalc
+APPS := direwolf decode_aprs text2tt tt2text ll2utm utm2ll aclients atest log2gpx gen_packets ttcalc kissutil
 
 all :  $(APPS) direwolf.desktop direwolf.conf
 	@echo " "
@@ -255,18 +254,18 @@ endif
 # but the initial test doesn't look good.  About 2.3 times as slow.
 
 # If you want to use OSS (for FreeBSD, OpenBSD) instead of
-# ALSA (for Linux), comment out (or remove) the two lines below.
-
+# ALSA (for Linux), comment out (or remove) the line below.
 # TODO:  Can we automate this somehow?
 
-CFLAGS += -DUSE_ALSA
-LDFLAGS += -lasound
+alsa = 1
 
 ifeq ($(wildcard /usr/include/pthread.h),)
 $(error /usr/include/pthread.h does not exist.  Install it with "sudo apt-get install libc6-dev" or "sudo yum install libc6-dev" )
 endif
 
-ifneq ($(USE_ALSA),)
+ifneq ($(alsa),)
+CFLAGS += -DUSE_ALSA
+LDFLAGS += -lasound
 ifeq ($(wildcard /usr/include/alsa/asoundlib.h),)
 $(error /usr/include/alsa/asoundlib.h does not exist.  Install it with "sudo apt-get install libasound2-dev" or "sudo yum install libasound2-dev" )
 endif
@@ -377,9 +376,9 @@ tocalls-symbols :
 
 # Separate application to decode raw data.
 
-# First two use .c rather than .o because they depend on DECAMAIN definition.
+# First three use .c rather than .o because they depend on DECAMAIN definition.
 
-decode_aprs : decode_aprs.c kiss_frame.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 misc.a
+decode_aprs : decode_aprs.c kiss_frame.c ax25_pad.c dwgpsnmea.o dwgps.o dwgpsd.o serial_port.o symbols.o textcolor.o fcs_calc.o latlong.o log.o telemetry.o tt_text.o misc.a
 	$(CC) $(CFLAGS) -DDECAMAIN -o $@ $^ $(LDFLAGS)
 
 
@@ -429,6 +428,13 @@ aclients : aclients.c ax25_pad.c fcs_calc.c textcolor.o misc.a
 	$(CC) $(CFLAGS) -g -o $@ $^ 
 
 
+# Talk to a KISS TNC.
+# Note:  kiss_frame.c has conditional compilation on KISSUTIL.
+
+kissutil : kissutil.c kiss_frame.c ax25_pad.o fcs_calc.o textcolor.o serial_port.o dtime_now.o sock.o misc.a
+	$(CC) $(CFLAGS) -g -DKISSUTIL -o $@ $^
+
+
 # Touch Tone to Speech sample application.
 
 ttcalc : ttcalc.o ax25_pad.o fcs_calc.o textcolor.o misc.a
@@ -562,6 +568,7 @@ install : $(APPS) direwolf.conf tocalls.txt symbols-new.txt symbolsX.txt dw-icon
 	$(INSTALL) gen_packets $(INSTALLDIR)/bin
 	$(INSTALL) atest $(INSTALLDIR)/bin
 	$(INSTALL) ttcalc $(INSTALLDIR)/bin
+	$(INSTALL) kissutil $(INSTALLDIR)/bin
 	$(INSTALL) dwespeak.sh $(INSTALLDIR)/bin
 #
 # Telemetry Toolkit executables.   Other .conf and .txt files will go into doc directory.

Makefile.win

@@ -16,7 +16,7 @@
 #
 
 
-all : direwolf decode_aprs text2tt tt2text ll2utm utm2ll aclients log2gpx gen_packets atest ttcalc tnctest
+all : direwolf decode_aprs text2tt tt2text ll2utm utm2ll aclients log2gpx gen_packets atest ttcalc tnctest kissutil
 
 
 # People say we need -mthreads option for threads to work properly.
@@ -30,6 +30,8 @@ CFLAGS := -Ofast -march=pentium3 -msse -Iregex -Iutm -Igeotranz -mthreads -DUSE_
 AR := ar
 
 CFLAGS += -g
+# TEMP EXPERIMENT - DO NOT RELEASE
+#CFLAGS += -fsanitize=undefined
 
 # For version 1.4, we upgrade from gcc 4.6.2 to 4.9.3.
 
@@ -159,9 +161,9 @@ tocalls-symbols :
 
 # Separate application to decode raw data.
 
-# First two use .c rather than .o because they depend on DECAMAIN definition.
+# First three use .c rather than .o because they depend on DECAMAIN definition.
 
-decode_aprs : decode_aprs.c kiss_frame.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 regex.a misc.a geotranz.a
+decode_aprs : decode_aprs.c kiss_frame.c ax25_pad.c dwgpsnmea.o dwgps.o serial_port.o symbols.o  textcolor.o fcs_calc.o latlong.o log.o telemetry.o tt_text.o regex.a misc.a geotranz.a
 	$(CC) $(CFLAGS) -DDECAMAIN -o decode_aprs $^
 
 
@@ -556,6 +558,14 @@ aclients : aclients.c ax25_pad.c fcs_calc.c textcolor.c misc.a regex.a
 	$(CC) $(CFLAGS) -o $@ $^ -lwinmm -lws2_32
 
 
+# Talk to a KISS TNC.
+
+# Note:  kiss_frame.c has conditional compilation on KISSUTIL.
+
+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
+	$(CC) $(CFLAGS) -DKISSUTIL -o $@ $^ -lwinmm -lws2_32
+
+
 # Touch Tone to Speech sample application.
 
 ttcalc : ttcalc.o ax25_pad.o fcs_calc.o textcolor.o misc.a regex.a
@@ -641,6 +651,7 @@ dist-win : direwolf.exe decode_aprs.exe text2tt.exe tt2text.exe ll2utm.exe utm2l
 		gen_packets.exe \
 		atest.exe \
 		ttcalc.exe \
+		kissutil.exe \
 		dwespeak.bat \
 		telemetry-toolkit/*
 	rm README-doc.md