projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
src
/
core
/
ao_panic.c
diff --git
a/src/core/ao_panic.c
b/src/core/ao_panic.c
index 244917a8af9a32a44c0bc1bc756bee7f00750f90..c29cd8feb279d605e06ffafa50ff3a53f7864dbd 100644
(file)
--- a/
src/core/ao_panic.c
+++ b/
src/core/ao_panic.c
@@
-29,6
+29,10
@@
#define ao_led_off(x)
#endif
#define ao_led_off(x)
#endif
+#ifndef AO_LED_PANIC
+#define AO_LED_PANIC AO_LED_RED
+#endif
+
static void
ao_panic_delay(uint8_t n)
{
static void
ao_panic_delay(uint8_t n)
{
@@
-45,13
+49,18
@@
ao_panic(uint8_t reason)
{
uint8_t n;
{
uint8_t n;
- __critical for (;;) {
+#if LOW_LEVEL_DEBUG
+ ao_cur_task = NULL;
+ printf ("panic %d\n", reason);
+#endif
+ ao_arch_block_interrupts();
+ for (;;) {
ao_panic_delay(20);
for (n = 0; n < 5; n++) {
ao_panic_delay(20);
for (n = 0; n < 5; n++) {
- ao_led_on(AO_LED_
RED
);
+ ao_led_on(AO_LED_
PANIC
);
ao_beep(AO_BEEP_HIGH);
ao_panic_delay(1);
ao_beep(AO_BEEP_HIGH);
ao_panic_delay(1);
- ao_led_off(AO_LED_
RED
);
+ ao_led_off(AO_LED_
PANIC
);
ao_beep(AO_BEEP_LOW);
ao_panic_delay(1);
}
ao_beep(AO_BEEP_LOW);
ao_panic_delay(1);
}
@@
-61,11
+70,19
@@
ao_panic(uint8_t reason)
#ifdef SDCC
#pragma disable_warning 126
#endif
#ifdef SDCC
#pragma disable_warning 126
#endif
- for (n = 0; n < reason; n++) {
- ao_led_on(AO_LED_RED);
+ if (reason & 0x40) {
+ ao_led_on(AO_LED_PANIC);
+ ao_beep(AO_BEEP_HIGH);
+ ao_panic_delay(40);
+ ao_led_off(AO_LED_PANIC);
+ ao_beep(AO_BEEP_OFF);
+ ao_panic_delay(10);
+ }
+ for (n = 0; n < (reason & 0x3f); n++) {
+ ao_led_on(AO_LED_PANIC);
ao_beep(AO_BEEP_MID);
ao_panic_delay(10);
ao_beep(AO_BEEP_MID);
ao_panic_delay(10);
- ao_led_off(AO_LED_
RED
);
+ ao_led_off(AO_LED_
PANIC
);
ao_beep(AO_BEEP_OFF);
ao_panic_delay(10);
}
ao_beep(AO_BEEP_OFF);
ao_panic_delay(10);
}