From a955e96b62e21d439908da0e9aa00361d609c306 Mon Sep 17 00:00:00 2001 From: rusefi Date: Mon, 11 May 2020 18:27:43 -0400 Subject: [PATCH] RED FATAL/CRITICAL LED is a bit dim when it should be OFF fix https://github.com/rusefi/hw_microRusEfi/issues/157 --- firmware/config/boards/clean_env_variables.bat | 2 +- .../config/boards/microrusefi/!compile-nucleo-Manhattan.bat | 2 +- firmware/config/boards/microrusefi/board.mk | 4 ++-- .../config/boards/nucleo_f746/!compile-stm32f746_nucleo.bat | 2 +- .../config/boards/nucleo_f767/!compile-stm32f767_nucleo.bat | 2 +- firmware/config/boards/nucleo_f767/!compile-stm32f767_osc.bat | 2 +- firmware/config/boards/proteus/board.mk | 2 +- firmware/config/boards/skeleton/board.mk | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/firmware/config/boards/clean_env_variables.bat b/firmware/config/boards/clean_env_variables.bat index 9bb0de5b55..02b9251ddf 100644 --- a/firmware/config/boards/clean_env_variables.bat +++ b/firmware/config/boards/clean_env_variables.bat @@ -6,7 +6,7 @@ set PROJECT_BOARD= set PROJECT_CPU= set USE_BOOTLOADER= set DEFAULT_ENGINE_TYPE= -set EFI_FATAL_ERROR_PIN= +set LED_CRITICAL_ERROR_BRAIN_PIN= set BUILDDIR= set DEBUG_LEVEL_OPT= set USE_FATFS= diff --git a/firmware/config/boards/microrusefi/!compile-nucleo-Manhattan.bat b/firmware/config/boards/microrusefi/!compile-nucleo-Manhattan.bat index 8e972665dd..07602dc575 100644 --- a/firmware/config/boards/microrusefi/!compile-nucleo-Manhattan.bat +++ b/firmware/config/boards/microrusefi/!compile-nucleo-Manhattan.bat @@ -7,7 +7,7 @@ set PROJECT_BOARD=microrusefi set PROJECT_CPU=ARCH_STM32F7 set DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=BMW_M73_F -set EFI_FATAL_ERROR_PIN = -DEFI_FATAL_ERROR_PIN=GPIOB_14 +set LED_CRITICAL_ERROR_BRAIN_PIN = -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOB_14 set EXTRA_PARAMS=-DDUMMY ^ -DEFI_COMMUNICATION_PIN=GPIOB_7 diff --git a/firmware/config/boards/microrusefi/board.mk b/firmware/config/boards/microrusefi/board.mk index 7860166622..11fc4be050 100644 --- a/firmware/config/boards/microrusefi/board.mk +++ b/firmware/config/boards/microrusefi/board.mk @@ -25,8 +25,8 @@ ifeq ($(DEFAULT_ENGINE_TYPE),) DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=MICRO_RUS_EFI endif -ifeq ($(EFI_FATAL_ERROR_PIN),) - EFI_FATAL_ERROR_PIN = -DEFI_FATAL_ERROR_PIN=GPIOE_3 +ifeq ($(LED_CRITICAL_ERROR_BRAIN_PIN),) + LED_CRITICAL_ERROR_BRAIN_PIN = -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOE_3 endif diff --git a/firmware/config/boards/nucleo_f746/!compile-stm32f746_nucleo.bat b/firmware/config/boards/nucleo_f746/!compile-stm32f746_nucleo.bat index 66cab1e0f6..76ad86a366 100644 --- a/firmware/config/boards/nucleo_f746/!compile-stm32f746_nucleo.bat +++ b/firmware/config/boards/nucleo_f746/!compile-stm32f746_nucleo.bat @@ -12,7 +12,7 @@ set EXTRA_PARAMS=-DDUMMY -DSTM32F746xx ^ -DEFI_INJECTOR_PIN3=GPIO_UNASSIGNED ^ -DEFI_COMMUNICATION_PIN=GPIOB_7 ^ -DFIRMWARE_ID=\"nucleo746\" ^ - -DEFI_FATAL_ERROR_PIN=GPIOB_14 ^ + -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOB_14 ^ -DEFI_TOOTH_LOGGER=FALSE ^ -DRAM_UNUSED_SIZE=10 ^ -DSTATUS_LOGGING_BUFFER_SIZE=1400 ^ diff --git a/firmware/config/boards/nucleo_f767/!compile-stm32f767_nucleo.bat b/firmware/config/boards/nucleo_f767/!compile-stm32f767_nucleo.bat index bf0e3188fa..9ee14770e7 100644 --- a/firmware/config/boards/nucleo_f767/!compile-stm32f767_nucleo.bat +++ b/firmware/config/boards/nucleo_f767/!compile-stm32f767_nucleo.bat @@ -13,7 +13,7 @@ set EXTRA_PARAMS=-DDUMMY -DSTM32F767xx ^ -DFIRMWARE_ID=\"nucleo767\" ^ -DEFI_COMMUNICATION_PIN=GPIOB_7 ^ -DSTATUS_LOGGING_BUFFER_SIZE=1400 ^ - -DEFI_FATAL_ERROR_PIN=GPIOB_14 ^ + -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOB_14 ^ -DEFI_ENABLE_ASSERTS=FALSE ^ -DCH_DBG_ENABLE_CHECKS=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE set DEBUG_LEVEL_OPT="-O2" diff --git a/firmware/config/boards/nucleo_f767/!compile-stm32f767_osc.bat b/firmware/config/boards/nucleo_f767/!compile-stm32f767_osc.bat index cbf1f791ce..06e60a81b8 100644 --- a/firmware/config/boards/nucleo_f767/!compile-stm32f767_osc.bat +++ b/firmware/config/boards/nucleo_f767/!compile-stm32f767_osc.bat @@ -9,7 +9,7 @@ set EXTRA_PARAMS=-DDUMMY -DSTM32F767xx ^ -DEFI_INJECTOR_PIN3=GPIO_UNASSIGNED ^ -DFIRMWARE_ID=\"board767\" ^ -DEFI_COMMUNICATION_PIN=GPIOB_7 ^ - -DEFI_FATAL_ERROR_PIN=GPIOB_14 ^ + -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOB_14 ^ -DEFI_ENABLE_ASSERTS=FALSE ^ -DEFI_USE_OSC=TRUE ^ -DCH_DBG_ENABLE_CHECKS=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE diff --git a/firmware/config/boards/proteus/board.mk b/firmware/config/boards/proteus/board.mk index a8c51c7ff0..5da66e3e98 100644 --- a/firmware/config/boards/proteus/board.mk +++ b/firmware/config/boards/proteus/board.mk @@ -22,7 +22,7 @@ else endif # Override DEFAULT_ENGINE_TYPE -DDEFS += $(MCU_DEFS) -DEFI_USE_OSC=TRUE -DEFI_FATAL_ERROR_PIN=GPIOE_3 -DFIRMWARE_ID=\"proteus\" -DDEFAULT_ENGINE_TYPE=PROTEUS -DSTM32_ADC_USE_ADC3=TRUE -DEFI_INCLUDE_ENGINE_PRESETS=FALSE -DEFI_ICU_INPUTS=FALSE -DHAL_TRIGGER_USE_PAL=TRUE -DEFI_VEHICLE_SPEED=FALSE -DEFI_LOGIC_ANALYZER=FALSE +DDEFS += $(MCU_DEFS) -DEFI_USE_OSC=TRUE -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOE_3 -DFIRMWARE_ID=\"proteus\" -DDEFAULT_ENGINE_TYPE=PROTEUS -DSTM32_ADC_USE_ADC3=TRUE -DEFI_INCLUDE_ENGINE_PRESETS=FALSE -DEFI_ICU_INPUTS=FALSE -DHAL_TRIGGER_USE_PAL=TRUE -DEFI_VEHICLE_SPEED=FALSE -DEFI_LOGIC_ANALYZER=FALSE # Proteus <=v0.2 needs ADC hack - vbatt is on ADC3 ifeq ($(PROTEUS_LEGACY),TRUE) diff --git a/firmware/config/boards/skeleton/board.mk b/firmware/config/boards/skeleton/board.mk index bcabe02ae7..22bd9621a9 100644 --- a/firmware/config/boards/skeleton/board.mk +++ b/firmware/config/boards/skeleton/board.mk @@ -25,4 +25,4 @@ ifeq ($(DEFAULT_ENGINE_TYPE),) endif # Add them all together -DDEFS += $(MCU_DEFS) -DEFI_USE_OSC=TRUE -DEFI_FATAL_ERROR_PIN=GPIOE_3 -DFIRMWARE_ID=\"skeleton\" $(DEFAULT_ENGINE_TYPE) +DDEFS += $(MCU_DEFS) -DEFI_USE_OSC=TRUE -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOE_3 -DFIRMWARE_ID=\"skeleton\" $(DEFAULT_ENGINE_TYPE)