projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Remove spurious ao_mma655x_spi_index variable
[fw/altos]
/
src
/
kernel
/
ao_pyro.c
diff --git
a/src/kernel/ao_pyro.c
b/src/kernel/ao_pyro.c
index 5a556d594c75b5b8947d49757d68deb3a58bab5c..527112acfbfcbc1332464966f95ed5c47cbfac54 100644
(file)
--- a/
src/kernel/ao_pyro.c
+++ b/
src/kernel/ao_pyro.c
@@
-160,14
+160,14
@@
ao_pyro_ready(struct ao_pyro *pyro)
#endif
case ao_pyro_time_less:
#endif
case ao_pyro_time_less:
- if ((int16_t) (ao_time() - ao_
boost
_tick) <= pyro->time_less)
+ if ((int16_t) (ao_time() - ao_
launch
_tick) <= pyro->time_less)
continue;
continue;
- DBG("time %d > %d\n", (int16_t)(ao_time() - ao_
boost
_tick), pyro->time_less);
+ DBG("time %d > %d\n", (int16_t)(ao_time() - ao_
launch
_tick), pyro->time_less);
break;
case ao_pyro_time_greater:
break;
case ao_pyro_time_greater:
- if ((int16_t) (ao_time() - ao_
boost
_tick) >= pyro->time_greater)
+ if ((int16_t) (ao_time() - ao_
launch
_tick) >= pyro->time_greater)
continue;
continue;
- DBG("time %d < %d\n", (int16_t)(ao_time() - ao_
boost
_tick), pyro->time_greater);
+ DBG("time %d < %d\n", (int16_t)(ao_time() - ao_
launch
_tick), pyro->time_greater);
break;
case ao_pyro_ascending:
break;
case ao_pyro_ascending:
@@
-182,7
+182,7
@@
ao_pyro_ready(struct ao_pyro *pyro)
break;
case ao_pyro_after_motor:
break;
case ao_pyro_after_motor:
- if (ao_motor_number
=
= pyro->motor)
+ if (ao_motor_number
>
= pyro->motor)
continue;
DBG("motor %d != %d\n", ao_motor_number, pyro->motor);
break;
continue;
DBG("motor %d != %d\n", ao_motor_number, pyro->motor);
break;