flip icu/pal default (#4268)
* flip icu/pal default * s * s * cleanup * eg33
This commit is contained in:
parent
169fc5e086
commit
0bc445b461
|
@ -54,18 +54,6 @@
|
|||
// #undef HAL_USE_USB_MSD
|
||||
// #define HAL_USE_USB_MSD FALSE
|
||||
|
||||
#undef EFI_ICU_INPUTS
|
||||
#define EFI_ICU_INPUTS FALSE
|
||||
|
||||
#undef HAL_TRIGGER_USE_PAL
|
||||
#define HAL_TRIGGER_USE_PAL TRUE
|
||||
|
||||
#undef EFI_LOGIC_ANALYZER
|
||||
#define EFI_LOGIC_ANALYZER FALSE
|
||||
|
||||
#undef HAL_VSS_USE_PAL
|
||||
#define HAL_VSS_USE_PAL TRUE
|
||||
|
||||
#undef LED_CRITICAL_ERROR_BRAIN_PIN
|
||||
#define LED_CRITICAL_ERROR_BRAIN_PIN Gpio::C11
|
||||
|
||||
|
|
|
@ -54,18 +54,6 @@
|
|||
// #undef HAL_USE_USB_MSD
|
||||
// #define HAL_USE_USB_MSD FALSE
|
||||
|
||||
#undef EFI_ICU_INPUTS
|
||||
#define EFI_ICU_INPUTS FALSE
|
||||
|
||||
#undef HAL_TRIGGER_USE_PAL
|
||||
#define HAL_TRIGGER_USE_PAL TRUE
|
||||
|
||||
#undef EFI_LOGIC_ANALYZER
|
||||
#define EFI_LOGIC_ANALYZER FALSE
|
||||
|
||||
#undef HAL_VSS_USE_PAL
|
||||
#define HAL_VSS_USE_PAL TRUE
|
||||
|
||||
#undef LED_CRITICAL_ERROR_BRAIN_PIN
|
||||
#define LED_CRITICAL_ERROR_BRAIN_PIN Gpio::G11
|
||||
|
||||
|
|
|
@ -19,6 +19,8 @@ endif
|
|||
DDEFS += -DHW_FRANKENSO=1
|
||||
DDEFS += $(DEFAULT_ENGINE_TYPE)
|
||||
|
||||
DDEFS += -DEFI_ICU_INPUTS=TRUE -DHAL_TRIGGER_USE_PAL=FALSE -DEFI_LOGIC_ANALYZER=TRUE
|
||||
|
||||
DDEFS += -DSTM32_I2C_USE_I2C3=TRUE
|
||||
|
||||
ifndef IS_RE_BOOTLOADER
|
||||
|
|
|
@ -8,6 +8,6 @@ FW_ID_ENV=frankensoNA6
|
|||
# sad technical debt: HW CI uses default bundle and it needs logic analyzer
|
||||
# while humans want to use second cam input asap https://rusefi.com/forum/viewtopic.php?f=4&t=2343
|
||||
#
|
||||
export EXTRA_PARAMS="-DDUMMY -DSHORT_BOARD_NAME=frankenso_na6 -DEFI_ICU_INPUTS=FALSE -DHAL_TRIGGER_USE_PAL=TRUE -DEFI_LOGIC_ANALYZER=FALSE"
|
||||
export EXTRA_PARAMS="-DDUMMY -DSHORT_BOARD_NAME=frankenso_na6"
|
||||
|
||||
bash ../common_make.sh f407-discovery ARCH_STM32F4
|
||||
|
|
|
@ -11,7 +11,6 @@ DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
|
|||
# Add them all together
|
||||
DDEFS += -DFIRMWARE_ID=\"AlphaX-2chan\"
|
||||
DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
|
||||
DDEFS += -DHAL_TRIGGER_USE_PAL=TRUE
|
||||
|
||||
include $(BOARDS_DIR)/hellen/hellen-common144.mk
|
||||
|
||||
|
|
|
@ -11,7 +11,6 @@ DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
|
|||
# Add them all together
|
||||
DDEFS += -DFIRMWARE_ID=\"AlphaX-4chan\"
|
||||
DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
|
||||
DDEFS += -DHAL_TRIGGER_USE_PAL=TRUE
|
||||
|
||||
include $(BOARDS_DIR)/hellen/hellen-common144.mk
|
||||
|
||||
|
|
|
@ -11,7 +11,6 @@ DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
|
|||
# Add them all together
|
||||
DDEFS += -DFIRMWARE_ID=\"hellen81hd\"
|
||||
DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
|
||||
DDEFS += -DHAL_TRIGGER_USE_PAL=TRUE
|
||||
|
||||
DDEFS += -DSTM32_PWM_USE_TIM3=TRUE -DHAL_USE_ICU=FALSE
|
||||
|
||||
|
|
|
@ -10,7 +10,6 @@ DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
|
|||
# Add them all together
|
||||
DDEFS += -DFIRMWARE_ID=\"hellenE67\" $(VAR_DEF_ENGINE_TYPE)
|
||||
DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
|
||||
DDEFS += -DHAL_TRIGGER_USE_PAL=TRUE
|
||||
|
||||
# No hardware serial TS
|
||||
DDEFS += -DTS_NO_PRIMARY=1
|
||||
|
|
|
@ -14,7 +14,6 @@ DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
|
|||
# Add them all together
|
||||
DDEFS += -DFIRMWARE_ID=\"hellenNB1\" $(VAR_DEF_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
|
||||
|
||||
|
|
|
@ -17,7 +17,6 @@ DDEFS += -DTS_NO_PRIMARY=1
|
|||
# Add them all together
|
||||
DDEFS += -DFIRMWARE_ID=\"hellen121nissan\" $(VAR_DEF_ENGINE_TYPE)
|
||||
DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
|
||||
DDEFS += -DHAL_TRIGGER_USE_PAL=TRUE
|
||||
|
||||
DDEFS += -DSHORT_BOARD_NAME=hellen121nissan
|
||||
|
||||
|
|
|
@ -17,7 +17,6 @@ DDEFS += -DTS_NO_PRIMARY=1
|
|||
# Add them all together
|
||||
DDEFS += -DFIRMWARE_ID=\"hellen121vag\" $(VAR_DEF_ENGINE_TYPE)
|
||||
DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
|
||||
DDEFS += -DHAL_TRIGGER_USE_PAL=TRUE
|
||||
|
||||
DDEFS += -DSHORT_BOARD_NAME=hellen121vag
|
||||
|
||||
|
|
|
@ -19,7 +19,6 @@ DDEFS += -DTS_NO_PRIMARY=1
|
|||
# Add them all together
|
||||
DDEFS += -DFIRMWARE_ID=\"hellen128\" $(VAR_DEF_ENGINE_TYPE)
|
||||
DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
|
||||
DDEFS += -DHAL_TRIGGER_USE_PAL=TRUE
|
||||
|
||||
DDEFS += -DSHORT_BOARD_NAME=hellen128
|
||||
|
||||
|
|
|
@ -17,7 +17,6 @@ DDEFS += -DTS_NO_PRIMARY=1
|
|||
# Add them all together
|
||||
DDEFS += -DFIRMWARE_ID=\"hellen154hyundai\" $(VAR_DEF_ENGINE_TYPE)
|
||||
DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
|
||||
DDEFS += -DHAL_TRIGGER_USE_PAL=TRUE
|
||||
|
||||
DDEFS += -DSHORT_BOARD_NAME=hellen154hyundai
|
||||
|
||||
|
|
|
@ -17,7 +17,6 @@ DDEFS += -DTS_NO_PRIMARY=1
|
|||
# Add them all together
|
||||
DDEFS += -DFIRMWARE_ID=\"hellenNA6\" $(VAR_DEF_ENGINE_TYPE)
|
||||
DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
|
||||
DDEFS += -DHAL_TRIGGER_USE_PAL=TRUE
|
||||
|
||||
DDEFS += -DSHORT_BOARD_NAME=hellenNA6
|
||||
|
||||
|
|
|
@ -19,7 +19,6 @@ DDEFS += -DTS_NO_PRIMARY=1
|
|||
# Add them all together
|
||||
DDEFS += -DFIRMWARE_ID=\"hellen72\" $(VAR_DEF_ENGINE_TYPE)
|
||||
DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
|
||||
DDEFS += -DHAL_TRIGGER_USE_PAL=TRUE
|
||||
|
||||
DDEFS += -DSHORT_BOARD_NAME=hellen72
|
||||
|
||||
|
|
|
@ -15,8 +15,7 @@ DDEFS += -DDISABLE_CAN_UPDATE_DASH=TRUE
|
|||
# Add them all together
|
||||
DDEFS += -DFIRMWARE_ID=\"hellen81\"
|
||||
#DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
|
||||
#DDEFS += -DHAL_TRIGGER_USE_PAL=TRUE -DHAL_VSS_USE_PAL=TRUE
|
||||
DDEFS += -DHAL_TRIGGER_USE_ADC=TRUE -DHAL_VSS_USE_PAL=TRUE
|
||||
DDEFS += -DHAL_TRIGGER_USE_ADC=TRUE
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -18,7 +18,6 @@ DDEFS += -DTS_NO_PRIMARY=1
|
|||
# Add them all together
|
||||
DDEFS += -DFIRMWARE_ID=\"hellen88bmw\" $(VAR_DEF_ENGINE_TYPE)
|
||||
DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
|
||||
DDEFS += -DHAL_TRIGGER_USE_PAL=TRUE
|
||||
|
||||
DDEFS += -DSHORT_BOARD_NAME=hellen88bmw
|
||||
|
||||
|
|
|
@ -14,7 +14,6 @@ DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
|
|||
# Add them all together
|
||||
DDEFS += -DFIRMWARE_ID=\"hellenNB1\" $(VAR_DEF_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
|
||||
|
||||
DDEFS += -DSHORT_BOARD_NAME=hellenNA8_96
|
||||
|
|
|
@ -24,9 +24,6 @@ EFI_CONSOLE_TTL_PINS = -DEFI_CONSOLE_TX_BRAIN_PIN=Gpio::B10 -DEFI_CONSOLE_RX_BRA
|
|||
DDEFS += -DSTM32_UART_USE_USART3=FALSE -DHAL_USE_UART=FALSE
|
||||
DDEFS += -DEFI_USE_UART_DMA=FALSE -DTS_NO_PRIMARY=TRUE
|
||||
|
||||
# todo: technical debt: EFI_LOGIC_ANALYZER does not work in PAL mode
|
||||
DDEFS += -DEFI_ICU_INPUTS=FALSE -DHAL_TRIGGER_USE_PAL=TRUE -DEFI_LOGIC_ANALYZER=FALSE
|
||||
|
||||
DDEFS += -DEFI_CAN_SERIAL=TRUE
|
||||
|
||||
DDEFS += -DEFI_CJ125=FALSE -DBOARD_L9779_COUNT=0 -DEFI_HD44780_LCD=FALSE -DEFI_LCD=FALSE
|
||||
|
|
|
@ -16,9 +16,6 @@ DDEFS += $(VAR_DEF_ENGINE_TYPE)
|
|||
|
||||
DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
|
||||
|
||||
DDEFS += -DEFI_ICU_INPUTS=FALSE -DHAL_TRIGGER_USE_PAL=TRUE
|
||||
DDEFS += -DEFI_LOGIC_ANALYZER=FALSE
|
||||
|
||||
DDEFS += -DEFI_CAN_SERIAL=TRUE
|
||||
|
||||
# Turn off stuff proteus doesn't have/need
|
||||
|
|
|
@ -90,10 +90,10 @@
|
|||
#define EFI_ENABLE_ASSERTS TRUE
|
||||
#endif /* EFI_ENABLE_ASSERTS */
|
||||
|
||||
#define EFI_ICU_INPUTS TRUE
|
||||
#define EFI_ICU_INPUTS FALSE
|
||||
|
||||
#ifndef HAL_TRIGGER_USE_PAL
|
||||
#define HAL_TRIGGER_USE_PAL FALSE
|
||||
#define HAL_TRIGGER_USE_PAL TRUE
|
||||
#endif /* HAL_TRIGGER_USE_PAL */
|
||||
|
||||
#ifndef HAL_TRIGGER_USE_ADC
|
||||
|
|
|
@ -29,11 +29,6 @@ DDEFS += -DDEFAULT_ENGINE_TYPE=SUBARUEG33_DEFAULTS
|
|||
DDEFS += -DBOARD_L9779_COUNT=0
|
||||
|
||||
#Some options override
|
||||
#ICU vs PAL/EXTI
|
||||
DDEFS += -DHAL_TRIGGER_USE_PAL=TRUE
|
||||
DDEFS += -DEFI_ICU_INPUTS=FALSE
|
||||
DDEFS += -DEFI_LOGIC_ANALYZER=FALSE
|
||||
|
||||
DDEFS += -DHAL_USE_UART=FALSE
|
||||
DDEFS += -DUART_USE_WAIT=FALSE
|
||||
|
||||
|
|
|
@ -66,15 +66,15 @@
|
|||
* Build-in logic analyzer support. Logic analyzer viewer is one of the java console panes.
|
||||
*/
|
||||
#ifndef EFI_LOGIC_ANALYZER
|
||||
#define EFI_LOGIC_ANALYZER TRUE
|
||||
#define EFI_LOGIC_ANALYZER FALSE
|
||||
#endif
|
||||
|
||||
#ifndef EFI_ICU_INPUTS
|
||||
#define EFI_ICU_INPUTS TRUE
|
||||
#define EFI_ICU_INPUTS FALSE
|
||||
#endif
|
||||
|
||||
#ifndef HAL_TRIGGER_USE_PAL
|
||||
#define HAL_TRIGGER_USE_PAL FALSE
|
||||
#define HAL_TRIGGER_USE_PAL TRUE
|
||||
#endif /* HAL_TRIGGER_USE_PAL */
|
||||
|
||||
#ifndef HAL_TRIGGER_USE_ADC
|
||||
|
|
|
@ -41,12 +41,6 @@
|
|||
#undef EFI_ICU_INPUTS
|
||||
#define EFI_ICU_INPUTS FALSE
|
||||
|
||||
#undef HAL_TRIGGER_USE_PAL
|
||||
#define HAL_TRIGGER_USE_PAL TRUE
|
||||
|
||||
#undef EFI_LOGIC_ANALYZER
|
||||
#define EFI_LOGIC_ANALYZER FALSE
|
||||
|
||||
#undef LUA_USER_HEAP
|
||||
#define LUA_USER_HEAP 100000
|
||||
#undef LUA_SYSTEM_HEAP
|
||||
|
|
Loading…
Reference in New Issue