From dc7a24d80fed3396047bd93bce3053c29c99e686 Mon Sep 17 00:00:00 2001 From: Andrei Date: Sat, 22 Apr 2017 01:28:12 +0300 Subject: [PATCH] call-board-configuration pull request (fix) --- firmware/config/boards/ST_STM32F4/board.c | 7 +++++++ firmware/config/boards/ST_STM32F4/board.h | 1 + firmware/controllers/algo/engine_configuration.cpp | 2 +- firmware/svnversion.h | 4 ++-- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/firmware/config/boards/ST_STM32F4/board.c b/firmware/config/boards/ST_STM32F4/board.c index 4b26d39f8a..b15f1e5f29 100644 --- a/firmware/config/boards/ST_STM32F4/board.c +++ b/firmware/config/boards/ST_STM32F4/board.c @@ -127,3 +127,10 @@ bool mmc_lld_is_write_protected(MMCDriver *mmcp) { */ void boardInit(void) { } + +/** + * @brief Board-specific configuration code. + * @todo Add your board-specific code, if any. + */ +void setBoardConfiguration(void) { +} diff --git a/firmware/config/boards/ST_STM32F4/board.h b/firmware/config/boards/ST_STM32F4/board.h index d2526091e0..b2b7631f76 100644 --- a/firmware/config/boards/ST_STM32F4/board.h +++ b/firmware/config/boards/ST_STM32F4/board.h @@ -1342,6 +1342,7 @@ extern "C" { #endif void boardInit(void); + void setBoardConfiguration(void); #ifdef __cplusplus } #endif diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index d00f18329e..5562e4d581 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -869,7 +869,7 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) { engineConfiguration->tpsAccelLength = 12; engineConfiguration->tpsAccelEnrichmentThreshold = 40; // TPS % change, per engine cycle - boardInit(); + setBoardConfiguration(); } void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_ENGINE_PARAMETER_S) { diff --git a/firmware/svnversion.h b/firmware/svnversion.h index e62f252e07..9d3c30f097 100644 --- a/firmware/svnversion.h +++ b/firmware/svnversion.h @@ -1,5 +1,5 @@ // This file was generated by Version2Header -// Thu Apr 13 12:43:45 EDT 2017 +// Sat Apr 22 01:25:51 EEST 2017 #ifndef VCS_VERSION -#define VCS_VERSION "13823" +#define VCS_VERSION "13886" #endif