drivers: Use 'main_value' instead of 'main'

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

diff --git a/src/drivers/ao_aprs.c b/src/drivers/ao_aprs.c
index 2e977612809ddbe4c41333486e85f25f3aa0f569..bc5c29dfc85634d9f5a4905ead05b55308583293 100644 (file)
--- a/src/drivers/ao_aprs.c
+++ b/src/drivers/ao_aprs.c
@@ -527,7 +527,7 @@ static int tncComment(uint8_t *buf)
        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));
+       int16_t main_value = ao_ignite_decivolt(AO_SENSE_MAIN(&packet));
 #endif
 
        return sprintf((char *) buf,
@@ -548,8 +548,8 @@ static int tncComment(uint8_t *buf)
                       apogee%10
 #endif
 #ifdef AO_SENSE_MAIN
-                      , main/10,
-                      main%10
+                      , main_value/10,
+                      main_value%10
 #endif
                       , ao_serial_number
                );
@@ -719,7 +719,13 @@ static int tncPositionPacket(void)
 
     buf = tncBuffer;
 
+#ifdef AO_APRS_TEST
+#define AO_APRS_FORMAT_COMPRESSED      0
+#define AO_APRS_FORMAT_UNCOMPRESSED    1
+    switch (AO_APRS_FORMAT_COMPRESSED) {
+#else
     switch (ao_config.aprs_format) {
+#endif
     case AO_APRS_FORMAT_COMPRESSED:
     default:
     {
@@ -798,10 +804,10 @@ static int tncPositionPacket(void)
            /* Convert from meters to feet */
            alt = (alt * 328 + 50) / 100;
 
-           buf += sprintf((char *) tncBuffer, "!%02u%02u.%02u%c/%03u%02u.%02u%c'/A=%06u ",
+           buf += sprintf((char *) tncBuffer, "!%02u%02u.%02u%c/%03u%02u.%02u%c'/A=%06lu ",
                           lat_deg, lat_min, lat_frac, lat_sign,
                           lon_deg, lon_min, lon_frac, lon_sign,
-                          alt);
+                          (long) alt);
            break;
     }
     }