|
@@ -80,13 +80,13 @@ iv::decition::Decition iv::decition::ChanganShenlanAdapter::getAdapterDeciton(GP
|
|
controlSpeed = limitSpeed(realSpeed, controlBrake, dSpeed, controlSpeed);
|
|
controlSpeed = limitSpeed(realSpeed, controlBrake, dSpeed, controlSpeed);
|
|
|
|
|
|
if(DecideGps00::minDecelerate<0){
|
|
if(DecideGps00::minDecelerate<0){
|
|
- controlBrake = max((0-DecideGps00::minDecelerate)*30,controlBrake);
|
|
|
|
|
|
+ controlBrake = max((0-DecideGps00::minDecelerate)*20,controlBrake);
|
|
controlSpeed=0;
|
|
controlSpeed=0;
|
|
}
|
|
}
|
|
controlBrake=min(controlBrake,100.0f);
|
|
controlBrake=min(controlBrake,100.0f);
|
|
controlBrake=max(controlBrake,0.0f);
|
|
controlBrake=max(controlBrake,0.0f);
|
|
|
|
|
|
- (*decition)->brake = 0 - controlBrake/25;
|
|
|
|
|
|
+ (*decition)->brake = 0 - controlBrake/20;
|
|
(*decition)->torque= controlSpeed;
|
|
(*decition)->torque= controlSpeed;
|
|
lastTorque=(*decition)->torque;
|
|
lastTorque=(*decition)->torque;
|
|
|
|
|