From 752b995def32d5c8a017a562b17d791513c8ddde Mon Sep 17 00:00:00 2001 From: andreika-git Date: Fri, 16 Nov 2018 15:08:20 +0200 Subject: [PATCH] STM32F7: Fix Unit-tests (#621) --- firmware/controllers/algo/accel_enrichment.cpp | 2 +- firmware/controllers/math/pid.cpp | 6 ++---- firmware/controllers/math/pid.h | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/firmware/controllers/algo/accel_enrichment.cpp b/firmware/controllers/algo/accel_enrichment.cpp index 7843c11f3b..99c877d114 100644 --- a/firmware/controllers/algo/accel_enrichment.cpp +++ b/firmware/controllers/algo/accel_enrichment.cpp @@ -26,8 +26,8 @@ #include "engine_state.h" #include "engine_math.h" #include "signal_executor.h" -#include "tunerstudio_configuration.h" #if EFI_TUNER_STUDIO || defined(__DOXYGEN__) +#include "tunerstudio_configuration.h" extern TunerStudioOutputChannels tsOutputChannels; #endif /* EFI_TUNER_STUDIO */ diff --git a/firmware/controllers/math/pid.cpp b/firmware/controllers/math/pid.cpp index f72d7e7cff..cbb29edf4b 100644 --- a/firmware/controllers/math/pid.cpp +++ b/firmware/controllers/math/pid.cpp @@ -106,17 +106,15 @@ void Pid::setErrorAmplification(float coef) { errorAmplificationCoef = coef; } -void Pid::postState(TunerStudioOutputChannels *tsOutputChannels) { #if EFI_TUNER_STUDIO || defined(__DOXYGEN__) +void Pid::postState(TunerStudioOutputChannels *tsOutputChannels) { postState(tsOutputChannels, 1); -#endif /* EFI_TUNER_STUDIO */ } /** * see https://rusefi.com/wiki/index.php?title=Manual:Debug_fields */ void Pid::postState(TunerStudioOutputChannels *tsOutputChannels, int pMult) { -#if EFI_TUNER_STUDIO || defined(__DOXYGEN__) tsOutputChannels->debugFloatField1 = prevResult; tsOutputChannels->debugFloatField2 = iTerm; tsOutputChannels->debugFloatField3 = getPrevError(); @@ -129,8 +127,8 @@ void Pid::postState(TunerStudioOutputChannels *tsOutputChannels, int pMult) { tsOutputChannels->debugIntField2 = getOffset(); tsOutputChannels->debugIntField3 = resetCounter; tsOutputChannels->debugIntField4 = pid->period; -#endif /* EFI_TUNER_STUDIO */ } +#endif /* EFI_TUNER_STUDIO */ void Pid::sleep() { #if !EFI_UNIT_TEST || defined(__DOXYGEN__) diff --git a/firmware/controllers/math/pid.h b/firmware/controllers/math/pid.h index 5d59a36d64..3fd8eba918 100644 --- a/firmware/controllers/math/pid.h +++ b/firmware/controllers/math/pid.h @@ -41,10 +41,10 @@ public: float getIntegration(void); float getPrevError(void); void setErrorAmplification(float coef); -#if EFI_PROD_CODE || EFI_SIMULATOR +#if EFI_TUNER_STUDIO || defined(__DOXYGEN__) void postState(TunerStudioOutputChannels *tsOutputChannels); void postState(TunerStudioOutputChannels *tsOutputChannels, int pMult); -#endif +#endif /* EFI_TUNER_STUDIO */ float minResult; float maxResult; float iTerm;