mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-11-21 00:24:57 +01:00
feat: ET22 louvre lamp, lit until the main reservoir opens the louvres (eu07/maszyna#451)
The ET22 cab binds its louvre lamp to i-voltbrake: (voltage on the brake controller) as a stand-in. The real lamp goes out once the main compressors have filled the main reservoir to about 5 bar and the pneumatic louvres of the motor fans open. - New optional lamp i-louvresclosed:, lit (with low voltage power) while the main reservoir pressure is below LouvresOpenPressure. - New optional Cntrl. key LouvresOpenPressure [bar], 5.0 by default, so the .mmd change alone is enough. - i-vent_trim: (btLampkaWentZaluzje, never driven) is left alone, because the WMB10 binds it and would suddenly light up. SVN data, to change once this is released (old data works as before): - dynamic/pkp/et22_v3/201eo.mmd.inc, 201eo_160ec.mmd.inc, 201ek.mmd: i-voltbrake: lampka_zaluzje -> i-louvresclosed: lampka_zaluzje - dynamic/pkp/et22-2000_v2/201em.mmd: i-voltbrake: zaluzje -> i-louvresclosed: zaluzje (eu07/maszyna#451)
This commit is contained in:
@@ -2163,6 +2163,7 @@ class TMoverParameters
|
||||
bool StLinFlag = false; /*!o styczniki liniowe*/
|
||||
bool StLinSwitchOff{false}; // state of the button forcing motor connectors open
|
||||
line_contactors_interlock LineContactorsInterlock{line_contactors_interlock::none}; // what else the line contactors need to close
|
||||
double LouvresOpenPressure{5.0}; // main reservoir pressure [bar] at which the pneumatic louvres of the motor fans open (ET22)
|
||||
bool ResistorsFlag = false; /*!o jazda rezystorowa*/
|
||||
double RventRot = 0.0; /*!s obroty wentylatorow rozruchowych*/
|
||||
double PantographVoltage{0.0}; // voltage supplied to pantographs
|
||||
@@ -2477,6 +2478,11 @@ class TMoverParameters
|
||||
{
|
||||
return false == StLinFlag && MainCircuitLampsEnabled();
|
||||
}
|
||||
// whether the pneumatic louvres of the motor fans are still closed, the main reservoir short of the pressure that opens them
|
||||
bool LouvresClosed() const
|
||||
{
|
||||
return Compressor < LouvresOpenPressure;
|
||||
}
|
||||
// whether the devices the line contactors are interlocked with (LineContactorsInterlock) let them close
|
||||
bool LineContactorsInterlockReleased() const;
|
||||
// whether the pumps a joint oil and fuel pump switch works, those not started automatically, are all switched on
|
||||
|
||||
@@ -11022,6 +11022,7 @@ void TMoverParameters::LoadFIZ_Cntrl(std::string const &line)
|
||||
auto lookup = interlocks.find(extract_value("LineContactorsInterlock", line));
|
||||
LineContactorsInterlock = lookup != interlocks.end() ? lookup->second : line_contactors_interlock::none;
|
||||
}
|
||||
extract_value(LouvresOpenPressure, "LouvresOpenPressure", line, "");
|
||||
// compartment lights
|
||||
{
|
||||
auto lookup = starts.find(extract_value("CompartmentLightsStart", line));
|
||||
|
||||
Reference in New Issue
Block a user