altos: Report nsat in view in APRS packet

[fw/altos] / src / drivers / ao_aprs.c

diff --git a/src/drivers/ao_aprs.c b/src/drivers/ao_aprs.c
index 56d984375ba82f725875cddd1cc921e74c285aa5..c327c89702e8fc8a34c772a4752830a0c39a8d9f 100644 (file)
--- a/src/drivers/ao_aprs.c
+++ b/src/drivers/ao_aprs.c
@@ -488,9 +488,21 @@ 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 int tncComment(uint8_t *buf)
 {
+#if HAS_ADC
        struct ao_data packet;
        
        ao_arch_critical(ao_data_get(&packet););
@@ -500,28 +512,38 @@ static int tncComment(uint8_t *buf)
        int16_t main = ao_ignite_decivolt(AO_SENSE_MAIN(&packet));
 
        return sprintf((char *) buf,
-                      "B:%d.%d A:%d.%d M:%d.%d",
+                      "S: %d B:%d.%d A:%d.%d M:%d.%d",
+                      ao_num_sats(),
                       battery/10,
                       battery % 10,
                       apogee/10,
                       apogee%10,
                       main/10,
                       main%10);
-}
+#else
+       return sprintf((char *) buf,
+                      "S: %d", ao_num_sats());
 #endif
+}
 
 /**
  *   Generate the plain text position packet.
  */
 static int tncPositionPacket(void)
 {
-    int32_t    latitude = ao_gps_data.latitude;
-    int32_t    longitude = ao_gps_data.longitude;
-    int32_t    altitude = ao_gps_data.altitude;
+    int32_t    latitude = 0;
+    int32_t    longitude = 0;
+    int32_t    altitude = 0;
     uint8_t    *buf;
 
-    if (altitude < 0)
-       altitude = 0;
+    if (ao_gps_data.flags & AO_GPS_VALID) {
+       latitude = ao_gps_data.latitude;
+       longitude = ao_gps_data.longitude;
+       altitude = ao_gps_data.altitude;
+       if (altitude < 0)
+           altitude = 0;
+    }
+
     altitude = (altitude * (int32_t) 10000 + (3048/2)) / (int32_t) 3048;
     
     buf = tncBuffer;
@@ -550,11 +572,7 @@ static int tncPositionPacket(void)
 
     *buf++ = 33 + ((1 << 5) | (2 << 3));
 
-#if HAS_ADC
     buf += tncComment(buf);
-#else
-    *buf = '\0';
-#endif
 
     return buf - tncBuffer;
 }