diff --git a/firmware/config/boards/hellen/alphax-2chan/board.mk b/firmware/config/boards/hellen/alphax-2chan/board.mk index a22b1356a1..fc697f1dc9 100644 --- a/firmware/config/boards/hellen/alphax-2chan/board.mk +++ b/firmware/config/boards/hellen/alphax-2chan/board.mk @@ -13,10 +13,7 @@ DDEFS += -DFIRMWARE_ID=\"AlphaX-2chan\" DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE 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-common144.mk +DDEFS += $(PRIMARY_COMMUNICATION_PORT_USART2) + diff --git a/firmware/config/boards/hellen/alphax-4chan/board.mk b/firmware/config/boards/hellen/alphax-4chan/board.mk index 6b4ac4a411..d1aa40826b 100644 --- a/firmware/config/boards/hellen/alphax-4chan/board.mk +++ b/firmware/config/boards/hellen/alphax-4chan/board.mk @@ -13,10 +13,7 @@ DDEFS += -DFIRMWARE_ID=\"AlphaX-4chan\" DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE 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-common144.mk +DDEFS += $(PRIMARY_COMMUNICATION_PORT_USART2) + diff --git a/firmware/config/boards/hellen/harley81/board.mk b/firmware/config/boards/hellen/harley81/board.mk index 27e6386503..07e551db51 100644 --- a/firmware/config/boards/hellen/harley81/board.mk +++ b/firmware/config/boards/hellen/harley81/board.mk @@ -13,10 +13,8 @@ DDEFS += -DFIRMWARE_ID=\"hellen81hd\" DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE 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-common144.mk +# Enable serial pins on expansion header +DDEFS += $(PRIMARY_COMMUNICATION_PORT_USART2) + diff --git a/firmware/config/boards/hellen/hellen-common144.mk b/firmware/config/boards/hellen/hellen-common144.mk index 887795b1ff..9eb6ee898a 100644 --- a/firmware/config/boards/hellen/hellen-common144.mk +++ b/firmware/config/boards/hellen/hellen-common144.mk @@ -6,4 +6,6 @@ endif DDEFS += $(LED_CRITICAL_ERROR_BRAIN_PIN) +PRIMARY_COMMUNICATION_PORT_USART2=-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 \ 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 9f28d1e997..8cf68eb696 100644 --- a/firmware/config/boards/hellen/hellen-nb1/board.mk +++ b/firmware/config/boards/hellen/hellen-nb1/board.mk @@ -16,9 +16,7 @@ DDEFS += -DFIRMWARE_ID=\"hellenNB1\" $(DEFAULT_ENGINE_TYPE) DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE DDEFS += -DHAL_TRIGGER_USE_PAL=TRUE - +include $(BOARDS_DIR)/hellen/hellen-common144.mk # 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-common144.mk +DDEFS += $(PRIMARY_COMMUNICATION_PORT_USART2) diff --git a/firmware/config/boards/hellen/hellenNA8_96/board.mk b/firmware/config/boards/hellen/hellenNA8_96/board.mk index 526b23ebb7..9a44a14054 100644 --- a/firmware/config/boards/hellen/hellenNA8_96/board.mk +++ b/firmware/config/boards/hellen/hellenNA8_96/board.mk @@ -18,11 +18,8 @@ DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE DDEFS += -DFIRMWARE_ID=\"hellenNB1\" $(DEFAULT_ENGINE_TYPE) DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE 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-common144.mk +# Enable serial pins on expansion header +DDEFS += $(PRIMARY_COMMUNICATION_PORT_USART2) +