Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged two "ifs" into one #85

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Merged two "ifs" into one #85

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions PID_v1.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,21 +66,23 @@ bool PID::Compute()
double input = *myInput;
double error = *mySetpoint - input;
double dInput = (input - lastInput);
double output;

/*Compute integral*/
outputSum+= (ki * error);

/*Add Proportional on Measurement, if P_ON_M is specified*/
if(!pOnE) outputSum-= kp * dInput;
/*Compute proportional*/
if(pOnE) output = kp * error;
else { outputSum -= kp * dInput; output = 0; }

if(outputSum > outMax) outputSum= outMax;
else if(outputSum < outMin) outputSum= outMin;

/*Add Proportional on Error, if P_ON_E is specified*/
double output;
if(pOnE) output = kp * error;
else output = 0;
/*Compute derivative*/
output -= kd * dInput;

/*Compute Rest of PID Output*/
output += outputSum - kd * dInput;
/*Merge*/
output += outputSum;

if(output > outMax) output = outMax;
else if(output < outMin) output = outMin;
Expand Down