rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

STM32F7: Fix Unit-tests (#621)

This commit is contained in:
andreika-git 2018-11-16 15:08:20 +02:00 committed by rusefi
parent 23fea3c0c5
commit 752b995def
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/controllers/algo/accel_enrichment.cpp
View File

@ -26,8 +26,8 @@
#include "engine_state.h" #include "engine_state.h"
#include "engine_math.h" #include "engine_math.h"
#include "signal_executor.h" #include "signal_executor.h"
#include "tunerstudio_configuration.h"
#if EFI_TUNER_STUDIO || defined(__DOXYGEN__) #if EFI_TUNER_STUDIO || defined(__DOXYGEN__)
#include "tunerstudio_configuration.h"
extern TunerStudioOutputChannels tsOutputChannels; extern TunerStudioOutputChannels tsOutputChannels;
#endif /* EFI_TUNER_STUDIO */ #endif /* EFI_TUNER_STUDIO */

6
firmware/controllers/math/pid.cpp
View File

@ -106,17 +106,15 @@ void Pid::setErrorAmplification(float coef) {
errorAmplificationCoef = coef; errorAmplificationCoef = coef;
} }
void Pid::postState(TunerStudioOutputChannels *tsOutputChannels) {
#if EFI_TUNER_STUDIO || defined(__DOXYGEN__) #if EFI_TUNER_STUDIO || defined(__DOXYGEN__)
void Pid::postState(TunerStudioOutputChannels *tsOutputChannels) {
postState(tsOutputChannels, 1); postState(tsOutputChannels, 1);
#endif /* EFI_TUNER_STUDIO */
} }
/** /**
* see https://rusefi.com/wiki/index.php?title=Manual:Debug_fields * see https://rusefi.com/wiki/index.php?title=Manual:Debug_fields
*/ */
void Pid::postState(TunerStudioOutputChannels *tsOutputChannels, int pMult) { void Pid::postState(TunerStudioOutputChannels *tsOutputChannels, int pMult) {
#if EFI_TUNER_STUDIO || defined(__DOXYGEN__)
tsOutputChannels->debugFloatField1 = prevResult; tsOutputChannels->debugFloatField1 = prevResult;
tsOutputChannels->debugFloatField2 = iTerm; tsOutputChannels->debugFloatField2 = iTerm;
tsOutputChannels->debugFloatField3 = getPrevError(); tsOutputChannels->debugFloatField3 = getPrevError();
@ -129,8 +127,8 @@ void Pid::postState(TunerStudioOutputChannels *tsOutputChannels, int pMult) {
tsOutputChannels->debugIntField2 = getOffset(); tsOutputChannels->debugIntField2 = getOffset();
tsOutputChannels->debugIntField3 = resetCounter; tsOutputChannels->debugIntField3 = resetCounter;
tsOutputChannels->debugIntField4 = pid->period; tsOutputChannels->debugIntField4 = pid->period;
#endif /* EFI_TUNER_STUDIO */
} }
#endif /* EFI_TUNER_STUDIO */
void Pid::sleep() { void Pid::sleep() {
#if !EFI_UNIT_TEST || defined(__DOXYGEN__) #if !EFI_UNIT_TEST || defined(__DOXYGEN__)

4
firmware/controllers/math/pid.h
View File

@ -41,10 +41,10 @@ public:
float getIntegration(void); float getIntegration(void);
float getPrevError(void); float getPrevError(void);
void setErrorAmplification(float coef); void setErrorAmplification(float coef);
#if EFI_PROD_CODE || EFI_SIMULATOR #if EFI_TUNER_STUDIO || defined(__DOXYGEN__)
void postState(TunerStudioOutputChannels *tsOutputChannels); void postState(TunerStudioOutputChannels *tsOutputChannels);
void postState(TunerStudioOutputChannels *tsOutputChannels, int pMult); void postState(TunerStudioOutputChannels *tsOutputChannels, int pMult);
#endif #endif /* EFI_TUNER_STUDIO */
float minResult; float minResult;
float maxResult; float maxResult;
float iTerm; float iTerm;