From 7302eedf7b0549c740e1cb261a5c8cc2e12e18ac Mon Sep 17 00:00:00 2001
From: rusefillc <sdfsdfqsf2334234234>
Date: Sun, 3 Oct 2021 00:59:34 -0400
Subject: [PATCH] export board-specific macro for stm32 pins based on board
 yaml #3298

---
 .../hellen/hellen121vag/board_configuration.cpp    |  6 +-----
 .../hellen/hellen128/board_configuration.cpp       |  9 +++++----
 .../hellen64_miataNA6_94/board_configuration.cpp   |  8 ++------
 firmware/config/boards/hellen/hellen_meta.h        | 14 ++++++++++++++
 4 files changed, 22 insertions(+), 15 deletions(-)
 create mode 100644 firmware/config/boards/hellen/hellen_meta.h

diff --git a/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp b/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp
index a094982fd8..c64682572a 100644
--- a/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp
+++ b/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp
@@ -13,6 +13,7 @@
 #include "pch.h"
 #include "fsio_impl.h"
 #include "custom_engine.h"
+#include "../hellen_meta.h"
 
 static void hellenWbo() {
 	engineConfiguration->enableAemXSeries = true;
@@ -24,11 +25,6 @@ static void setInjectorPins() {
 	engineConfiguration->injectionPins[2] = GPIOD_11; // 97 - INJ_3
 	engineConfiguration->injectionPins[3] = GPIOD_10;
 
-	//engineConfiguration->injectionPins[4] = GPIOD_9;
-	//engineConfiguration->injectionPins[5] = GPIOF_12;
-	//engineConfiguration->injectionPins[6] = GPIOF_13;
-	//engineConfiguration->injectionPins[7] = GPIOF_14;
-
 	// Disable remainder
 	for (int i = 4; i < MAX_CYLINDER_COUNT;i++) {
 		engineConfiguration->injectionPins[i] = GPIO_UNASSIGNED;
diff --git a/firmware/config/boards/hellen/hellen128/board_configuration.cpp b/firmware/config/boards/hellen/hellen128/board_configuration.cpp
index cbefe4b30c..abf4f601d9 100644
--- a/firmware/config/boards/hellen/hellen128/board_configuration.cpp
+++ b/firmware/config/boards/hellen/hellen128/board_configuration.cpp
@@ -13,13 +13,14 @@
 #include "pch.h"
 #include "fsio_impl.h"
 #include "custom_engine.h"
+#include "../hellen_meta.h"
 
 static void hellenWbo() {
 	engineConfiguration->enableAemXSeries = true;
 }
 
 static void setInjectorPins() {
-	engineConfiguration->injectionPins[0] = GPIOG_7;
+	engineConfiguration->injectionPins[0] = H176_LS_1;
 	engineConfiguration->injectionPins[1] = GPIOG_8;
 	engineConfiguration->injectionPins[2] = GPIOD_11;
 	engineConfiguration->injectionPins[3] = GPIOD_10;
@@ -156,9 +157,9 @@ void setBoardDefaultConfiguration(void) {
 	engineConfiguration->injectionMode = IM_SEQUENTIAL;//IM_BATCH;// IM_SEQUENTIAL;
 
 	//Set default ETB config
-	engineConfiguration->etbIo[0].directionPin1 = GPIOC_6; // out_pwm2
-	engineConfiguration->etbIo[0].directionPin2 = GPIOC_7; // out_pwm3
-	engineConfiguration->etbIo[0].controlPin = GPIOD_13; // ETB_EN out_pwm1
+	engineConfiguration->etbIo[0].directionPin1 = H176_OUT_PWM2;
+	engineConfiguration->etbIo[0].directionPin2 = H176_OUT_PWM3;
+	engineConfiguration->etbIo[0].controlPin = H176_OUT_PWM1; // ETB_EN
 	CONFIG(etb_use_two_wires) = true;
 
 	strcpy(CONFIG(engineMake), ENGINE_MAKE_MERCEDES);
diff --git a/firmware/config/boards/hellen/hellen64_miataNA6_94/board_configuration.cpp b/firmware/config/boards/hellen/hellen64_miataNA6_94/board_configuration.cpp
index 2c86b95fc4..42bd779d5c 100644
--- a/firmware/config/boards/hellen/hellen64_miataNA6_94/board_configuration.cpp
+++ b/firmware/config/boards/hellen/hellen64_miataNA6_94/board_configuration.cpp
@@ -13,18 +13,14 @@
 #include "pch.h"
 #include "fsio_impl.h"
 #include "custom_engine.h"
+#include "../hellen_meta.h"
 
 static void setInjectorPins() {
-	engineConfiguration->injectionPins[0] = GPIOG_7;
+	engineConfiguration->injectionPins[0] = H176_LS_1;
 	engineConfiguration->injectionPins[1] = GPIOG_8;
 	engineConfiguration->injectionPins[2] = GPIOD_11;
 	engineConfiguration->injectionPins[3] = GPIOD_10;
 
-	//engineConfiguration->injectionPins[4] = GPIOD_9;
-	//engineConfiguration->injectionPins[5] = GPIOF_12;
-	//engineConfiguration->injectionPins[6] = GPIOF_13;
-	//engineConfiguration->injectionPins[7] = GPIOF_14;
-
 	// Disable remainder
 	for (int i = 4; i < MAX_CYLINDER_COUNT;i++) {
 		engineConfiguration->injectionPins[i] = GPIO_UNASSIGNED;
diff --git a/firmware/config/boards/hellen/hellen_meta.h b/firmware/config/boards/hellen/hellen_meta.h
new file mode 100644
index 0000000000..8634f34d28
--- /dev/null
+++ b/firmware/config/boards/hellen/hellen_meta.h
@@ -0,0 +1,14 @@
+/*
+ * hellen_meta.h
+ *
+ * @date Oct 2, 2021
+ * @author Andrey Belomutskiy, (c) 2012-2021
+ */
+
+#pragma once
+
+#define H176_LS_1 GPIOG_7
+
+#define H176_OUT_PWM1 GPIOD_13
+#define H176_OUT_PWM2 GPIOC_6
+#define H176_OUT_PWM3 GPIOC_7