projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
telegps-v0.3: Reduce stack size to fit in ram
[fw/altos]
/
src
/
kernel
/
ao_report.c
diff --git
a/src/kernel/ao_report.c
b/src/kernel/ao_report.c
index 26604d1ad4d784a96318dae4e8115327fe702cbc..4624403a10d61e0a255caf38f56fecdc8bcff4af 100644
(file)
--- a/
src/kernel/ao_report.c
+++ b/
src/kernel/ao_report.c
@@
-149,7
+149,7
@@
ao_report_digit(uint8_t digit)
}
static void
}
static void
-ao_report_number(
int16
_t n)
+ao_report_number(
ao_v
_t n)
{
uint8_t digits[10];
uint8_t ndigits, i;
{
uint8_t digits[10];
uint8_t ndigits, i;
@@
-158,7
+158,7
@@
ao_report_number(int16_t n)
n = 0;
ndigits = 0;
do {
n = 0;
ndigits = 0;
do {
- digits[ndigits++] =
n % 10
;
+ digits[ndigits++] =
(uint8_t) (n % 10)
;
n /= 10;
} while (n);
n /= 10;
} while (n);
@@
-200,8
+200,8
@@
ao_report_igniter_ready(enum ao_igniter igniter)
uint8_t
ao_report_igniter(void)
{
uint8_t
ao_report_igniter(void)
{
- return (ao_report_igniter_ready(ao_igniter_drogue) |
- (ao_report_igniter_ready(ao_igniter_main) << 1));
+ return (
uint8_t) (
ao_report_igniter_ready(ao_igniter_drogue) |
+
(ao_report_igniter_ready(ao_igniter_main) << 1));
}
#endif
}
#endif
@@
-285,6
+285,15
@@
ao_report(void)
while (c-- && ao_flight_state == ao_flight_pad)
pause(AO_MS_TO_TICKS(100));
}
while (c-- && ao_flight_state == ao_flight_pad)
pause(AO_MS_TO_TICKS(100));
}
+#endif
+#if HAS_PAD_REPORT
+ while (ao_flight_state == ao_flight_pad) {
+ uint8_t c;
+ ao_report_flight_state();
+ c = 50;
+ while (c-- && ao_flight_state == ao_flight_pad)
+ pause(AO_MS_TO_TICKS(100));
+ }
#endif
while (ao_report_state == ao_flight_state)
ao_sleep(&ao_flight_state);
#endif
while (ao_report_state == ao_flight_state)
ao_sleep(&ao_flight_state);