18
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-19 15:45:23 +01:00
Commit Graph

61 Commits

Author SHA1 Message Date
jerrrrycho
200d3ae73b fix: review of the EN57 EP brake (Sonar null check, EP fuse of the cab car, AI re-asserts the EP brake)
- tests: REQUIRE the brake handle before dereferencing it (Sonar cpp:S2259)
- TESt::FillBrakeRes is const (S5817)
- cab EP brake command: drop the mvControlled->EpFuse check, SwitchEPBrake
  already checks the cab car's (mvOccupied) EP fuse with the control supply
- AI: with the handle already at the EP brake position, switch the EP brake
  on again once the control supply is back
2026-11-08 17:37:56 +01:00
jerrrrycho
87f1d960a0 fix: EN57 brakes hauled with the brake hose alone, Knorr EP brake without control power
eu07/maszyna#87: the EP2 (and EP1) valve charged its auxiliary reservoir only
from the main reservoir pipe. A dead EN57 hauled by a locomotive coupled with
the hook and the brake hose alone ("3") never charged it, its control
reservoir stopped at about 2.5 bar and the unit didn't brake. The valve now
refills the auxiliary reservoir from the brake pipe through the slide valve's
check valve, as every ESt does (TESt::FillBrakeRes, shared with TESt::GetPF,
which stays bit for bit the same). With the main reservoir pipe charged the
auxiliary reservoir stays above the brake pipe and nothing changes; the
reservoir now also takes air from the brake pipe while it is below it, e.g.
at start-up before the compressor has charged the main reservoir pipe.

eu07/maszyna#134: the EP brake of the Knorr St113 handle (EN57-001) worked
with the reverser in neutral, the battery off or the EP fuse switched off
(Ctrl+Z). It now needs the control powered, as the Oerlikon handle's does
(EPBrakeControlPowered: battery, reverser out of neutral, EP fuse), and an
EP brake switched on drops out (holding the cylinder pressure) when the
control loses power. The positions of the EP release and brake were already
moved by 810b7ad07; a test pins them.

No change to game data needed.
2026-11-08 04:25:34 +01:00
pwarszawski
6374e2d32e AI braking: predict the ESt3 brake force from the distributor characteristic 2026-11-02 20:07:32 +01:00
pwarszawski
8112733e0d Merge remote-tracking branch 'origin/master' into fix187
# Conflicts:
#	McZapkie/Oerlikon_ESt.h
#	McZapkie/hamulce.h
2026-10-22 07:08:29 +02:00
jerrrrycho
6263fe539b Fix/sonar maintainability rebased (#209)
* refactor(sonar): use override instead of redundant virtual (cpp:S3471)

* refactor(sonar): remove empty statements, one declaration per statement (cpp:S1116, cpp:S1659)

* refactor(sonar): drop redundant lambda return types (cpp:S3574)

* refactor(sonar): prefer using over typedef (cpp:S5416)

* refactor(sonar): use =default for trivial special members (cpp:S3490)

* refactor(sonar): use nullptr literal (cpp:S4962)

* refactor(sonar): remove redundant access specifiers (cpp:S3539)

* refactor(sonar): remove redundant casts (cpp:S1905)

* refactor(sonar): use std::scoped_lock instead of std::lock_guard (cpp:S5997)

* refactor(sonar): construct elements in place with emplace_back (cpp:S6003)

* refactor(sonar): make narrowing conversions explicit (cpp:S5276)

* refactor(sonar): mark unused parameters (cpp:S1172)

Unused names are commented out; parameters used only on some platforms
are marked [[maybe_unused]].

* refactor(sonar): declare non-mutating member functions const (cpp:S5817)

Virtual functions are left untouched so overrides keep matching.

* refactor(sonar): merge collapsible nested if statements (cpp:S1066)

Comments that preceded the inner if are kept above the merged statement.

* refactor(sonar): scope single-use variables in if init-statements (cpp:S6004)

* fix(sonar): give polymorphic base classes virtual destructors (cpp:S1235)

* refactor(sonar): use try_emplace for map insertion (cpp:S6030)

* refactor(sonar): use auto where the type is spelled out on the right (cpp:S5827)

* refactor(sonar): remove redundant parentheses (cpp:S1110)

* refactor(sonar): document intentionally empty functions (cpp:S1186)

* refactor(sonar): remove dead stores (cpp:S1854)

Side effects (e.g. LISTLINE++) are kept.

* refactor(sonar): remove unused variables, captures and private fields (cpp:S1481, cpp:S1068)

* refactor(sonar): use structured bindings for pair access (cpp:S6005)

* refactor(sonar): use range-based loops and ranges algorithms (cpp:S5566)

* refactor(sonar): split chained assignments (cpp:S1121)

* refactor(sonar): add default cases to switch statements (cpp:S3562)

* refactor(sonar): use std::size for array lengths (cpp:S7127)

* refactor(sonar): use std::ranges algorithms and std::erase(_if) (cpp:S6197)

* refactor(sonar): access static members through the class (cpp:S2209)

* refactor(sonar): add braces around nested if-else (cpp:S5261)

* refactor(sonar): avoid side effects inside typeid operands (cpp:S5279)

* refactor(sonar): drop top-level const from by-value return types (cpp:S5951)

* refactor(sonar): declare variables separately from their type definitions (cpp:S3646)

* refactor(sonar): declare loop counters in the for statement (cpp:S5955)

* refactor(sonar): rely on class template argument deduction (cpp:S6012)

* refactor(sonar): inherit base constructors instead of forwarding them (cpp:S5952)

* refactor(sonar): rename locals that shadow outer declarations (cpp:S1117)

Only local variables and definition parameters are renamed; shadowing
struct fields and enumerators in headers are left for a separate change.

* refactor(sonar): reduce enum qualification with using enum (cpp:S6177)

Applied only where no unqualified name in the block could be captured by
the introduced enumerators.

* refactor(sonar): mark converting constructors explicit (cpp:S1709)

sound_source and the gl::object conversion operators stay implicit; they
are relied upon by copy-list-initialisation and GL calls.

* refactor(sonar): initialise members in initialiser lists or declarations (cpp:S3230)

* refactor(sonar): make read-only local references and pointers const (cpp:S5350)

* refactor(sonar): take read-only pointer and reference parameters as const (cpp:S995)

TTrain command handlers keep their signature, it is fixed by the handler table.

* refactor(sonar): pass expensive-to-copy parameters by const reference (cpp:S1238)

Signatures declared in files touched by PR 206 (Driver.h, EU07.cpp) and
virtual overrides are left unchanged.

* refactor(sonar): use transparent comparators for string-keyed maps (cpp:S6045)

std::unordered_map instances and map types exposed in headers used by
other modules are left as they are.

* fix(sonar): do not use UI text as a printf format string (cpp:S5281)

Text lines containing '%' would otherwise be interpreted as format
specifiers by ImGui::TextColored.

* refactor(sonar): use std::bind_front for callbacks (cpp:S5995)

* refactor(sonar): drop const_cast on string literals passed to the Python C API (cpp:S859)

* refactor(sonar): take read-only string parameters as std::string_view (cpp:S6009)

The Windows messaging helpers keep std::string, they need c_str().

* refactor(sonar): make read-only global tables const (cpp:S5421)

Mutable global state (flags, timers, singletons) is left as is.

* refactor(sonar): replace single-case switch statements with if (cpp:S1301)

* refactor(sonar): format UUIDs and log timestamps with std::format (cpp:S6494, cpp:S5945)

* refactor(sonar): use std::array for local fixed-size arrays (cpp:S5945)

Arrays that are class members or part of headers are left unchanged.

* fix(sonar): test the bearing damage bit, not bit 0 (cpp:S872)

'DamageFlag & dtrain_bearing > 0' parsed as 'DamageFlag & (dtrain_bearing > 0)',
i.e. DamageFlag & 1, so bearing friction reacted to the wrong damage flag.

* refactor(sonar): assorted small fixes

- empty() instead of size() comparisons (cpp:S1155)
- member initialisers in declaration order (cpp:S3229)
- no redundant c_str() when a std::string is accepted (cpp:S7121)
- contains() on associative containers (cpp:S6171)
- const reference instead of a copying range-for (cpp:S6032)
- starts_with() for prefix checks (cpp:S6178)
- no std::move on temporaries (cpp:S5274)
- has_value() on std::optional (cpp:S7172)
- bool literals for bool members (cpp:S5820)
- inline only on the definition (cpp:S3548)
- explicit base access specifier (cpp:S5965)
- explicit element access instead of dereferencing an array (cpp:S7116)
- rely on the C++20 rewritten operator!= (cpp:S6186)

* refactor(sonar): more small fixes

- std::format instead of iostream manipulators in to_string/to_hex_str (cpp:S6495);
  output verified identical, negative hex values keep the unsigned form
- remove an empty compound statement (cpp:S108)
- drop an always-false unsigned < 0 branch (cpp:S1768)
- explicit lambda capture (cpp:S3608)
- std::make_unique (cpp:S5950)

* chore: strip stray carriage returns left in TTrain constructor comments

* fix: keep quantize() in its own value type

The S5276 change cast the result of the generic quantize<Type_>() to
unsigned int, which truncated float/double callers (shadow angle slider,
editor rotation snapping, AI speed control steps) and broke negative values.

* fix(sonar): use integer loop counters in segment sampling (cpp:S2193)

* refactor(sonar): clean up issues reported on PR 209

- remove locals left unused after the dead-store cleanup (cpp:S1481, cpp:S1854)
- unnamed unused parameter (cpp:S1172)
- single-use declarations moved into if init-statements (cpp:S6004)
- auto for casted initialisers (cpp:S5827)
- const references and pointers where nothing is modified (cpp:S5350)
- rename structured bindings shadowed by inner declarations (cpp:S1117)
2026-10-11 13:22:33 +02:00
pwarszawski
36d4f16c01 Brake force table: take the rapid step threshold from the distributor
TMoverParameters::BrakeForceR() halves the force of a vehicle set to R
below 40 km/h. That is one approximation for every distributor, but a
NESt3/ESt4 distributor with a rapid relay engages the step above 70 km/h
and keeps it down to 50 km/h (TNESt3::GetPF, RapidStatus), and below
that its cylinder pressure is divided by the relay's own multiplier
(TRapid, RapidMult). For a vehicle braking from speed the full force
therefore lasts down to 50 km/h, not 40. The AI builds its consist brake
table (fBrake_a0/a1) from BrakeForceR(), so between 40 and 50 km/h it
expected twice the force the wagons actually deliver.

Add TBrake::GetRapidRatio(), which keeps the old approximation as the
default, and override it in TNESt3 with the relay's threshold and
multiplier. The brake itself is unchanged; only the prediction is.
2026-09-27 17:50:23 +02:00
jerrrrycho
d85096f64d reformat: remove redundant parentheses 2026-06-30 21:19:46 +02:00
129924315d Cleanup hamulce.cpp/h with Mover.cpp/h 2026-04-27 18:21:55 +02:00
milek7
eb5908bf08 Merge remote-tracking branch 'youby/master' into sim 2022-01-14 16:39:20 +01:00
Królik Uszasty
3edc5dd216 Added increased flow factor for filling stroke positions for handles K5P and 6P 2022-01-11 19:39:41 +01:00
milek7
5bafa31f9d Merge commit 'd8170c932b448ba6888e702746b5ae22632062d8' into sim 2022-01-05 22:21:05 +01:00
Królik Uszasty
5775493b2d Poprawka asymilacji w K5P i 6P, ograniczenie interwencji automanewrowego w luzowanie pojazdów, zaliczanie pozycji utrzymania ciśnienia jako jazda 2022-01-01 20:50:30 +01:00
tmj-fstate
2e86b3a5e9 ai braking test, motor overload relay threshold logic enhancement, vehicle max load parameter 2021-06-05 21:30:53 +02:00
Królik Uszasty
40cc1cf083 AI uses pneumatic brake in EMUs when pulling non-ep-brake vehicles 2020-10-24 17:30:09 +02:00
stele
635d9d68a3 Parametrisation of maximum brake overload pressure and pressure decrease speed after it. 2020-06-22 21:39:17 +02:00
tmj-fstate
ad1a14082c load visualization submodel visibility selection tweak, passenger train acceleration ai logic enhancement, brake code enhancement, cab control label tweak 2020-06-05 16:43:07 +02:00
tmj-fstate
c457ffe05d basic power circuits simulation, vehicle device presence definition, automatic coupling tweaks, minor vehicle simulation logic enhancements, minor brake simulation logic fixes, pantograph control enhancements, ai logic enhancements 2020-04-30 03:08:37 +02:00
tmj-fstate
1dc81abae9 opengl 3.3 renderer switch to core profile, additional train state data exposed to uart interface, minor bug fixes 2019-11-01 18:51:27 +01:00
tmj-fstate
d24fccb4d7 maintenance: fixes for some of cppcheck warnings 2019-10-24 23:03:39 +02:00
Królik Uszasty
dbfda7c1e5 Modified overpressure for MHZ_K5P 2019-09-15 15:26:04 +02:00
Królik Uszasty
31c8b69fca More flexible brake handles and universal brake buttons 2019-09-15 15:25:53 +02:00
tmj-fstate
57f7ac27da build 190430. ai braking logic tweaks 2019-05-01 03:44:53 +02:00
Królik Uszasty
6769c45103 Better antislipping system in EStED 2019-04-03 16:22:42 +02:00
Królik Uszasty
4855b3a5a5 New Handle type MHZ_6P for Traxx 2019-03-17 19:09:29 +01:00
Królik Uszasty
fb36c1348b Fix for MHZ_K5P - no sudden overload in middle posistion 2019-03-17 19:09:16 +01:00
Królik Uszasty
f1ba909a94 Stuff for EW58: handle FVE408, valve EP1, enhanced TUHEX for 3-stage ED brake, old blending for DC-ED and EP brake 2019-03-05 20:00:44 +01:00
Królik Uszasty
ce0cd764ec Added MHZ_K5P brake handle for new EMUs/DMUs 2018-06-04 00:08:37 +02:00
Królik Uszasty
847f4db5b4 Added definition of rapid velocity for EStED brake valve 2018-05-11 14:55:32 +02:00
tmj-fstate
64dea17e6f basic fuel pump, brake reservoirs air leaks, support for combined axle clatter sounds, dedicated loud buffer clash and coupler stretch sounds 2018-03-27 00:49:17 +02:00
tmj-fstate
23761dc665 build 180131. support for nested material attribute definitions, minor bug fixes, refactoring and master branch unifications 2018-01-31 16:07:50 +01:00
tmj-fstate
0124032d3b maintenance: settings item refactoring, include dependencies fixes 2018-01-26 16:44:47 +01:00
tmj-fstate
e3915e3c52 fix for emptying brake reservoirs 2017-10-25 15:44:41 +02:00
Królik Uszasty
9cd20971f5 Korekta progu działania, wyliczanie opóźnienia hamowania z uwzględnieniem wcześniejszego luzowania, dodanie poprawki wymaganej pozycji zaworu maszynisty (siły hamowania) w zależności od wyczerpania i przeładowania hamulców 2017-08-03 22:55:46 +02:00
tmj-fstate
473837395c build 170502. minor fixes for brakes subsystem, distribution of sandbox commands to other consist units 2017-05-02 22:29:51 +02:00
tmj-fstate
2fd7bc5a93 control for e-p brake system, brake acting speed, departure signal, heating, door lock. Support for rear pantograph lowering button, all pantographs lowering button. Increased recognition of converter as a valid low voltage power source. 2017-04-16 17:22:56 +02:00
tmj-fstate
441b39ce5f partial render code revert, oerlikon brakes fix, sound fixes 2017-03-16 22:18:14 +01:00
tmj-fstate
1b6339e482 miscellaneous bug fixes. 2017-02-10 22:17:12 +01:00
tmj-fstate
3b2bba69d6 merged upstream changes 2017-01-23 12:40:14 +01:00
firleju
81aad5d1ae Konwersja na UTF-8
Konwersja na UTF-8


Konwersja na UTF-8


Konwersja na UTF-8


Konwersja na UTF-8


Konwersja do UTF-8


Konwersja na UTF-8


Konwersja na UTF-8


Konwersja na UTF-8
2017-01-23 06:58:53 +01:00
firleju
3dec967d30 Dodany nagłowek typeinfo do stdafx.
Sformatowane hamulce.
2017-01-19 17:41:40 +01:00
tmj-fstate
6ab550831d basic patches for most of discovered memory leaks, fixes for brake system components 2017-01-18 07:56:51 +01:00
tmj-fstate
15cf3d73a8 removed dependencies on the old parser. The code can now be compiled outside of Borland C++ 2017-01-15 15:27:53 +01:00
firleju
bcb1e4cb95 Poprawki inicjalizacji hamulców 2016-12-21 06:16:06 +01:00
firleju
df2365f353 Inicjacja wszystkich zapomnianych zmiennych w hamulcach 2016-12-10 21:59:52 +01:00
firleju
0659256619 Załatanie dziury w kranie hamulca 2016-12-08 21:35:57 +01:00
firleju
49edb9a56e Poprawione odczytywanie pozycji w BPT 2016-12-05 23:09:42 +01:00
firleju
25f85aa9a8 Sprawdzone do dizel_Update.
Dodano funkcje wirtualne do hamulców
2016-11-27 21:47:35 +01:00
firleju
f9043a254f Sprawdzone mover do UpdatePipePressure
Dodane funkcje virtualne do TBrake zamiast static_cast
2016-11-27 14:46:05 +01:00
firleju
92b483cded Hamulce przestawione na map -2..10. Sprawdzanie movera
Mover sprawdzony do IncMainCtrl.
2016-11-23 13:10:18 +01:00
firleju
e90b7cfb25 Przesunięcie Init dla TNest3. Zmiany w CheckLocParams 2016-11-07 17:15:41 +01:00