From 6c2d9879b9338b5c2486a82c9dbd9c7e35d97337 Mon Sep 17 00:00:00 2001
From: rusefillc <sdfsdfqsf2334234234>
Date: Wed, 9 Feb 2022 23:04:27 -0500
Subject: [PATCH] reducing code duplication 144

---
 firmware/config/boards/hellen/hellen-common144.mk      |  9 +++++++++
 firmware/config/boards/hellen/hellen-nb1/board.mk      |  9 +--------
 firmware/config/boards/hellen/hellen121nissan/board.mk |  9 ++-------
 .../config/boards/hellen/hellen154hyundai/board.mk     | 10 ++--------
 firmware/config/boards/hellen/hellen88bmw/board.mk     |  8 ++------
 firmware/config/boards/hellen/hellenNA8_96/board.mk    |  8 ++------
 6 files changed, 18 insertions(+), 35 deletions(-)
 create mode 100644 firmware/config/boards/hellen/hellen-common144.mk

diff --git a/firmware/config/boards/hellen/hellen-common144.mk b/firmware/config/boards/hellen/hellen-common144.mk
new file mode 100644
index 0000000000..673798e765
--- /dev/null
+++ b/firmware/config/boards/hellen/hellen-common144.mk
@@ -0,0 +1,9 @@
+
+# 144 package MCU
+ifeq ($(LED_CRITICAL_ERROR_BRAIN_PIN),)
+  LED_CRITICAL_ERROR_BRAIN_PIN = -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOG_0
+endif
+
+DDEFS += $(LED_CRITICAL_ERROR_BRAIN_PIN)
+
+include $(BOARDS_DIR)/hellen/hellen-common.mk
\ No newline at end of file
diff --git a/firmware/config/boards/hellen/hellen-nb1/board.mk b/firmware/config/boards/hellen/hellen-nb1/board.mk
index 4476344343..ded24e3c95 100644
--- a/firmware/config/boards/hellen/hellen-nb1/board.mk
+++ b/firmware/config/boards/hellen/hellen-nb1/board.mk
@@ -9,15 +9,8 @@ ifeq ($(DEFAULT_ENGINE_TYPE),)
   DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_NB1
 endif
 
-# 144 package MCU
-ifeq ($(LED_CRITICAL_ERROR_BRAIN_PIN),)
-  LED_CRITICAL_ERROR_BRAIN_PIN = -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOG_0
-endif
-
 DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
 
-
-
 # Add them all together
 DDEFS += -DEFI_USE_OSC=TRUE -DFIRMWARE_ID=\"hellenNB1\" $(DEFAULT_ENGINE_TYPE) $(LED_CRITICAL_ERROR_BRAIN_PIN) $(LED_COMMUNICATION_BRAIN_PIN)
 DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
@@ -28,4 +21,4 @@ DDEFS += -DHAL_TRIGGER_USE_PAL=TRUE
 # Enable serial pins on expansion header
 DDEFS += -DEFI_CONSOLE_TX_BRAIN_PIN=GPIOD_6 -DEFI_CONSOLE_RX_BRAIN_PIN=GPIOD_5 -DTS_PRIMARY_PORT=UARTD2 -DSTM32_UART_USE_USART2=1
 
-include $(BOARDS_DIR)/hellen/hellen-common.mk
+include $(BOARDS_DIR)/hellen/hellen-common144.mk
diff --git a/firmware/config/boards/hellen/hellen121nissan/board.mk b/firmware/config/boards/hellen/hellen121nissan/board.mk
index bf5add5189..ec5b93f15d 100644
--- a/firmware/config/boards/hellen/hellen121nissan/board.mk
+++ b/firmware/config/boards/hellen/hellen121nissan/board.mk
@@ -9,21 +9,16 @@ ifeq ($(DEFAULT_ENGINE_TYPE),)
   DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_121_NISSAN_6_CYL
 endif
 
-# 144 package MCU
-ifeq ($(LED_CRITICAL_ERROR_BRAIN_PIN),)
-  LED_CRITICAL_ERROR_BRAIN_PIN = -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOG_0
-endif
-
 DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
 
 # Disable serial ports on this board as UART3 causes a DMA conflict with the SD card
 DDEFS += -DTS_NO_PRIMARY=1
 
 # Add them all together
-DDEFS += -DEFI_USE_OSC=TRUE -DFIRMWARE_ID=\"hellen121nissan\" $(DEFAULT_ENGINE_TYPE) $(LED_CRITICAL_ERROR_BRAIN_PIN) $(LED_COMMUNICATION_BRAIN_PIN)
+DDEFS += -DEFI_USE_OSC=TRUE -DFIRMWARE_ID=\"hellen121nissan\" $(DEFAULT_ENGINE_TYPE) $(LED_COMMUNICATION_BRAIN_PIN)
 DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
 DDEFS += -DHAL_TRIGGER_USE_PAL=TRUE
 
 
 
-include $(BOARDS_DIR)/hellen/hellen-common.mk
+include $(BOARDS_DIR)/hellen/hellen-common144.mk
diff --git a/firmware/config/boards/hellen/hellen154hyundai/board.mk b/firmware/config/boards/hellen/hellen154hyundai/board.mk
index 4ff9eb9488..da30794e56 100644
--- a/firmware/config/boards/hellen/hellen154hyundai/board.mk
+++ b/firmware/config/boards/hellen/hellen154hyundai/board.mk
@@ -9,22 +9,16 @@ ifeq ($(DEFAULT_ENGINE_TYPE),)
   DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_154_HYUNDAI_COUPE_BK2
 endif
 
-# 144 package MCU
-ifeq ($(LED_CRITICAL_ERROR_BRAIN_PIN),)
-  LED_CRITICAL_ERROR_BRAIN_PIN = -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOG_0
-endif
-
 DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
 
 # Disable serial ports on this board as UART3 causes a DMA conflict with the SD card
 DDEFS += -DTS_NO_PRIMARY=1
 
 # Add them all together
-DDEFS += -DEFI_USE_OSC=TRUE -DFIRMWARE_ID=\"hellen154hyundai\" $(DEFAULT_ENGINE_TYPE) $(LED_CRITICAL_ERROR_BRAIN_PIN) $(LED_COMMUNICATION_BRAIN_PIN)
+DDEFS += -DEFI_USE_OSC=TRUE -DFIRMWARE_ID=\"hellen154hyundai\" $(DEFAULT_ENGINE_TYPE) $(LED_COMMUNICATION_BRAIN_PIN)
 DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
 DDEFS += -DHAL_TRIGGER_USE_PAL=TRUE
 
 
 
-include $(BOARDS_DIR)/hellen/hellen-common.mk
-
+include $(BOARDS_DIR)/hellen/hellen-common144.mk
diff --git a/firmware/config/boards/hellen/hellen88bmw/board.mk b/firmware/config/boards/hellen/hellen88bmw/board.mk
index 3ae5cd38d7..b588a7080a 100644
--- a/firmware/config/boards/hellen/hellen88bmw/board.mk
+++ b/firmware/config/boards/hellen/hellen88bmw/board.mk
@@ -9,10 +9,6 @@ ifeq ($(DEFAULT_ENGINE_TYPE),)
   DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_88_BMW
 endif
 
-# 144 package MCU
-ifeq ($(LED_CRITICAL_ERROR_BRAIN_PIN),)
-  LED_CRITICAL_ERROR_BRAIN_PIN = -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOG_0
-endif
 
 DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
 
@@ -20,10 +16,10 @@ DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
 DDEFS += -DTS_NO_PRIMARY=1
 
 # Add them all together
-DDEFS += -DEFI_USE_OSC=TRUE -DFIRMWARE_ID=\"hellen88bmw\" $(DEFAULT_ENGINE_TYPE) $(LED_CRITICAL_ERROR_BRAIN_PIN) $(LED_COMMUNICATION_BRAIN_PIN)
+DDEFS += -DEFI_USE_OSC=TRUE -DFIRMWARE_ID=\"hellen88bmw\" $(DEFAULT_ENGINE_TYPE) $(LED_COMMUNICATION_BRAIN_PIN)
 DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
 DDEFS += -DHAL_TRIGGER_USE_PAL=TRUE
 
 
 
-include $(BOARDS_DIR)/hellen/hellen-common.mk
+include $(BOARDS_DIR)/hellen/hellen-common144.mk
diff --git a/firmware/config/boards/hellen/hellenNA8_96/board.mk b/firmware/config/boards/hellen/hellenNA8_96/board.mk
index c278cf528c..e00719b480 100644
--- a/firmware/config/boards/hellen/hellenNA8_96/board.mk
+++ b/firmware/config/boards/hellen/hellenNA8_96/board.mk
@@ -9,17 +9,13 @@ ifeq ($(DEFAULT_ENGINE_TYPE),)
   DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_NA8_96
 endif
 
-# 144 package MCU
-ifeq ($(LED_CRITICAL_ERROR_BRAIN_PIN),)
-  LED_CRITICAL_ERROR_BRAIN_PIN = -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOG_0
-endif
 
 DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
 
 
 
 # Add them all together
-DDEFS += -DEFI_USE_OSC=TRUE -DFIRMWARE_ID=\"hellenNB1\" $(DEFAULT_ENGINE_TYPE) $(LED_CRITICAL_ERROR_BRAIN_PIN) $(LED_COMMUNICATION_BRAIN_PIN)
+DDEFS += -DEFI_USE_OSC=TRUE -DFIRMWARE_ID=\"hellenNB1\" $(DEFAULT_ENGINE_TYPE) $(LED_COMMUNICATION_BRAIN_PIN)
 DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
 DDEFS += -DHAL_TRIGGER_USE_PAL=TRUE
 
@@ -28,5 +24,5 @@ DDEFS += -DHAL_TRIGGER_USE_PAL=TRUE
 # Enable serial pins on expansion header
 DDEFS += -DEFI_CONSOLE_TX_BRAIN_PIN=GPIOD_6 -DEFI_CONSOLE_RX_BRAIN_PIN=GPIOD_5 -DTS_PRIMARY_PORT=UARTD2 -DSTM32_UART_USE_USART2=1
 
-include $(BOARDS_DIR)/hellen/hellen-common.mk
+include $(BOARDS_DIR)/hellen/hellen-common144.mk