From 00bfa3a0a660858511abfc19e4e3eb47ebf00ee6 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 2 Sep 2023 22:35:50 -0400 Subject: [PATCH] export board-specific macro for stm32 pins based on board yaml #3298 only:alphax-4chan_f7 --- .../config/boards/hellen/alphax-4chan/connectors/main.yaml | 3 +-- .../config/boards/hellen/hellen-nb1/board_configuration.cpp | 2 +- .../boards/hellen/hellen121nissan/board_configuration.cpp | 2 +- .../boards/hellen/hellen154hyundai/board_configuration.cpp | 2 +- .../config/boards/hellen/hellenNA8_96/board_configuration.cpp | 2 +- firmware/config/boards/hellen_meta.h | 4 ++-- firmware/config/engines/custom_engine.cpp | 4 ++++ 7 files changed, 11 insertions(+), 8 deletions(-) diff --git a/firmware/config/boards/hellen/alphax-4chan/connectors/main.yaml b/firmware/config/boards/hellen/alphax-4chan/connectors/main.yaml index a7c1f3723b..4dcc2d9c6e 100644 --- a/firmware/config/boards/hellen/alphax-4chan/connectors/main.yaml +++ b/firmware/config/boards/hellen/alphax-4chan/connectors/main.yaml @@ -308,8 +308,7 @@ pins: color: gray - pin: E7 - # H144_IN_D_AUX4 - id: A7 + meta: H144_IN_D_AUX4 class: event_inputs ts_name: E7 - Flex function: Digital Input / Flex fuel sensor diff --git a/firmware/config/boards/hellen/hellen-nb1/board_configuration.cpp b/firmware/config/boards/hellen/hellen-nb1/board_configuration.cpp index 9c6f63e355..905d56147c 100644 --- a/firmware/config/boards/hellen/hellen-nb1/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen-nb1/board_configuration.cpp @@ -90,7 +90,7 @@ void setBoardDefaultConfiguration() { engineConfiguration->enableSoftwareKnock = true; engineConfiguration->boostControlPin = Gpio::H144_LS_6; - engineConfiguration->acSwitch = H144_IN_D_AUX3; + engineConfiguration->acSwitch = Gpio::H144_IN_D_AUX3; engineConfiguration->acRelayPin = Gpio::H144_OUT_IO6; engineConfiguration->fuelPumpPin = Gpio::G2; // OUT_IO9 engineConfiguration->idle.solenoidPin = Gpio::D14; // OUT_PWM5 diff --git a/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp b/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp index 32179d17cc..23e67053b0 100644 --- a/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp @@ -55,7 +55,7 @@ static void setupDefaultSensorInputs() { engineConfiguration->camInputs[0] = Gpio::H144_IN_CAM; // todo: remove from default since 4 cylinder does not use it // todo: this requires unit test change - engineConfiguration->camInputs[1 * CAMS_PER_BANK] = H144_IN_D_AUX4; + engineConfiguration->camInputs[1 * CAMS_PER_BANK] = Gpio::H144_IN_D_AUX4; setTPS1Inputs(H144_IN_TPS, H144_IN_AUX1); diff --git a/firmware/config/boards/hellen/hellen154hyundai/board_configuration.cpp b/firmware/config/boards/hellen/hellen154hyundai/board_configuration.cpp index 80343f3ec6..e83efc140d 100644 --- a/firmware/config/boards/hellen/hellen154hyundai/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen154hyundai/board_configuration.cpp @@ -76,7 +76,7 @@ void setBoardConfigOverrides() { engineConfiguration->triggerInputPins[1] = Gpio::Unassigned; // Direct hall-only cam input // exhaust input same on both revisions - engineConfiguration->camInputs[1] = H144_IN_D_AUX4; + engineConfiguration->camInputs[1] = Gpio::H144_IN_D_AUX4; int16_t hellenBoardId = engine->engineState.hellenBoardId; if (hellenBoardId == -1) { diff --git a/firmware/config/boards/hellen/hellenNA8_96/board_configuration.cpp b/firmware/config/boards/hellen/hellenNA8_96/board_configuration.cpp index 53391a14db..2855e792b2 100644 --- a/firmware/config/boards/hellen/hellenNA8_96/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellenNA8_96/board_configuration.cpp @@ -95,7 +95,7 @@ void setBoardDefaultConfiguration() { engineConfiguration->enableSoftwareKnock = true; engineConfiguration->boostControlPin = Gpio::H144_LS_6; - engineConfiguration->acSwitch = H144_IN_D_AUX3; + engineConfiguration->acSwitch = Gpio::H144_IN_D_AUX3; engineConfiguration->acRelayPin = Gpio::H144_OUT_IO6; engineConfiguration->fuelPumpPin = Gpio::G2; // OUT_IO9 engineConfiguration->idle.solenoidPin = Gpio::D14; // OUT_PWM5 diff --git a/firmware/config/boards/hellen_meta.h b/firmware/config/boards/hellen_meta.h index 027bdc3297..2d3b098c1a 100644 --- a/firmware/config/boards/hellen_meta.h +++ b/firmware/config/boards/hellen_meta.h @@ -207,9 +207,9 @@ void detectHellenBoardType(); #define H144_IN_D_4 E15 // A22 -#define H144_IN_D_AUX3 Gpio::C5 +#define H144_IN_D_AUX3 C5 // A20 AIN20 -#define H144_IN_D_AUX4 Gpio::A7 +#define H144_IN_D_AUX4 A7 #define H176_LS_1 Gpio::G7 #define H176_LS_2 Gpio::G8 diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp index cfca170d07..42c9e75aa1 100644 --- a/firmware/config/engines/custom_engine.cpp +++ b/firmware/config/engines/custom_engine.cpp @@ -1019,4 +1019,8 @@ void alphax4chanStimQc() { engineConfiguration->triggerInputPins[0] = Gpio::H144_IN_CAM; engineConfiguration->triggerInputPins[1] = Gpio::H144_IN_D_4; + engineConfiguration->camInputs[0] = Gpio::H144_IN_VSS; + engineConfiguration->camInputs[1] = Gpio::H144_IN_D_AUX4; + engineConfiguration->camInputs[2] = Gpio::H144_IN_SENS2; + engineConfiguration->camInputs[3] = Gpio::H144_IN_SENS3; }