Fix bug: "INTERNAL ERROR: dlq_append NULL packet pointer." when using PASSALL.

Added APRStt position ambiguity option.

Author: wb2osz

CHANGES.md

@@ -3,12 +3,16 @@
 
 ----------
 
-## Version 1.3  -- Development snapshot H  --  November 2015 ##
+## Version 1.3  -- Development snapshot H  --  December 2015 ##
 
 ### New Feature: ###
 
 - New experimental demodulator.  More details later.
 
+### Bugs Fixed: ###
+
+- "INTERNAL ERROR: dlq_append NULL packet pointer." when using PASSALL.
+
 
 ----------
 

aprs_tt.c

@@ -1,4 +1,3 @@
-
 //
 //    This file is part of Dire Wolf, an amateur radio packet TNC.
 //
@@ -322,6 +321,7 @@ static char m_symbol_code;		// Default 'A'
 static char m_loc_text[24];
 static double m_longitude;		// Set to G_UNKNOWN if not defined.
 static double m_latitude;		// Set to G_UNKNOWN if not defined.
+static int m_ambiguity;
 static char m_comment[200];
 static char m_freq[12];
 static char m_mic_e;
@@ -354,8 +354,9 @@ void aprs_tt_sequence (int chan, char *msg)
 	m_symtab_or_overlay = '\\';
 	m_symbol_code = 'A';
 	strlcpy (m_loc_text, "", sizeof(m_loc_text));
-	m_longitude = G_UNKNOWN; 
-	m_latitude = G_UNKNOWN; 
+	m_longitude = G_UNKNOWN;
+	m_latitude = G_UNKNOWN;
+	m_ambiguity = 0;
 	strlcpy (m_comment, "", sizeof(m_comment));
 	strlcpy (m_freq, "", sizeof(m_freq));
 	m_mic_e = ' ';
@@ -384,7 +385,7 @@ void aprs_tt_sequence (int chan, char *msg)
 	if (err == 0) {
 
 	  err = tt_user_heard (m_callsign, m_ssid, m_symtab_or_overlay, m_symbol_code, 
-		m_loc_text, m_latitude, m_longitude,
+		m_loc_text, m_latitude, m_longitude, m_ambiguity,
 		m_freq, m_comment, m_mic_e, m_dao);
 	}
 
@@ -1254,6 +1255,18 @@ static int parse_location (char *e)
 	      }
 	      break;
 
+	    case TTLOC_AMBIG:
+
+	      if (strlen(xstr) != 1) {
+	        text_color_set(DW_COLOR_ERROR);
+	        dw_printf ("Expected 1 digits for the position ambiguity.\n");
+	        return (TT_ERROR_INVALID_LOC);
+	      }
+
+	      m_ambiguity = atoi(xstr);
+
+	      break;
+
 
 	    default:
 	      assert (0);
@@ -1451,6 +1464,8 @@ static int find_ttloc_match (char *e, char *xstr, char *ystr, char *zstr, char *
  *
  *		Cttt...tttt	- General comment in Multi-press encoding.
  *
+ *		CAttt...tttt	- New enhanced comment format that can handle all ASCII characters.
+ *
  *----------------------------------------------------------------*/
 
 static int parse_comment (char *e)
@@ -1461,6 +1476,11 @@ static int parse_comment (char *e)
 
 	len = strlen(e);
 
+	if (e[1] == 'A') {
+	  tt_ascii2d_to_text (e+2, 0, m_comment);
+	  return (0);
+	}
+
 	if (len == 2 && isdigit(e[1])) {
 	  m_mic_e = e[1];
 	  return (0);

aprs_tt.h

@@ -14,7 +14,7 @@
  */
 
 struct ttloc_s {
-	enum { TTLOC_POINT, TTLOC_VECTOR, TTLOC_GRID, TTLOC_UTM, TTLOC_MGRS, TTLOC_USNG, TTLOC_MACRO, TTLOC_MHEAD, TTLOC_SATSQ } type;
+	enum { TTLOC_POINT, TTLOC_VECTOR, TTLOC_GRID, TTLOC_UTM, TTLOC_MGRS, TTLOC_USNG, TTLOC_MACRO, TTLOC_MHEAD, TTLOC_SATSQ, TTLOC_AMBIG } type;
 
 	char pattern[20];	/* e.g. B998, B5bbbdddd, B2xxyy, Byyyxxx, BAxxxx */
 				/* For macros, it should be all fixed digits, */
@@ -61,6 +61,7 @@ struct ttloc_s {
 	  struct {
 	    char *definition;
 	  } macro;
+
 	};
 };
 

beacon.c

@@ -751,7 +751,7 @@ static void beacon_send (int j, dwgps_info_t *gpsinfo)
 		case BEACON_POSITION:
 
 		  encode_position (g_misc_config_p->beacon[j].messaging, g_misc_config_p->beacon[j].compress,
-			g_misc_config_p->beacon[j].lat, g_misc_config_p->beacon[j].lon,
+			g_misc_config_p->beacon[j].lat, g_misc_config_p->beacon[j].lon, 0,
 			(int)roundf(DW_METERS_TO_FEET(g_misc_config_p->beacon[j].alt_m)),
 			g_misc_config_p->beacon[j].symtab, g_misc_config_p->beacon[j].symbol, 
 			g_misc_config_p->beacon[j].power, g_misc_config_p->beacon[j].height, g_misc_config_p->beacon[j].gain, g_misc_config_p->beacon[j].dir,
@@ -764,7 +764,7 @@ static void beacon_send (int j, dwgps_info_t *gpsinfo)
 
 		case BEACON_OBJECT:
 
-		  encode_object (g_misc_config_p->beacon[j].objname, g_misc_config_p->beacon[j].compress, 0, g_misc_config_p->beacon[j].lat, g_misc_config_p->beacon[j].lon, 
+		  encode_object (g_misc_config_p->beacon[j].objname, g_misc_config_p->beacon[j].compress, 0, g_misc_config_p->beacon[j].lat, g_misc_config_p->beacon[j].lon, 0,
 			g_misc_config_p->beacon[j].symtab, g_misc_config_p->beacon[j].symbol, 
 			g_misc_config_p->beacon[j].power, g_misc_config_p->beacon[j].height, g_misc_config_p->beacon[j].gain, g_misc_config_p->beacon[j].dir,
 			G_UNKNOWN, G_UNKNOWN, /* course, speed */
@@ -795,7 +795,7 @@ static void beacon_send (int j, dwgps_info_t *gpsinfo)
 	            }
 
 		    encode_position (g_misc_config_p->beacon[j].messaging, g_misc_config_p->beacon[j].compress, 
-			gpsinfo->dlat, gpsinfo->dlon, my_alt_ft,
+			gpsinfo->dlat, gpsinfo->dlon, 0, my_alt_ft,
 			g_misc_config_p->beacon[j].symtab, g_misc_config_p->beacon[j].symbol, 
 			g_misc_config_p->beacon[j].power, g_misc_config_p->beacon[j].height, g_misc_config_p->beacon[j].gain, g_misc_config_p->beacon[j].dir,
 			coarse, (int)roundf(gpsinfo->speed_knots),

config.c

@@ -1428,6 +1428,11 @@ void config_init (char *fname, struct audio_s *p_audio_config,
 	      }
 	      else if (strcasecmp(t, "PASSALL") == 0) {
 	        p_audio_config->achan[channel].passall = 1;
+	        text_color_set(DW_COLOR_ERROR);
+                dw_printf ("Line %d: There is an old saying, \"Be careful what you ask for because you might get it.\"\n", line);
+                dw_printf ("The PASSALL option means allow all frames even when they are invalid.\n");
+                dw_printf ("You are asking to receive random trash and you WILL get your wish.\n");
+                dw_printf ("Don't complain when you see all sorts of random garbage.  That's what you asked for.\n");
 	      }
 	      else {
 	        text_color_set(DW_COLOR_ERROR);
@@ -2823,6 +2828,81 @@ void config_init (char *fname, struct audio_s *p_audio_config,
 	    //}
 	  }
 
+/*
+ * TTAMBIG 		- Define pattern to be used for Object Location Ambiguity.
+ *
+ * TTAMBIG   pattern
+ *
+ *			Pattern would be  B[0-9A-D]x
+ *
+ *			Must have exactly one x.
+ */
+
+	  else if (strcasecmp(t, "TTAMBIG") == 0) {
+
+// TODO1.3:  TTAMBIG To be continued...
+
+	    struct ttloc_s *tl;
+	    int j;
+
+	    assert (p_tt_config->ttloc_size >= 2);
+	    assert (p_tt_config->ttloc_len >= 0 && p_tt_config->ttloc_len <= p_tt_config->ttloc_size);
+
+	    /* Allocate new space, but first, if already full, make larger. */
+	    if (p_tt_config->ttloc_len == p_tt_config->ttloc_size) {
+	      p_tt_config->ttloc_size += p_tt_config->ttloc_size / 2;
+	      p_tt_config->ttloc_ptr = realloc (p_tt_config->ttloc_ptr, sizeof(struct ttloc_s) * p_tt_config->ttloc_size);
+	    }
+	    p_tt_config->ttloc_len++;
+	    assert (p_tt_config->ttloc_len > 0 && p_tt_config->ttloc_len <= p_tt_config->ttloc_size);
+
+	    tl = &(p_tt_config->ttloc_ptr[p_tt_config->ttloc_len-1]);
+	    tl->type = TTLOC_AMBIG;
+	    strlcpy(tl->pattern, "", sizeof(tl->pattern));
+
+	    /* Pattern: B, optional additional button, exactly x for matching */
+
+	    t = split(NULL,0);
+	    if (t == NULL) {
+	      text_color_set(DW_COLOR_ERROR);
+	      dw_printf ("Line %d: Missing pattern for TTAMBIG command.\n", line);
+	      p_tt_config->ttloc_len--;
+	      continue;
+	    }
+	    strlcpy (tl->pattern, t, sizeof(tl->pattern));
+
+	    if (t[0] != 'B') {
+	      text_color_set(DW_COLOR_ERROR);
+	      dw_printf ("Line %d: TTAMBIG pattern must begin with upper case 'B'.\n", line);
+	      p_tt_config->ttloc_len--;
+	      continue;
+	    }
+
+	    /* Optionally one of 0-9ABCD */
+
+	    if (strchr("ABCD", t[1]) != NULL || isdigit(t[1])) {
+	      j = 2;
+	    }
+	    else {
+	      j = 1;
+	    }
+
+	    if (strcmp(t+j, "x") != 0) {
+	      text_color_set(DW_COLOR_ERROR);
+	      dw_printf ("Line %d: TTAMBIG pattern must end with exactly one x in lower case.\n", line);
+	      p_tt_config->ttloc_len--;
+	      continue;
+	    }
+
+	    /* temp debugging */
+
+	    //for (j=0; j<p_tt_config->ttloc_len; j++) {
+	    //  dw_printf ("debug ttloc %d/%d %s\n", j, p_tt_config->ttloc_size,
+	    //		p_tt_config->ttloc_ptr[j].pattern);
+	    //}
+	  }
+
+
 /*
  * TTMACRO 		- Define compact message format with full expansion
  *
@@ -3034,6 +3114,37 @@ void config_init (char *fname, struct audio_s *p_audio_config,
 	        }
 	      }
 
+	      else if (strncmp(pi, "CA{", 3) == 0) {
+
+		// Convert to enhanced comment that can contain any ASCII character.
+
+	        pi += 3;
+	        ps = stemp;
+	        while (*pi != '}' && *pi != '*' && *pi != '\0') {
+	          *ps++ = *pi++;
+	        }
+	        if (*pi == '}') {
+	          *ps = '\0';
+	          if (tt_text_to_ascii2d (stemp, 0, ttemp) == 0) {
+	            //text_color_set(DW_COLOR_DEBUG);
+	            //dw_printf ("DEBUG Line %d: CA{%s} -> CA%s\n", line, stemp, ttemp);
+	            strlcat (otemp, "CA", sizeof(otemp));
+	            strlcat (otemp, ttemp, sizeof(otemp));
+	          }
+	          else {
+	            text_color_set(DW_COLOR_ERROR);
+	            dw_printf ("Line %d: CA{%s} could not be converted to tones for enhanced comment.\n", line, stemp);
+		    tt_error++;
+	          }
+	        }
+	        else {
+	          text_color_set(DW_COLOR_ERROR);
+	          dw_printf ("Line %d: CA{... is missing matching } in TTMACRO definition.\n", line);
+		  tt_error++;
+	        }
+	      }
+
+
 	      else if (strchr("0123456789ABCD*#xyz", *pi) != NULL) {
 	        t2[0] = *pi;
 	        strlcat (otemp, t2, sizeof(otemp));

dlq.c

@@ -254,7 +254,7 @@ void dlq_append (dlq_type_t type, int chan, int subchan, int slice, packet_t pp,
 	assert (chan >= 0 && chan < MAX_CHANS);
 
 	if (pp == NULL) {
-	  text_color_set(DW_COLOR_DEBUG);
+	  text_color_set(DW_COLOR_ERROR);
 	  dw_printf ("INTERNAL ERROR:  dlq_append NULL packet pointer. Please report this!\n");
 	  return;
 	}