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'
[fw/altos]
/
src
/
kernel
/
ao_telemetry.c
diff --git
a/src/kernel/ao_telemetry.c
b/src/kernel/ao_telemetry.c
index 1fd4037f540b8d0d01618b6a22672cd613bb187b..e0f4d8c22aea4f6399cf03c4b46ad3915b63b335 100644
(file)
--- a/
src/kernel/ao_telemetry.c
+++ b/
src/kernel/ao_telemetry.c
@@
-58,7
+58,7
@@
static AO_TICK_TYPE ao_aprs_time;
#define AO_SEND_MEGA 1
#endif
#define AO_SEND_MEGA 1
#endif
-#if defined (TELEMETRUM_V_2_0) || defined (TELEMETRUM_V_3_0)
+#if defined (TELEMETRUM_V_2_0) || defined (TELEMETRUM_V_3_0)
|| defined (TELEMETRUM_V_4_0)
#define AO_SEND_METRUM 1
#endif
#define AO_SEND_METRUM 1
#endif
@@
-490,7
+490,10
@@
ao_set_aprs_time(void)
} else {
delta = second - ao_gps_data.second;
}
} else {
delta = second - ao_gps_data.second;
}
- ao_aprs_time = ao_gps_tick + AO_SEC_TO_TICKS(delta);
+ if (delta < (interval >> 1))
+ delta += interval;
+
+ ao_aprs_time = ao_gps_utc_tick + AO_SEC_TO_TICKS(delta);
} else {
ao_aprs_time += AO_SEC_TO_TICKS(ao_config.aprs_interval);
}
} else {
ao_aprs_time += AO_SEC_TO_TICKS(ao_config.aprs_interval);
}