diff options
| author | Keith Packard <keithp@keithp.com> | 2012-07-02 23:44:10 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-07-02 23:45:43 -0700 |
| commit | 933fc7e4c2f617e49e1cfdf45b83695290b51456 (patch) | |
| tree | c62ea7041ed7a0b9c4f1092aac43453e5a7ab272 | |
| parent | 50b343d389039eae082e82b8ac0b76ae3e2b3ad4 (diff) | |
altos: Do not block igniters on the radio mutex.
Blocking igniters on the radio mutex fails when doing igniter testing
over the RF link; the packet receiver task will never release the
mutex and the CPU at the same time, causing the system to lock up.
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | src/core/ao_ignite.c | 6 | ||||
| -rw-r--r-- | src/telemetrum-v1.1/.sdcdbrc | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/src/core/ao_ignite.c b/src/core/ao_ignite.c index d4aef153..e82de355 100644 --- a/src/core/ao_ignite.c +++ b/src/core/ao_ignite.c @@ -81,9 +81,6 @@ ao_igniter_status(enum ao_igniter igniter) void ao_igniter_fire(enum ao_igniter igniter) __critical { -#ifndef MEGAMETRUM - ao_mutex_get(&ao_radio_mutex); -#endif ao_ignition[igniter].firing = 1; switch(ao_config.ignite_mode) { case AO_IGNITE_MODE_DUAL: @@ -128,9 +125,6 @@ ao_igniter_fire(enum ao_igniter igniter) __critical break; } ao_ignition[igniter].firing = 0; -#ifndef MEGAMETRUM - ao_mutex_put(&ao_radio_mutex); -#endif } void diff --git a/src/telemetrum-v1.1/.sdcdbrc b/src/telemetrum-v1.1/.sdcdbrc index 710b4a2f..fbe9a599 100644 --- a/src/telemetrum-v1.1/.sdcdbrc +++ b/src/telemetrum-v1.1/.sdcdbrc @@ -1 +1 @@ ---directory=.. +--directory=../cc1111:../product:../core:../drivers:. |