projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Mark GPS telemetry packets with GPS time stamp
[fw/altos]
/
src
/
core
/
ao_telemetry.c
diff --git
a/src/core/ao_telemetry.c
b/src/core/ao_telemetry.c
index 79d1bb814f7b2ad87da0414bce50fb9841b05177..c3bbfec5aa7d40468f903ab53919985979020636 100644
(file)
--- a/
src/core/ao_telemetry.c
+++ b/
src/core/ao_telemetry.c
@@
-16,6
+16,7
@@
*/
#include "ao.h"
*/
#include "ao.h"
+#include "ao_log.h"
#include "ao_product.h"
static __pdata uint16_t ao_telemetry_interval;
#include "ao_product.h"
static __pdata uint16_t ao_telemetry_interval;
@@
-28,7
+29,7
@@
static __pdata uint16_t ao_aprs_time;
#include <ao_aprs.h>
#endif
#include <ao_aprs.h>
#endif
-#if defined(
MEGAMETRUM
)
+#if defined(
TELEMEGA
)
#define AO_SEND_MEGA 1
#endif
#define AO_SEND_MEGA 1
#endif
@@
-229,6
+230,7
@@
ao_send_location(void)
ao_xmemcpy(&telemetry.location.flags,
&ao_gps_data.flags,
26);
ao_xmemcpy(&telemetry.location.flags,
&ao_gps_data.flags,
26);
+ telemetry.location.tick = ao_gps_tick;
ao_mutex_put(&ao_gps_mutex);
ao_radio_send(&telemetry, sizeof (telemetry));
ao_telemetry_loc_cur = ao_telemetry_config_max;
ao_mutex_put(&ao_gps_mutex);
ao_radio_send(&telemetry, sizeof (telemetry));
ao_telemetry_loc_cur = ao_telemetry_config_max;
@@
-299,28
+301,37
@@
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
+ {
#ifdef AO_SEND_ALL_BARO
#ifdef AO_SEND_ALL_BARO
- ao_send_baro();
+
ao_send_baro();
#endif
#endif
+#if HAS_FLIGHT
#ifdef AO_SEND_MEGA
#ifdef AO_SEND_MEGA
- ao_send_mega_sensor();
- ao_send_mega_data();
+
ao_send_mega_sensor();
+
ao_send_mega_data();
#else
#else
- ao_send_sensor();
+ ao_send_sensor();
+#endif
#endif
#if HAS_COMPANION
#endif
#if HAS_COMPANION
- if (ao_companion_running)
- ao_send_companion();
+
if (ao_companion_running)
+
ao_send_companion();
#endif
#endif
- ao_send_configuration();
+
ao_send_configuration();
#if HAS_GPS
#if HAS_GPS
- ao_send_location();
- ao_send_satellite();
+
ao_send_location();
+
ao_send_satellite();
#endif
#endif
+ }
#ifndef AO_SEND_ALL_BARO
if (ao_rdf &&
#ifndef AO_SEND_ALL_BARO
if (ao_rdf &&
+#if HAS_APRS
+ !(ao_config.radio_enable & AO_RADIO_DISABLE_RDF) &&
+#endif
(int16_t) (ao_time() - ao_rdf_time) >= 0)
{
#if HAS_IGNITE_REPORT
(int16_t) (ao_time() - ao_rdf_time) >= 0)
{
#if HAS_IGNITE_REPORT
@@
-335,8
+346,10
@@
ao_telemetry(void)
ao_radio_rdf();
}
#if HAS_APRS
ao_radio_rdf();
}
#if HAS_APRS
- if (ao_rdf && (int16_t) (ao_time() - ao_aprs_time) >= 0) {
- ao_aprs_time = ao_time() + AO_APRS_INTERVAL_TICKS;
+ if (ao_config.aprs_interval != 0 &&
+ (int16_t) (ao_time() - ao_aprs_time) >= 0)
+ {
+ ao_aprs_time = ao_time() + AO_SEC_TO_TICKS(ao_config.aprs_interval);
ao_aprs_send();
}
#endif
ao_aprs_send();
}
#endif
@@
-406,9
+419,6
@@
ao_rdf_set(uint8_t rdf)
ao_radio_rdf_abort();
else {
ao_rdf_time = ao_time() + AO_RDF_INTERVAL_TICKS;
ao_radio_rdf_abort();
else {
ao_rdf_time = ao_time() + AO_RDF_INTERVAL_TICKS;
-#if HAS_APRS
- ao_aprs_time = ao_time() + AO_APRS_INTERVAL_TICKS;
-#endif
}
}
}
}