From 0bc445b461dedbecd697ed13619d8ecf250e5841 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Wed, 22 Jun 2022 15:43:39 -0700 Subject: [PATCH] flip icu/pal default (#4268) * flip icu/pal default * s * s * cleanup * eg33 --- firmware/config/boards/48way/board.h | 12 ------------ firmware/config/boards/core8/board.h | 12 ------------ firmware/config/boards/f407-discovery/board.mk | 2 ++ .../config/boards/frankenso/compile_frankenso_na6.sh | 2 +- firmware/config/boards/hellen/alphax-2chan/board.mk | 1 - firmware/config/boards/hellen/alphax-4chan/board.mk | 1 - firmware/config/boards/hellen/harley81/board.mk | 1 - firmware/config/boards/hellen/hellen-gm-e67/board.mk | 1 - firmware/config/boards/hellen/hellen-nb1/board.mk | 1 - .../config/boards/hellen/hellen121nissan/board.mk | 1 - firmware/config/boards/hellen/hellen121vag/board.mk | 1 - firmware/config/boards/hellen/hellen128/board.mk | 1 - .../config/boards/hellen/hellen154hyundai/board.mk | 1 - .../boards/hellen/hellen64_miataNA6_94/board.mk | 1 - firmware/config/boards/hellen/hellen72/board.mk | 1 - firmware/config/boards/hellen/hellen81/board.mk | 3 +-- firmware/config/boards/hellen/hellen88bmw/board.mk | 1 - firmware/config/boards/hellen/hellenNA8_96/board.mk | 1 - firmware/config/boards/microrusefi/board.mk | 3 --- firmware/config/boards/proteus/board.mk | 3 --- firmware/config/boards/skeleton/efifeatures.h | 4 ++-- firmware/config/boards/subaru_eg33/board.mk | 5 ----- firmware/config/stm32f4ems/efifeatures.h | 6 +++--- firmware/config/stm32h7ems/efifeatures.h | 6 ------ 24 files changed, 9 insertions(+), 62 deletions(-) diff --git a/firmware/config/boards/48way/board.h b/firmware/config/boards/48way/board.h index dc20bbc548..588a55bdcb 100755 --- a/firmware/config/boards/48way/board.h +++ b/firmware/config/boards/48way/board.h @@ -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 diff --git a/firmware/config/boards/core8/board.h b/firmware/config/boards/core8/board.h index f6dd2cc6e6..9d0f0758ce 100644 --- a/firmware/config/boards/core8/board.h +++ b/firmware/config/boards/core8/board.h @@ -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 diff --git a/firmware/config/boards/f407-discovery/board.mk b/firmware/config/boards/f407-discovery/board.mk index aa25040716..67748acc24 100644 --- a/firmware/config/boards/f407-discovery/board.mk +++ b/firmware/config/boards/f407-discovery/board.mk @@ -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 diff --git a/firmware/config/boards/frankenso/compile_frankenso_na6.sh b/firmware/config/boards/frankenso/compile_frankenso_na6.sh index e08236faed..eabcbead8e 100644 --- a/firmware/config/boards/frankenso/compile_frankenso_na6.sh +++ b/firmware/config/boards/frankenso/compile_frankenso_na6.sh @@ -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 diff --git a/firmware/config/boards/hellen/alphax-2chan/board.mk b/firmware/config/boards/hellen/alphax-2chan/board.mk index 64bd3a35a4..cf8444cd32 100644 --- a/firmware/config/boards/hellen/alphax-2chan/board.mk +++ b/firmware/config/boards/hellen/alphax-2chan/board.mk @@ -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 diff --git a/firmware/config/boards/hellen/alphax-4chan/board.mk b/firmware/config/boards/hellen/alphax-4chan/board.mk index f874945f17..c8d42178f0 100644 --- a/firmware/config/boards/hellen/alphax-4chan/board.mk +++ b/firmware/config/boards/hellen/alphax-4chan/board.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 diff --git a/firmware/config/boards/hellen/harley81/board.mk b/firmware/config/boards/hellen/harley81/board.mk index e5d2629899..0fa0f2fdaa 100644 --- a/firmware/config/boards/hellen/harley81/board.mk +++ b/firmware/config/boards/hellen/harley81/board.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 diff --git a/firmware/config/boards/hellen/hellen-gm-e67/board.mk b/firmware/config/boards/hellen/hellen-gm-e67/board.mk index 0e3ee831e9..aacdf52e9e 100644 --- a/firmware/config/boards/hellen/hellen-gm-e67/board.mk +++ b/firmware/config/boards/hellen/hellen-gm-e67/board.mk @@ -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 diff --git a/firmware/config/boards/hellen/hellen-nb1/board.mk b/firmware/config/boards/hellen/hellen-nb1/board.mk index c67bc0c6e8..07e39ef548 100644 --- a/firmware/config/boards/hellen/hellen-nb1/board.mk +++ b/firmware/config/boards/hellen/hellen-nb1/board.mk @@ -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 diff --git a/firmware/config/boards/hellen/hellen121nissan/board.mk b/firmware/config/boards/hellen/hellen121nissan/board.mk index 23f9da82d1..ac0b1bd897 100644 --- a/firmware/config/boards/hellen/hellen121nissan/board.mk +++ b/firmware/config/boards/hellen/hellen121nissan/board.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 diff --git a/firmware/config/boards/hellen/hellen121vag/board.mk b/firmware/config/boards/hellen/hellen121vag/board.mk index a0cfc00764..d69b63bf09 100644 --- a/firmware/config/boards/hellen/hellen121vag/board.mk +++ b/firmware/config/boards/hellen/hellen121vag/board.mk @@ -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 diff --git a/firmware/config/boards/hellen/hellen128/board.mk b/firmware/config/boards/hellen/hellen128/board.mk index 636f54faad..b2e8d1bbab 100644 --- a/firmware/config/boards/hellen/hellen128/board.mk +++ b/firmware/config/boards/hellen/hellen128/board.mk @@ -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 diff --git a/firmware/config/boards/hellen/hellen154hyundai/board.mk b/firmware/config/boards/hellen/hellen154hyundai/board.mk index a2875d841f..7253484213 100644 --- a/firmware/config/boards/hellen/hellen154hyundai/board.mk +++ b/firmware/config/boards/hellen/hellen154hyundai/board.mk @@ -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 diff --git a/firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk b/firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk index b08442d54e..5cad7027b6 100644 --- a/firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk +++ b/firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk @@ -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 diff --git a/firmware/config/boards/hellen/hellen72/board.mk b/firmware/config/boards/hellen/hellen72/board.mk index 0ed86924ee..858588eb5a 100644 --- a/firmware/config/boards/hellen/hellen72/board.mk +++ b/firmware/config/boards/hellen/hellen72/board.mk @@ -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 diff --git a/firmware/config/boards/hellen/hellen81/board.mk b/firmware/config/boards/hellen/hellen81/board.mk index 5f94114213..fcd82d59b8 100644 --- a/firmware/config/boards/hellen/hellen81/board.mk +++ b/firmware/config/boards/hellen/hellen81/board.mk @@ -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 diff --git a/firmware/config/boards/hellen/hellen88bmw/board.mk b/firmware/config/boards/hellen/hellen88bmw/board.mk index a00c288145..d4f2625939 100644 --- a/firmware/config/boards/hellen/hellen88bmw/board.mk +++ b/firmware/config/boards/hellen/hellen88bmw/board.mk @@ -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 diff --git a/firmware/config/boards/hellen/hellenNA8_96/board.mk b/firmware/config/boards/hellen/hellenNA8_96/board.mk index 8b115bd930..39b2a13014 100644 --- a/firmware/config/boards/hellen/hellenNA8_96/board.mk +++ b/firmware/config/boards/hellen/hellenNA8_96/board.mk @@ -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 diff --git a/firmware/config/boards/microrusefi/board.mk b/firmware/config/boards/microrusefi/board.mk index fc9ce93bfb..85a1f40a83 100644 --- a/firmware/config/boards/microrusefi/board.mk +++ b/firmware/config/boards/microrusefi/board.mk @@ -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 diff --git a/firmware/config/boards/proteus/board.mk b/firmware/config/boards/proteus/board.mk index 286e14bfde..63642d6399 100644 --- a/firmware/config/boards/proteus/board.mk +++ b/firmware/config/boards/proteus/board.mk @@ -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 diff --git a/firmware/config/boards/skeleton/efifeatures.h b/firmware/config/boards/skeleton/efifeatures.h index 52a0dc238d..02408444db 100644 --- a/firmware/config/boards/skeleton/efifeatures.h +++ b/firmware/config/boards/skeleton/efifeatures.h @@ -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 diff --git a/firmware/config/boards/subaru_eg33/board.mk b/firmware/config/boards/subaru_eg33/board.mk index 46aadc9649..0f93ce37a6 100644 --- a/firmware/config/boards/subaru_eg33/board.mk +++ b/firmware/config/boards/subaru_eg33/board.mk @@ -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 diff --git a/firmware/config/stm32f4ems/efifeatures.h b/firmware/config/stm32f4ems/efifeatures.h index 28fd3d9cdf..21d46dc428 100644 --- a/firmware/config/stm32f4ems/efifeatures.h +++ b/firmware/config/stm32f4ems/efifeatures.h @@ -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 diff --git a/firmware/config/stm32h7ems/efifeatures.h b/firmware/config/stm32h7ems/efifeatures.h index 014a1e794d..fbf4ce3606 100644 --- a/firmware/config/stm32h7ems/efifeatures.h +++ b/firmware/config/stm32h7ems/efifeatures.h @@ -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