projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into micropeak-logging
[fw/altos]
/
src
/
core
/
ao_telemetry.c
diff --git
a/src/core/ao_telemetry.c
b/src/core/ao_telemetry.c
index cfc72e048fe4b3c19f4c71fd41184be2dc110dcc..8d440e15410ff4bd7833bcd5da6e1380d8ba46f9 100644
(file)
--- a/
src/core/ao_telemetry.c
+++ b/
src/core/ao_telemetry.c
@@
-299,7
+299,6
@@
ao_telemetry(void)
#endif
while (ao_telemetry_interval) {
#endif
while (ao_telemetry_interval) {
-
#if HAS_APRS
if (!(ao_config.radio_enable & AO_RADIO_DISABLE_TELEMETRY))
#endif
#if HAS_APRS
if (!(ao_config.radio_enable & AO_RADIO_DISABLE_TELEMETRY))
#endif
@@
-343,10
+342,10
@@
ao_telemetry(void)
ao_radio_rdf();
}
#if HAS_APRS
ao_radio_rdf();
}
#if HAS_APRS
- if (
(ao_config.radio_enable & AO_RADIO_ENABLE_APRS)
&&
+ if (
ao_config.aprs_interval != 0
&&
(int16_t) (ao_time() - ao_aprs_time) >= 0)
{
(int16_t) (ao_time() - ao_aprs_time) >= 0)
{
- ao_aprs_time = ao_time() + AO_
APRS_INTERVAL_TICKS
;
+ ao_aprs_time = ao_time() + AO_
SEC_TO_TICKS(ao_config.aprs_interval)
;
ao_aprs_send();
}
#endif
ao_aprs_send();
}
#endif