josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove duplication in crash handlers 

It's kind of nice that all handlers eventually came to become the same.
This commit is contained in:
Yuri D'Elia 2021-06-14 12:38:23 +02:00
parent fa0f58d5bc
commit 96aad0a475
1 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Firmware/Marlin_main.cpp
View File

@ -1715,46 +1715,36 @@ void setup()
#endif //WATCHDOG #endif //WATCHDOG
} }
#if defined(WATCHDOG) && defined(EMERGENCY_HANDLERS)
ISR(WDT_vect) static inline void crash_and_burn(dump_crash_reason reason)
{ {
WRITE(BEEPER, HIGH); WRITE(BEEPER, HIGH);
eeprom_update_byte((uint8_t*)EEPROM_FW_CRASH_FLAG, (uint8_t)dump_crash_reason::watchdog); eeprom_update_byte((uint8_t*)EEPROM_FW_CRASH_FLAG, (uint8_t)reason);
#ifdef EMERGENCY_DUMP #ifdef EMERGENCY_DUMP
xfdump_full_dump_and_reset(dump_crash_reason::watchdog); xfdump_full_dump_and_reset(reason);
#elif defined(EMERGENCY_SERIAL_DUMP) #elif defined(EMERGENCY_SERIAL_DUMP)
if(emergency_serial_dump) if(emergency_serial_dump)
serial_dump_and_reset(dump_crash_reason::watchdog); serial_dump_and_reset(reason);
#endif #endif
softReset(); softReset();
} }
#endif
#ifdef EMERGENCY_HANDLERS #ifdef EMERGENCY_HANDLERS
ISR(BADISR_vect) #ifdef WATCHDOG
ISR(WDT_vect)
{ {
WRITE(BEEPER, HIGH); crash_and_burn(dump_crash_reason::watchdog);
eeprom_update_byte((uint8_t*)EEPROM_FW_CRASH_FLAG, (uint8_t)dump_crash_reason::bad_isr);
#ifdef EMERGENCY_DUMP
xfdump_full_dump_and_reset(dump_crash_reason::bad_isr);
#elif defined(EMERGENCY_SERIAL_DUMP)
if(emergency_serial_dump)
serial_dump_and_reset(dump_crash_reason::bad_isr);
#endif
softReset();
} }
#endif #endif
ISR(BADISR_vect)
{
crash_and_burn(dump_crash_reason::bad_isr);
}
#endif //EMERGENCY_HANDLERS
void stack_error() { void stack_error() {
WRITE(BEEPER, HIGH); crash_and_burn(dump_crash_reason::stack_error);
eeprom_update_byte((uint8_t*)EEPROM_FW_CRASH_FLAG, (uint8_t)dump_crash_reason::stack_error);
#ifdef EMERGENCY_DUMP
xfdump_full_dump_and_reset(dump_crash_reason::stack_error);
#elif defined(EMERGENCY_SERIAL_DUMP)
if (emergency_serial_dump)
serial_dump_and_reset(dump_crash_reason::stack_error);
#endif
softReset();
} }