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

Merge pull request #156 from MaSzyna-EU07/fix-traxx-independent-brake

Browse Source 
Fix "Traxx" local brake
This commit is contained in:
Hirek
2026-08-19 10:03:11 +02:00
committed by GitHub
parent 1357afb9e1 7cc6a67399
commit dcd87d8c80
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
McZapkie/Mover.cpp
View File

@@ -4497,7 +4497,7 @@ void TMoverParameters::UpdatePipePressure(double dt)
if (EngineType != TEngineType::ElectricInductionMotor)
{
double lbpa = LocalBrakePosA;
double lbpa = LocHandleTimeTraxx ? eim_localbrake : LocalBrakePosA;
if (EIMCtrlType > 0 && UniCtrlIntegratedLocalBrakeCtrl)
{
lbpa = std::max(0.0, -eimic_real);
@@ -4513,7 +4513,20 @@ void TMoverParameters::UpdatePipePressure(double dt)
// in EIM stock the pneumatic local brake is normally driven only by the MED algorithm
// (LocalBrakePosAEIM). When SplitEDPneumaticBrake is active the dedicated LocalBrake
// 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;
if (LocHandleTimeTraxx)
{
lbpa = eim_localbrake;
}
else if (SplitEDPneumaticBrake) // When LocHandleTimeTraxx and SplitEDPneumaticBrake are both active, lbpa is taken from LocHandleTimeTraxx, which is the desired behavior.
{
lbpa = LocalBrakePosA;
}
else
{
lbpa = 0.0;
}
dpLocalValve = LocHandle->GetPF(std::max(lbpa, LocalBrakePosAEIM), Hamulec->GetBCP(), ScndPipePress, dt, 0);
}
@@ -7466,17 +7479,17 @@ void TMoverParameters::CheckEIMIC(double dt)
}
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]);
}
else
else // pozycja 1, utrzymanie cisnienia
{
if (eim_localbrake < Hamulec->GetEDBCP() / MaxBrakePress[0])
eim_localbrake = 0;