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

94 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
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
jerrrrycho
79bd0c8e91 fix(sonar): addressing reliability/security issues (#202) 2026-10-04 20:00:13 +02:00
jerrrrycho
d85096f64d reformat: remove redundant parentheses 2026-06-30 21:19:46 +02:00
docentYT
59347af5a0 Replace some std::min and std::max combinations with std::clamp 2026-05-02 19:38:14 +02:00
docentYT
d1f16411a1 Replace clamp with std::clamp 2026-05-01 22:14:29 +02:00
docentYT
337e750ed1 Replace Max0R and Min0R with std::max and std::min 2026-04-30 23:47:32 +02:00
129924315d Cleanup hamulce.cpp/h with Mover.cpp/h 2026-04-27 18:21:55 +02: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
xwizard
943b32e023 Removes unnecessary assert() and caps "sg" at 1.0 2022-07-15 16:00:15 +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
fa9136e333 Repair of St133 drivers' valve for both player and AI 2021-05-03 02:02:53 +02:00
milek7
810b7ad074 Position offset to Knorr EP TSt113 valve 2021-01-30 13:31:59 +01: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
Królik Uszasty
0261f30448 mergi with tmj 2020-10-09 21:11:25 +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
Królik Uszasty
0e87e554dc Simple fix for faster EStED reaction 2019-11-01 19:26:59 +01:00
Królik Uszasty
b1237e7245 Simple fix for faster EStED reaction 2019-10-31 22:51:52 +01: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
Królik Uszasty
4bf900cbab Modified overpressure for MHZ_K5P 2019-09-14 23:26:37 +02:00
Królik Uszasty
75d0c4628a More flexible brake handles and universal brake buttons 2019-09-14 16:35:14 +02:00
Królik Uszasty
95a961f2b3 Merge with TMJ 2019-05-08 21:47:05 +02:00
tmj-fstate
57f7ac27da build 190430. ai braking logic tweaks 2019-05-01 03:44:53 +02:00
tmj-fstate
111026f700 build 190419. radio message volume, drag calculation enhancement, ai acceleration logic tweak, event duplicate scanning fix 2019-04-19 20:29:00 +02:00
Królik Uszasty
a0a9330734 Increased BrakeAccThreshold of DMUs, fix for AI using MHZ_K5P handle 2019-04-14 16:32:35 +02:00
Królik Uszasty
2f3ef8c529 Fixed manual AntiSlippingBraking for LSt valve 2019-04-09 00:58:51 +02:00
Królik Uszasty
ec3edc8824 Fixed manual AntiSlippingBraking for LSt valve 2019-04-07 19:14:14 +02:00
Królik Uszasty
6769c45103 Better antislipping system in EStED 2019-04-03 16:22:42 +02:00
Królik Uszasty
913cfc8ae8 Better antislipping system in EStED 2019-04-02 21:12:46 +02:00
Królik Uszasty
916a611c8d Fix for AI decoupling old Knorr/West locomotives 2019-03-23 23:44:39 +01:00
Królik Uszasty
8fddbadbaf Fix for AI decoupling old Knorr/West locomotives 2019-03-23 08:52:47 +01:00
Królik Uszasty
df068534d4 Fix for Handle=H14K1 with BrakeValve=K 2019-03-22 00:13:45 +01:00
Królik Uszasty
a3af2453a0 Reworked main brake handle usage by AI - it can use time-dependent handles now. 2019-03-22 00:13:33 +01:00
Królik Uszasty
be63aa7452 Fix for Handle=H14K1 with BrakeValve=K 2019-03-21 23:17:41 +01:00
Królik Uszasty
3fd408bd46 Reworked main brake handle usage by AI - it can use time-dependent handles now. 2019-03-21 17:25:05 +01: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
6b56fbddbe New Handle type MHZ_6P for Traxx 2019-03-16 20:43:12 +01:00
Królik Uszasty
ca0c904d6a Fix for MHZ_K5P - no sudden overload in middle posistion 2019-03-15 20:41:11 +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
5b20724845 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 16:53:58 +01:00
tmj-fstate
7933ade080 maintenance: removed deprecated files, linux friendly include names 2018-10-12 19:53:33 +02:00