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

OOP all the way, maybe too much OOP? :)

This commit is contained in:
rusefi 2019-09-11 20:23:25 -04:00
parent 2349ea237a
commit e30000f1ca
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
firmware/util/math/pid.cpp
View File

@ -58,7 +58,7 @@ float Pid::getUnclampedOutput(float target, float input, float dTime) {
previousError = error;
return pTerm + iTerm + dTerm + parameters->offset;
return pTerm + iTerm + dTerm + getOffset();
}
/**
@ -69,8 +69,8 @@ float Pid::getOutput(float target, float input, float dTime) {
if (output > parameters->maxValue) {
output = parameters->maxValue;
} else if (output < parameters->minValue) {
output = parameters->minValue;
} else if (output < getMinValue()) {
output = getMinValue();
}
this->output = output;
return output;
@ -114,6 +114,10 @@ float Pid::getOffset(void) const {
return parameters->offset;
}
float Pid::getMinValue(void) const {
return parameters->minValue;
}
void Pid::setErrorAmplification(float coef) {
errorAmplificationCoef = coef;
}
@ -152,7 +156,7 @@ void Pid::sleep() {
void Pid::showPidStatus(Logging *logging, const char*msg) {
scheduleMsg(logging, "%s settings: offset=%d P=%.5f I=%.5f D=%.5f period=%dms",
msg,
parameters->offset,
getOffset(),
parameters->pFactor,
parameters->iFactor,
parameters->dFactor,

3
firmware/util/math/pid.h
View File

@ -53,7 +53,8 @@ public:
float getP(void) const;
float getI(void) const;
float getD(void) const;
float getOffset(void) const;
virtual float getOffset(void) const;
virtual float getMinValue(void) const;
float getIntegration(void) const;
float getPrevError(void) const;
void setErrorAmplification(float coef);