From ca0f3ba2408ac874c4f3297013c0457631384a66 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Thu, 17 Dec 2020 20:22:04 -0500 Subject: [PATCH] HW CI is flaky :( #2063 more detailed error messages --- firmware/controllers/system/efi_gpio.cpp | 6 +++++- firmware/hw_layer/pin_repository.cpp | 8 +++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/firmware/controllers/system/efi_gpio.cpp b/firmware/controllers/system/efi_gpio.cpp index c8f876d0ec..5529090792 100644 --- a/firmware/controllers/system/efi_gpio.cpp +++ b/firmware/controllers/system/efi_gpio.cpp @@ -473,7 +473,11 @@ void OutputPin::initPin(const char *msg, brain_pin_e brainPin, const pin_output_ return; if (*outputMode > OM_OPENDRAIN_INVERTED) { - firmwareError(CUSTOM_INVALID_MODE_SETTING, "%s invalid pin_output_mode_e", msg); + firmwareError(CUSTOM_INVALID_MODE_SETTING, "%s invalid pin_output_mode_e %d %s", + msg, + *outputMode, + hwPortname(brainPin) + ); return; } iomode_t mode = (*outputMode == OM_DEFAULT || *outputMode == OM_INVERTED) ? diff --git a/firmware/hw_layer/pin_repository.cpp b/firmware/hw_layer/pin_repository.cpp index 33625883a1..b791781a18 100644 --- a/firmware/hw_layer/pin_repository.cpp +++ b/firmware/hw_layer/pin_repository.cpp @@ -21,6 +21,8 @@ static LoggingWithStorage logger("pin repos"); +EXTERN_CONFIG; + static PinRepository pinRepository; static int brainPin_to_index(brain_pin_e brainPin) @@ -264,7 +266,11 @@ bool brain_pin_markUsed(brain_pin_e brainPin, const char *msg) { * connected, so the warning is never displayed on the console and that's quite a problem! */ // warning(OBD_PCM_Processor_Fault, "brain pin %d req by %s used by %s", brainPin, msg, getBrainUsedPin(index)); - firmwareError(CUSTOM_ERR_PIN_ALREADY_USED_1, "Pin \"%s\" required by \"%s\" but is used by \"%s\"", hwPortname(brainPin), msg, getBrainUsedPin(index)); + firmwareError(CUSTOM_ERR_PIN_ALREADY_USED_1, "Pin \"%s\" required by \"%s\" but is used by \"%s\" %s", + hwPortname(brainPin), + msg, + getBrainUsedPin(index), + getEngine_type_e(engineConfiguration->engineType)); return true; }