projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Make sure we don't beep out continuity twice in idle mode
[fw/altos]
/
src
/
kernel
/
ao_report.c
diff --git
a/src/kernel/ao_report.c
b/src/kernel/ao_report.c
index 5314fc8fb82fa7a698dd3743939ef23fe54dbeda..f4253b3db9e42f1427a3cda44ec215c13ce74dcf 100644
(file)
--- a/
src/kernel/ao_report.c
+++ b/
src/kernel/ao_report.c
@@
-246,15
+246,15
@@
ao_report_continuity(void) __reentrant
void
ao_report(void)
{
void
ao_report(void)
{
- ao_report_state = ao_flight_state;
for(;;) {
for(;;) {
+ ao_report_state = ao_flight_state;
#if HAS_BATTERY_REPORT
#if HAS_BATTERY_REPORT
- if (ao_
fligh
t_state == ao_flight_startup)
+ if (ao_
repor
t_state == ao_flight_startup)
ao_report_battery();
else
#endif
ao_report_beep();
ao_report_battery();
else
#endif
ao_report_beep();
- if (ao_
fligh
t_state == ao_flight_landed) {
+ if (ao_
repor
t_state == ao_flight_landed) {
ao_report_altitude();
#if HAS_FLIGHT
ao_delay(AO_SEC_TO_TICKS(5));
ao_report_altitude();
#if HAS_FLIGHT
ao_delay(AO_SEC_TO_TICKS(5));
@@
-262,7
+262,7
@@
ao_report(void)
#endif
}
#if HAS_IGNITE_REPORT
#endif
}
#if HAS_IGNITE_REPORT
- if (ao_
fligh
t_state == ao_flight_idle)
+ if (ao_
repor
t_state == ao_flight_idle)
ao_report_continuity();
while (ao_flight_state == ao_flight_pad) {
uint8_t c;
ao_report_continuity();
while (ao_flight_state == ao_flight_pad) {
uint8_t c;
@@
-272,10
+272,8
@@
ao_report(void)
pause(AO_MS_TO_TICKS(100));
}
#endif
pause(AO_MS_TO_TICKS(100));
}
#endif
-
while (ao_report_state == ao_flight_state)
ao_sleep(DATA_TO_XDATA(&ao_flight_state));
while (ao_report_state == ao_flight_state)
ao_sleep(DATA_TO_XDATA(&ao_flight_state));
- ao_report_state = ao_flight_state;
}
}
}
}