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

Optional SpeedCtrl shutoff when pneumatic braking is active

Browse Source
This commit is contained in:
Królik Uszasty
2020-10-10 01:25:47 +02:00
parent 1bc8e70021
commit 3bb58ca08c
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
McZapkie/Mover.cpp
View File

@@ -2162,7 +2162,7 @@ bool TMoverParameters::IncMainCtrl(int CtrlSpeed)
else { else {
++MainCtrlPos; ++MainCtrlPos;
OK = true; OK = true;
if ((EIMCtrlType == 0) && (SpeedCtrlAutoTurnOffFlag == 1) && (MainCtrlActualPos != MainCtrlPos)) if ((EIMCtrlType == 0) && (SpeedCtrlAutoTurnOffFlag & 1 == 1) && (MainCtrlActualPos != MainCtrlPos))
{ {
DecScndCtrl(2); DecScndCtrl(2);
SpeedCtrlUnit.IsActive = false; SpeedCtrlUnit.IsActive = false;
@@ -2331,7 +2331,7 @@ bool TMoverParameters::DecMainCtrl(int CtrlSpeed)
{ {
MainCtrlPos--; MainCtrlPos--;
OK = true; OK = true;
if ((EIMCtrlType == 0) && (SpeedCtrlAutoTurnOffFlag == 1) && (MainCtrlActualPos != MainCtrlPos)) { if ((EIMCtrlType == 0) && (SpeedCtrlAutoTurnOffFlag & 1 == 1) && (MainCtrlActualPos != MainCtrlPos)) {
DecScndCtrl(2); DecScndCtrl(2);
SpeedCtrlUnit.IsActive = false; SpeedCtrlUnit.IsActive = false;
} }
@@ -2495,7 +2495,7 @@ bool TMoverParameters::IncScndCtrl(int CtrlSpeed)
if ((OK) && (EngineType == TEngineType::ElectricInductionMotor) && (ScndCtrlPosNo == 1) && (MainCtrlPos>0)) if ((OK) && (EngineType == TEngineType::ElectricInductionMotor) && (ScndCtrlPosNo == 1) && (MainCtrlPos>0))
{ {
SpeedCtrlValue = Vel; SpeedCtrlValue = Vel;
if ((EIMCtrlType == 0)&&(SpeedCtrlAutoTurnOffFlag == 1)) if ((EIMCtrlType == 0)&&(SpeedCtrlAutoTurnOffFlag & 1 == 1))
{ {
MainCtrlActualPos = MainCtrlPos; MainCtrlActualPos = MainCtrlPos;
} }
@@ -7139,6 +7139,11 @@ void TMoverParameters::CheckSpeedCtrl(double dt)
else else
eimicSpeedCtrl = clamp(0.5 * (SpeedCtrlValue * 2 - Vel), -1.0, 1.0); eimicSpeedCtrl = clamp(0.5 * (SpeedCtrlValue * 2 - Vel), -1.0, 1.0);
} }
if (((SpeedCtrlAutoTurnOffFlag & 2) == 2) && (Hamulec->GetEDBCP() > 0.25))
{
DecScndCtrl(2);
SpeedCtrlUnit.IsActive = false;
}
} }
else { else {
eimicSpeedCtrl = 1; eimicSpeedCtrl = 1;