Fix ttgrid corner and various cleanups.

Author: wb2osz

src/aprs_tt.c

@@ -1283,13 +1283,26 @@ static int parse_location (char *e)
 
 	      lat0 = tt_config.ttloc_ptr[ipat].grid.lat0;
 	      lat9 = tt_config.ttloc_ptr[ipat].grid.lat9;
+	      double yrange = lat9 - lat0;
 	      y = atof(ystr);
-	      m_latitude = lat0 + y * (lat9-lat0) / (pow(10., strlen(ystr)) - 1.);
-
+	      double user_y_max = round(pow(10., strlen(ystr)) - 1.);	// e.g. 999 for 3 digits
+	      m_latitude = lat0 + yrange * y / user_y_max;
+#if 0
+	      dw_printf ("TTLOC_GRID LAT min=%f, max=%f, range=%f\n", lat0, lat9, yrange);
+	      dw_printf ("TTLOC_GRID LAT user_y=%f, user_y_max=%f\n", y, user_y_max);
+	      dw_printf ("TTLOC_GRID LAT min + yrange * user_y / user_y_range = %f\n", m_latitude);
+#endif
 	      lon0 = tt_config.ttloc_ptr[ipat].grid.lon0;
 	      lon9 = tt_config.ttloc_ptr[ipat].grid.lon9;
+	      double xrange = lon9 - lon0;
 	      x = atof(xstr);
-	      m_longitude = lon0 + x * (lon9-lon0) / (pow(10., strlen(xstr)) - 1.);
+	      double user_x_max = round(pow(10., strlen(xstr)) - 1.);
+	      m_longitude = lon0 + xrange * x / user_x_max;
+#if 0
+	      dw_printf ("TTLOC_GRID LON min=%f, max=%f, range=%f\n", lon0, lon9, xrange);
+	      dw_printf ("TTLOC_GRID LON user_x=%f, user_x_max=%f\n", x, user_x_max);
+	      dw_printf ("TTLOC_GRID LON min + xrange * user_x / user_x_range = %f\n", m_longitude);
+#endif
 
 	      m_dao[2] = e[0];
 	      m_dao[3] = e[1];
@@ -1972,6 +1985,7 @@ static const struct {
 													/* Latitude comes out ok, 37.9137 -> 55.82 min. */
 													/* Longitude -81.1254 -> 8.20 min */
 	{ "B21234*A67979#",	"679",    "12", "7A", "", "", "12.3400", "56.1200", "!TB2!" },
+
 	{ "B533686*A67979#",	"679",    "12", "7A", "", "", "37.9222", "81.1143", "!TB5!" },
 
 // TODO: should test other coordinate systems.

src/atest.c

@@ -886,7 +886,7 @@ void dlq_rec_frame (int chan, int subchan, int slice, packet_t pp, alevel_t alev
 
 	  decode_aprs_t A;
 
-	  decode_aprs (&A, pp, 0);
+	  decode_aprs (&A, pp, 0, 0);
 
 	  // Temp experiment to see how different systems set the RR bits in the source and destination.
 	  // log_rr_bits (&A, pp);

src/ax25_pad.c

@@ -350,8 +350,9 @@ void ax25_delete (packet_t this_p)
  *		strict	- True to enforce rules for packets sent over the air.
  *			  False to be more lenient for packets from IGate server.
  *
- *			  Messages from an IGate server can have longer 
- *		 	  addresses after qAC.  Up to 9 observed so far. 
+ *			  Packets from an IGate server can have longer
+ *		 	  addresses after qAC.  Up to 9 observed so far.
+ *			  The SSID can be 2 alphanumeric characters, not just 1 to 15.
  *
  *			  We can just truncate the name because we will only
  *			  end up discarding it.    TODO:  check on this.
@@ -740,6 +741,7 @@ packet_t ax25_dup (packet_t copy_from)
  *				  alphanumeric characters for the SSID.
  *				  We also get messages like this from a server.
  *					KB1POR>APU25N,TCPIP*,qAC,T2NUENGLD:...
+ *					K1BOS-B>APOSB,TCPIP,WR2X-2*:...
  *
  *				  2 (extra true) will complain if * is found at end.
  *
@@ -1983,6 +1985,7 @@ void ax25_format_addrs (packet_t this_p, char *result)
 	}
 
 	ax25_get_addr_with_ssid (this_p, AX25_SOURCE, stemp);
+	// FIXME:  For ALL strcat: Pass in sizeof result and use strlcat.
 	strcat (result, stemp);
 	strcat (result, ">");
 

src/config.c

@@ -2397,10 +2397,9 @@ void config_init (char *fname, struct audio_s *p_audio_config,
  */
 
 /*
- * DIGIPEAT  from-chan  to-chan  alias-pattern  wide-pattern  [ OFF|DROP|MARK|TRACE | NOID=alias ]
+ * DIGIPEAT  from-chan  to-chan  alias-pattern  wide-pattern  [ OFF|DROP|MARK|TRACE | ATGP=alias ]
  *
- * NOID is an ugly hack for the specific need of ATGP which needs more that 8 digipeaters.
- * The via path starts out as HOP7-7,HOP7-7 and we do not want tracing so it does not fill up.
+ * ATGP is an ugly hack for the specific need of ATGP which needs more that 8 digipeaters.
  * DO NOT put this in the User Guide.  On a need to know basis.
  */
 
@@ -2527,8 +2526,8 @@ void config_init (char *fname, struct audio_s *p_audio_config,
 	        p_digi_config->preempt[from_chan][to_chan] = PREEMPT_TRACE;
 	        t = split(NULL,0);
 	      }
-	      else if (strncasecmp(t, "NOID=", 5) == 0) {
-	        strlcpy (p_digi_config->noid[from_chan][to_chan], t+5, sizeof(p_digi_config->noid[from_chan][to_chan]));;
+	      else if (strncasecmp(t, "ATGP=", 5) == 0) {
+	        strlcpy (p_digi_config->atgp[from_chan][to_chan], t+5, sizeof(p_digi_config->atgp[from_chan][to_chan]));;
 	        t = split(NULL,0);
 	      }
 	    }
@@ -3221,7 +3220,7 @@ void config_init (char *fname, struct audio_s *p_audio_config,
 	    t = split(NULL,0);
 	    if (t == NULL) {
 	      text_color_set(DW_COLOR_ERROR);
-	      dw_printf ("Line %d: Missing latitude for TTGRID command.\n", line);
+	      dw_printf ("Line %d: Missing minimum latitude for TTGRID command.\n", line);
 	      continue;
 	    }
 	    tl->grid.lat0 = parse_ll(t,LAT,line);
@@ -3231,7 +3230,7 @@ void config_init (char *fname, struct audio_s *p_audio_config,
 	    t = split(NULL,0);
 	    if (t == NULL) {
 	      text_color_set(DW_COLOR_ERROR);
-	      dw_printf ("Line %d: Missing longitude for TTGRID command.\n", line);
+	      dw_printf ("Line %d: Missing minimum longitude for TTGRID command.\n", line);
 	      continue;
 	    }
 	    tl->grid.lon0 = parse_ll(t,LON,line);
@@ -3241,7 +3240,7 @@ void config_init (char *fname, struct audio_s *p_audio_config,
 	    t = split(NULL,0);
 	    if (t == NULL) {
 	      text_color_set(DW_COLOR_ERROR);
-	      dw_printf ("Line %d: Missing latitude for TTGRID command.\n", line);
+	      dw_printf ("Line %d: Missing maximum latitude for TTGRID command.\n", line);
 	      continue;
 	    }
 	    tl->grid.lat9 = parse_ll(t,LAT,line);
@@ -3251,13 +3250,16 @@ void config_init (char *fname, struct audio_s *p_audio_config,
 	    t = split(NULL,0);
 	    if (t == NULL) {
 	      text_color_set(DW_COLOR_ERROR);
-	      dw_printf ("Line %d: Missing longitude for TTGRID command.\n", line);
+	      dw_printf ("Line %d: Missing maximum longitude for TTGRID command.\n", line);
 	      continue;
 	    }
-	    tl->grid.lon0 = parse_ll(t,LON,line);
+	    tl->grid.lon9 = parse_ll(t,LON,line);
 
 	    /* temp debugging */
 
+	    // dw_printf ("CONFIG TTGRID min %f %f\n", tl->grid.lat0, tl->grid.lon0);
+	    // dw_printf ("CONFIG TTGRID max %f %f\n", tl->grid.lat9, tl->grid.lon9);
+
 	    //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);