PTT was being turned off too soon when sending Morse code.

Add capability to send DTMF tones.
-qd option now suppresses complaints about telemetry packets.
Handle more than 150 destinations in tocalls.txt.

Author: wb2osz

Makefile.linux

@@ -325,7 +325,7 @@ log2gpx : log2gpx.c textcolor.o misc.a
 
 # Test application to generate sound.
 
-gen_packets : gen_packets.c ax25_pad.c hdlc_send.c fcs_calc.c gen_tone.c morse.c textcolor.c dsp.c misc.a
+gen_packets : gen_packets.c ax25_pad.c hdlc_send.c fcs_calc.c gen_tone.c morse.c dtmf.c textcolor.c dsp.c misc.a
 	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
 
 # Unit test for AFSK demodulator
@@ -588,7 +588,7 @@ install-rpi : dw-start.sh
 # Combine some unit tests into a single regression sanity check.
 
 
-check : dtest ttest tttexttest pftest tlmtest lltest enctest kisstest pad2test xidtest check-modem1200 check-modem300 check-modem9600 check-modem19200 check-modem2400 check-modem4800
+check : dtest ttest tttexttest pftest tlmtest lltest enctest kisstest pad2test xidtest dtmftest check-modem1200 check-modem300 check-modem9600 check-modem19200 check-modem2400 check-modem4800
 
 # Can we encode and decode at popular data rates?
 
@@ -632,8 +632,8 @@ check-modem4800 : gen_packets atest
 # Unit test for inner digipeater algorithm
 
 .PHONY : dtest
-dtest : digipeater.c dedupe.c \
-		pfilter.o ax25_pad.o fcs_calc.o tq.o textcolor.o \
+dtest : digipeater.c dedupe.c pfilter.c \
+		ax25_pad.o fcs_calc.o tq.o textcolor.o \
 		decode_aprs.o dwgpsnmea.o dwgps.o dwgpsd.o serial_port.o latlong.o telemetry.o symbols.o tt_text.o misc.a
 	$(CC) $(CFLAGS) -DDIGITEST -o $@ $^ $(LDFLAGS)
 	./dtest
@@ -717,6 +717,15 @@ xidtest : xid.c textcolor.o misc.a
 	rm xidtest
 
 
+# Unit Test for DTMF encode/decode.
+
+.PHONY: dtmftest
+dtmftest : dtmf.c textcolor.o
+	$(CC) $(CFLAGS) -DDTMF_TEST -o $@ $^  $(LDFLAGS)
+	./dtmftest
+	rm dtmftest
+
+
 
 #  -----------------------------  Manual tests and experiments  ---------------------------
 

Makefile.macosx

@@ -437,7 +437,7 @@ log2gpx : log2gpx.c
 
 # Test application to generate sound.
 
-gen_packets : gen_packets.c ax25_pad.c hdlc_send.c fcs_calc.c gen_tone.c morse.c textcolor.c dsp.c
+gen_packets : gen_packets.c ax25_pad.c hdlc_send.c fcs_calc.c gen_tone.c morse.c dtmf.c textcolor.c dsp.c
 	$(CC) $(CFLAGS) -o $@ $^ $(LDLIBS) -lm
 
 demod.o      : tune.h

decode_aprs.c

@@ -111,7 +111,7 @@ static void aprs_station_capabilities (decode_aprs_t *A, char *, int);
 static void aprs_status_report (decode_aprs_t *A, char *, int);
 static void aprs_general_query (decode_aprs_t *A, char *, int, int quiet);
 static void aprs_directed_station_query (decode_aprs_t *A, char *addressee, char *query, int quiet);
-static void aprs_telemetry (decode_aprs_t *A, char *, int, int quiet);
+static void aprs_telemetry (decode_aprs_t *A, char *info, int info_len, int quiet);
 static void aprs_raw_touch_tone (decode_aprs_t *A, char *, int);
 static void aprs_morse_code (decode_aprs_t *A, char *, int);
 static void aprs_positionless_weather_report (decode_aprs_t *A, unsigned char *, int);
@@ -3076,7 +3076,7 @@ double get_latitude_8 (char *p, int quiet)
 	  return (G_UNKNOWN);
 	}
 
-	if (plat->minn[0] >= '0' || plat->minn[0] <= '5')
+	if (plat->minn[0] >= '0' && plat->minn[0] <= '5')
 	  result += ((plat->minn[0]) - '0') * (10. / 60.);
 	else if (plat->minn[0] == ' ')
 	  ;
@@ -3239,7 +3239,7 @@ double get_longitude_9 (char *p, int quiet)
 	  return (G_UNKNOWN);
 	}
 
-	if (plon->minn[0] >= '0' || plon->minn[0] <= '5')
+	if (plon->minn[0] >= '0' && plon->minn[0] <= '5')
 	  result += ((plon->minn[0]) - '0') * (10. / 60.);
 	else if (plon->minn[0] == ' ')
 	  ;
@@ -3683,7 +3683,15 @@ static int data_extension_comment (decode_aprs_t *A, char *pdext)
  *
  *------------------------------------------------------------------*/
 
-#define MAX_TOCALLS 150
+// If I was more ambitious, this would dynamically allocate enough
+// storage based on the file contents.  Just stick in a constant for
+// now.  This takes an insignificant amount of space and
+// I don't anticipate tocalls.txt growing that quickly.
+// Version 1.4 - add message if too small instead of silently ignoring the rest.
+
+// Dec. 2016 tocalls.txt has 153 destination addresses.
+
+#define MAX_TOCALLS 200
 
 static struct tocalls_s {
 	unsigned char len;
@@ -3780,7 +3788,7 @@ static void decode_tocall (decode_aprs_t *A, char *dest)
 	        if (strlen(tocalls[num_tocalls].prefix) > 2) {
 	          tocalls[num_tocalls].description = strdup(stuff+14);
 		  tocalls[num_tocalls].len = strlen(tocalls[num_tocalls].prefix);
-	          // dw_printf("debug: %d '%s' -> '%s'\n", tocalls[num_tocalls].len, tocalls[num_tocalls].prefix, tocalls[num_tocalls].description);
+	          // dw_printf("debug %d: %d '%s' -> '%s'\n", num_tocalls, tocalls[num_tocalls].len, tocalls[num_tocalls].prefix, tocalls[num_tocalls].description);
 
 	          num_tocalls++;
 	        }
@@ -3804,11 +3812,15 @@ static void decode_tocall (decode_aprs_t *A, char *dest)
 	        if (strlen(tocalls[num_tocalls].prefix) > 2) {
 	          tocalls[num_tocalls].description = strdup(stuff+14);
 		  tocalls[num_tocalls].len = strlen(tocalls[num_tocalls].prefix);
-	          // dw_printf("debug: %d '%s' -> '%s'\n", tocalls[num_tocalls].len, tocalls[num_tocalls].prefix, tocalls[num_tocalls].description);
+	          // dw_printf("debug %d: %d '%s' -> '%s'\n", num_tocalls, tocalls[num_tocalls].len, tocalls[num_tocalls].prefix, tocalls[num_tocalls].description);
 
 	          num_tocalls++;
 	        }
 	      }
+	      if (num_tocalls == MAX_TOCALLS) {		// oops. might have discarded some.
+	        text_color_set(DW_COLOR_ERROR);
+	        dw_printf("MAX_TOCALLS needs to be larger than %d to handle contents of 'tocalls.txt'.\n", MAX_TOCALLS);
+	      }
 	    }
 	    fclose(fp);
 
@@ -3832,9 +3844,12 @@ static void decode_tocall (decode_aprs_t *A, char *dest)
 	      dw_printf("System types in the destination field will not be decoded.\n");
 	    }
 	  }
-
 
 	  first_time = 0;
+
+	  //for (n=0; n<num_tocalls; n++) {
+	  //  dw_printf("sorted %d: %d '%s' -> '%s'\n", n, tocalls[n].len, tocalls[n].prefix, tocalls[n].description);
+	  //}
 	}
 
 

direwolf.c

@@ -107,6 +107,7 @@
 #include "aprs_tt.h"
 #include "tt_user.h"
 #include "igate.h"
+#include "pfilter.h"
 #include "symbols.h"
 #include "dwgps.h"
 #include "waypoint.h"
@@ -164,6 +165,8 @@ static struct tt_config_s tt_config;
 //struct digi_config_s digi_config;
 //struct cdigi_config_s cdigi_config;
 
+static const int audio_amplitude = 100;	/* % of audio sample range. */
+					/* This translates to +-32k for 16 bit samples. */
 
 static int d_u_opt = 0;			/* "-d u" command line option to print UTF-8 also in hexadecimal. */
 static int d_p_opt = 0;			/* "-d p" option for dumping packets over radio. */				
@@ -254,7 +257,7 @@ int main (int argc, char *argv[])
 	text_color_init(t_opt);
 	text_color_set(DW_COLOR_INFO);
 	//dw_printf ("Dire Wolf version %d.%d (%s) Beta Test\n", MAJOR_VERSION, MINOR_VERSION, __DATE__);
-	dw_printf ("Dire Wolf DEVELOPMENT version %d.%d %s (%s)\n", MAJOR_VERSION, MINOR_VERSION, "D", __DATE__);
+	dw_printf ("Dire Wolf DEVELOPMENT version %d.%d %s (%s)\n", MAJOR_VERSION, MINOR_VERSION, "E", __DATE__);
 	//dw_printf ("Dire Wolf version %d.%d\n", MAJOR_VERSION, MINOR_VERSION);
 
 #if defined(ENABLE_GPSD) || defined(USE_HAMLIB)
@@ -693,7 +696,7 @@ int main (int argc, char *argv[])
 /*
  * Initialize the touch tone decoder & APRStt gateway.
  */
-	dtmf_init (&audio_config);
+	dtmf_init (&audio_config, audio_amplitude);
 	aprs_tt_init (&tt_config);
 	tt_user_init (&audio_config, &tt_config);
 
@@ -702,8 +705,8 @@ int main (int argc, char *argv[])
  * Note:  This is not the same as a volume control you would see on the screen.
  * It is the range of the digital sound representation.
 */
-	gen_tone_init (&audio_config, 100, 0);
-	morse_init (&audio_config, 100);
+	gen_tone_init (&audio_config, audio_amplitude, 0);
+	morse_init (&audio_config, audio_amplitude);
 
 	assert (audio_config.adev[0].bits_per_sample == 8 || audio_config.adev[0].bits_per_sample == 16);
 	assert (audio_config.adev[0].num_channels == 1 || audio_config.adev[0].num_channels == 2);
@@ -746,6 +749,7 @@ int main (int argc, char *argv[])
 	digipeater_init (&audio_config, &digi_config);
 	igate_init (&audio_config, &igate_config, &digi_config, d_i_opt);
 	cdigipeater_init (&audio_config, &cdigi_config);
+	//FIXME//pfilter_init (&igate_config, 0);
 	ax25_link_init (&misc_config);
 
 /*
@@ -1015,16 +1019,21 @@ void app_process_rec_packet (int chan, int subchan, int slice, packet_t pp, alev
 	}
 
 
-/* Decode the contents of APRS frames and display in human-readable form. */
-/* Suppress decoding if "-q d" option used. */
-
+/*
+ * Decode the contents of UI frames and display in human-readable form.
+ * Could be APRS or anything random for old fashioned packet beacons.
+ *
+ * Suppress printed decoding if "-q d" option used.
+ */
 
 	if (ax25_is_aprs(pp)) {
 
 	  decode_aprs_t A;
 
-	  decode_aprs (&A, pp, 0);
+	  // we still want to decode it for logging and other processing.
+	  // Just be quiet about errors if "-qd" is set.
 
+	  decode_aprs (&A, pp, q_d_opt);
 
 	  if ( ! q_d_opt ) {
 
@@ -1046,9 +1055,10 @@ void app_process_rec_packet (int chan, int subchan, int slice, packet_t pp, alev
 	  // temp experiment.
 	  //log_rr_bits (&A, pp);
 
-	  // Add to list of stations heard.
+	  // Add to list of stations heard over the radio.
 
 	  mheard_save (chan, &A, pp, alevel, retries);
+	  //FIXME//mheard_save_rf (chan, &A, pp, alevel, retries);
 
 
 	  // Convert to NMEA waypoint sentence if we have a location.