From dffe5701fb41ee31336f293c78f14b05266a2437 Mon Sep 17 00:00:00 2001 From: Andrey Date: Mon, 25 Oct 2021 14:22:46 -0400 Subject: [PATCH] export board-specific macro for stm32 pins based on board yaml #3298 proteus meta progress --- .../config/boards/proteus/board_configuration.cpp | 14 ++++---------- firmware/config/boards/proteus/proteus_meta.h | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/firmware/config/boards/proteus/board_configuration.cpp b/firmware/config/boards/proteus/board_configuration.cpp index a1664c75e3..0ddf673d6d 100644 --- a/firmware/config/boards/proteus/board_configuration.cpp +++ b/firmware/config/boards/proteus/board_configuration.cpp @@ -119,17 +119,11 @@ static void setupDefaultSensorInputs() { engineConfiguration->triggerInputPins[1] = GPIO_UNASSIGNED; engineConfiguration->triggerInputPins[2] = GPIO_UNASSIGNED; - // CLT = Analog Temp 3 = PB0 - engineConfiguration->clt.adcChannel = EFI_ADC_8; - // IAT = Analog Temp 2 = PC5 - engineConfiguration->iat.adcChannel = EFI_ADC_15; - - // TPS = Analog volt 2 = PC1 - engineConfiguration->tps1_1AdcChannel = EFI_ADC_11; - - // MAP = Analog volt 1 = PC0 - engineConfiguration->map.sensor.hwChannel = EFI_ADC_10; + engineConfiguration->clt.adcChannel = PROTEUS_IN_CLT; + engineConfiguration->iat.adcChannel = PROTEUS_IN_IAT; + engineConfiguration->tps1_1AdcChannel = PROTEUS_IN_TPS; + engineConfiguration->map.sensor.hwChannel = PROTEUS_IN_MAP; // pin #28 WBO AFR "Analog Volt 10" engineConfiguration->afr.hwChannel = EFI_ADC_5; diff --git a/firmware/config/boards/proteus/proteus_meta.h b/firmware/config/boards/proteus/proteus_meta.h index c83d0fe82d..a667e41b6c 100644 --- a/firmware/config/boards/proteus/proteus_meta.h +++ b/firmware/config/boards/proteus/proteus_meta.h @@ -54,6 +54,21 @@ #define PROTEUS_HS_11 GPIOG_3 #define PROTEUS_HS_12 GPIOG_2 +// IAT = Analog Temp 2 = PC5 +#define PROTEUS_IN_ANALOG_TEMP_2 EFI_ADC_15 +#define PROTEUS_IN_IAT PROTEUS_IN_ANALOG_TEMP_2 + +// CLT = Analog Temp 3 = PB0 +#define PROTEUS_IN_ANALOG_TEMP_3 EFI_ADC_8 +#define PROTEUS_IN_CLT PROTEUS_IN_ANALOG_TEMP_3 + +// MAP = Analog volt 1 = PC0 +#define PROTEUS_IN_ANALOG_VOLT_1 EFI_ADC_10 +#define PROTEUS_IN_MAP PROTEUS_IN_ANALOG_VOLT_1 + +// TPS = Analog volt 2 = PC1 +#define PROTEUS_IN_ANALOG_VOLT_2 EFI_ADC_11 +#define PROTEUS_IN_TPS PROTEUS_IN_ANALOG_VOLT_2 #define PROTEUS_VR_1 GPIOE_7 #define PROTEUS_VR_2 GPIOE_8