From 92e4b0d653c78ddc99703097c55948fc0faff2e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Thu, 19 Apr 2018 22:48:30 +0200 Subject: [PATCH] Speed control fix for AI --- Driver.cpp | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 857202e3..9953ad8b 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -2750,12 +2750,12 @@ bool TController::IncSpeed() OK = mvControlling->IncMainCtrl(std::max(1,mvOccupied->MainCtrlPosNo/10)); //tutaj jeszcze powinien być tempomat - double SpeedCntrl = VelDesired; + double SpeedCntrlVel = VelDesired; if (fProximityDist < 50) { - SpeedCntrl = std::min(SpeedCntrl, VelNext); + SpeedCntrlVel = std::min(SpeedCntrlVel, VelNext); } - this->SpeedCntrl(SpeedCntrl); + SpeedCntrl(SpeedCntrlVel); } break; @@ -2817,15 +2817,6 @@ bool TController::DecSpeed(bool force) break; case ElectricInductionMotor: OK = mvControlling->DecMainCtrl(1); - if ((mvControlling->ScndCtrlPosNo > 0)&&(mvControlling->Mains)) //jeżeli tempomat - { - mvControlling->IncScndCtrl(1); - mvControlling->RunCommand("SpeedCntrl", VelDesired, mvControlling->CabNo); - } - else - { - mvControlling->DecScndCtrl(2); - } break; case WheelsDriven: if (!mvControlling->CabNo)