rusefi
/
rusefi-full
mirror of https://github.com/rusefi/rusefi-full.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2015-02-04 06:06:14 -06:00
parent dad6bf83f2
commit f0babba0d1
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
firmware/controllers/error_handling.cpp
View File

@ -34,12 +34,7 @@ void chDbgPanic3(const char *msg, const char * file, int line) {
dbg_panic_msg = msg; dbg_panic_msg = msg;
#endif /* CH_DBG_SYSTEM_STATE_CHECK */ #endif /* CH_DBG_SYSTEM_STATE_CHECK */
/** ON_FATAL_ERROR();
* low-level function is used here to reduce stack usage
*/
// todo: extract a macro for this
palWritePad(LED_ERROR_PORT, LED_ERROR_PIN, 1);
turnAllPinsOff();
#if EFI_HD44780_LCD #if EFI_HD44780_LCD
lcdShowFatalMessage((char *) msg); lcdShowFatalMessage((char *) msg);
#endif /* EFI_HD44780_LCD */ #endif /* EFI_HD44780_LCD */

9
firmware/global.h
View File

@ -100,4 +100,13 @@ typedef Thread thread_t;
#define EXTERN_ENGINE #define EXTERN_ENGINE
#endif #endif
/**
* low-level function is used here to reduce stack usage
*/
#define ON_FATAL_ERROR() \
palWritePad(LED_ERROR_PORT, LED_ERROR_PIN, 1); \
turnAllPinsOff();
#endif /* GLOBAL_H_ */ #endif /* GLOBAL_H_ */

7
firmware/rusefi.cpp
View File

@ -230,10 +230,7 @@ extern engine_pins_s enginePins;
void firmwareError(const char *errorMsg, ...) { void firmwareError(const char *errorMsg, ...) {
if (hasFirmwareErrorFlag) if (hasFirmwareErrorFlag)
return; return;
// todo: extract a macro and use the same macro here and in ON_FATAL_ERROR();
// the other place where we have palWritePad(LED_ERROR_PORT, LED_ERROR_PIN, 1);
enginePins.errorLedPin.setValue(1);
turnAllPinsOff();
hasFirmwareErrorFlag = TRUE; hasFirmwareErrorFlag = TRUE;
if (indexOf(errorMsg, '%') == -1) { if (indexOf(errorMsg, '%') == -1) {
/** /**
@ -262,5 +259,5 @@ int getRusEfiVersion(void) {
return 1; // this is here to make the compiler happy about the unused array return 1; // this is here to make the compiler happy about the unused array
if (UNUSED_CCM_SIZE == 0) if (UNUSED_CCM_SIZE == 0)
return 1; // this is here to make the compiler happy about the unused array return 1; // this is here to make the compiler happy about the unused array
return 20150202; return 20150204;
} }