rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

code duplication between hellen boards #2611 

it has to get worse before it gets better
This commit is contained in:
rusefillc 2021-05-01 19:45:09 -04:00
parent 88a1389af8
commit bfaad4c1b2
13 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/config/boards/hellen/hellen121nissan/board.h
View File

@ -30,7 +30,7 @@
/* /*
* Board identifier. * Board identifier.
*/ */
#define BOARD_NAME "Hellen72" #define BOARD_NAME "hellen121nissan"
#define EFI_USB_AF 10U #define EFI_USB_AF 10U
#define EFI_USB_SERIAL_DM GPIOA_11 #define EFI_USB_SERIAL_DM GPIOA_11

8
firmware/config/boards/hellen/hellen121nissan/board.mk
View File

@ -1,10 +1,10 @@
# Combine the related files for a specific platform and MCU. # Combine the related files for a specific platform and MCU.
# Target ECU board design # Target ECU board design
BOARDCPPSRC = $(BOARDS_DIR)/hellen/hellen72/board_configuration.cpp BOARDCPPSRC = $(BOARDS_DIR)/hellen/hellen121nissan/board_configuration.cpp
BOARDINC = $(BOARDS_DIR)/hellen/hellen72 BOARDINC = $(BOARDS_DIR)/hellen/hellen121nissan
# 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 hellen121nissan
ifeq ($(DEFAULT_ENGINE_TYPE),) ifeq ($(DEFAULT_ENGINE_TYPE),)
DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_NB2 DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_NB2
endif endif
@ -28,7 +28,7 @@ DDEFS += -DLED_COMMUNICATION_BRAIN_PIN_MODE=INVERTED_OUTPUT
DDEFS += -DTS_NO_PRIMARY -DTS_NO_SECONDARY DDEFS += -DTS_NO_PRIMARY -DTS_NO_SECONDARY
# Add them all together # 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=\"hellen121nissan\" $(DEFAULT_ENGINE_TYPE) $(LED_CRITICAL_ERROR_BRAIN_PIN) $(LED_COMMUNICATION_BRAIN_PIN)
DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
DDEFS += -DEFI_ICU_INPUTS=FALSE -DHAL_TRIGGER_USE_PAL=TRUE -DHAL_VSS_USE_PAL=TRUE DDEFS += -DEFI_ICU_INPUTS=FALSE -DHAL_TRIGGER_USE_PAL=TRUE -DHAL_VSS_USE_PAL=TRUE
# todo: is it broken? # todo: is it broken?

6
firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp
View File

@ -1,10 +1,10 @@
/** /**
* @file boards/hellen/hellen72/board_configuration.cpp * @file boards/hellen/hellen121nissan/board_configuration.cpp
* *
* *
* @brief Configuration defaults for the Hellen72 board * @brief Configuration defaults for the hellen121nissan board
* *
* See https://rusefi.com/s/hellen72 * See https://rusefi.com/s/hellen121nissan
* *
* @author andreika <prometheus.pcb@gmail.com> * @author andreika <prometheus.pcb@gmail.com>
* @author Andrey Belomutskiy, (c) 2012-2020 * @author Andrey Belomutskiy, (c) 2012-2020

4
firmware/config/boards/hellen/hellen121nissan/compile_hellen121nissan.sh
View File

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
export PROJECT_BOARD=hellen/hellen72 export PROJECT_BOARD=hellen/hellen121nissan
export PROJECT_CPU=ARCH_STM32F4 export PROJECT_CPU=ARCH_STM32F4
export EXTRA_PARAMS="-DSHORT_BOARD_NAME=hellen72" export EXTRA_PARAMS="-DSHORT_BOARD_NAME=hellen121nissan"
cd .. cd ..
bash ../common_make.sh bash ../common_make.sh

2
firmware/config/boards/hellen/hellen121vag/board.h
View File

@ -30,7 +30,7 @@
/* /*
* Board identifier. * Board identifier.
*/ */
#define BOARD_NAME "Hellen72" #define BOARD_NAME "hellen121vag"
#define EFI_USB_AF 10U #define EFI_USB_AF 10U
#define EFI_USB_SERIAL_DM GPIOA_11 #define EFI_USB_SERIAL_DM GPIOA_11

8
firmware/config/boards/hellen/hellen121vag/board.mk
View File

@ -1,10 +1,10 @@
# Combine the related files for a specific platform and MCU. # Combine the related files for a specific platform and MCU.
# Target ECU board design # Target ECU board design
BOARDCPPSRC = $(BOARDS_DIR)/hellen/hellen72/board_configuration.cpp BOARDCPPSRC = $(BOARDS_DIR)/hellen/hellen121vag/board_configuration.cpp
BOARDINC = $(BOARDS_DIR)/hellen/hellen72 BOARDINC = $(BOARDS_DIR)/hellen/hellen121vag
# 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 hellen121vag
ifeq ($(DEFAULT_ENGINE_TYPE),) ifeq ($(DEFAULT_ENGINE_TYPE),)
DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_NB2 DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_NB2
endif endif
@ -28,7 +28,7 @@ DDEFS += -DLED_COMMUNICATION_BRAIN_PIN_MODE=INVERTED_OUTPUT
DDEFS += -DTS_NO_PRIMARY -DTS_NO_SECONDARY DDEFS += -DTS_NO_PRIMARY -DTS_NO_SECONDARY
# Add them all together # 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=\"hellen121vag\" $(DEFAULT_ENGINE_TYPE) $(LED_CRITICAL_ERROR_BRAIN_PIN) $(LED_COMMUNICATION_BRAIN_PIN)
DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
DDEFS += -DEFI_ICU_INPUTS=FALSE -DHAL_TRIGGER_USE_PAL=TRUE -DHAL_VSS_USE_PAL=TRUE DDEFS += -DEFI_ICU_INPUTS=FALSE -DHAL_TRIGGER_USE_PAL=TRUE -DHAL_VSS_USE_PAL=TRUE
# todo: is it broken? # todo: is it broken?

6
firmware/config/boards/hellen/hellen121vag/board_configuration.cpp
View File

@ -1,10 +1,10 @@
/** /**
* @file boards/hellen/hellen72/board_configuration.cpp * @file boards/hellen/hellen121vag/board_configuration.cpp
* *
* *
* @brief Configuration defaults for the Hellen72 board * @brief Configuration defaults for the hellen121vag board
* *
* See https://rusefi.com/s/hellen72 * See https://rusefi.com/s/hellen121vag
* *
* @author andreika <prometheus.pcb@gmail.com> * @author andreika <prometheus.pcb@gmail.com>
* @author Andrey Belomutskiy, (c) 2012-2020 * @author Andrey Belomutskiy, (c) 2012-2020

4
firmware/config/boards/hellen/hellen121vag/compile_hellen121vag.sh
View File

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
export PROJECT_BOARD=hellen/hellen72 export PROJECT_BOARD=hellen/hellen121vag
export PROJECT_CPU=ARCH_STM32F4 export PROJECT_CPU=ARCH_STM32F4
export EXTRA_PARAMS="-DSHORT_BOARD_NAME=hellen72" export EXTRA_PARAMS="-DSHORT_BOARD_NAME=hellen121vag"
cd .. cd ..
bash ../common_make.sh bash ../common_make.sh

2
firmware/config/boards/hellen/hellen128/board.h
View File

@ -30,7 +30,7 @@
/* /*
* Board identifier. * Board identifier.
*/ */
#define BOARD_NAME "Hellen72" #define BOARD_NAME "hellen128"
#define EFI_USB_AF 10U #define EFI_USB_AF 10U
#define EFI_USB_SERIAL_DM GPIOA_11 #define EFI_USB_SERIAL_DM GPIOA_11

8
firmware/config/boards/hellen/hellen128/board.mk
View File

@ -1,10 +1,10 @@
# Combine the related files for a specific platform and MCU. # Combine the related files for a specific platform and MCU.
# Target ECU board design # Target ECU board design
BOARDCPPSRC = $(BOARDS_DIR)/hellen/hellen72/board_configuration.cpp BOARDCPPSRC = $(BOARDS_DIR)/hellen/hellen128/board_configuration.cpp
BOARDINC = $(BOARDS_DIR)/hellen/hellen72 BOARDINC = $(BOARDS_DIR)/hellen/hellen128
# 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 hellen128
ifeq ($(DEFAULT_ENGINE_TYPE),) ifeq ($(DEFAULT_ENGINE_TYPE),)
DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_NB2 DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_NB2
endif endif
@ -28,7 +28,7 @@ DDEFS += -DLED_COMMUNICATION_BRAIN_PIN_MODE=INVERTED_OUTPUT
DDEFS += -DTS_NO_PRIMARY -DTS_NO_SECONDARY DDEFS += -DTS_NO_PRIMARY -DTS_NO_SECONDARY
# Add them all together # 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=\"hellen128\" $(DEFAULT_ENGINE_TYPE) $(LED_CRITICAL_ERROR_BRAIN_PIN) $(LED_COMMUNICATION_BRAIN_PIN)
DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
DDEFS += -DEFI_ICU_INPUTS=FALSE -DHAL_TRIGGER_USE_PAL=TRUE -DHAL_VSS_USE_PAL=TRUE DDEFS += -DEFI_ICU_INPUTS=FALSE -DHAL_TRIGGER_USE_PAL=TRUE -DHAL_VSS_USE_PAL=TRUE
# todo: is it broken? # todo: is it broken?

6
firmware/config/boards/hellen/hellen128/board_configuration.cpp
View File

@ -1,10 +1,10 @@
/** /**
* @file boards/hellen/hellen72/board_configuration.cpp * @file boards/hellen/hellen128/board_configuration.cpp
* *
* *
* @brief Configuration defaults for the Hellen72 board * @brief Configuration defaults for the hellen128 board
* *
* See https://rusefi.com/s/hellen72 * See https://rusefi.com/s/hellen128
* *
* @author andreika <prometheus.pcb@gmail.com> * @author andreika <prometheus.pcb@gmail.com>
* @author Andrey Belomutskiy, (c) 2012-2020 * @author Andrey Belomutskiy, (c) 2012-2020

4
firmware/config/boards/hellen/hellen128/compile_hellen128.sh
View File

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
export PROJECT_BOARD=hellen/hellen72 export PROJECT_BOARD=hellen/hellen128
export PROJECT_CPU=ARCH_STM32F4 export PROJECT_CPU=ARCH_STM32F4
export EXTRA_PARAMS="-DSHORT_BOARD_NAME=hellen72" export EXTRA_PARAMS="-DSHORT_BOARD_NAME=hellen128"
cd .. cd ..
bash ../common_make.sh bash ../common_make.sh

2
firmware/gen_config.sh
View File

@ -16,7 +16,7 @@ bash gen_config_default.sh
# firmware\tunerstudio\generated and firmware\controllers\generated folders # firmware\tunerstudio\generated and firmware\controllers\generated folders
# maybe one day we will automate but not yet # maybe one day we will automate but not yet
# #
for BOARD in "hellen/hellen72 hellen72" "hellen/hellen64_miataNA6_94 hellenNA6" "microrusefi mre_f7" "microrusefi mre_f4" "frankenso frankenso_na6" "prometheus prometheus_469" "prometheus prometheus_405" "proteus proteus_f7" "proteus proteus_f4"; do for BOARD in "hellen/hellen128 hellen128" "hellen/hellen121vag hellen121vag" "hellen/hellen121nissan hellen121nissan" "hellen/hellen72 hellen72" "hellen/hellen64_miataNA6_94 hellenNA6" "microrusefi mre_f7" "microrusefi mre_f4" "frankenso frankenso_na6" "prometheus prometheus_469" "prometheus prometheus_405" "proteus proteus_f7" "proteus proteus_f4"; do
BOARD_NAME="${BOARD% *}" BOARD_NAME="${BOARD% *}"
BOARD_SHORT_NAME="${BOARD#* }" BOARD_SHORT_NAME="${BOARD#* }"
bash gen_config_board.sh $BOARD_NAME $BOARD_SHORT_NAME bash gen_config_board.sh $BOARD_NAME $BOARD_SHORT_NAME