diff --git a/.github/workflows/build-firmware.yaml b/.github/workflows/build-firmware.yaml index 064fd3cdcf..454257e77c 100644 --- a/.github/workflows/build-firmware.yaml +++ b/.github/workflows/build-firmware.yaml @@ -12,7 +12,7 @@ jobs: matrix: # What boards should we build for? In the 'include' section below, # set up what each of these boards needs to build. - build-target: [hellen72, cypress, frankenso_na6, kinetis, mre_f4, mre_f4_recovery, mre_f4_hardware_QC_special_build, mre_f7, prometheus_405, prometheus_469, proteus_f4, proteus_f4_hardware_QC_special_build, proteus_f7, proteus_h7, stm32f767_nucleo, stm32h743_nucleo, subaru_eg33_f7] + build-target: [hellen72, hellen64_miataNA6_94, cypress, frankenso_na6, kinetis, mre_f4, mre_f4_recovery, mre_f4_hardware_QC_special_build, mre_f7, prometheus_405, prometheus_469, proteus_f4, proteus_f4_hardware_QC_special_build, proteus_f7, proteus_h7, stm32f767_nucleo, stm32h743_nucleo, subaru_eg33_f7] include: # Board configurations @@ -20,6 +20,11 @@ jobs: folder: hellen/hellen72 ini-file: rusefi_hellen72.ini + # Board configurations + - build-target: hellen64_miataNA6_94 + folder: hellen/hellen64_miataNA6_94 + ini-file: rusefi_hellenNA6.ini + # Board configurations - build-target: cypress folder: hellen diff --git a/firmware/config/boards/hellen/hellen64_miataNA6_94/!compile_hellenNA6.bat b/firmware/config/boards/hellen/hellen64_miataNA6_94/!compile_hellenNA6.bat index d260b050a9..1fc5c075cb 100644 --- a/firmware/config/boards/hellen/hellen64_miataNA6_94/!compile_hellenNA6.bat +++ b/firmware/config/boards/hellen/hellen64_miataNA6_94/!compile_hellenNA6.bat @@ -1,2 +1,2 @@ @echo off -bash.exe compile_hellen72.sh +bash.exe compile_hellenNA6.sh diff --git a/firmware/config/boards/hellen/hellen64_miataNA6_94/board.h b/firmware/config/boards/hellen/hellen64_miataNA6_94/board.h index f3f92e5fae..b167c0f024 100644 --- a/firmware/config/boards/hellen/hellen64_miataNA6_94/board.h +++ b/firmware/config/boards/hellen/hellen64_miataNA6_94/board.h @@ -30,7 +30,7 @@ /* * Board identifier. */ -#define BOARD_NAME "Hellen72" +#define BOARD_NAME "HellenNA6" #define EFI_USB_AF 10U #define EFI_USB_SERIAL_DM GPIOA_11 diff --git a/firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk b/firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk index ce7cd73eef..ee402ed373 100644 --- a/firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk +++ b/firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk @@ -1,12 +1,12 @@ # Combine the related files for a specific platform and MCU. # Target ECU board design -BOARDCPPSRC = $(BOARDS_DIR)/hellen/hellen72/board_configuration.cpp -BOARDINC = $(BOARDS_DIR)/hellen/hellen72 +BOARDCPPSRC = $(BOARDS_DIR)/hellen/hellen64_miataNA6_94/board_configuration.cpp +BOARDINC = $(BOARDS_DIR)/hellen/hellen64_miataNA6_94 -# Set this if you want a default engine type other than normal Hellen72 +# Set this if you want a default engine type other than normal hellen64_miataNA6_94 ifeq ($(DEFAULT_ENGINE_TYPE),) - DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_NB2 + DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_NA6 endif ifeq ($(LED_CRITICAL_ERROR_BRAIN_PIN),) @@ -28,7 +28,7 @@ DDEFS += -DLED_COMMUNICATION_BRAIN_PIN_MODE=INVERTED_OUTPUT DDEFS += -DTS_NO_PRIMARY -DTS_NO_SECONDARY # Add them all together -DDEFS += -DEFI_USE_OSC=TRUE -DFIRMWARE_ID=\"hellen72\" $(DEFAULT_ENGINE_TYPE) $(LED_CRITICAL_ERROR_BRAIN_PIN) $(LED_COMMUNICATION_BRAIN_PIN) +DDEFS += -DEFI_USE_OSC=TRUE -DFIRMWARE_ID=\"hellenNA6\" $(DEFAULT_ENGINE_TYPE) $(LED_CRITICAL_ERROR_BRAIN_PIN) $(LED_COMMUNICATION_BRAIN_PIN) # -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE DDEFS += -DEFI_ICU_INPUTS=FALSE -DHAL_TRIGGER_USE_PAL=TRUE -DHAL_VSS_USE_PAL=TRUE # todo: is it broken? 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 66edaa31a3..90f4079a3e 100644 --- a/firmware/config/boards/hellen/hellen64_miataNA6_94/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen64_miataNA6_94/board_configuration.cpp @@ -1,10 +1,10 @@ /** - * @file boards/hellen/hellen72/board_configuration.cpp + * @file boards/hellen/hellen64_miataNA6_94/board_configuration.cpp * * - * @brief Configuration defaults for the Hellen72 board + * @brief Configuration defaults for the hellen64_miataNA6_94 board * - * See https://rusefi.com/s/hellen72 + * See https://rusefi.com/s/hellenNA6 * * @author andreika * @author Andrey Belomutskiy, (c) 2012-2020 diff --git a/firmware/config/boards/hellen/hellen64_miataNA6_94/compile_hellenNA6.sh b/firmware/config/boards/hellen/hellen64_miataNA6_94/compile_hellenNA6.sh index fba01bf769..389ecc4535 100644 --- a/firmware/config/boards/hellen/hellen64_miataNA6_94/compile_hellenNA6.sh +++ b/firmware/config/boards/hellen/hellen64_miataNA6_94/compile_hellenNA6.sh @@ -1,8 +1,8 @@ #!/bin/bash -export PROJECT_BOARD=hellen/hellen72 +export PROJECT_BOARD=hellen/hellen64_miataNA6_94 export PROJECT_CPU=ARCH_STM32F4 -export EXTRA_PARAMS="-DSHORT_BOARD_NAME=hellen72" +export EXTRA_PARAMS="-DSHORT_BOARD_NAME=hellenNA6" cd .. bash ../common_make.sh