18
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-20 08:04:57 +01:00
Commit Graph

3 Commits

Author SHA1 Message Date
jerrrrycho
efe5b682f7 fix: line contactors interlocked with speed-started blowers close at a standstill
With LineContactorsInterlock=MotorBlowers the line contactors waited for
every motor blower to run. A blower with MotorBlowersStartVelocity starts
only with the vehicle moving and the motors drawing current, so standing it
never ran, the contactors never closed, no current flowed and the vehicle
couldn't start at all; the same after a stop longer than
MotorBlowersSustainTime.

- For a blower with a start velocity the interlock now asks whether it is
  switched on and has power (not switched off, switched on where the driver
  starts it, its power source present), instead of whether it runs. Blowers
  without a start velocity still have to run.
- The power source of a blower (battery: 24 V, converter: 110 V, else the
  main circuit) is one function, MotorBlowerPowerIsAvailable(), used by
  MotorBlowersCheck() and the interlock. None of the three needs the line
  contactors closed: the battery and the converter run before them, and the
  main circuit is the line breaker they need anyway.

(eu07/maszyna#460)
2026-11-11 15:00:27 +01:00
jerrrrycho
d50f51cdff 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)
2026-11-07 20:41:06 +01:00
jerrrrycho
f34f912b38 feat: interlock the line contactors with the section fans, own-converter lamp (eu07/maszyna#460)
On the ET42 the fans of each section run off that section's converter: the
section fan switch of the cab is bound to converterlocal_sw. The line
contactors of a section with its fans switched off must not close.

- New optional Cntrl. key LineContactorsInterlock=Converter|MotorBlowers.
  MotorConnectorsCheck() then also needs the vehicle's own converter
  (ConverterFlag, not the trainset's shared 110 V), or all its motor
  blowers, running. It is checked per vehicle, so only that section stays
  off, and switching the fans off on the way opens its contactors. Without
  the key nothing changes.
- New optional lamp i-converteraoff:, lit while the converter of the
  vehicle with the cab is off. i-converteroff: follows the shared 110 V, so
  with one ET42 section's fans off it stayed dark. i-converterboff: already
  covers the other section.

SVN data, to change once this is released (old data works as before):
- dynamic/pkp/et42_v2/112e-a.fiz, 112e-b.fiz: LineContactorsInterlock=Converter
  in the Cntrl. line.
- dynamic/pkp/et42_v2/112e-a.mmd.inc, 112e-b.mmd.inc:
  i-converter: nadm_przetw -> i-converteraoff: nadm_przetw,
  i-converterb: nadm_przetw_b -> i-converterboff: nadm_przetw_b,
  i-compressor: sprezarka -> i-compressoroff: sprezarka,
  i-compressorb: sprezarka_b -> i-compressorboff: sprezarka_b
  (the compressor "off" lamps already light with the compressor switched off
  or stopped by its pressure governor).

(eu07/maszyna#460)
2026-11-07 20:36:25 +01:00