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

diff --git a/src/drivers/ao_aprs.c b/src/drivers/ao_aprs.c
index d472af4e..679dd7bc 100644
--- a/src/drivers/ao_aprs.c
+++ b/src/drivers/ao_aprs.c
@@ -500,29 +500,55 @@ static int ao_num_sats(void)
     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,
-		       "S: %d 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,
-		       "S: %d", ao_num_sats());
+		       "%c%d",
+		       ao_gps_locked(),
+		       ao_num_sats());
 #endif
 }