rusefi
/
rusefi
mirror of https://github.com/rusefi/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reducing enum confusion

This commit is contained in:
rusefillc 2023-06-18 11:05:44 -04:00 committed by rusefillc
parent 57ebda479e
commit 5c194059c0
32 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/config/boards/48way/board.mk
View File

@ -4,4 +4,4 @@ BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp
# Override DEFAULT_ENGINE_TYPE
DDEFS += -DSHORT_BOARD_NAME=48way
DDEFS += -DFIRMWARE_ID=\"48way\"
DDEFS += -DDEFAULT_ENGINE_TYPE=MINIMAL_PINS
DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS

2
firmware/config/boards/BB_V2/board.mk
View File

@ -3,7 +3,7 @@ BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp
# Override DEFAULT_ENGINE_TYPE
DDEFS += -DSTM32F407xx
DDEFS += -DSHORT_BOARD_NAME=BB_V2 -DDEFAULT_ENGINE_TYPE=MINIMAL_PINS
DDEFS += -DSHORT_BOARD_NAME=BB_V2 -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS
DDEFS += -DFIRMWARE_ID=\"BB_V2\"
DDEFS += -DLED_CRITICAL_ERROR_BRAIN_PIN=Gpio::Unassigned
DDEFS += -DHAL_TRIGGER_USE_PAL=TRUE

2
firmware/config/boards/BB_V3/board.mk
View File

@ -3,7 +3,7 @@ BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp
# Override DEFAULT_ENGINE_TYPE
DDEFS += -DSTM32F407xx
DDEFS += -DSHORT_BOARD_NAME=BB_V3 -DDEFAULT_ENGINE_TYPE=MINIMAL_PINS
DDEFS += -DSHORT_BOARD_NAME=BB_V3 -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS
DDEFS += -DFIRMWARE_ID=\"BB_V3\"
DDEFS += -DLED_CRITICAL_ERROR_BRAIN_PIN=Gpio::Unassigned
DDEFS += -DHAL_TRIGGER_USE_PAL=TRUE

2
firmware/config/boards/core8/board.mk
View File

@ -4,4 +4,4 @@ BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp
# Override DEFAULT_ENGINE_TYPE
DDEFS += -DSHORT_BOARD_NAME=core8
DDEFS += -DFIRMWARE_ID=\"core8\"
DDEFS += -DDEFAULT_ENGINE_TYPE=MINIMAL_PINS
DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS

2
firmware/config/boards/coreECU/board.mk
View File

@ -3,7 +3,7 @@ BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp
# Override DEFAULT_ENGINE_TYPE
DDEFS += -DSTM32F407xx
DDEFS += -DSHORT_BOARD_NAME=BB_V3 -DDEFAULT_ENGINE_TYPE=MINIMAL_PINS
DDEFS += -DSHORT_BOARD_NAME=BB_V3 -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS
DDEFS += -DFIRMWARE_ID=\"BB_V3\"
DDEFS += -DLED_CRITICAL_ERROR_BRAIN_PIN=Gpio::Unassigned
DDEFS += -DHAL_TRIGGER_USE_PAL=TRUE

2
firmware/config/boards/f407-discovery/board.mk
View File

@ -5,7 +5,7 @@ BOARDCPPSRC = $(BOARD_DIR)/board_extra.cpp
DDEFS += -DSTM32F407xx
ifeq ($(VAR_DEF_ENGINE_TYPE),)
VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=DEFAULT_FRANKENSO
VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=engine_type_e::DEFAULT_FRANKENSO
endif
# here we use different names for env variable and macro name in order to reduce confusion. overall this is about Frankenso builds defining FIRMWARE_ID

2
firmware/config/boards/hellen/hellen-honda-k/board.mk
View File

@ -4,7 +4,7 @@
BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp
# Set this if you want a default engine type other than normal
ifeq ($(VAR_DEF_ENGINE_TYPE),)
# VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_154_HYUNDAI_COUPE_BK2
# VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=engine_type_e::HELLEN_154_HYUNDAI_COUPE_BK2
endif
DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE

2
firmware/config/boards/hellen/hellen-nb1/board.mk
View File

@ -4,7 +4,7 @@
BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp
# Set this if you want a default engine type other than normal hellen-nb1
ifeq ($(VAR_DEF_ENGINE_TYPE),)
VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_NB1
VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=engine_type_e::HELLEN_NB1
endif
DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE

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

@ -4,7 +4,7 @@
BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp
# Set this if you want a default engine type other than normal hellen121nissan
ifeq ($(VAR_DEF_ENGINE_TYPE),)
VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_121_NISSAN_6_CYL
VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=engine_type_e::HELLEN_121_NISSAN_6_CYL
endif
DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE

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

@ -4,7 +4,7 @@
BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp
# Set this if you want a default engine type other than normal hellen121vag
ifeq ($(VAR_DEF_ENGINE_TYPE),)
VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_121_VAG_4_CYL
VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=engine_type_e::HELLEN_121_VAG_4_CYL
endif
DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE

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

@ -5,7 +5,7 @@ BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp
# Set this if you want a default engine type other than normal hellen128
ifeq ($(VAR_DEF_ENGINE_TYPE),)
VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_128_MERCEDES_4_CYL
VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=engine_type_e::HELLEN_128_MERCEDES_4_CYL
endif

2
firmware/config/boards/hellen/hellen154hyundai/board.mk
View File

@ -4,7 +4,7 @@
BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp
# Set this if you want a default engine type other than normal
ifeq ($(VAR_DEF_ENGINE_TYPE),)
VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_154_HYUNDAI_COUPE_BK2
VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=engine_type_e::HELLEN_154_HYUNDAI_COUPE_BK2
endif
DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE

2
firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk
View File

@ -4,7 +4,7 @@
BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp
# Set this if you want a default engine type other than normal hellen64_miataNA6_94
ifeq ($(VAR_DEF_ENGINE_TYPE),)
VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_NA6
VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=engine_type_e::HELLEN_NA6
endif
DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE

2
firmware/config/boards/hellen/hellen72/board.mk
View File

@ -5,7 +5,7 @@ BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp
# Set this if you want a default engine type other than normal Hellen72
ifeq ($(VAR_DEF_ENGINE_TYPE),)
VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_NB2
VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=engine_type_e::HELLEN_NB2
endif

2
firmware/config/boards/hellen/hellenNA8_96/board.mk
View File

@ -4,7 +4,7 @@
BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp
# Set this if you want a default engine type other than normal hellen-nb1
ifeq ($(VAR_DEF_ENGINE_TYPE),)
VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_NA8_96
VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=engine_type_e::HELLEN_NA8_96
endif
DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE

2
firmware/config/boards/m74_9/board.mk
View File

@ -10,5 +10,5 @@ DDEFS += -DEFI_FILE_LOGGING=FALSE
USE_FATFS = no
DDEFS += -DFIRMWARE_ID=\"m74_9\"
DDEFS += -DDEFAULT_ENGINE_TYPE=MINIMAL_PINS
DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS
DDEFS += -DSHORT_BOARD_NAME=m74_9

2
firmware/config/boards/microrusefi/!compile-nucleo-Manhattan.bat
View File

@ -4,7 +4,7 @@ cd ../../..
set PROJECT_BOARD=microrusefi
set PROJECT_CPU=ARCH_STM32F7
set VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=BMW_M73_F
set VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=engine_type_e::BMW_M73_F
set LED_CRITICAL_ERROR_BRAIN_PIN = -DLED_CRITICAL_ERROR_BRAIN_PIN=Gpio::B14
set EXTRA_PARAMS=-DDUMMY ^

2
firmware/config/boards/microrusefi/compile_mre_f4_hardware_QC_special_build.sh
View File

@ -18,7 +18,7 @@ export EXTRA_PARAMS="-DDUMMY \
-DHW_CHECK_ALWAYS_STIMULATE=TRUE \
-DRAMDISK_INVALID"
export VAR_DEF_ENGINE_TYPE=-DDEFAULT_ENGINE_TYPE=MRE_BOARD_NEW_TEST
export VAR_DEF_ENGINE_TYPE=-DDEFAULT_ENGINE_TYPE=engine_type_e::MRE_BOARD_NEW_TEST
# this QC configuration is used to assert our status with debug info
export DEBUG_LEVEL_OPT="-O0 -ggdb -g"

2
firmware/config/boards/microrusefi/compile_mre_f4_slave.sh
View File

@ -2,7 +2,7 @@
export EXTRA_PARAMS=-DDUMMY -DEFI_CANBUS_SLAVE=TRUE
export VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=BMW_M73_MRE_SLAVE
export VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=engine_type_e::BMW_M73_MRE_SLAVE
bash ../common_make.sh microrusefi ARCH_STM32F4

2
firmware/config/boards/microrusefi/compile_mre_f7_test.sh
View File

@ -1,5 +1,5 @@
#!/bin/bash
export VAR_DEF_ENGINE_TYPE="-DDEFAULT_ENGINE_TYPE=MRE_BOARD_TEST"
export VAR_DEF_ENGINE_TYPE="-DDEFAULT_ENGINE_TYPE=engine_type_e::MRE_BOARD_TEST"
bash ../common_make.sh microrusefi ARCH_STM32F7

2
firmware/config/boards/nucleo_f429/board.mk
View File

@ -10,5 +10,5 @@ DDEFS += -DEFI_ETHERNET=TRUE
IS_STM32F429 = yes
DDEFS += -DFIRMWARE_ID=\"nucleo_f429\"
DDEFS += -DDEFAULT_ENGINE_TYPE=MINIMAL_PINS
DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS
DDEFS += -DSHORT_BOARD_NAME=nucleo_f429

2
firmware/config/boards/nucleo_f767/board.mk
View File

@ -13,5 +13,5 @@ LWIP = yes
DDEFS += -DEFI_ETHERNET=TRUE
DDEFS += -DFIRMWARE_ID=\"nucleo_f767\"
DDEFS += -DDEFAULT_ENGINE_TYPE=MINIMAL_PINS
DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS
DDEFS += -DSHORT_BOARD_NAME=nucleo_f767

2
firmware/config/boards/nucleo_h743/board.mk
View File

@ -9,5 +9,5 @@ LWIP = yes
DDEFS += -DEFI_ETHERNET=TRUE
DDEFS += -DFIRMWARE_ID=\"nucleo_h743\"
DDEFS += -DDEFAULT_ENGINE_TYPE=MINIMAL_PINS
DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS
DDEFS += -DSHORT_BOARD_NAME=nucleo_h743

2
firmware/config/boards/proteus/compile_proteus_f4_hardware_QC_special_build.sh
View File

@ -2,7 +2,7 @@
export EXTRA_PARAMS="-DVR_HW_CHECK_MODE=TRUE -DHW_CHECK_MODE=TRUE -DHW_CHECK_SD=TRUE -DHW_CHECK_ALWAYS_STIMULATE=TRUE"
export VAR_DEF_ENGINE_TYPE=-DDEFAULT_ENGINE_TYPE=PROTEUS_QC_TEST_BOARD
export VAR_DEF_ENGINE_TYPE=-DDEFAULT_ENGINE_TYPE=engine_type_e::PROTEUS_QC_TEST_BOARD
# export DEBUG_LEVEL_OPT="-O0 -ggdb -g"

2
firmware/config/boards/proteus/compile_proteus_f7_hardware_QC_special_build.sh
View File

@ -2,7 +2,7 @@
export EXTRA_PARAMS="-DVR_HW_CHECK_MODE=TRUE -DHW_CHECK_MODE=TRUE -DHW_CHECK_SD=TRUE -DHW_CHECK_ALWAYS_STIMULATE=TRUE"
export VAR_DEF_ENGINE_TYPE=-DDEFAULT_ENGINE_TYPE=PROTEUS_QC_TEST_BOARD
export VAR_DEF_ENGINE_TYPE=-DDEFAULT_ENGINE_TYPE=engine_type_e::PROTEUS_QC_TEST_BOARD
# export DEBUG_LEVEL_OPT="-O0 -ggdb -g"

2
firmware/config/boards/s105/board.mk
View File

@ -36,7 +36,7 @@ DDEFS += -DTS_PRIMARY_UxART_PORT=SD1
DDEFS += -DEFI_CONSOLE_TX_BRAIN_PIN=Gpio::A9 -DEFI_CONSOLE_RX_BRAIN_PIN=Gpio::A10
DDEFS += -DFIRMWARE_ID=\"s105\"
DDEFS += -DDEFAULT_ENGINE_TYPE=MINIMAL_PINS
DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS
# Required include directories
# Shared variables

2
firmware/config/boards/subaru_eg33/board.mk
View File

@ -20,7 +20,7 @@ DDEFS += -DFIRMWARE_ID=\"EG33\"
DDEFS += -DSHORT_BOARD_NAME=subaru_eg33_f7
# Override DEFAULT_ENGINE_TYPE
DDEFS += -DDEFAULT_ENGINE_TYPE=SUBARUEG33_DEFAULTS
DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::SUBARUEG33_DEFAULTS
# HW options
DDEFS += -DBOARD_L9779_COUNT=0

2
firmware/config/boards/tdg-pdm8/board.mk
View File

@ -10,4 +10,4 @@ DDEFS += -DEFI_USB_SERIAL=FALSE
DDEFS += -DHW_TDG_PDM8=1
DDEFS += -DFIRMWARE_ID=\"tdg-pdm8\" -DSHORT_BOARD_NAME=tdg-pdm8
DDEFS += -DDEFAULT_ENGINE_TYPE=MINIMAL_PINS
DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS

4
firmware/controllers/algo/engine_configuration.cpp
View File

@ -651,7 +651,7 @@ void loadConfiguration() {
#if EFI_INTERNAL_FLASH
if (SHOULD_IGNORE_FLASH() || IGNORE_FLASH_CONFIGURATION) {
engineConfiguration->engineType = engine_type_e::DEFAULT_ENGINE_TYPE;
engineConfiguration->engineType = DEFAULT_ENGINE_TYPE;
resetConfigurationExt(engineConfiguration->engineType);
writeToFlashNow();
} else {
@ -661,7 +661,7 @@ void loadConfiguration() {
}
#else // not EFI_INTERNAL_FLASH
// This board doesn't load configuration, initialize the default
engineConfiguration->engineType = engine_type_e::DEFAULT_ENGINE_TYPE;
engineConfiguration->engineType = DEFAULT_ENGINE_TYPE;
resetConfigurationExt(engineConfiguration->engineType);
#endif /* EFI_INTERNAL_FLASH */

2
firmware/controllers/algo/engine_configuration.h
View File

@ -11,7 +11,7 @@
#include "persistent_configuration.h"
#ifndef DEFAULT_ENGINE_TYPE
#define DEFAULT_ENGINE_TYPE MINIMAL_PINS
#define DEFAULT_ENGINE_TYPE engine_type_e::MINIMAL_PINS
#endif
#define CLT_MANUAL_IDLE_CORRECTION config->cltIdleCorrBins, config->cltIdleCorr, CLT_CURVE_SIZE

2
firmware/controllers/bench_test.cpp
View File

@ -502,7 +502,7 @@ void executeTSCommand(uint16_t subsystem, uint16_t index) {
case TS_SET_DEFAULT_ENGINE:
fatalErrorForPresetApply();
setEngineType((int)engine_type_e::DEFAULT_ENGINE_TYPE);
setEngineType((int)DEFAULT_ENGINE_TYPE);
break;
case 0x79:

4
firmware/controllers/flash_main.cpp
View File

@ -319,7 +319,7 @@ void readFromFlash() {
getFlashAddrFirstCopy();
getFlashAddrSecondCopy();
resetConfigurationExt(engine_type_e::DEFAULT_ENGINE_TYPE);
resetConfigurationExt(DEFAULT_ENGINE_TYPE);
FlashState result = FlashState::Ok;
#else
@ -332,7 +332,7 @@ void readFromFlash() {
efiPrintf("Need to reset flash to default due to CRC mismatch");
[[fallthrough]];
case FlashState::BlankChip:
resetConfigurationExt(engine_type_e::DEFAULT_ENGINE_TYPE);
resetConfigurationExt(DEFAULT_ENGINE_TYPE);
break;
case FlashState::IncompatibleVersion:
// Preserve engine type from old config