projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Allow architecture to define the type of port registers
[fw/altos]
/
src
/
core
/
ao_telemetry.c
diff --git
a/src/core/ao_telemetry.c
b/src/core/ao_telemetry.c
index 8d440e15410ff4bd7833bcd5da6e1380d8ba46f9..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;
@@
-306,12
+308,14
@@
ao_telemetry(void)
#ifdef AO_SEND_ALL_BARO
ao_send_baro();
#endif
#ifdef AO_SEND_ALL_BARO
ao_send_baro();
#endif
+#if HAS_FLIGHT
#ifdef AO_SEND_MEGA
ao_send_mega_sensor();
ao_send_mega_data();
#else
ao_send_sensor();
#endif
#ifdef AO_SEND_MEGA
ao_send_mega_sensor();
ao_send_mega_data();
#else
ao_send_sensor();
#endif
+#endif
#if HAS_COMPANION
if (ao_companion_running)
#if HAS_COMPANION
if (ao_companion_running)