X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_aprs.c;h=0a6c72ce9e2a1af03fd81f131982bf660e6e78fb;hb=7b275ddfe20f54857d7d1abb98607c406b678090;hp=c327c89702e8fc8a34c772a4752830a0c39a8d9f;hpb=6367ab2dec718c512073f70dfab86dbd1656b1fe;p=fw%2Faltos

diff --git a/src/drivers/ao_aprs.c b/src/drivers/ao_aprs.c
index c327c897..0a6c72ce 100644
--- a/src/drivers/ao_aprs.c
+++ b/src/drivers/ao_aprs.c
@@ -500,6 +500,14 @@ 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
@@ -512,7 +520,8 @@ static int tncComment(uint8_t *buf)
 	int16_t main = ao_ignite_decivolt(AO_SENSE_MAIN(&packet));
 
 	return sprintf((char *) buf,
-		       "S: %d B:%d.%d A:%d.%d M:%d.%d",
+		       "%c%d B%d.%d A%d.%d M%d.%d",
+		       ao_gps_locked(),
 		       ao_num_sats(),
 		       battery/10,
 		       battery % 10,
@@ -522,7 +531,9 @@ static int tncComment(uint8_t *buf)
 		       main%10);
 #else
 	return sprintf((char *) buf,
-		       "S: %d", ao_num_sats());
+		       "%c%d",
+		       ao_gps_locked(),
+		       ao_num_sats());
 #endif
 }
 
@@ -531,9 +542,10 @@ static int tncComment(uint8_t *buf)
  */
 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) {
@@ -544,30 +556,29 @@ 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));