rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Hellen says merge #1772 error pin

This commit is contained in:
rusefi 2020-09-09 18:18:59 -04:00
parent a0aeeb4919
commit 3af04d7824
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/controllers/core/error_handling.cpp
View File

@ -48,12 +48,13 @@ char *getFirmwareError(void) {
extern ioportid_t errorLedPort; extern ioportid_t errorLedPort;
extern ioportmask_t errorLedPin; extern ioportmask_t errorLedPin;
extern uint8_t errorLedSetState;
/** /**
* low-level function is used here to reduce stack usage * low-level function is used here to reduce stack usage
*/ */
#define ON_FATAL_ERROR() \ #define ON_FATAL_ERROR() \
palWritePad(errorLedPort, errorLedPin, 1); \ palWritePad(errorLedPort, errorLedPin, errorLedSetState); \
turnAllPinsOff(); \ turnAllPinsOff(); \
enginePins.communicationLedPin.setValue(1); enginePins.communicationLedPin.setValue(1);
#endif /* EFI_PROD_CODE */ #endif /* EFI_PROD_CODE */

9
firmware/controllers/system/efi_gpio.cpp
View File

@ -33,6 +33,7 @@ EnginePins enginePins;
static Logging* logger; static Logging* logger;
pin_output_mode_e DEFAULT_OUTPUT = OM_DEFAULT; pin_output_mode_e DEFAULT_OUTPUT = OM_DEFAULT;
pin_output_mode_e INVERTED_OUTPUT = OM_INVERTED;
static const char *sparkNames[] = { "coil1", "coil2", "coil3", "coil4", "coil5", "coil6", "coil7", "coil8", static const char *sparkNames[] = { "coil1", "coil2", "coil3", "coil4", "coil5", "coil6", "coil7", "coil8",
"coil9", "coil10", "coil11", "coil12"}; "coil9", "coil10", "coil11", "coil12"};
@ -488,13 +489,19 @@ void OutputPin::unregisterOutput(brain_pin_e oldPin) {
// by reducing stack requirement // by reducing stack requirement
ioportid_t errorLedPort; ioportid_t errorLedPort;
ioportmask_t errorLedPin; ioportmask_t errorLedPin;
uint8_t errorLedSetState;
#ifndef LED_ERROR_BRAIN_PIN_MODE
#define LED_ERROR_BRAIN_PIN_MODE DEFAULT_OUTPUT
#endif /* LED_ERROR_BRAIN_PIN_MODE */
void initPrimaryPins(Logging *sharedLogger) { void initPrimaryPins(Logging *sharedLogger) {
logger = sharedLogger; logger = sharedLogger;
#if EFI_PROD_CODE #if EFI_PROD_CODE
enginePins.errorLedPin.initPin("led: ERROR status", LED_ERROR_BRAIN_PIN); enginePins.errorLedPin.initPin("led: ERROR status", LED_ERROR_BRAIN_PIN, &(LED_ERROR_BRAIN_PIN_MODE));
errorLedPort = getHwPort("primary", LED_ERROR_BRAIN_PIN); errorLedPort = getHwPort("primary", LED_ERROR_BRAIN_PIN);
errorLedPin = getHwPin("primary", LED_ERROR_BRAIN_PIN); errorLedPin = getHwPin("primary", LED_ERROR_BRAIN_PIN);
errorLedSetState = (LED_ERROR_BRAIN_PIN_MODE == INVERTED_OUTPUT) ? 0 : 1;
#endif /* EFI_PROD_CODE */ #endif /* EFI_PROD_CODE */
} }