From 0e6a51e5c0f22939b3e3834787acf653d01870e0 Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 26 Oct 2021 10:27:10 -0400 Subject: [PATCH] export board-specific macro for stm32 pins based on board yaml #3298 meta progress --- firmware/Makefile | 1 + .../microrusefi/board_configuration.cpp | 13 ++++------ firmware/config/boards/microrusefi/mre_meta.h | 15 ------------ firmware/config/boards/mre_meta.h | 24 +++++++++++++++++++ .../boards/{proteus => }/proteus_meta.h | 0 firmware/config/engines/mazda_miata_vvt.cpp | 2 ++ simulator/Makefile | 1 + unit_tests/Makefile | 3 +-- 8 files changed, 34 insertions(+), 25 deletions(-) delete mode 100644 firmware/config/boards/microrusefi/mre_meta.h create mode 100644 firmware/config/boards/mre_meta.h rename firmware/config/boards/{proteus => }/proteus_meta.h (100%) diff --git a/firmware/Makefile b/firmware/Makefile index 17024d4847..a5e1e4b0d3 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -290,6 +290,7 @@ INCDIR = \ $(CHIBIOS)/os/hal/lib/peripherals/sensors \ $(CONFDIR) \ config/engines \ + config/boards \ config \ ext \ ext_algo \ diff --git a/firmware/config/boards/microrusefi/board_configuration.cpp b/firmware/config/boards/microrusefi/board_configuration.cpp index 60a20d8145..8938b174c6 100644 --- a/firmware/config/boards/microrusefi/board_configuration.cpp +++ b/firmware/config/boards/microrusefi/board_configuration.cpp @@ -20,6 +20,7 @@ #include "pch.h" #include "fsio_impl.h" +#include "mre_meta.h" static void setInjectorPins() { engineConfiguration->injectionPins[0] = TLE8888_PIN_1; @@ -133,22 +134,18 @@ static void setupDefaultSensorInputs() { // open question if it's great to have TPS in default TPS - the down-side is for // vehicles without TPS or for first start without TPS one would have to turn in off // to avoid cranking corrections based on wrong TPS data - // tps = "20 - AN volt 5" PC3 - engineConfiguration->tps1_1AdcChannel = EFI_ADC_13; + engineConfiguration->tps1_1AdcChannel = MRE_IN_TPS; engineConfiguration->tps2_1AdcChannel = EFI_ADC_NONE; - // EFI_ADC_10: "27 - AN volt 1" - engineConfiguration->map.sensor.hwChannel = EFI_ADC_10; + engineConfiguration->map.sensor.hwChannel = MRE_IN_MAP; // EFI_ADC_14: "32 - AN volt 6" engineConfiguration->afr.hwChannel = EFI_ADC_14; - // clt = "18 - AN temp 1" - engineConfiguration->clt.adcChannel = EFI_ADC_0; + engineConfiguration->clt.adcChannel = MRE_IN_CLT; - // iat = "23 - AN temp 2" - engineConfiguration->iat.adcChannel = EFI_ADC_1; + engineConfiguration->iat.adcChannel = MRE_IN_IAT; setCommonNTCSensor(&engineConfiguration->auxTempSensor1, 2700); setCommonNTCSensor(&engineConfiguration->auxTempSensor2, 2700); diff --git a/firmware/config/boards/microrusefi/mre_meta.h b/firmware/config/boards/microrusefi/mre_meta.h deleted file mode 100644 index 9252d6428e..0000000000 --- a/firmware/config/boards/microrusefi/mre_meta.h +++ /dev/null @@ -1,15 +0,0 @@ -/* - * @file mre_meta.h - * - * @date Oct 25, 2021 - * @author Andrey Belomutskiy, (c) 2012-2021 - */ - -#pragma once - -// // clt = "18 - AN temp 1" -#define MRE_IN_ANALOG_TEMP_1 EFI_ADC_0 -#define MRE_IN_CLT MRE_IN_ANALOG_TEMP_1 - -// "27 - AN volt 1" -#define MRE_IN_ANALOG_VOLT_1 EFI_ADC_10 diff --git a/firmware/config/boards/mre_meta.h b/firmware/config/boards/mre_meta.h new file mode 100644 index 0000000000..abc19c8fe9 --- /dev/null +++ b/firmware/config/boards/mre_meta.h @@ -0,0 +1,24 @@ +/* + * @file mre_meta.h + * + * @date Oct 25, 2021 + * @author Andrey Belomutskiy, (c) 2012-2021 + */ + +#pragma once + +// clt = "18 - AN temp 1" +#define MRE_IN_ANALOG_TEMP_1 EFI_ADC_0 +#define MRE_IN_CLT MRE_IN_ANALOG_TEMP_1 + +// iat = "23 - AN temp 2" +#define MRE_IN_ANALOG_TEMP_2 EFI_ADC_1 +#define MRE_IN_IAT MRE_IN_ANALOG_TEMP_2 + +// map = "27 - AN volt 1" +#define MRE_IN_ANALOG_VOLT_1 EFI_ADC_10 +#define MRE_IN_MAP MRE_IN_ANALOG_VOLT_1 + +// tps = "20 - AN volt 5" PC3 +#define MRE_IN_ANALOG_VOLT_5 EFI_ADC_13 +#define MRE_IN_TPS MRE_IN_ANALOG_VOLT_5 diff --git a/firmware/config/boards/proteus/proteus_meta.h b/firmware/config/boards/proteus_meta.h similarity index 100% rename from firmware/config/boards/proteus/proteus_meta.h rename to firmware/config/boards/proteus_meta.h diff --git a/firmware/config/engines/mazda_miata_vvt.cpp b/firmware/config/engines/mazda_miata_vvt.cpp index 970e34e58c..cf4eab3dcc 100644 --- a/firmware/config/engines/mazda_miata_vvt.cpp +++ b/firmware/config/engines/mazda_miata_vvt.cpp @@ -59,6 +59,8 @@ #include "proteus_meta.h" #endif +#include "mre_meta.h" + static const float injectorLagBins[VBAT_INJECTOR_CURVE_SIZE] = { 6.0, 8.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0 diff --git a/simulator/Makefile b/simulator/Makefile index db71acc013..6fc66619f8 100644 --- a/simulator/Makefile +++ b/simulator/Makefile @@ -204,6 +204,7 @@ INCDIR = . \ $(PROJECT_DIR)/init \ $(CONSOLE_INC) \ $(PROJECT_DIR)/config/engines \ + $(PROJECT_DIR)/config/boards/ \ $(PROJECT_DIR)/ext_algo \ $(HW_LAYER_DRIVERS_INC) \ $(HW_LAYER_INC) \ diff --git a/unit_tests/Makefile b/unit_tests/Makefile index ed623dba7c..c15df99175 100644 --- a/unit_tests/Makefile +++ b/unit_tests/Makefile @@ -68,8 +68,7 @@ INCDIR += \ $(ALLINC) \ $(UTIL_INC) \ $(PROJECT_DIR)/config/engines \ - $(PROJECT_DIR)/config/boards/proteus \ - $(PROJECT_DIR)/config/boards/microrusefi \ + $(PROJECT_DIR)/config/boards/ \ $(CONTROLLERS_INC) \ $(CONSOLE_INC) \ $(DEVELOPMENT_DIR) \