eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-09-01 06:59:18 +02:00
Code Issues 134 Wiki Activity

Fix "Traxx" local brake

Browse Source
This commit is contained in:
Ryba04
2026-08-18 00:04:31 +02:00
parent 1357afb9e1
commit 7d3b9a7360
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
McZapkie/Mover.cpp
View File

@@ -4497,7 +4497,7 @@ void TMoverParameters::UpdatePipePressure(double dt)
if (EngineType != TEngineType::ElectricInductionMotor) if (EngineType != TEngineType::ElectricInductionMotor)
{ {
double lbpa = LocalBrakePosA; double lbpa = LocHandleTimeTraxx ? eim_localbrake : LocalBrakePosA;
if (EIMCtrlType > 0 && UniCtrlIntegratedLocalBrakeCtrl) if (EIMCtrlType > 0 && UniCtrlIntegratedLocalBrakeCtrl)
{ {
lbpa = std::max(0.0, -eimic_real); lbpa = std::max(0.0, -eimic_real);
@@ -4513,7 +4513,8 @@ void TMoverParameters::UpdatePipePressure(double dt)
// in EIM stock the pneumatic local brake is normally driven only by the MED algorithm // in EIM stock the pneumatic local brake is normally driven only by the MED algorithm
// (LocalBrakePosAEIM). When SplitEDPneumaticBrake is active the dedicated LocalBrake // (LocalBrakePosAEIM). When SplitEDPneumaticBrake is active the dedicated LocalBrake
// lever should apply pneumatic pressure on the locomotive directly, bypassing MED. // lever should apply pneumatic pressure on the locomotive directly, bypassing MED.
double lbpa = SplitEDPneumaticBrake ? LocalBrakePosA : 0.0; // LocHandleTimeTraxx also bypasses MED, but has 3 positions (brake-hold-unbrake).
double lbpa = LocHandleTimeTraxx ? eim_localbrake : (SplitEDPneumaticBrake ? LocalBrakePosA : 0.0);
dpLocalValve = LocHandle->GetPF(std::max(lbpa, LocalBrakePosAEIM), Hamulec->GetBCP(), ScndPipePress, dt, 0); dpLocalValve = LocHandle->GetPF(std::max(lbpa, LocalBrakePosAEIM), Hamulec->GetBCP(), ScndPipePress, dt, 0);
} }
@@ -7466,17 +7467,17 @@ void TMoverParameters::CheckEIMIC(double dt)
} }
if (LocHandleTimeTraxx) if (LocHandleTimeTraxx)
{ {
if (LocalBrakeRatio() < 0.05) // pozycja 0 if (LocalBrakeRatio() < 0.4) // pozycja 0, odhamowywanie
{ {
eim_localbrake -= dt * 0.17; // zmniejszanie eim_localbrake -= dt * 0.17;
} }
if (LocalBrakeRatio() > 0.15) // pozycja 2 if (LocalBrakeRatio() > 0.6) // pozycja 2, zahamowywanie
{ {
eim_localbrake += dt * 0.17; // wzrastanie eim_localbrake += dt * 0.17;
eim_localbrake = std::max(eim_localbrake, BrakePress / MaxBrakePress[0]); eim_localbrake = std::max(eim_localbrake, BrakePress / MaxBrakePress[0]);
} }
else else // pozycja 1, utrzymanie cisnienia
{ {
if (eim_localbrake < Hamulec->GetEDBCP() / MaxBrakePress[0]) if (eim_localbrake < Hamulec->GetEDBCP() / MaxBrakePress[0])
eim_localbrake = 0; eim_localbrake = 0;