From 00a7f26ef9ccd110378b2c33775f8178e52e03c6 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 16 Dec 2018 01:13:44 -0500 Subject: [PATCH] progress --- firmware/config/stm32f4ems/efifeatures.h | 2 ++ firmware/hw_layer/digital_input_hw.cpp | 4 ++-- firmware/hw_layer/digital_input_hw.h | 6 +++--- firmware/hw_layer/trigger_input.cpp | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/firmware/config/stm32f4ems/efifeatures.h b/firmware/config/stm32f4ems/efifeatures.h index 262d8e0299..fb424d1c8d 100644 --- a/firmware/config/stm32f4ems/efifeatures.h +++ b/firmware/config/stm32f4ems/efifeatures.h @@ -49,6 +49,8 @@ */ #define EFI_WAVE_ANALYZER TRUE +#define EFI_ICU_INPUTS TRUE + /** * TunerStudio support. */ diff --git a/firmware/hw_layer/digital_input_hw.cpp b/firmware/hw_layer/digital_input_hw.cpp index 6bb023227a..23c7282df4 100644 --- a/firmware/hw_layer/digital_input_hw.cpp +++ b/firmware/hw_layer/digital_input_hw.cpp @@ -28,7 +28,7 @@ #include "mpu_util.h" #include "fl_stack.h" -#if EFI_WAVE_ANALYZER || defined(__DOXYGEN__) +#if EFI_ICU_INPUTS || defined(__DOXYGEN__) #include "eficonsole.h" #include "pin_repository.h" @@ -272,4 +272,4 @@ void startInputDriver(digital_input_s *hw, bool isActiveHigh) { hw->started = true; } -#endif /* EFI_WAVE_ANALYZER */ +#endif /* EFI_ICU_INPUTS */ diff --git a/firmware/hw_layer/digital_input_hw.h b/firmware/hw_layer/digital_input_hw.h index 081616ce58..e7abcc4365 100644 --- a/firmware/hw_layer/digital_input_hw.h +++ b/firmware/hw_layer/digital_input_hw.h @@ -5,8 +5,8 @@ * @author Andrey Belomutskiy, (c) 2012-2017 */ -#ifndef WAVE_ANALYZER_HW_H_ -#define WAVE_ANALYZER_HW_H_ +#ifndef DIGITAL_INPUT_HW_H_ +#define DIGITAL_INPUT_HW_H_ #include "global.h" @@ -34,4 +34,4 @@ icuchannel_t getInputCaptureChannel(brain_pin_e hwPin); #endif -#endif /* WAVE_ANALYZER_HW_H_ */ +#endif /* DIGITAL_INPUT_HW_H_ */ diff --git a/firmware/hw_layer/trigger_input.cpp b/firmware/hw_layer/trigger_input.cpp index 20a4dac37a..ed6362fa0b 100644 --- a/firmware/hw_layer/trigger_input.cpp +++ b/firmware/hw_layer/trigger_input.cpp @@ -3,7 +3,7 @@ * @brief Position sensor hardware layer * * todo: code reuse with digital_input_hw.cpp was never finished - * todo: at the moment due to half-done code reuse we depend on EFI_WAVE_ANALYZER which makes no sense, need to finish this refactoring + * todo: at the moment due to half-done code reuse we already depend on EFI_ICU_INPUTS but still have custom code * todo: VVT implementation is a nasty copy-paste :( * * see digital_input_hw.cp