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

#393

This commit is contained in:
rusefi 2017-04-10 15:16:00 -04:00
parent 297edc758e
commit 713a23dc8d
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
firmware/controllers/algo/aux_pid.cpp
View File

@ -58,8 +58,11 @@ static msg_t auxPidThread(int param) {
int dt = maxI(10, engineConfiguration->auxPidDT[0]); int dt = maxI(10, engineConfiguration->auxPidDT[0]);
chThdSleepMilliseconds(dt); chThdSleepMilliseconds(dt);
if (parametersVersion.isOld()) if (parametersVersion.isOld()) {
auxPid.reset(); auxPid.reset();
auxPid.minResult = engineConfiguration->aux1PidMin;
auxPid.maxResult = engineConfiguration->aux1PidMax;
}
float rpm = engine->rpmCalculator.rpmValue; float rpm = engine->rpmCalculator.rpmValue;

6
firmware/controllers/alternatorController.cpp
View File

@ -51,6 +51,8 @@ static msg_t AltCtrlThread(int param) {
if (shouldResetPid) { if (shouldResetPid) {
alternatorPidResetCounter++; alternatorPidResetCounter++;
altPid.reset(); altPid.reset();
altPid.minResult = engineConfiguration->bc.alternatorPidMin;
altPid.maxResult = engineConfiguration->bc.alternatorPidMax;
shouldResetPid = false; shouldResetPid = false;
} }
#endif #endif
@ -154,7 +156,9 @@ void setDefaultAlternatorParameters(void) {
} }
void onConfigurationChangeAlternatorCallback(engine_configuration_s *previousConfiguration) { void onConfigurationChangeAlternatorCallback(engine_configuration_s *previousConfiguration) {
shouldResetPid = !altPid.isSame(&previousConfiguration->alternatorControl); shouldResetPid = !altPid.isSame(&previousConfiguration->alternatorControl) ||
engineConfiguration->bc.alternatorPidMin != previousConfiguration->bc.alternatorPidMin ||
engineConfiguration->bc.alternatorPidMax != previousConfiguration->bc.alternatorPidMax;
} }
void initAlternatorCtrl(Logging *sharedLogger) { void initAlternatorCtrl(Logging *sharedLogger) {

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

@ -35,10 +35,10 @@ public:
#if EFI_PROD_CODE || EFI_SIMULATOR #if EFI_PROD_CODE || EFI_SIMULATOR
void postState(TunerStudioOutputChannels *tsOutputChannels); void postState(TunerStudioOutputChannels *tsOutputChannels);
#endif #endif
private:
pid_s *pid;
float minResult; float minResult;
float maxResult; float maxResult;
private:
pid_s *pid;
float iTerm; float iTerm;
float dTerm; // we are remembering this only for debugging purposes float dTerm; // we are remembering this only for debugging purposes