X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fdrivers%2Fao_aprs.c;h=679dd7bc1e5e9a2a42920d2c42e5f63db9cfade3;hp=25a651ca3a836ac4eb9593606a84ced0be9856a6;hb=cb228304d8df3063914ab505a530d4ea79ca027d;hpb=4a5b3837b460d1b6fcea99312728114c4734495a

diff --git a/src/drivers/ao_aprs.c b/src/drivers/ao_aprs.c
index 25a651ca..679dd7bc 100644
--- a/src/drivers/ao_aprs.c
+++ b/src/drivers/ao_aprs.c
@@ -488,36 +488,79 @@ static void tncCompressInt(uint8_t *dest, int32_t value, int len) {
 	}
 }
 
-#if HAS_ADC
+static int ao_num_sats(void)
+{
+    int i;
+    int n = 0;
+
+    for (i = 0; i < ao_gps_tracking_data.channels; i++) {
+	if (ao_gps_tracking_data.sats[i].svid)
+	    n++;
+    }
+    return n;
+}
+
+static char ao_gps_locked(void)
+{
+    if (ao_gps_data.flags & AO_GPS_VALID)
+	return 'L';
+    else
+	return 'U';
+}
+
 static int tncComment(uint8_t *buf)
 {
+#if HAS_ADC
 	struct ao_data packet;
-	
+
 	ao_arch_critical(ao_data_get(&packet););
 
 	int16_t battery = ao_battery_decivolt(packet.adc.v_batt);
+#ifdef AO_SENSE_DROGUE
 	int16_t apogee = ao_ignite_decivolt(AO_SENSE_DROGUE(&packet));
+#endif
+#ifdef AO_SENSE_MAIN
 	int16_t main = ao_ignite_decivolt(AO_SENSE_MAIN(&packet));
+#endif
 
 	return sprintf((char *) buf,
-		       "B:%d.%d A:%d.%d M:%d.%d",
+		       "%c%d B%d.%d"
+#ifdef AO_SENSE_DROGUE
+		       " A%d.%d"
+#endif
+#ifdef AO_SENSE_MAIN
+		       " M%d.%d"
+#endif
+		       , ao_gps_locked(),
+		       ao_num_sats(),
 		       battery/10,
-		       battery % 10,
-		       apogee/10,
-		       apogee%10,
-		       main/10,
-		       main%10);
-}
+		       battery % 10
+#ifdef AO_SENSE_DROGUE
+		       , apogee/10,
+		       apogee%10
 #endif
+#ifdef AO_SENSE_MAIN
+		       , main/10,
+		       main%10
+#endif
+		);
+#else
+	return sprintf((char *) buf,
+		       "%c%d",
+		       ao_gps_locked(),
+		       ao_num_sats());
+#endif
+}
 
 /**
  *   Generate the plain text position packet.
  */
 static int tncPositionPacket(void)
 {
-    int32_t	latitude = 0;
-    int32_t	longitude = 0;
-    int32_t	altitude = 0;
+    static int32_t	latitude;
+    static int32_t	longitude;
+    static int32_t	altitude;
+    int32_t		lat, lon, alt;
     uint8_t	*buf;
 
     if (ao_gps_data.flags & AO_GPS_VALID) {
@@ -528,39 +571,34 @@ static int tncPositionPacket(void)
 	    altitude = 0;
     }
 
-    altitude = (altitude * (int32_t) 10000 + (3048/2)) / (int32_t) 3048;
-    
     buf = tncBuffer;
     *buf++ = '!';
 
     /* Symbol table ID */
     *buf++ = '/';
 
-    latitude = ((uint64_t) 380926 * (900000000 - latitude)) / 10000000;
-    longitude = ((uint64_t) 190463 * (1800000000 + longitude)) / 10000000;
+    lat = ((uint64_t) 380926 * (900000000 - latitude)) / 10000000;
+    lon = ((uint64_t) 190463 * (1800000000 + longitude)) / 10000000;
 
 #define ALTITUDE_LOG_BASE	0.001998002662673f	/* log(1.002) */
 
-    altitude = logf((float) altitude) * (1/ALTITUDE_LOG_BASE);
+    alt = (altitude * (int32_t) 10000 + (3048/2)) / (int32_t) 3048;
+    alt = logf((float) altitude) * (1/ALTITUDE_LOG_BASE);
 
-    tncCompressInt(buf, latitude, 4);
+    tncCompressInt(buf, lat, 4);
     buf += 4;
-    tncCompressInt(buf, longitude, 4);
+    tncCompressInt(buf, lon, 4);
     buf += 4;
 
     /* Symbol code */
     *buf++ = '\'';
 
-    tncCompressInt(buf, altitude, 2);
+    tncCompressInt(buf, alt, 2);
     buf += 2;
 
     *buf++ = 33 + ((1 << 5) | (2 << 3));
 
-#if HAS_ADC
     buf += tncComment(buf);
-#else
-    *buf = '\0';
-#endif
 
     return buf - tncBuffer;
 }