From f1785fee11a3c417815caf283ecdd6b6d31343f4 Mon Sep 17 00:00:00 2001 From: Andrey G Date: Sun, 14 Feb 2021 02:45:33 +0300 Subject: [PATCH] Config cleanups (#2347) * Remove duplication * Ports: STM32F7: we want PAL_USE_CALLBACKS for F7 too --- firmware/config/boards/skeleton/efifeatures.h | 4 ---- firmware/hw_layer/ports/stm32/stm32f7/cfg/halconf.h | 9 +++++++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/firmware/config/boards/skeleton/efifeatures.h b/firmware/config/boards/skeleton/efifeatures.h index 4ec6f3ace2..aa4603582d 100644 --- a/firmware/config/boards/skeleton/efifeatures.h +++ b/firmware/config/boards/skeleton/efifeatures.h @@ -113,10 +113,6 @@ #define HAL_TRIGGER_USE_PAL FALSE #endif /* HAL_TRIGGER_USE_PAL */ -#ifndef HAL_TRIGGER_USE_PAL -#define HAL_TRIGGER_USE_PAL FALSE -#endif /* HAL_TRIGGER_USE_PAL */ - #ifndef HAL_TRIGGER_USE_ADC #define HAL_TRIGGER_USE_ADC FALSE #endif /* HAL_TRIGGER_USE_ADC */ diff --git a/firmware/hw_layer/ports/stm32/stm32f7/cfg/halconf.h b/firmware/hw_layer/ports/stm32/stm32f7/cfg/halconf.h index 6f9f7b4b6e..d3986e8277 100644 --- a/firmware/hw_layer/ports/stm32/stm32f7/cfg/halconf.h +++ b/firmware/hw_layer/ports/stm32/stm32f7/cfg/halconf.h @@ -47,6 +47,15 @@ #define HAL_USE_PAL TRUE #endif +#if !defined(PAL_USE_WAIT) || defined(__DOXYGEN__) +#define PAL_USE_WAIT FALSE +#endif + +// rusEfi uses callback for PAL input capture +#if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__) +#define PAL_USE_CALLBACKS TRUE +#endif + /** * @brief Enables the ADC subsystem. */