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

better method name

This commit is contained in:
rusefi 2018-07-29 16:30:23 -04:00
parent 7abd2d9b0a
commit 4c2ecf25eb
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -334,7 +334,7 @@ void Engine::setConfig(persistent_config_s *config) {
this->config = config; this->config = config;
engineConfiguration = &config->engineConfiguration; engineConfiguration = &config->engineConfiguration;
memset(config, 0, sizeof(persistent_config_s)); memset(config, 0, sizeof(persistent_config_s));
engineState.warmupAfrPid.init(&config->engineConfiguration.warmupAfrPid); engineState.warmupAfrPid.initPidClass(&config->engineConfiguration.warmupAfrPid);
} }
void Engine::printKnockState(void) { void Engine::printKnockState(void) {

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

@ -12,14 +12,14 @@
#include "math.h" #include "math.h"
Pid::Pid() { Pid::Pid() {
init(NULL); initPidClass(NULL);
} }
Pid::Pid(pid_s *pid) { Pid::Pid(pid_s *pid) {
init(pid); initPidClass(pid);
} }
void Pid::init(pid_s *pid) { void Pid::initPidClass(pid_s *pid) {
this->pid = pid; this->pid = pid;
resetCounter = 0; resetCounter = 0;
@ -120,12 +120,12 @@ void Pid::postState(TunerStudioOutputChannels *tsOutputChannels, int pMult) {
tsOutputChannels->debugFloatField3 = getPrevError(); tsOutputChannels->debugFloatField3 = getPrevError();
tsOutputChannels->debugFloatField4 = getI(); tsOutputChannels->debugFloatField4 = getI();
tsOutputChannels->debugFloatField5 = getD(); tsOutputChannels->debugFloatField5 = getD();
tsOutputChannels->debugFloatField6 = dTerm;
// tsOutputChannels->debugFloatField6 = pid->minValue; // tsOutputChannels->debugFloatField6 = pid->minValue;
tsOutputChannels->debugFloatField7 = pid->maxValue; tsOutputChannels->debugFloatField7 = pid->maxValue;
tsOutputChannels->debugIntField1 = getP() * pMult; tsOutputChannels->debugIntField1 = getP() * pMult;
tsOutputChannels->debugIntField2 = getOffset(); tsOutputChannels->debugIntField2 = getOffset();
tsOutputChannels->debugIntField3 = resetCounter; tsOutputChannels->debugIntField3 = resetCounter;
tsOutputChannels->debugFloatField6 = dTerm;
} }
#endif #endif

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

@ -25,7 +25,7 @@ class Pid {
public: public:
Pid(); Pid();
Pid(pid_s *pid); Pid(pid_s *pid);
void init(pid_s *pid); void initPidClass(pid_s *pid);
bool isSame(pid_s *pid); bool isSame(pid_s *pid);
float getValue(float target, float input); float getValue(float target, float input);