From 68fa78a5824e968e48a30b703c130dc37403e0df Mon Sep 17 00:00:00 2001 From: Agent Date: Wed, 1 Apr 2026 23:26:39 +0000 Subject: [PATCH] feat(overheat): Add overheat indicator lamps for oil, water, water_aux, and engine - Add engine_max_temp and engine_is_hot fields to heat_data structure - Add EngineMaxTemperature field extraction from .fiz files - Add engine overheat check comparing Ts with engine_max_temp - Add four new overheat lamp indicators: - i-oil_overheat - i-water_overheat - i-wateraux_overheat - i-engine_overheat - Add lamp update logic to turn on/off based on is_hot flags - Add lamp initialization in clear_cab_controls() This implements issue #77 - overheat lamps for diesel engines. The lamps will turn on when: - Oil temperature exceeds OilMaxTemperature - Water temperature exceeds WaterMaxTemperature - Auxiliary water temperature exceeds WaterAuxMaxTemperature - Engine temperature exceeds EngineMaxTemperature Each check includes 8-degree hysteresis to prevent rapid on/off cycling. --- McZapkie/MOVER.h | 3 +++ McZapkie/Mover.cpp | 5 +++++ vehicle/Train.cpp | 20 ++++++++++++++++++++ vehicle/Train.h | 5 +++++ 4 files changed, 33 insertions(+) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index c9c3bb04..c4388569 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -1066,6 +1066,9 @@ class TMoverParameters float temperatura1{50.0}; float temperatura2{40.0}; float powerfactor{1.0}; // coefficient of heat generation for engines other than su45 + // engine overheat threshold + float engine_max_temp{-1}; // maximum acceptable engine temperature, triggers overheat lamp when exceeded + bool engine_is_hot{false}; // engine temperature crossed cooling threshold }; struct spring_brake diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index ca62fb72..ca9a66de 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -8174,6 +8174,10 @@ void TMoverParameters::dizel_Heat( double const dt ) { dizel_heat.oil.is_hot = ( ( dizel_heat.oil.config.temp_max > 0 ) && ( dizel_heat.To > dizel_heat.oil.config.temp_max - ( dizel_heat.oil.is_hot ? 8 : 0 ) ) ); + // engine overheat check + dizel_heat.engine_is_hot = ( + ( dizel_heat.engine_max_temp > 0 ) + && ( dizel_heat.Ts > dizel_heat.engine_max_temp - ( dizel_heat.engine_is_hot ? 8 : 0 ) ) ); auto const PT = ( ( false == dizel_heat.water.is_cold ) @@ -11254,6 +11258,7 @@ void TMoverParameters::LoadFIZ_Engine( std::string const &Input ) { extract_value( dizel_heat.water_aux.config.shutters, "WaterAuxShutters", Input, "" ); extract_value( dizel_heat.oil.config.temp_min, "OilMinTemperature", Input, "" ); extract_value( dizel_heat.oil.config.temp_max, "OilMaxTemperature", Input, "" ); + extract_value( dizel_heat.engine_max_temp, "EngineMaxTemperature", Input, "" ); extract_value( dizel_heat.fan_speed, "WaterCoolingFanSpeed", Input, "" ); // water heater extract_value( WaterHeater.config.temp_min, "HeaterMinTemperature", Input, "" ); diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp index e512f6b2..de2e8e5e 100644 --- a/vehicle/Train.cpp +++ b/vehicle/Train.cpp @@ -7926,6 +7926,11 @@ bool TTrain::Update( double const Deltatime ) btLampkaRearRightEndLight.Turn( ( mvOccupied->iLights[ end::rear ] & light::redmarker_right ) != 0 ); // others btLampkaMalfunction.Turn( mvControlled->dizel_heat.PA ); + // overheat indicator lamps + btLampkaOilOverheat.Turn( mvControlled->dizel_heat.oil.is_hot ); + btLampkaWaterOverheat.Turn( mvControlled->dizel_heat.water.is_hot ); + btLampkaWaterAuxOverheat.Turn( mvControlled->dizel_heat.water_aux.is_hot ); + btLampkaEngineOverheat.Turn( mvControlled->dizel_heat.engine_is_hot ); btLampkaMotorBlowers.Turn( ( mvControlled->MotorBlowers[ end::front ].is_active ) && ( mvControlled->MotorBlowers[ end::rear ].is_active ) ); btLampkaCoolingFans.Turn( mvControlled->RventRot > 1.0 ); btLampkaTempomat.Turn( mvOccupied->SpeedCtrlUnit.IsActive ); @@ -7966,6 +7971,11 @@ bool TTrain::Update( double const Deltatime ) btLampkaBrakeProfileR.Turn( false ); btLampkaSpringBrakeActive.Turn( false ); btLampkaSpringBrakeInactive.Turn( false ); + // overheat indicator lamps off + btLampkaOilOverheat.Turn( false ); + btLampkaWaterOverheat.Turn( false ); + btLampkaWaterAuxOverheat.Turn( false ); + btLampkaEngineOverheat.Turn( false ); btLampkaMaxSila.Turn( false ); btLampkaPrzekrMaxSila.Turn( false ); btLampkaRadio.Turn( false ); @@ -9756,6 +9766,11 @@ void TTrain::clear_cab_controls() btLampkaNadmWent.Clear(9); btLampkaWysRozr.Clear(((mvControlled->TrainType & dt_ET22) != 0) ? -1 : 10); // ET22 nie ma tej lampki btLampkaOgrzewanieSkladu.Clear(11); + // overheat indicator lamps + btLampkaOilOverheat.Clear(-1); + btLampkaWaterOverheat.Clear(-1); + btLampkaWaterAuxOverheat.Clear(-1); + btLampkaEngineOverheat.Clear(-1); btHaslerBrakes.Clear(12); // ciśnienie w cylindrach do odbijania na haslerze btHaslerCurrent.Clear(13); // prąd na silnikach do odbijania na haslerze // Numer 14 jest używany dla buczka SHP w update_sounds() @@ -10425,6 +10440,11 @@ bool TTrain::initialize_button(cParser &Parser, std::string const &Label, int co { "i-mainbreakerblinking:", btLampkaMainBreakerBlinkingIfReady }, { "i-vent_ovld:", btLampkaNadmWent }, { "i-comp_ovld:", btLampkaNadmSpr }, + // overheat indicator lamps + { "i-oil_overheat:", btLampkaOilOverheat }, + { "i-water_overheat:", btLampkaWaterOverheat }, + { "i-wateraux_overheat:", btLampkaWaterAuxOverheat }, + { "i-engine_overheat:", btLampkaEngineOverheat }, { "i-resistors:", btLampkaOpory }, { "i-no_resistors:", btLampkaBezoporowa }, { "i-no_resistors_b:", btLampkaBezoporowaB }, diff --git a/vehicle/Train.h b/vehicle/Train.h index 2831e825..96a41463 100644 --- a/vehicle/Train.h +++ b/vehicle/Train.h @@ -761,6 +761,11 @@ public: // reszta może by?publiczna TButton btLampkaBrakeProfileR; // rapid brake acting speed TButton btLampkaSpringBrakeActive; TButton btLampkaSpringBrakeInactive; + // overheat indicator lamps + TButton btLampkaOilOverheat; + TButton btLampkaWaterOverheat; + TButton btLampkaWaterAuxOverheat; + TButton btLampkaEngineOverheat; // KURS90 TButton btLampkaBoczniki; TButton btLampkaMaxSila;