|
@@ -238,7 +238,13 @@ public class PidLambdaV2Container {
|
|
lastError = error;
|
|
lastError = error;
|
|
lastPidValue=kp * error + ki * integral + kd * derivative;
|
|
lastPidValue=kp * error + ki * integral + kd * derivative;
|
|
double result=currentValue+lastPidValue;
|
|
double result=currentValue+lastPidValue;
|
|
- double min=setPoint>lambda?lambda:setPoint;
|
|
|
|
|
|
+ double min;
|
|
|
|
+ if(lambda<0){
|
|
|
|
+ min=setPoint;
|
|
|
|
+ }else {
|
|
|
|
+ min=setPoint>lambda?lambda:setPoint;
|
|
|
|
+ }
|
|
|
|
+
|
|
if(result<=min/8d){
|
|
if(result<=min/8d){
|
|
result=min/8d;
|
|
result=min/8d;
|
|
}
|
|
}
|