projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Fix config upgrade from 1.24 to 1.25
[fw/altos]
/
src
/
drivers
/
ao_aprs.c
diff --git
a/src/drivers/ao_aprs.c
b/src/drivers/ao_aprs.c
index 2e977612809ddbe4c41333486e85f25f3aa0f569..826985c6e06e2f0b004a05c36a2b6976cd6a49ba 100644
(file)
--- a/
src/drivers/ao_aprs.c
+++ b/
src/drivers/ao_aprs.c
@@
-234,7
+234,7
@@
static void timeInit()
#define TNC_TX_DELAY 45
/// The size of the TNC output buffer.
#define TNC_TX_DELAY 45
/// The size of the TNC output buffer.
-#define TNC_BUFFER_SIZE 4
0
+#define TNC_BUFFER_SIZE 4
8
/// States that define the current mode of the 1200 bps (A-FSK) state machine.
typedef enum
/// States that define the current mode of the 1200 bps (A-FSK) state machine.
typedef enum
@@
-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 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,
#endif
return sprintf((char *) buf,
@@
-548,8
+548,8
@@
static int tncComment(uint8_t *buf)
apogee%10
#endif
#ifdef AO_SENSE_MAIN
apogee%10
#endif
#ifdef AO_SENSE_MAIN
- , main/10,
- main%10
+ , main
_value
/10,
+ main
_value
%10
#endif
, ao_serial_number
);
#endif
, ao_serial_number
);
@@
-719,7
+719,13
@@
static int tncPositionPacket(void)
buf = tncBuffer;
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) {
switch (ao_config.aprs_format) {
+#endif
case AO_APRS_FORMAT_COMPRESSED:
default:
{
case AO_APRS_FORMAT_COMPRESSED:
default:
{
@@
-798,10
+804,10
@@
static int tncPositionPacket(void)
/* Convert from meters to feet */
alt = (alt * 328 + 50) / 100;
/* 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=%06
l
u ",
lat_deg, lat_min, lat_frac, lat_sign,
lon_deg, lon_min, lon_frac, lon_sign,
lat_deg, lat_min, lat_frac, lat_sign,
lon_deg, lon_min, lon_frac, lon_sign,
- alt);
+
(long)
alt);
break;
}
}
break;
}
}