projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Add pyro code testing to ao_flight_test for TeleMega
[fw/altos]
/
src
/
core
/
ao_telemetry.c
diff --git
a/src/core/ao_telemetry.c
b/src/core/ao_telemetry.c
index cfc72e048fe4b3c19f4c71fd41184be2dc110dcc..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,7
+301,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
@@
-307,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)
@@
-343,10
+346,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