From 92d249918b9b6497859afb34033ae130c100a4de Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Mon, 22 Mar 2021 11:15:09 -0700 Subject: [PATCH] rename setBoardConfigurationOverrides (#2479) * rename * proteus * comments Co-authored-by: Matthew Kennedy --- .../config/boards/hellen/hellen72/board_configuration.cpp | 4 ++-- firmware/config/boards/me7_pnp/board_configuration.cpp | 2 +- firmware/config/boards/microrusefi/board_configuration.cpp | 4 ++-- firmware/config/boards/nucleo_f767/board_configuration.cpp | 4 ++-- firmware/config/boards/nucleo_h743/board_configuration.cpp | 4 ++-- firmware/config/boards/prometheus/board_configuration.cpp | 4 ++-- firmware/config/boards/proteus/board_configuration.cpp | 4 ++-- firmware/config/boards/st_stm32f4/board_extra.c | 4 ++-- firmware/config/boards/subaru_eg33/board_configuration.cpp | 4 ++-- firmware/controllers/algo/engine_configuration.cpp | 4 ++-- firmware/hw_layer/ports/chconf_common.h | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/firmware/config/boards/hellen/hellen72/board_configuration.cpp b/firmware/config/boards/hellen/hellen72/board_configuration.cpp index f6c33f9fc1..cc5261143c 100644 --- a/firmware/config/boards/hellen/hellen72/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen72/board_configuration.cpp @@ -129,13 +129,13 @@ void setSerialConfigurationOverrides(void) { /** - * @brief Board-specific configuration code overrides. + * @brief Board-specific configuration defaults. * * See also setDefaultEngineConfiguration * * @todo Add your board-specific code, if any. */ -void setBoardConfigurationOverrides(void) { +void setBoardDefaultConfiguration(void) { setInjectorPins(); setIgnitionPins(); setLedPins(); diff --git a/firmware/config/boards/me7_pnp/board_configuration.cpp b/firmware/config/boards/me7_pnp/board_configuration.cpp index a101e79ac6..44085735c0 100644 --- a/firmware/config/boards/me7_pnp/board_configuration.cpp +++ b/firmware/config/boards/me7_pnp/board_configuration.cpp @@ -40,7 +40,7 @@ void setPinConfigurationOverrides(void) { engineConfiguration->fanPin = GPIO_UNASSIGNED; } -void setBoardConfigurationOverrides(void) { +void setBoardDefaultConfiguration(void) { // NOT USED engineConfiguration->externalKnockSenseAdc = EFI_ADC_NONE; diff --git a/firmware/config/boards/microrusefi/board_configuration.cpp b/firmware/config/boards/microrusefi/board_configuration.cpp index 0b5c242298..83c3b34671 100644 --- a/firmware/config/boards/microrusefi/board_configuration.cpp +++ b/firmware/config/boards/microrusefi/board_configuration.cpp @@ -190,13 +190,13 @@ void setSerialConfigurationOverrides(void) { /** - * @brief Board-specific configuration code overrides. + * @brief Board-specific configuration defaults. * * See also setDefaultEngineConfiguration * * @todo Add your board-specific code, if any. */ -void setBoardConfigurationOverrides(void) { +void setBoardDefaultConfiguration(void) { setInjectorPins(); setIgnitionPins(); setLedPins(); diff --git a/firmware/config/boards/nucleo_f767/board_configuration.cpp b/firmware/config/boards/nucleo_f767/board_configuration.cpp index f529872b9a..2fee3b0ca5 100644 --- a/firmware/config/boards/nucleo_f767/board_configuration.cpp +++ b/firmware/config/boards/nucleo_f767/board_configuration.cpp @@ -37,10 +37,10 @@ void setSdCardConfigurationOverrides(void) { } /** - * @brief Board-specific configuration code overrides. + * @brief Board-specific configuration defaults. * @todo Add your board-specific code, if any. */ -void setBoardConfigurationOverrides(void) { +void setBoardDefaultConfiguration(void) { setSerialConfigurationOverrides(); engineConfiguration->runningLedPin = GPIOB_0; //green LED diff --git a/firmware/config/boards/nucleo_h743/board_configuration.cpp b/firmware/config/boards/nucleo_h743/board_configuration.cpp index ef74afc02f..a7100f9f7e 100644 --- a/firmware/config/boards/nucleo_h743/board_configuration.cpp +++ b/firmware/config/boards/nucleo_h743/board_configuration.cpp @@ -1,10 +1,10 @@ #include "adc_inputs.h" /** - * @brief Board-specific configuration code overrides. + * @brief Board-specific configuration defaults. * @todo Add your board-specific code, if any. */ -void setBoardConfigurationOverrides(void) { +void setBoardDefaultConfiguration(void) { } /** diff --git a/firmware/config/boards/prometheus/board_configuration.cpp b/firmware/config/boards/prometheus/board_configuration.cpp index e2c4405ba2..c810729dc6 100644 --- a/firmware/config/boards/prometheus/board_configuration.cpp +++ b/firmware/config/boards/prometheus/board_configuration.cpp @@ -128,10 +128,10 @@ void setSdCardConfigurationOverrides(void) { } /** - * @brief Board-specific configuration code overrides. + * @brief Board-specific configuration defaults. * @todo Add your board-specific code, if any. */ -void setBoardConfigurationOverrides(void) { +void setBoardDefaultConfiguration(void) { // give a chance to trigger SWD programmer... Wait for 2 secs (=2000 ms). // TODO: remove it when the bootloader is ready chThdSleepMilliseconds(2000); diff --git a/firmware/config/boards/proteus/board_configuration.cpp b/firmware/config/boards/proteus/board_configuration.cpp index cc18f333e0..b807a00fd4 100644 --- a/firmware/config/boards/proteus/board_configuration.cpp +++ b/firmware/config/boards/proteus/board_configuration.cpp @@ -176,13 +176,13 @@ void setSerialConfigurationOverrides(void) { /** - * @brief Board-specific configuration code overrides. + * @brief Board-specific configuration defaults. * * See also setDefaultEngineConfiguration * * @todo Add your board-specific code, if any. */ -void setBoardConfigurationOverrides(void) { +void setBoardDefaultConfiguration(void) { setInjectorPins(); setIgnitionPins(); setLedPins(); diff --git a/firmware/config/boards/st_stm32f4/board_extra.c b/firmware/config/boards/st_stm32f4/board_extra.c index 7ba32f2dcb..8c9ef1b598 100644 --- a/firmware/config/boards/st_stm32f4/board_extra.c +++ b/firmware/config/boards/st_stm32f4/board_extra.c @@ -5,10 +5,10 @@ #include "chconf_common.h" /** - * @brief Board-specific configuration code overrides. + * @brief Board-specific configuration defaults. * @todo Add your board-specific code, if any. */ -void setBoardConfigurationOverrides(void) { +void setBoardDefaultConfiguration(void) { } /** diff --git a/firmware/config/boards/subaru_eg33/board_configuration.cpp b/firmware/config/boards/subaru_eg33/board_configuration.cpp index 31c0f966d2..24307470da 100644 --- a/firmware/config/boards/subaru_eg33/board_configuration.cpp +++ b/firmware/config/boards/subaru_eg33/board_configuration.cpp @@ -40,10 +40,10 @@ void setSdCardConfigurationOverrides(void) { } /** - * @brief Board-specific configuration code overrides. + * @brief Board-specific configuration defaults. * @todo Add your board-specific code, if any. */ -void setBoardConfigurationOverrides(void) { +void setBoardDefaultConfiguration(void) { setSerialConfigurationOverrides(); /* Battery voltage */ diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 92b1f87781..5d43e75ba3 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -1144,7 +1144,7 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb #if EFI_PROD_CODE // call overrided board-specific configuration setup, if needed (for custom boards only) - setBoardConfigurationOverrides(); + setBoardDefaultConfiguration(); #endif engineConfiguration->engineType = engineType; @@ -1159,7 +1159,7 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb case PROMETHEUS_DEFAULTS: case MINIMAL_PINS: // all basic settings are already set in prepareVoidConfiguration(), no need to set anything here - // nothing to do - we do it all in setBoardConfigurationOverrides + // nothing to do - we do it all in setBoardDefaultConfiguration break; case TEST_ENGINE: setTestEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); diff --git a/firmware/hw_layer/ports/chconf_common.h b/firmware/hw_layer/ports/chconf_common.h index 45bc82f9fb..f31136de48 100644 --- a/firmware/hw_layer/ports/chconf_common.h +++ b/firmware/hw_layer/ports/chconf_common.h @@ -50,7 +50,7 @@ extern "C" extern "C" { #endif void boardInit(void); - void setBoardConfigurationOverrides(void); + void setBoardDefaultConfiguration(void); void setPinConfigurationOverrides(void); void setSerialConfigurationOverrides(void); void setSdCardConfigurationOverrides(void);