diff --git a/.github/workflows/build-firmware.yaml b/.github/workflows/build-firmware.yaml index 01ab230b6e..2bcff4963f 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 + target-extra-params: -DHAL_TRIGGER_USE_PAL=TRUE -DHAL_USE_ICU=FALSE -DEFI_VEHICLE_SPEED=FALSE -DEFI_LOGIC_ANALYZER=FALSE - build-target: mre-f4 efi-cpu: ARCH_STM32F4 diff --git a/firmware/config/boards/frankenso/!compile-frankenso-pal.bat b/firmware/config/boards/frankenso/!compile-frankenso-pal.bat index ed2d93cf77..d8d08c6178 100644 --- a/firmware/config/boards/frankenso/!compile-frankenso-pal.bat +++ b/firmware/config/boards/frankenso/!compile-frankenso-pal.bat @@ -6,7 +6,6 @@ set EXTRA_PARAMS=-DDUMMY ^ -DEFI_VEHICLE_SPEED=FALSE ^ -DHAL_USE_ICU=FALSE ^ -DEFI_LOGIC_ANALYZER=FALSE ^ - -DHAL_USE_ICU=FALSE ^ -DDEFAULT_ENGINE_TYPE=MIATA_NA6_VAF ^ -DFIRMWARE_ID=\"frankensoNA6\" diff --git a/firmware/hw_layer/trigger_input_exti.cpp b/firmware/hw_layer/trigger_input_exti.cpp index c6beacbb6b..fc0995d797 100644 --- a/firmware/hw_layer/trigger_input_exti.cpp +++ b/firmware/hw_layer/trigger_input_exti.cpp @@ -73,11 +73,11 @@ void turnOnTriggerInputPin(const char *msg, int index, bool isTriggerShaft) { * * do not set to both edges if we need only one * * simplify callback in case of one edge */ ioline_t pal_line = PAL_LINE(getHwPort("trg", brainPin), getHwPin("trg", brainPin)); - efiExtiEnablePin(msg, brainPin, PAL_EVENT_MODE_BOTH_EDGES, isVvtShaft ? shaft_callback : cam_callback, (void *)pal_line); + efiExtiEnablePin(msg, brainPin, PAL_EVENT_MODE_BOTH_EDGES, isTriggerShaft ? shaft_callback : cam_callback, (void *)pal_line); } void turnOffTriggerInputPin(brain_pin_e brainPin) { - stopDigitalCapture("trigger", brainPin); + efiExtiDisablePin(brainPin); } void setPrimaryChannel(brain_pin_e brainPin) {