X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fdrivers%2Fao_aprs.c;h=56d984375ba82f725875cddd1cc921e74c285aa5;hp=96e90f0027f080faa4015d660bcdaab7ecaa85de;hb=c743eaa060080a7bd236466b93cff3abc96f405b;hpb=cc06242e882cba462791962c199b7c89e79adc65

diff --git a/src/drivers/ao_aprs.c b/src/drivers/ao_aprs.c
index 96e90f00..56d98437 100644
--- a/src/drivers/ao_aprs.c
+++ b/src/drivers/ao_aprs.c
@@ -488,6 +488,28 @@ static void tncCompressInt(uint8_t *dest, int32_t value, int len) {
 	}
 }
 
+#if HAS_ADC
+static int tncComment(uint8_t *buf)
+{
+	struct ao_data packet;
+	
+	ao_arch_critical(ao_data_get(&packet););
+
+	int16_t battery = ao_battery_decivolt(packet.adc.v_batt);
+	int16_t apogee = ao_ignite_decivolt(AO_SENSE_DROGUE(&packet));
+	int16_t main = ao_ignite_decivolt(AO_SENSE_MAIN(&packet));
+
+	return sprintf((char *) buf,
+		       "B:%d.%d A:%d.%d M:%d.%d",
+		       battery/10,
+		       battery % 10,
+		       apogee/10,
+		       apogee%10,
+		       main/10,
+		       main%10);
+}
+#endif
+
 /**
  *   Generate the plain text position packet.
  */
@@ -502,72 +524,8 @@ static int tncPositionPacket(void)
 	altitude = 0;
     altitude = (altitude * (int32_t) 10000 + (3048/2)) / (int32_t) 3048;
     
-#if 0
-    char	lat_sign = 'N', lon_sign = 'E';
-    uint16_t	lat_deg;
-    uint16_t	lon_deg;
-    uint16_t	lat_min;
-    uint16_t	lat_frac;
-    uint16_t	lon_min;
-    uint16_t	lon_frac;
-
-    if (latitude < 0) {
-	lat_sign = 'S';
-	latitude = -latitude;
-    }
-
-    if (longitude < 0) {
-	lon_sign = 'W';
-	longitude = -longitude;
-    }
-
-    /* Round latitude and longitude by 0.005 minutes */
-    latitude = latitude + 833;
-    if (latitude > 900000000)
-	latitude = 900000000;
-    longitude = longitude + 833;
-    if (longitude > 1800000000)
-	    longitude = 1800000000;
-
-    lat_deg = latitude / 10000000;
-    latitude -= lat_deg * 10000000;
-    latitude *= 60;
-    lat_min = latitude / 10000000;
-    latitude -= lat_min * 10000000;
-    lat_frac = latitude / 100000;
-
-    lon_deg = longitude / 10000000;
-    longitude -= lon_deg * 10000000;
-    longitude *= 60;
-    lon_min = longitude / 10000000;
-    longitude -= lon_min * 10000000;
-    lon_frac = longitude / 100000;
-
-#if 0
-    return sprintf ((char *) tncBuffer, "=%02u%02u.%02u%c\\%03u%02u.%02u%cO /A=%06u\015",
-		    lat_deg, lat_min, lat_frac, lat_sign,
-		    lon_deg, lon_min, lon_frac, lon_sign,
-		    altitude);
-#endif
-
-    return sprintf ((char *) tncBuffer, "/%02u%02u%02uh%02u%02u.%02u%c/%03u%02u.%02u%c'/A=%06u\015",
-		    ao_gps_data.hour,
-		    ao_gps_data.minute,
-		    ao_gps_data.second,
-		    lat_deg, lat_min, lat_frac, lat_sign,
-		    lon_deg, lon_min, lon_frac, lon_sign,
-		    altitude);
-#endif
     buf = tncBuffer;
-#if APRS_TIME
-    sprintf ((char *) buf, "/%02u%02u%02uh",
-	     ao_gps_data.hour,
-	     ao_gps_data.minute,
-	     ao_gps_data.second);
-    buf += 8;
-#else
     *buf++ = '!';
-#endif
 
     /* Symbol table ID */
     *buf++ = '/';
@@ -591,7 +549,13 @@ static int tncPositionPacket(void)
     buf += 2;
 
     *buf++ = 33 + ((1 << 5) | (2 << 3));
-    *buf++ = '\0';
+
+#if HAS_ADC
+    buf += tncComment(buf);
+#else
+    *buf = '\0';
+#endif
+
     return buf - tncBuffer;
 }