eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 15:09:19 +02:00
Code Issues 123 Wiki Activity

Speed control fix for AI

Browse Source
This commit is contained in:
Królik Uszasty
2018-04-19 22:48:30 +02:00
committed by tmj-fstate
parent beede90885
commit 92e4b0d653
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Driver.cpp
View File

@@ -2750,12 +2750,12 @@ bool TController::IncSpeed()
OK = mvControlling->IncMainCtrl(std::max(1,mvOccupied->MainCtrlPosNo/10)); OK = mvControlling->IncMainCtrl(std::max(1,mvOccupied->MainCtrlPosNo/10));
//tutaj jeszcze powinien być tempomat //tutaj jeszcze powinien być tempomat
double SpeedCntrl = VelDesired; double SpeedCntrlVel = VelDesired;
if (fProximityDist < 50) if (fProximityDist < 50)
{ {
SpeedCntrl = std::min(SpeedCntrl, VelNext); SpeedCntrlVel = std::min(SpeedCntrlVel, VelNext);
} }
this->SpeedCntrl(SpeedCntrl); SpeedCntrl(SpeedCntrlVel);
} }
break; break;
@@ -2817,15 +2817,6 @@ bool TController::DecSpeed(bool force)
break; break;
case ElectricInductionMotor: case ElectricInductionMotor:
OK = mvControlling->DecMainCtrl(1); 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; break;
case WheelsDriven: case WheelsDriven:
if (!mvControlling->CabNo) if (!mvControlling->CabNo)