16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 00:49:19 +02:00
Commit Graph

701 Commits

Author SHA1 Message Date
docentYT
337e750ed1 Replace Max0R and Min0R with std::max and std::min 2026-04-30 23:47:32 +02:00
7acc34df3e Merge pull request #97 from docentYT/migrate-from-dumb3d-to-glm
Migrate from dumb3d to glm
2026-04-28 19:46:46 +02:00
docentYT
d5d1825e38 Remove dumb3d 2026-04-27 23:03:47 +02:00
129924315d Cleanup hamulce.cpp/h with Mover.cpp/h 2026-04-27 18:21:55 +02:00
dcfd34908a Revert "Add power smoothing for inverter based vehicles"
This reverts commit 40bbbc6210.
For some reason it broke SA13x controllers lol
2026-04-17 20:08:04 +02:00
593e4bcf36 Merge branch 'master' into master 2026-04-14 21:01:04 +02:00
ae056f2bbd Merge pull request #79 from xingzihai/engine-overheat
feat: add EngineMaxTemperature support for diesel locomotive overheat detection
2026-04-14 20:49:37 +02:00
jakubg1
0d010e8c6a Simplify derailing logic, derail reason enum
- The `TMoverParameters::derail()` function has been renamed to `::Derail()`, with a capital D.
- All derail events now use that function.
  - Simplified and unified the logic behind different derail types.
  - The `dtrack_freerail` track type is now slightly increasing the chance of derailing on a tight curve, as it was the intention.
- A new `DerailReason` enum has been created which holds all derail types.
- The `DerailReason` field in the `TMoverParameters` class has been removed.
  - This was a transient field which is not necessary anymore.
  - The logging functionality as such has been moved from `DynObj.cpp` to `Mover.cpp`.
2026-04-04 02:05:49 +02:00
xingzihai
754fc50ca8 feat: add EngineMaxTemperature support for diesel locomotive overheat detection
Add engine temperature monitoring to diesel locomotive heat management system:
- Add engine field to heat_data struct (fluid_circuit_t type)
- Add EngineMaxTemperature config extraction in .fiz files
- Add engine overheat detection logic (is_hot check)
- Include engine.is_hot in PT status check

Implements issue #77: Oil, water and engine overheat lamps for diesel locomotives
2026-04-01 23:28:28 +00:00
Agent
68fa78a582 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.
2026-04-01 23:26:39 +00:00
copilot-swe-agent[bot]
7e49aa8740 Rewrite #includes to use explicit subdirectory paths
Co-authored-by: Hirek193 <23196899+Hirek193@users.noreply.github.com>
2026-03-14 19:16:48 +00:00
40bbbc6210 Add power smoothing for inverter based vehicles 2026-02-08 13:04:49 +01:00
7b8fa3f226 Set wiper default pos = 0 in case not defined 2025-09-30 21:08:22 +02:00
a7c2fa22f1 Add wiperList Default parameter (for default position) 2025-09-30 21:03:38 +02:00
b969a55533 Fix lightsset command so bot wont affect it 2025-09-19 01:58:40 +02:00
Ryba04
33ad7b718f Merge branch 'master' into master 2025-09-13 19:46:26 +02:00
072165aae3 Resolve conflicts for merge 2025-09-04 20:27:45 +02:00
jakubg1
dc8de9aa07 Separate FFList from DEList, add FFEDList (ffBrakeList)
Added a new optional section to .fiz files: `ffBrakeList`. It is used instead of `ffList` whenever the vehicle has its ED braking engaged.

Example (dynamic/pkp/elf_v1/inverter_kp.fiz):
```
ffList: Size=3
0	2.0
33.7	2.08
34.0	2.12
130.4	8.10
endff

ffBrakeList: Size=4
0	2.0
33.7	2.08
34.8	2.08
34.8	2.17
130.4	8.10
endff
```
2025-09-04 04:36:26 +02:00
6e2835bdeb Remove starts with statement 2025-08-21 20:25:18 +02:00
be8218949c More linux specific blocks 2025-08-21 20:22:26 +02:00
c0437946c7 Prevent multiple battery switches in hold conditions 2025-07-23 12:29:04 +02:00
13f7551b5f Modern dimmer overhaul
Now it supports custom positions
2025-07-15 16:06:42 +02:00
Ryba04
6b21737ec4 Merge pull request #85 from Anonim17PL/master
Poprawki po 078470c, 2a5d8cc i 7cac46d
2025-05-04 17:40:59 +02:00
WLs50
0280b40ca5 Merge remote-tracking branch 'manul-public/master' into manul-staging 2025-04-05 14:24:53 +02:00
Anonim17PL
583dc8c1ec Czy ktoś w ogóle kompiluje ten kod?
```/home/debian/autobuilder/output/build/maszyna/application.h:41:10: error: extra qualification ‘eu07_application::’ on member ‘DiscordRPCService’ [-fpermissive]
   41 |     void eu07_application::DiscordRPCService(); // discord rich presence service function (runs as separate thread)
      |          ^~~~~~~~~~~~~~~~```

Czy C++20 jest nam potrzebne?
```/home/debian/autobuilder/output/build/maszyna/McZapkie/Mover.cpp:11346:34: error: ‘std::string’ {aka ‘class std::__cxx11::basic_string<char>’} has no member named ‘_Starts_with’
11346 |                     if (PantType._Starts_with("DSA")) // zakladam ze wszystkie pantografy DSA sa takie same
      |                                  ^~~~~~~~~~~~```

Kompletny absurd z 7cac46d:
```/home/debian/autobuilder/output/build/maszyna/particles.cpp:477:29: error: cannot bind non-const lvalue reference of type ‘cParser&’ to an rvalue of type ‘cParser’
  477 |     if( source.deserialize( cParser( templatepath + templatename + ".txt", cParser::buffer_FILE ) ) ) {
      |                             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~```
2025-03-24 13:25:51 +01:00
b5172e940b Add wiper animation 2025-03-16 16:24:48 +01:00
a505962b10 Mover reload function fix 2025-03-16 16:22:59 +01:00
dad32c28a2 After cherrypick fixes to 2a5d8cc6de 2025-03-16 16:22:33 +01:00
f59f3c368e Add WBL85, EC160 pantograph types 2025-03-16 16:22:24 +01:00
5258c4c775 Developer tools: Add vehicle fiz reload button 2025-03-16 16:22:19 +01:00
7d27e6ce33 Battery button impulse behavior 2025-03-16 16:22:12 +01:00
b252d4aacd Bring back maxTachoSpeed... 2025-03-16 16:21:57 +01:00
b10e6ccda3 Add distance counter double click to activate
DCMB=[No] - Czy potrzebne jest podwojne nacisniecie
DCDPP=[1.0] - W jakim czasie drugie nacisnienie ma nastapic od pierwszego, aby aktywowac pomiar
2025-03-16 16:16:37 +01:00
bb2894d86c Fix turbo sound 2025-03-16 15:44:36 +01:00
848f57d817 Fix 4-step switch animation 2025-03-16 15:44:28 +01:00
76185d10f2 General logic fixes 2025-03-16 15:42:57 +01:00
b114699ab3 General lights overhaul
Add modern light switcher

Available fiz variables with defualt parameters
Headlights: LampRed=255 LampGreen=255 LampBlue=255 DimmedMultiplier=0.6 NormalMultiplier=1.0 HighbeamDimmedMultiplier=2.5 HighBeamMultiplier=2.8

Switches: ModernDimmer=No ModernDimmerOffPosition=Yes
2025-03-16 14:37:37 +01:00
a75ac837bf header declarations unification for tacho parameters 2025-03-16 14:37:27 +01:00
f17f0e0726 Fix compilation error (badly assigned variable) 2025-03-16 13:45:52 +01:00
9e447d22da Add variable door lock speed
DoorLockSpeed in Doors: section in fiz
2025-03-16 13:45:45 +01:00
f86e2688ba Add logic for defining max analog tacho display speed
MaxTachoSpeed in Cntrl. section in fiz
2025-03-16 13:45:39 +01:00
b14c1d9718 Add missing mover nrot comment 2025-03-16 12:25:34 +01:00
bb56f97692 Add sustain parameter (BRVto in Engine section) 2025-03-16 12:25:01 +01:00
f10550ea23 Add braking resistor ventilator sound and simple simulation 2025-03-16 12:24:50 +01:00
332530643b Add HideDirStatusSpeed parameter 2025-03-16 12:23:45 +01:00
c7e78b8e0c Implemented HideDirStatusWhenMoving entry 2025-03-16 12:23:32 +01:00
f8d6bf5d0c Add wiper animation 2025-03-06 22:51:24 +01:00
c986b60895 Mover reload function fix 2025-02-24 22:30:23 +01:00
9c1e7cd36e After cherrypick fixes to 2a5d8cc6de 2025-02-17 18:26:59 +01:00
2a5d8cc6de Add WBL85, EC160 pantograph types 2025-02-17 18:12:15 +01:00