From dce2e17f1bce5a07fa2033441468396263756139 Mon Sep 17 00:00:00 2001 From: rusefi Date: Wed, 9 Jan 2019 00:25:45 -0500 Subject: [PATCH] #655 clean-up --- firmware/controllers/system/SingleTimerExecutor.cpp | 5 +---- firmware/hw_layer/microsecond_timer.cpp | 4 ++-- unit_tests/efifeatures.h | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/firmware/controllers/system/SingleTimerExecutor.cpp b/firmware/controllers/system/SingleTimerExecutor.cpp index 59bce85a56..9df41992d2 100644 --- a/firmware/controllers/system/SingleTimerExecutor.cpp +++ b/firmware/controllers/system/SingleTimerExecutor.cpp @@ -21,12 +21,9 @@ #include "efitime.h" #include "efilib2.h" -#if EFI_PROD_CODE || defined(__DOXYGEN__) +#if EFI_SIGNAL_EXECUTOR_ONE_TIMER || defined(__DOXYGEN__) #include "microsecond_timer.h" #include "tunerstudio_configuration.h" -#endif - -#if (EFI_SIGNAL_EXECUTOR_ONE_TIMER && EFI_PROD_CODE )|| defined(__DOXYGEN__) #include "rfiutil.h" static Executor instance; diff --git a/firmware/hw_layer/microsecond_timer.cpp b/firmware/hw_layer/microsecond_timer.cpp index 526b51bfcc..6423b070fc 100644 --- a/firmware/hw_layer/microsecond_timer.cpp +++ b/firmware/hw_layer/microsecond_timer.cpp @@ -88,7 +88,7 @@ void setHardwareUsTimer(int32_t timeUs) { timerRestartCounter++; } -static void callback(GPTDriver *gptp) { +static void hwTimerCallback(GPTDriver *gptp) { (void)gptp; timerCallbackCounter++; if (globalTimerCallback == NULL) { @@ -142,7 +142,7 @@ private: MicrosecondTimerWatchdogController watchdogControllerInstance; static constexpr GPTConfig gpt5cfg = { 1000000, /* 1 MHz timer clock.*/ -callback, /* Timer callback.*/ + hwTimerCallback, /* Timer callback.*/ 0, 0 }; void initMicrosecondTimer(void) { diff --git a/unit_tests/efifeatures.h b/unit_tests/efifeatures.h index 4f336e81e4..23203a3a51 100644 --- a/unit_tests/efifeatures.h +++ b/unit_tests/efifeatures.h @@ -45,7 +45,7 @@ #define EFI_SUPPORT_FORD_FIESTA TRUE #define EFI_SUPPORT_NISSAN_PRIMERA TRUE -#define EFI_SIGNAL_EXECUTOR_ONE_TIMER TRUE +#define EFI_SIGNAL_EXECUTOR_ONE_TIMER FALSE #define EFI_SIGNAL_EXECUTOR_SLEEP FALSE #define EFI_SHAFT_POSITION_INPUT TRUE