diff --git a/.github/workflows/build-firmware.yaml b/.github/workflows/build-firmware.yaml index b729c7a8d2..d341b0e57b 100644 --- a/.github/workflows/build-firmware.yaml +++ b/.github/workflows/build-firmware.yaml @@ -24,7 +24,7 @@ jobs: - build-target: frankenso-pal efi-cpu: ARCH_STM32F4 efi-board: st_stm32f4 - target-extra-params: -DHAL_TRIGGER_USE_PAL=TRUE -DHAL_USE_ICU=FALSE -DEFI_VEHICLE_SPEED=FALSE -DEFI_LOGIC_ANALYZER=FALSE + target-extra-params: -DHAL_TRIGGER_USE_PAL=TRUE -DEFI_ICU_INPUTS=FALSE -DEFI_VEHICLE_SPEED=FALSE -DEFI_LOGIC_ANALYZER=FALSE - build-target: mre-f4 efi-cpu: ARCH_STM32F4 diff --git a/firmware/config/boards/proteus/board.mk b/firmware/config/boards/proteus/board.mk index 4c657cb8a7..b849cc4150 100644 --- a/firmware/config/boards/proteus/board.mk +++ b/firmware/config/boards/proteus/board.mk @@ -24,4 +24,4 @@ endif # Override DEFAULT_ENGINE_TYPE -DDEFS += $(MCU_DEFS) -DEFI_USE_OSC=TRUE -DEFI_FATAL_ERROR_PIN=GPIOE_3 -DFIRMWARE_ID=\"proteus\" -DDEFAULT_ENGINE_TYPE=PROTEUS -DUSE_ADC3_VBATT_HACK -DSTM32_ADC_USE_ADC3=TRUE -DEFI_INCLUDE_ENGINE_PRESETS=FALSE +DDEFS += $(MCU_DEFS) -DEFI_USE_OSC=TRUE -DEFI_FATAL_ERROR_PIN=GPIOE_3 -DFIRMWARE_ID=\"proteus\" -DDEFAULT_ENGINE_TYPE=PROTEUS -DUSE_ADC3_VBATT_HACK -DSTM32_ADC_USE_ADC3=TRUE -DEFI_INCLUDE_ENGINE_PRESETS=FALSE -DEFI_ICU_INPUTS=FALSE -DHAL_TRIGGER_USE_PAL=TRUE -DEFI_VEHICLE_SPEED=FALSE -DEFI_LOGIC_ANALYZER=FALSE diff --git a/firmware/controllers/sensors/map.cpp b/firmware/controllers/sensors/map.cpp index 9d7c5fd0df..4b9459b5e1 100644 --- a/firmware/controllers/sensors/map.cpp +++ b/firmware/controllers/sensors/map.cpp @@ -277,7 +277,7 @@ void initMapDecoder(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) { //engine->configurationListeners.registerCallback(applyConfiguration); if (engineConfiguration->hasFrequencyReportingMapSensor) { -#if HAL_USE_ICU +#if EFI_ICU_INPUTS digital_input_s* digitalMapInput = startDigitalCapture("MAP freq", CONFIG(frequencyReportingMapInputPin)); digitalMapInput->setWidthCallback((VoidInt) digitalMapWidthCallback, NULL); diff --git a/firmware/hw_layer/trigger_input.cpp b/firmware/hw_layer/trigger_input.cpp index c08cfa5918..ac7efb9541 100644 --- a/firmware/hw_layer/trigger_input.cpp +++ b/firmware/hw_layer/trigger_input.cpp @@ -76,6 +76,7 @@ static int turnOnTriggerInputPin(const char *msg, int index, bool isTriggerShaft return 0; /* try ICU first */ +#if EFI_ICU_INPUTS if (icuTriggerTurnOnInputPin(msg, index, isTriggerShaft) >= 0) { if (isTriggerShaft) shaftTriggerType[index] = TRIGGER_ICU; @@ -83,6 +84,7 @@ static int turnOnTriggerInputPin(const char *msg, int index, bool isTriggerShaft camTriggerType[index] = TRIGGER_ICU; return 0; } +#endif /* ... then EXTI */ if (extiTriggerTurnOnInputPin(msg, index, isTriggerShaft) >= 0) { @@ -103,15 +105,19 @@ static void turnOffTriggerInputPin(int index, bool isTriggerShaft) { activeConfiguration.triggerInputPins[index] : activeConfiguration.camInputs[index]; if (isTriggerShaft) { +#if EFI_ICU_INPUTS if (shaftTriggerType[index] == TRIGGER_ICU) icuTriggerTurnOffInputPin(brainPin); +#endif if (shaftTriggerType[index] == TRIGGER_EXTI) extiTriggerTurnOffInputPin(brainPin); shaftTriggerType[index] = TRIGGER_NONE; } else { +#if EFI_ICU_INPUTS if (camTriggerType[index] == TRIGGER_ICU) icuTriggerTurnOffInputPin(brainPin); +#endif if (camTriggerType[index] == TRIGGER_EXTI) extiTriggerTurnOffInputPin(brainPin);