better default DEFAULT_ENGINE_TYPE

This commit is contained in:
rusefillc 2022-02-09 19:52:22 -05:00
parent 78675bf57b
commit b5ad82cfd6
5 changed files with 12 additions and 16 deletions

View File

@ -3,7 +3,7 @@ echo "Compiling for https://rusefi.com/forum/viewtopic.php?f=4&t=1489"
cd ../.. cd ../..
rem TODO: somehow this -DDUMMY is helping us to not mess up the parameters, why?! rem TODO: somehow this -DDUMMY is helping us to not mess up the parameters, why?!
rem https://github.com/rusefi/rusefi/issues/684 rem https://github.com/rusefi/rusefi/issues/684
set EXTRA_PARAMS="-DDUMMY -DEFI_COMMUNICATION_PIN=GPIOA_7 -DDEFAULT_ENGINE_TYPE=MINIMAL_PINS" set EXTRA_PARAMS="-DDUMMY -DEFI_COMMUNICATION_PIN=GPIOA_7"
make -j8 clean make -j8 clean
call config/boards/common_make.bat call config/boards/common_make.bat

View File

@ -5,7 +5,7 @@ rem TODO: somehow this -DDUMMY is helping us to not mess up the parameters, why?
rem https://github.com/rusefi/rusefi/issues/684 rem https://github.com/rusefi/rusefi/issues/684
rem this board has only 512K flash so using custom FLASH_ADDR rem this board has only 512K flash so using custom FLASH_ADDR
rem You probably want "flash0 : org = 0x08000000, len = 450K" in the .ld file rem You probably want "flash0 : org = 0x08000000, len = 450K" in the .ld file
set EXTRA_PARAMS=-DDUMMY -DEFI_COMMUNICATION_PIN=GPIOB_9 -DSTM32_RTCPRE_VALUE=25 -DDEFAULT_ENGINE_TYPE=MINIMAL_PINS^ set EXTRA_PARAMS=-DDUMMY -DEFI_COMMUNICATION_PIN=GPIOB_9 -DSTM32_RTCPRE_VALUE=25 ^
-DEFI_INTERNAL_FLASH=FALSE ^ -DEFI_INTERNAL_FLASH=FALSE ^
-DHAL_USE_RTC=FALSE ^ -DHAL_USE_RTC=FALSE ^
-DBOARD_OTG_NOVBUSSENS ^ -DBOARD_OTG_NOVBUSSENS ^

View File

@ -4,8 +4,13 @@ echo "Compiling for Cypress FM4 S6E2CxAH"
# TODO: somehow this -DDUMMY is helping us to not mess up the parameters, why?! # TODO: somehow this -DDUMMY is helping us to not mess up the parameters, why?!
# https://github.com/rusefi/rusefi/issues/684 # https://github.com/rusefi/rusefi/issues/684
export EXTRA_PARAMS="-DDUMMY -D__USE_CMSIS\ export EXTRA_PARAMS="-DDUMMY -D__USE_CMSIS\
-DEFI_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_CHECKS=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE\ -DEFI_ENABLE_ASSERTS=FALSE \
-DDEFAULT_ENGINE_TYPE=MINIMAL_PINS" -DCH_DBG_ENABLE_CHECKS=FALSE \
-DCH_DBG_ENABLE_ASSERTS=FALSE \
-DCH_DBG_ENABLE_STACK_CHECK=FALSE \
-DCH_DBG_FILL_THREADS=FALSE \
-DCH_DBG_THREADS_PROFILING=FALSE\
"
TRIGGER_USE_ADC = yes TRIGGER_USE_ADC = yes

View File

@ -4,11 +4,6 @@
BOARDCPPSRC = $(BOARDS_DIR)/hellen/hellen81/board_configuration.cpp BOARDCPPSRC = $(BOARDS_DIR)/hellen/hellen81/board_configuration.cpp
BOARDINC = $(BOARDS_DIR)/hellen/hellen81 BOARDINC = $(BOARDS_DIR)/hellen/hellen81
# Set this if you want a default engine type other than normal Hellen81
ifeq ($(DEFAULT_ENGINE_TYPE),)
DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=MINIMAL_PINS
endif
ifeq ($(LED_CRITICAL_ERROR_BRAIN_PIN),) ifeq ($(LED_CRITICAL_ERROR_BRAIN_PIN),)
LED_CRITICAL_ERROR_BRAIN_PIN = -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOH_8 LED_CRITICAL_ERROR_BRAIN_PIN = -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOH_8
endif endif
@ -26,7 +21,7 @@ DDEFS += -DEFI_CAN_SERIAL=TRUE
DDEFS += -DDISABLE_CAN_UPDATE_DASH=TRUE DDEFS += -DDISABLE_CAN_UPDATE_DASH=TRUE
# Add them all together # Add them all together
DDEFS += -DEFI_USE_OSC=TRUE -DFIRMWARE_ID=\"hellen81\" $(DEFAULT_ENGINE_TYPE) $(LED_CRITICAL_ERROR_BRAIN_PIN) $(LED_COMMUNICATION_BRAIN_PIN) DDEFS += -DEFI_USE_OSC=TRUE -DFIRMWARE_ID=\"hellen81\" $(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
DDEFS += -DEFI_ICU_INPUTS=FALSE -DHAL_TRIGGER_USE_ADC=TRUE -DHAL_VSS_USE_PAL=TRUE DDEFS += -DEFI_ICU_INPUTS=FALSE -DHAL_TRIGGER_USE_ADC=TRUE -DHAL_VSS_USE_PAL=TRUE

View File

@ -8,10 +8,6 @@ ifeq ($(PROJECT_CPU),ARCH_STM32F4)
BOARDINC = $(BOARDS_DIR)/skeleton BOARDINC = $(BOARDS_DIR)/skeleton
endif endif
# Set this if you want a default engine type DDEFS += -DDEFAULT_ENGINE_TYPE=DEFAULT_FRANKENSO
ifeq ($(DEFAULT_ENGINE_TYPE),)
DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=MICRO_RUS_EFI
endif
# Add them all together # Add them all together
DDEFS += -DEFI_USE_OSC=TRUE -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOE_3 -DFIRMWARE_ID=\"skeleton\" $(DEFAULT_ENGINE_TYPE) DDEFS += -DEFI_USE_OSC=TRUE -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOE_3 -DFIRMWARE_ID=\"skeleton\"