From 5804bbe8b48c1bae4104b032b1c8def0fb457fa2 Mon Sep 17 00:00:00 2001 From: Andrei Date: Sat, 22 Apr 2017 01:46:25 +0300 Subject: [PATCH] call-board-configuration pull request (fix2) --- firmware/config/boards/ST_STM32F4/board.c | 4 ++-- firmware/config/boards/ST_STM32F4/board.h | 2 +- firmware/controllers/algo/engine_configuration.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/firmware/config/boards/ST_STM32F4/board.c b/firmware/config/boards/ST_STM32F4/board.c index b15f1e5f29..ebab7df998 100644 --- a/firmware/config/boards/ST_STM32F4/board.c +++ b/firmware/config/boards/ST_STM32F4/board.c @@ -129,8 +129,8 @@ void boardInit(void) { } /** - * @brief Board-specific configuration code. + * @brief Board-specific configuration code overrides. * @todo Add your board-specific code, if any. */ -void setBoardConfiguration(void) { +void setBoardConfigurationOverrides(void) { } diff --git a/firmware/config/boards/ST_STM32F4/board.h b/firmware/config/boards/ST_STM32F4/board.h index b2b7631f76..abff6dfcad 100644 --- a/firmware/config/boards/ST_STM32F4/board.h +++ b/firmware/config/boards/ST_STM32F4/board.h @@ -1342,7 +1342,7 @@ extern "C" { #endif void boardInit(void); - void setBoardConfiguration(void); + void setBoardConfigurationOverrides(void); #ifdef __cplusplus } #endif diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 3ebe70a62d..49b1acb76a 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -870,7 +870,7 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) { engineConfiguration->tpsAccelEnrichmentThreshold = 40; // TPS % change, per engine cycle // call overrided board-specific configuration setup, if needed (for custom boards only) - setBoardConfiguration(); + setBoardConfigurationOverrides(); } void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_ENGINE_PARAMETER_S) {