projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stop log dumping at flight end. Print 'end' at end of log.
[fw/altos]
/
ao_log.c
diff --git
a/ao_log.c
b/ao_log.c
index 47d960d4e517c85507cbcbeae8cf8ac5cefc73c9..7284121db33c47b61b1f85659df69e54175badfc 100644
(file)
--- a/
ao_log.c
+++ b/
ao_log.c
@@
-124,10
+124,12
@@
ao_log(void)
log.u.flight.ground_accel = ao_ground_accel;
log.u.flight.flight = ao_log_dump_flight + 1;
ao_log_data(&log);
log.u.flight.ground_accel = ao_ground_accel;
log.u.flight.flight = ao_log_dump_flight + 1;
ao_log_data(&log);
- for (;;) {
- while (!ao_log_running)
- ao_sleep(&ao_log_running);
+ /* Write the whole contents of the ring to the log
+ * when starting up.
+ */
+ ao_log_adc_pos = ao_adc_ring_next(ao_adc_head);
+ for (;;) {
/* Write samples to EEPROM */
while (ao_log_adc_pos != ao_adc_head) {
log.type = AO_LOG_SENSOR;
/* Write samples to EEPROM */
while (ao_log_adc_pos != ao_adc_head) {
log.type = AO_LOG_SENSOR;
@@
-164,6
+166,10
@@
ao_log(void)
/* Wait for a while */
ao_delay(AO_MS_TO_TICKS(100));
/* Wait for a while */
ao_delay(AO_MS_TO_TICKS(100));
+
+ /* Stop logging when told to */
+ while (!ao_log_running)
+ ao_sleep(&ao_log_running);
}
}
}
}
@@
-185,7
+191,7
@@
ao_log_stop(void)
static void
dump_log(void)
{
static void
dump_log(void)
{
-
__xdata
uint8_t more;
+ uint8_t more;
for (more = ao_log_dump_first(); more; more = ao_log_dump_next()) {
printf("%c %4x %4x %4x\n",
for (more = ao_log_dump_first(); more; more = ao_log_dump_next()) {
printf("%c %4x %4x %4x\n",
@@
-193,7
+199,11
@@
dump_log(void)
ao_log_dump.tick,
ao_log_dump.u.anon.d0,
ao_log_dump.u.anon.d1);
ao_log_dump.tick,
ao_log_dump.u.anon.d0,
ao_log_dump.u.anon.d1);
+ if (ao_log_dump.type == AO_LOG_STATE &&
+ ao_log_dump.u.state.state == ao_flight_landed)
+ break;
}
}
+ printf("end\n");
}
__code struct ao_cmds ao_log_cmds[] = {
}
__code struct ao_cmds ao_log_cmds[] = {