projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Use flash loader on all STM products
[fw/altos]
/
src
/
core
/
ao_log_telem.c
diff --git
a/src/core/ao_log_telem.c
b/src/core/ao_log_telem.c
index 096ad9191e6255d930bb5596d2ef953d32daa518..23ebf7ddc62dc8e2efaf4e39531a3c2817c8ff19 100644
(file)
--- a/
src/core/ao_log_telem.c
+++ b/
src/core/ao_log_telem.c
@@
-15,7
+15,9
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include "ao.h"
+#include <ao.h>
+#include <ao_flight.h>
+#include <ao_sample.h>
__code uint8_t ao_log_format = AO_LOG_FORMAT_TELEMETRY;
__code uint8_t ao_log_format = AO_LOG_FORMAT_TELEMETRY;
@@
-90,6
+92,8
@@
ao_log_single(void)
ao_log_running = 1;
ao_log_single_restart();
ao_flight_state = ao_flight_startup;
ao_log_running = 1;
ao_log_single_restart();
ao_flight_state = ao_flight_startup;
+ ao_monitor_set(sizeof(struct ao_telemetry_generic));
+
for (;;) {
while (!ao_log_running)
ao_sleep(&ao_log_running);
for (;;) {
while (!ao_log_running)
ao_sleep(&ao_log_running);
@@
-98,9
+102,9
@@
ao_log_single(void)
while (ao_log_running) {
/* Write samples to EEPROM */
while (ao_log_monitor_pos != ao_monitor_head) {
while (ao_log_running) {
/* Write samples to EEPROM */
while (ao_log_monitor_pos != ao_monitor_head) {
- memcpy(&ao_log_single_write_data.telemetry,
- &ao_monitor_ring[ao_log_monitor_pos],
- AO_LOG_SINGLE_SIZE);
+
ao_x
memcpy(&ao_log_single_write_data.telemetry,
+
&ao_monitor_ring[ao_log_monitor_pos],
+
AO_LOG_SINGLE_SIZE);
ao_log_single_write();
ao_log_monitor_pos = ao_monitor_ring_next(ao_log_monitor_pos);
ao_log_telem_track();
ao_log_single_write();
ao_log_monitor_pos = ao_monitor_ring_next(ao_log_monitor_pos);
ao_log_telem_track();