Merge 79e5cc533a
into 9b4ca0e5b6
This commit is contained in:
commit
8361696ea5
@ -75,9 +75,8 @@ bool PID::Compute()
|
|||||||
else if(outputSum < outMin) outputSum= outMin;
|
else if(outputSum < outMin) outputSum= outMin;
|
||||||
|
|
||||||
/*Add Proportional on Error, if P_ON_E is specified*/
|
/*Add Proportional on Error, if P_ON_E is specified*/
|
||||||
double output;
|
double output = 0;
|
||||||
if(pOnE) output = kp * error;
|
if(pOnE) output = kp * error;
|
||||||
else output = 0;
|
|
||||||
|
|
||||||
/*Compute Rest of PID Output*/
|
/*Compute Rest of PID Output*/
|
||||||
output += outputSum - kd * dInput;
|
output += outputSum - kd * dInput;
|
||||||
|
Loading…
Reference in New Issue
Block a user