18
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-19 19:14:59 +01:00

feat: Elf emergency brake position in the master controller (eu07/maszyna#413)

The Elf's master controller (EIMCtrlType 2) gets an optional emergency
brake position below its position 0, turned on by the new .fiz key
EIMCtrlMainEmergency=Yes in Cntrl (default No, no change without it).
With it the old positions move up by one (MCPN 5, neutral at 4): the
emergency position brakes fully at once and vents the brake pipe, like
the alarm chain or the Impuls's EIMCtrlEmergency. The loader raises a
too small MCPN to 5 and logs it. The Elf code with hard-coded positions
(CheckEIMIC, the MED full braking, the AI) takes the shift into account.

SVN data to change afterwards (dynamic/pkp/elf_v1, needs this exe):
- every .fiz with EIMCtrlType=2: EIMCtrlMainEmergency=Yes, MCPN=5,
  DirChangeMaxPos=4 where present;
- the cab .mmd mainctrl entries: offset one notch lower (-0.06 -> -0.09),
  sounds shifted one index up, new sound0 with
  26284_elf_nastawnik_nagle_*.wav.

Issue: (eu07/maszyna#413)
This commit is contained in:
jerrrrycho
2026-11-07 19:53:10 +01:00
parent 939e42b611
commit 22c8e7322f
5 changed files with 189 additions and 16 deletions

View File

@@ -2710,7 +2710,7 @@ int TMoverParameters::MainCtrlNoPowerPos() const
}
case 2:
{
return 3;
return 3 + EIMCtrlEmergencyPositions();
}
case 3:
{
@@ -2735,6 +2735,16 @@ int TMoverParameters::MainCtrlPowerPos() const
return MainCtrlPos - MainCtrlNoPowerPos();
}
int TMoverParameters::EIMCtrlEmergencyPositions() const
{
return (EIMCtrlType == 2 && EIMCtrlMainEmergency) ? 1 : 0;
}
bool TMoverParameters::IsMainCtrlEmergencyPos() const
{
return MainCtrlPos < EIMCtrlEmergencyPositions();
}
// *************************************************************************************************
// Q: 20160710
// zwiększenie bocznika
@@ -4577,7 +4587,7 @@ void TMoverParameters::UpdatePipePressure(double dt)
// EngDmgFlag 32 (load destroyed) used to trigger this too; dropped, it has nothing to do with
// the emergency brake (a broken coupler sets AlarmChainFlag instead)
if (RadioStopFlag || AlarmChainFlag || (EIMCtrlEmergency && LocalBrakePosA >= 1.0) || SecuritySystem.is_braking() ||
if (RadioStopFlag || AlarmChainFlag || (EIMCtrlEmergency && LocalBrakePosA >= 1.0) || IsMainCtrlEmergencyPos() || SecuritySystem.is_braking() ||
(SpringBrakeDriveEmergencyVel >= 0 && Vel > SpringBrakeDriveEmergencyVel && SpringBrake.IsActive) ||
(0 == CabActive && (InactiveCabFlag & activation::emergencybrake) != 0))
{
@@ -7357,10 +7367,16 @@ void TMoverParameters::CheckEIMIC(double dt)
eimic = 0;
break;
case 2:
if (MainCtrlActualPos != MainCtrlPos || LastRelayTime > InitialCtrlDelay)
if (IsMainCtrlEmergencyPos())
{
// hamowanie nagle: pelne hamowanie od razu, przewod glowny oproznia UpdatePipePressure()
eimic = -1.0;
}
else if (MainCtrlActualPos != MainCtrlPos || LastRelayTime > InitialCtrlDelay)
{
double delta = MainCtrlActualPos == MainCtrlPos ? dt * CtrlDelay : 0.01;
switch (MainCtrlPos)
// the positions below are those of the controller without the emergency brake position
switch (MainCtrlPos - EIMCtrlEmergencyPositions())
{
case 0:
case 1:
@@ -10895,6 +10911,14 @@ void TMoverParameters::LoadFIZ_Cntrl(std::string const &line)
extract_value(LocHandleTimeTraxx, "LocalBrakeTraxx", line, "");
extract_value(EIMCtrlAdditionalZeros, "EIMCtrlAddZeros", line, "");
extract_value(EIMCtrlEmergency, "EIMCtrlEmergency", line, "");
// Elf (EIMCtrlType 2): an emergency brake position below the controller's position 0, which shifts the other positions up by one
extract_value(EIMCtrlMainEmergency, "EIMCtrlMainEmergency", line, "");
if (auto const elfpositions{4 + EIMCtrlEmergencyPositions()}; EIMCtrlEmergencyPositions() > 0 && MainCtrlPosNo < elfpositions)
{
// without it the controller would have no power position
ErrorLog(std::format("Bad fiz: EIMCtrlMainEmergency needs MCPN={} in {}", elfpositions, TypeName));
MainCtrlPosNo = elfpositions;
}
extract_value(ScndS, "ScndS", line, ""); // brak pozycji rownoleglej przy niskiej nastawie PSR