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

merge remote-tracking branch 'refs/remotes/youby/mover_in_c++'

Browse Source
This commit is contained in:
tmj-fstate
2017-11-05 02:06:59 +01:00
parent 714671492b a4183abea7
commit a93b1a5b1a
2 changed files with 38 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Driver.cpp
View File

@@ -2684,7 +2684,15 @@ bool TController::IncSpeed()
if (!mvControlling->FuseFlag)
if (Ready || (iDrivigFlags & movePress) || (mvOccupied->ShuntMode)) //{(BrakePress<=0.01*MaxBrakePress)}
{
OK = mvControlling->IncMainCtrl(1);
OK = mvControlling->IncMainCtrl(std::max(1,mvOccupied->MainCtrlPosNo/10));
//tutaj jeszcze powinien być tempomat
mvControlling->IncScndCtrl(1);
double SpeedCntrl = VelDesired;
if (fProximityDist < 50)
{
SpeedCntrl = std::min(SpeedCntrl, VelNext);
}
mvControlling->RunCommand("SpeedCntrl", VelDesired, mvControlling->CabNo);
}
break;
case WheelsDriven:
@@ -2737,11 +2745,22 @@ bool TController::DecSpeed(bool force)
break;
case Dumb:
case DieselElectric:
case ElectricInductionMotor:
OK = mvControlling->DecScndCtrl(2);
if (!OK)
OK = mvControlling->DecMainCtrl(2 + (mvControlling->MainCtrlPos / 2));
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)
mvControlling->CabActivisation();