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

Fix for standby mode for speed control

Browse Source
This commit is contained in:
Królik Uszasty
2019-10-16 22:36:25 +02:00
parent d12c2dd557
commit d3287efd3f
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
McZapkie/Mover.cpp
View File

@@ -2288,12 +2288,18 @@ bool TMoverParameters::DecScndCtrl(int CtrlSpeed)
SpeedCtrlValue = 0; SpeedCtrlValue = 0;
SendCtrlToNext("SpeedCntrl", SpeedCtrlValue, CabNo); SendCtrlToNext("SpeedCntrl", SpeedCtrlValue, CabNo);
SpeedCtrlUnit.IsActive = false; SpeedCtrlUnit.IsActive = false;
if (SpeedCtrlUnit.ManualStateOverride) {
eimic = 0.0;
}
} }
if ((OK) && (SpeedCtrl) && (ScndCtrlPos == 0) && (EngineType == TEngineType::DieselEngine)) if ((OK) && (SpeedCtrl) && (ScndCtrlPos == 0) && (EngineType == TEngineType::DieselEngine))
{ {
SpeedCtrlValue = 0; SpeedCtrlValue = 0;
SpeedCtrlUnit.IsActive = false; SpeedCtrlUnit.IsActive = false;
if (SpeedCtrlUnit.ManualStateOverride) {
eimic = 0.0;
}
} }
return OK; return OK;
@@ -6647,6 +6653,10 @@ void TMoverParameters::CheckSpeedCtrl(double dt)
if (MainCtrlPos > MainCtrlPosNo - 1) { if (MainCtrlPos > MainCtrlPosNo - 1) {
SpeedCtrlUnit.Standby = false; SpeedCtrlUnit.Standby = false;
} }
if (!SpeedCtrlUnit.BrakeIntervention) {
if ((Hamulec->GetEDBCP()>0.4) || (PipePress < (HighPipePress - 0.2)))
SpeedCtrlUnit.Standby = true;
}
if (UniCtrlList[MainCtrlPos].SpeedUp > 0) { if (UniCtrlList[MainCtrlPos].SpeedUp > 0) {
accfactor = 0.0; accfactor = 0.0;
} }
@@ -6686,7 +6696,7 @@ void TMoverParameters::CheckSpeedCtrl(double dt)
} }
} }
else { else {
eimicSpeedCtrl = 1; eimicSpeedCtrl = 0;
eimicSpeedCtrlIntegral = 0; eimicSpeedCtrlIntegral = 0;
} }
SpeedCtrlUnit.Parking = (Vel == 0.0) & (eimic <= 0); SpeedCtrlUnit.Parking = (Vel == 0.0) & (eimic <= 0);
@@ -6717,14 +6727,16 @@ void TMoverParameters::SpeedCtrlButton(int button)
void TMoverParameters::SpeedCtrlInc() void TMoverParameters::SpeedCtrlInc()
{ {
if ((SpeedCtrl) && (ScndCtrlPos > 0)) { if ((SpeedCtrl) && (ScndCtrlPos > 0)) {
SpeedCtrlValue = std::min(SpeedCtrlValue + SpeedCtrlUnit.VelocityStep, SpeedCtrlUnit.MaxVelocity); double x = floor(SpeedCtrlValue / SpeedCtrlUnit.VelocityStep) + 1.0;
SpeedCtrlValue = std::min(x * SpeedCtrlUnit.VelocityStep, SpeedCtrlUnit.MaxVelocity);
} }
} }
void TMoverParameters::SpeedCtrlDec() void TMoverParameters::SpeedCtrlDec()
{ {
if ((SpeedCtrl) && (ScndCtrlPos > 0)) { if ((SpeedCtrl) && (ScndCtrlPos > 0)) {
SpeedCtrlValue = std::max(SpeedCtrlValue - SpeedCtrlUnit.VelocityStep, SpeedCtrlUnit.MinVelocity); double x = ceil(SpeedCtrlValue / SpeedCtrlUnit.VelocityStep) - 1.0;
SpeedCtrlValue = std::max(x * SpeedCtrlUnit.VelocityStep, SpeedCtrlUnit.MinVelocity);
} }
} }