Brewery/Arduino-PID-Library
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update PID_v1.cpp

Browse Source
This commit is contained in:
clplaneguy 2019-04-05 05:40:44 -05:00 committed by GitHub
parent bb7fb20cd2
commit 621c989a28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
PID_v1.cpp
View File

@ -25,13 +25,13 @@ PID2::PID2(double* Input, double* Output, double* Setpoint,
mySetpoint = Setpoint; mySetpoint = Setpoint;
inAuto = false; inAuto = false;
PID::SetOutputLimits(0, 255); //default output limit corresponds to PID2::SetOutputLimits(0, 255); //default output limit corresponds to
//the arduino pwm limits //the arduino pwm limits
SampleTime = 100; //default Controller Sample Time is 0.1 seconds SampleTime = 100; //default Controller Sample Time is 0.1 seconds
PID::SetControllerDirection(ControllerDirection); PID2::SetControllerDirection(ControllerDirection);
PID::SetTunings(Kp, Ki, Kd, POn); PID2::SetTunings(Kp, Ki, Kd, POn);
lastTime = millis()-SampleTime; lastTime = millis()-SampleTime;
} }
@ -43,7 +43,7 @@ PID2::PID2(double* Input, double* Output, double* Setpoint,
PID2::PID2(double* Input, double* Output, double* Setpoint, PID2::PID2(double* Input, double* Output, double* Setpoint,
double Kp, double Ki, double Kd, int ControllerDirection) double Kp, double Ki, double Kd, int ControllerDirection)
:PID::PID(Input, Output, Setpoint, Kp, Ki, Kd, P_ON_E, ControllerDirection) :PID2::PID2(Input, Output, Setpoint, Kp, Ki, Kd, P_ON_E, ControllerDirection)
{ {
} }
@ -216,9 +216,9 @@ void PID2::SetControllerDirection(int Direction)
* functions query the internal state of the PID. they're here for display * functions query the internal state of the PID. they're here for display
* purposes. this are the functions the PID Front-end uses for example * purposes. this are the functions the PID Front-end uses for example
******************************************************************************/ ******************************************************************************/
double PID::GetKp(){ return dispKp; } double PID2::GetKp(){ return dispKp; }
double PID::GetKi(){ return dispKi;} double PID2::GetKi(){ return dispKi;}
double PID::GetKd(){ return dispKd;} double PID2::GetKd(){ return dispKd;}
int PID::GetMode(){ return inAuto ? AUTOMATIC : MANUAL;} int PID2::GetMode(){ return inAuto ? AUTOMATIC : MANUAL;}
int PID::GetDirection(){ return controllerDirection;} int PID2::GetDirection(){ return controllerDirection;}