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

95 Commits

Author SHA1 Message Date
jerrrrycho
9043d2d5fc fix(ai): a brake cut-out skipped on the run is done once the train stands
A train formed by coupling is inspected at the first buffer contact, above the
speed the inspector takes for a standstill, so its wagons without G kept their
brakes (Cw-1 §19.9) until some later stop, if any. brake_setting::apply() now
tells when it left a cut-out because the train was moving; AutoRewident keeps
that as a pending re-inspection and TController::reinspect_brakes() runs it
again once the train is below EU07_AI_MOVEMENT. The flag is dropped when the
order stops being a train run. The legacy inspector (ai.brakesetting.cw1 no)
never cuts a brake out and is unchanged.
2026-11-11 08:17:06 +01:00
jerrrrycho
a1335c1586 Merge remote-tracking branch 'origin/master' into fix/freight-brake-setting-cw1
# Conflicts:
#	utilities/Globals.cpp
2026-11-11 08:01:56 +01:00
maj00r
b251b6fe42 feat(blackbox): a black box of the session: the run, the cab, the signals and the stations to a file (#322)
* feat(blackbox): a recorder of the run, the cab, the signals and the stations to a file

With the physics logs on (and the new eu07.ini setting blackbox, on by
default), the simulator writes a black box of the session to
physicslog/*.blackbox: the scenery map (tracks, signals, W4 stop points
with their heading, W6 horn points), the timetables of the user's train,
and at 10 Hz the cab of the vehicle the user sits in (speed, controllers,
brakes, pressures, lights with the pattern the run asks for, the movement
kind), the AI's reference for the same place (target speed, next limit,
braking distance), the consist, the cameras and the vehicles around.
Changes go in as they happen: switches, signal aspects, commands,
signals passed with their aspect, stations stopped at, passed or missed,
horn requests, the autopilot switched on or off, couplings and vehicles
removed.

The driving aid's next speed limit moved from the UI panel to
TController::next_speed_limit(), so the panel and the recorder read the
same. The format is described in blackbox_doc.md; the writer and the
reader of the records have unit tests.

* fix(blackbox): the aspect a signal had when passed, the lamps the ends have, vehicles taken off

- A passed signal is written with the aspect the train had of it, kept in
  the speed table, not the one its memory cell shows when the pass is
  noticed: by then the train itself on the track behind has often set
  it to stop, and most passes were written as at stop.
- The cab record gains the lamps the vehicles at the head and the tail
  have at their outer ends (136 bytes), so a reader can check the light
  pattern against them as the driver does (no upper headlight, the
  auxiliary lamps, the rear-end signals only).
- A vehicle taken off the scenery and still pointed at by a coupler or
  the camera gets no new number; the camera lets go of it.
- The timetable written before a station goes under the vehicle the
  user is in now, not the one of the last look.
- The file buffer is given once the file is open: MSVC passed over one
  given before.
- The doc tells the AI fields before the consist is started and when
  entering a vehicle is a driver change.

* fix(blackbox): the stop of an automatic block signal passed is written as a stop

The speed table keeps the stop of an automatic block signal (SetVelocity 0 x) as the speed allowed after it, with spStopOnSBL; a pass of it was written as that speed with no flag. It is written as 0 with the flag of an automatic block stop again.

* feat(blackbox): the doors, the brakes of the whole train, a diesel's engine and the rest of the cab

The cab record grows from 136 to 190 bytes, so that a reader can check
everything the driver did:

- the doors: the permits on each side, the departure signal, the steps,
  the door lock and whether the doors are locked;
- the brakes: the equalizing reservoir of the driver's valve, the main
  reservoir pipe, the highest brake cylinder pressure of the train, the
  hand brake, the releaser, the setting (G/P/R/Mg) and the mode
  (PS/PN/EP/MED);
- what drives the vehicle (electric, induction, diesel, diesel-electric,
  steam, none), its power, a diesel's oil pressure, water, oil and engine
  temperatures, overheating, fuel and oil pumps, clutch and torque
  converter, the motor fans;
- the cruise control and its speed, the integrated driving handle of a
  unit, the radio channel, the horn's tones.

New device bits use the upper half of the 32-bit field; the new fields
come at the end of the record, so older readers still read it.

* fix(blackbox): the driver's valve field is what its gauge shows, the radio channel has no none

Handle->GetCP() is the equalizing reservoir of most valves but the time reservoir of the FV4a, empty but after an overcharge: the field is named and documented as what the valve shows. With no driver the radio channel reads as the first one, not 0.

---------

Co-authored-by: maj00r <maj00r@host>
2026-11-11 04:30:52 +01:00
maj00r
18c56359ee fix(ai): the stop point on a W4 kept the margin of a passenger stop from the platform's end (#321)
The W4 stop point was shifted with fMinProximityDist (8 m), while the
train comes to a stand anywhere up to the margin of a passenger stop
(10-15 m by the number of vehicles) short of it. A train stopping by
the middle of a platform could so stand with its tail a few metres past
the platform's end (L053: Swoszowice 204.5 m of 201, Tumlin 244.3 m of
242). The point is now shifted with the same margin the stop is judged
by, so the tail stays inside (197.5 m and 240.4 m on the same run).

Co-authored-by: maj00r <maj00r@host>
2026-11-11 04:30:13 +01:00
maj00r
5c8cc6d9a5 feat(ai): PointVelocity, a speed limit for the head of the train at a point beyond the cell (#304)
* feat(ai): PointVelocity, a speed limit for the head of the train at a point beyond the cell

A memory cell (or putvalues) with "PointVelocity v d" tells the train that the head has to be at v km/h
at the point d metres beyond the cell (v -1: no limit). The cell is read by the speed table scan like a
signal, live until the head passes it; what it says then is kept for the point, later changes of the
cell don't concern that train. The limit ends when the head passes the point, it doesn't hold the rest
of the train and doesn't extend or break a speed limit of the line, like W27 of length 0 moved d metres
on. The AI brakes so the head reaches the point at v; for a human driver it only shows as the next
speed limit of the driving aid, the security systems don't see it.

It is made for the warning disc of a level crossing (TOP, Osp1/Osp2), which has to give 20 km/h at the
crossing about 500 m beyond the disc, as the disc showed when the train passed it.

The cell with PointVelocity as its first command makes its getvalues scanned (passive) as SetVelocity
does; PutCommand ignores it when such an event runs. Old commands keep working as they did,
SetProximityVelocity included.

* fix(ai): a point limit isn't a signal, and a PointVelocity 0 can be released

From the review of the PointVelocity commit:
- a cell rewritten from SetVelocity or ShuntVelocity to PointVelocity drops the flags of a signal, so it
  can't count as a semaphor or report a signal passed at danger;
- PointVelocity 0 is read on after the head passes the cell, as a stop of a signal is, otherwise the
  train would stand short of the point for good;
- a point limit doesn't become eSignNext, so a W4 between the disc and the crossing keeps its release.

* fix(ai): a PointVelocity limit outlives a rebuilt speed table, and holds when shunting

The state of the cell, latched when the head passes it, is now kept by the
controller apart from the speed table, and the distance to the point is
measured by the movement of the consist in the world. Stopping, backing up
and going on between the cell and the point, coupling or a takeover no longer
lose the limit or read the cell anew, unless the head backs up past the cell,
when the cell is read again.

Near the point the desired speed is capped to the limit, so a train that
coasts within its tolerance (as a shunting one does) reaches the point at it.

* fix(ai): review of the latched point limits

- a point the head has passed already isn't latched, and a latched limit at
  or behind the head isn't applied (it asked for a full brake for a cycle);
- a latched limit is dropped once the head backs up behind its cell, so it
  can't follow the consist onto another track; the table reads the cell again;
- a cell latched already, found under the consist by a rebuilt table, is
  ignored whatever it shows now (a 0 for the next train no longer stops it);
- PointVelocity 0 stops at the usual distance, not from the approach;
- the heading follows the track under the measured vehicle, not the chord of
  the consist, which a long consist on a tight curve holds far off the track;
- vehicles coupled or uncoupled at the end towards the point move the head;
- a jump of the consist (moved elsewhere) drops the latched limits.

* fix(ai): a cab change and curves don't move the latched point limits

- the end of the consist towards the point is taken into the distance only
  when the consist changes (its end vehicles or its length), not when another
  vehicle is measured from (a cab change at a reversal) nor when a curve
  shortens its projection;
- the way of travel follows the direction of the driver's vehicle against
  its own couplers, not the chord of the consist, which on a balloon loop
  points against it.

* fix(ai): a coupling with a cab change in one order still moves the head of a latched point limit

The end of the consist measured from the previous vehicle is moved to the place of the new one, so a coupling or an uncoupling followed at once by a change of direction to the other cab (the shunting orders) is taken into the distance to the point.

---------

Co-authored-by: maj00r <maj00r@host>
2026-11-10 18:44:33 +01:00
jerrrrycho
91dab65369 Merge remote-tracking branch 'origin/master' into fix/freight-brake-setting-cw1
# Conflicts:
#	CMakeLists.txt
#	utilities/Globals.cpp
2026-11-09 15:32:03 +01:00
jerrrrycho
cf3080c1f3 Merge remote-tracking branch 'origin/master' into feat/elf-master-controller-emergency-brake
# Conflicts:
#	McZapkie/Mover.cpp
2026-11-09 15:30:38 +01:00
f908ae307b Merge pull request #265 from pwarszawski/feat/ai-braking-gradients
AI on up gradients: hold a train coming to a stand, start on the train brake
2026-11-09 12:59:34 +00:00
889aa2d5db Merge pull request #278 from MaSzyna-EU07/feat/shunt-lock-resistive
Field shunting locked at zero and on resistive positions (eu07/maszyna#402)
2026-11-09 12:53:57 +00:00
4a9ab1447e Merge pull request #279 from MaSzyna-EU07/fix/multiple-unit-electric-diesel
No multiple-unit control between electric and diesel locomotives (eu07/maszyna#520)
2026-11-09 12:53:30 +00:00
0c95dbfa5a Merge pull request #280 from MaSzyna-EU07/feat/radio-fuse
Radio fuse: a cut-off in the radio's power supply (eu07/maszyna#438)
2026-11-09 12:53:14 +00:00
ebc9eb8740 Merge pull request #281 from MaSzyna-EU07/feat/shunt-pantograph-config
AI: suggested pantograph setup for shunting in the .fiz (eu07/maszyna#461)
2026-11-09 12:52:58 +00:00
c1089a6b16 Merge pull request #292 from MaSzyna-EU07/fix/en57-ep2-brake-charging
EN57 brakes: charging when hauled with the brake hose alone, Knorr EP brake only with control power
2026-11-09 12:48:13 +00:00
jerrrrycho
64d1b7f847 fix: the inspector takes a train below 1 km/h for standing and a bank run for a train (review of #282)
The AI inspects the train while it still creeps to a stop (W4, Shunt to Obey_train) and as it couples, so the 0.05 km/h threshold missed the §19.9 cut-out; it now uses EU07_AI_MOVEMENT. Bank counts as a train, as in the braking tables.
2026-11-08 21:38:16 +01:00
jerrrrycho
276b36d85f Merge remote-tracking branch 'origin/master' into fix/freight-brake-setting-cw1
# Conflicts:
#	CMakeLists.txt
2026-11-08 21:15:31 +01:00
maj00r
9fecba82f0 Merge pull request #291 from MaSzyna-EU07/fix/sod-lamp-whole-consist
SOD lamp: doors of the whole consist, three states (eu07/maszyna#288)
2026-11-08 20:56:20 +01:00
maj00r
17676863bc Merge pull request #266 from MaSzyna-EU07/feat/exe-test-mode
Test mode: `--test` runs a scenery unattended and exits with the result (#541)
2026-11-08 20:41:57 +01:00
pwarszawski
1cb365a2a8 Merge master into feat/ai-braking-gradients (after #297) 2026-11-08 20:40:54 +01:00
jerrrrycho
7db67c3ce7 fix: the inspector cuts brakes out only in a train at a standstill, R+Mg keeps the rapid stage (review of #282)
- §19.9 cut-outs only when the AI runs the consist as a train (Obey_train); in shunting a wagon without G brakes on P,
  which also puts back a brake the inspector cut out before
- no new cut-out while the consist moves: left to the next inspection at a standstill (putting back still happens)
- ESt4R, LSt and EStED test the bit of R, so R+Mg keeps the high-speed stage of R as on the KE and Oerlikon valves
2026-11-08 18:03:13 +01:00
jerrrrycho
43fc80f452 fix: radio fuse review: working push buttons, own hint, HUD
- radioon_sw:/radiooff_sw:/radiofuseon_sw:/radiofuseoff_sw: are now loaded
  as push-button gauges in initialize_gauge, so they can be clicked; the
  enable/disable commands press them while held. radiotoggle and
  radiofusetoggle flip the state directly, so they don't move them.
- New driver hint "Close radio fuse" (radiofuseon); "Switch on radio" is
  given only when the radio's own switch is off.
- The HUD shows the radio channel only with the fuse closed.

(eu07/maszyna#438)
2026-11-08 17:52:39 +01:00
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
pwarszawski
8cc8158d2a AI: making for a passenger stop, leave room only for the brake's own fill time
Since #187 the braking curve towards a stop or a lower speed leaves room for
the time the brake takes to respond, as long as the train brake handle is
still in the running position. The horizon it takes has the AI's old
look-ahead, (1 - a0) * 30/3.6 s, about 7-8 s, as its floor; at 60 km/h that
is over 100 m, up to half of the braking distance. Stops at signals were
tuned with it. A vehicle that brakes with its independent brake (an SN61, a
light engine) leaves the train brake handle where it is, so it kept that
room the whole way in: it braked early and gently, came down to 10 km/h
some 50 m out and crawled the rest, applying power and the brake in turn.

Making for a passenger stop (the point the train is to stop at, found by the
scan of the route, is a W4), the room now covers only the time the brake
takes to fill (half its application time), without the look-ahead floor.
Stops at signals and anything else keep the room as it was.

When a vehicle ahead is closer than the stop the scan found, the train makes
for that vehicle, so the room is the full one again.
2026-11-08 16:25:12 +01:00
pwarszawski
63fe5bde57 AI on up gradients: what the review found
- The tractive force that tells the start on the train brake is over is
  projected on the direction of travel: Ft is in the vehicle's own frame, so
  a locomotive driven from its rear cab, or turned the other way in the
  consist, counted as nothing.
- Rolling back faster than 0.5 km/h ends the start on the train brake, so
  the rules for a train slipping back apply the brakes again.
- One threshold for an up gradient that rolls a standing train back,
  EU07_AI_UPHILLGRAVITY (-0.025 m/s2, about 2.5 per mille), for the stop
  hold, the locomotive brake on rollback, the start, uphill_brake_committed()
  and hold_train_coming_to_stand_uphill(); the stop hold and the rollback
  rule started at 0.5 per mille before, on almost level track.
- hold_train_coming_to_stand_uphill() brakes on the brake's response time
  only for a train that is not to pull up further.
- Starting against the brake keeps the train Ready only at a standstill; in
  motion a braking force left in the train stops it as before.
2026-11-08 15:56:32 +01:00
pwarszawski
f067478154 Merge master into feat/ai-braking-gradients (after #295) 2026-11-08 14:52:34 +01:00
pawelw
3487e75f9a AI: the passenger stop flag no longer turns itself on and off (#295)
Whether a train is at a passenger stop (IsAtPassengerStop) was checked against
the final approach margins fMinProximityDist and fMaxProximityDist, which are
themselves set from that flag: 10-15 m and 15-40 m at a stop, 8 m and 50 m
otherwise. With the two sets different, the flag switched on and off on every
other scan of the route on the way to a W4. Each time the train went from a
final approach to a stop 50 m long to one 15 m long and back: braking in one
scan, full power below the 10 km/h coasting speed in the next. Close to the
stop the braking demand did not hold the train to a standstill, and below
1 km/h the stop counted as done, so an SN61 drove off without ever standing
still (#290).

The margins are now worked out in train_proximity_margins(), and the check of
the stop uses the margins of a passenger stop whatever the flag is at the
moment. A vehicle that is not a train keeps the present ones, as before.
2026-11-08 14:40:13 +01:00
jerrrrycho
81f10e4d90 fix: AI wagon inspector cuts out the brake of wagons without G in a train on G (eu07/maszyna#350)
Cw-1 §19.9: in a freight train braked on G, the brake of a vehicle that has
no G setting (e.g. a passenger car with P and R) is cut out. The inspector
put such wagons on P; now it cuts their brake out the way the scenery's '0'
flag does (b_dmg, the distributor's reservoirs emptied), so the brake
releases and stays off.

- The vehicle remembers the inspector cut it out
  (TMoverParameters::BrakeCutOutByInspector); the next inspection puts such
  a brake back and sets it to what the new train needs. A brake cut out for
  any other reason (scenery, player, damage) is never put back; the cab's
  cut-out toggle hands an inspector's cut-out over to the player.
- Locomotives and the vehicle the train is driven from keep a working
  brake (on P). In the long locomotive setting (§19.3b) the train runs on
  P, so a wagon without G stays on P there.
- The braking tables after the settings leave cut-out brakes out.
- §18.3: a car with R whose brake is cut out counts as one on P.
- ai.brakesetting.cw1 no keeps the earlier behaviour: nothing cut out.

The choice and the cutting out stay in vehicle/brakesetting.{h,cpp}, with
unit tests on real wagons.
2026-11-08 13:03:06 +01:00
jerrrrycho
491ed3e6da Merge remote-tracking branch 'origin/master' into feat/exe-test-mode 2026-11-08 10:58:43 +01:00
jerrrrycho
547706b54d refactor(simulation): fix the Sonar remarks on the test mode code
- TController::TableCheck() calls TSpeedPos::Update() as it did before the
  test mode: the check for a signal passed at danger is a call of its own
  after it (CheckSignalPassedAtDanger), so the update lines nest no deeper
  than on master (S134). A switch is a track, so a signal's update never
  takes the switch-change branch and the check runs in the same place as
  before; the physicslogs of all 15 scenario cases are byte for byte the
  same.
- null_imgui_renderer is final (S1235), to_string(test_result) uses
  `using enum` (S6177), init_result_cell() is const (S5817),
  ConfigParseTest() takes a std::string_view (S6009) and the test settings
  struct is declared apart from its member (S3646).
2026-11-08 09:35:59 +01:00
jerrrrycho
4b769d95c1 fix: SOD lamp shows the doors of the whole consist in three states (eu07/maszyna#288)
The door closure signalling lamp (i-door_blocked) showed only Doors.is_locked
of the occupied vehicle, so a door open in another car or a coupled unit
didn't show on it.

TMoverParameters::door_closure() gives the state of one vehicle (none, locked,
released, open), the driver gathers the most severe one of the train in
determine_consist_state(), next to IsAnyDoorOpen, and the lamp is lit for
locked doors, blinks for closed but released ones (a permit given, or no lock
engaged on doors that need no permit) and is dark with a door open.

doorclosuresignal in eu07.ini (default yes) switches it; with no the lamp
shows is_locked of the occupied vehicle as before. No data change needed.
2026-11-08 02:05:45 +01:00
pwarszawski
b992df7ab7 AI braking: slowdowndistance in the init-statement of its if (Sonar S6004) 2026-11-07 23:53:02 +01:00
pwarszawski
95ceb815d2 AI braking: the braking curve outside the final approach in a method of its own
Takes care of the last two Sonar remarks, with no change in what the AI does:

- S134: the braking curve followed outside the final approach moves out of
  adjust_desired_speed_for_target_speed() into
  adjust_desired_speed_for_braking_curve(), with early returns.
- S6004: deltaAcc of increase_train_brake() is declared in the
  init-statement of its if.
2026-11-07 22:55:09 +01:00
pwarszawski
99cf46866a AI braking, ESt3: take care of the Sonar remarks on the braking PRs
No change in what the AI or the distributor does:

- S134: the step of the train brake sized from the consist brake table
  moves out of IncBrake() into increase_train_brake(), with early returns.
- S134, S1066: while starting uphill, the check of the released brakes
  leaves Ready as it was by assigning the flag instead of nesting an if.
- S6004: the uphill condition of control_uphill_start(), and the target
  cylinder pressure of TNESt3::CheckState(), are declared in the
  init-statement of their if.
- S5350: the loop summing the tractive force walks the consist through a
  pointer to const.
- S3776: the cylinder nozzle calibration for the AL2 relay moves out of
  TNESt3::SetSize() into ScaleNozzlesForAL2().
2026-11-07 22:00:30 +01:00
jerrrrycho
636d29eb22 fix: AI wagon inspector sets G/P/R by the instruction Cw-1 (eu07/maszyna#350)
The brake settings the AI chooses for a train (TController::AutoRewident) now
follow Cw-1 (Mw56) §18 and §19:

- freight trains: the 500 m / 1300 t and 300 m / 600 t limits apply to the
  wagons without the locomotives, limits included;
- long locomotive setting: the five wagons on G are counted from the head of
  the train, not again after every locomotive in it;
- a vehicle without the setting the train needs gets the other of G and P;
- passenger trains run on R only with at most three cars on P, fewer than
  those on R; cars with a magnetic rail brake run on R+Mg.

The choice moves to vehicle/brakesetting.{h,cpp} in eu07_core, with unit
tests. The old inspector stays behind the new eu07.ini key
ai.brakesetting.cw1 (default yes; no restores the earlier behaviour).

No game data changes needed.

(eu07/maszyna#350)
2026-11-07 21:53:25 +01:00
pwarszawski
292092a7aa AI braking: take care of the Sonar remarks on the new braking code
No change in what the AI does; only the structure of the code that came in
with the braking changes:

- S107: shaped_braking_demand() takes the consist brake table as a struct
  instead of four separate parameters; its lambdas capture explicitly.
- S3358: brake_response_horizon() picks the BrakeDelay entry without a
  nested conditional operator.
- S5276: the speed passed to braking_distance_multiplier() is converted to
  float explicitly, as it was implicitly before.
- S134: the stop case of the proximity range is an else-if of its own, and
  its body a method of its own, adjust_desired_speed_for_final_approach(),
  with early returns instead of nested ifs. The cargo train threshold
  push is a conditional subtraction instead of a nested if.
- S3776: pick_optimal_speed() hands the uncoupling stages and the uphill
  stand to set_velocity_for_uncoupling() and
  hold_train_coming_to_stand_uphill().
2026-11-07 21:40:02 +01:00
jerrrrycho
30bdc3da61 feat: radio fuse, a cut-off in the radio's power supply (eu07/maszyna#438)
TMoverParameters::RadioFuse, closed by default, stands for a fuse in the
cabinet, a lever on the desk or the switch on the radio's power supply.
RadioPowered() needs it closed, so with it open the radio's buttons, calls,
messages and the radio-stop stop working; opening it at a standstill resets
the radio-stop as switching the radio off does, and the radio and radio-stop
lamps go out. New commands radiofusetoggle/radiofuseenable/radiofusedisable
(no default keys), cab controls radiofuse_sw: (follows the fuse state),
radiofuseon_sw: and radiofuseoff_sw:, and radio_fuse for the Python screens.
The AI turning the radio back on closes the fuse too.

Existing vehicles don't change: the fuse starts closed and opens only from a
new cab control or a bound key. SVN data, optional: cabs that have such a
fuse or lever get one of the new controls in their .mmd, in the form of
radio_sw: (e.g. "radiofuse_sw: { <submodel> rot 0 0 0 }"); lang/*.po can
translate "radio fuse".

(eu07/maszyna#438)
2026-11-07 21:33:28 +01:00
jerrrrycho
8f51ea9a19 feat(ai): suggested pantograph setup for shunting in the .fiz (eu07/maszyna#461)
A new optional key in the AI section of the .fiz, ShuntPantstate= (bits as in
Pantstate: 1 front, 2 rear, 3 both), sets the pantographs the AI driver keeps
up while its order is Shunt or Loose_shunt, moving and standing alike: it
raises those of the setup and lowers the others once one of the setup
collects the voltage, and doesn't raise more when idling. Lowering on the
track's demand still comes first. Without the key (default 0) nothing
changes, so an ET41 no longer has to shunt on all four pantographs once its
.fiz says so.

SVN data, optional: add "AI: ShuntPantstate=<1|2|3>" to the .fiz of vehicles
that should shunt on fewer pantographs, e.g. dynamic/pkp/et41_v2/203e-a.fiz,
203e-b.fiz and their _dsa150 variants (no AI line there yet). Without it the
vehicles behave as before.

(eu07/maszyna#461)
2026-11-07 21:32:41 +01:00
pwarszawski
84fbd75e8f Merge branch 'feat/ai-braking-earlier-steps' into feat/ai-braking-gradients 2026-11-07 21:17:13 +01:00
pwarszawski
04b208bbaf Merge branch 'fix/est3-valve' into feat/ai-braking-earlier-steps 2026-11-07 21:17:12 +01:00
pwarszawski
71d4645e09 Merge remote-tracking branch 'origin/master' into fix/est3-valve 2026-11-07 21:17:04 +01:00
jerrrrycho
6dc1239553 fix: no multiple-unit control between electric and diesel locomotives
An electric and a diesel locomotive got their control coupled whenever the
scenario (and so the Starter) asked for it, since the scenery coupling ignores
ControlType, or when neither coupler named a control system, so a Vectron and
an SM42 ran in multiple unit.

TMoverParameters::Attach() now leaves the control connection out between an
electric (ElectricSeriesMotor, ElectricInductionMotor) and a diesel
(DieselEngine, DieselElectric/DumbDE) traction vehicle, for the scenery, the
AI, the coupling keys and the automatic couplers alike, and logs it. Vehicles
without own traction (cars, control trailers) are not affected, nor are
permanent couplings within a unit, nor couplers that both name the same
ControlType, which stays the vehicle authors' way to allow such a pair. The
AI coupling order expects the coupling the vehicles can take, so it doesn't
wait for the control connection forever.

Existing scenarios coupling such a pair still load, without the control
connection. "controlcoupling.enginecheck no" in eu07.ini turns the check off.
No SVN data change is needed. (eu07/maszyna#520)
2026-11-07 21:16:19 +01:00
jerrrrycho
5bc4e7cd2e feat: lock field shunting at zero and on resistive positions
New optional Cntrl. key ScndCtrlResistiveLock=Yes: IncScndCtrl() refuses
to step the shunt controller up while the master controller is at its
no-power position or on a resistive RList position (R >= 0.01), as the
interlock of the ET21, ET22 and EP09 does. Decreasing the shunt stays
allowed so it can't get stuck. The AI doesn't choose field shunting
while the lock applies. Without the key nothing changes.

Game data: the key is to be added to the Cntrl. line of the ET21
(et21_v2), ET22 (et22_v3, et22-2000_v2) and EP09 (ep09_v1, ep09_v2)
.fiz files that define it; until then they behave as before.

(eu07/maszyna#402)
2026-11-07 21:01:54 +01:00
jerrrrycho
22c8e7322f feat: Elf emergency brake position in the master controller (eu07/maszyna#413)
The Elf's master controller (EIMCtrlType 2) gets an optional emergency
brake position below its position 0, turned on by the new .fiz key
EIMCtrlMainEmergency=Yes in Cntrl (default No, no change without it).
With it the old positions move up by one (MCPN 5, neutral at 4): the
emergency position brakes fully at once and vents the brake pipe, like
the alarm chain or the Impuls's EIMCtrlEmergency. The loader raises a
too small MCPN to 5 and logs it. The Elf code with hard-coded positions
(CheckEIMIC, the MED full braking, the AI) takes the shift into account.

SVN data to change afterwards (dynamic/pkp/elf_v1, needs this exe):
- every .fiz with EIMCtrlType=2: EIMCtrlMainEmergency=Yes, MCPN=5,
  DirChangeMaxPos=4 where present;
- the cab .mmd mainctrl entries: offset one notch lower (-0.06 -> -0.09),
  sounds shifted one index up, new sound0 with
  26284_elf_nastawnik_nagle_*.wav.

Issue: (eu07/maszyna#413)
2026-11-07 19:53:16 +01:00
pwarszawski
137eb9641f AI: start a train uphill on the train brake
Starting uphill the AI released the train brake (and the locomotive
brake with it) at once, while the power came on only later: a train on
10 per mille rolled back 20-30 m (E186 with 19 container wagons), and an
E189 with 7 Z2 coaches rolled back for minutes without power, because
the brake applied again for the rollback kept the power off. Many
locomotives cannot pull while their own cylinder is under pressure
(asynchronous drives switch to braking, others have a control pressure
switch), so holding the train on the locomotive brake is no way out.

A train standing on an up gradient with the train brake applied now
starts as a driver of a heavy train does:

- the train brake stays applied, the locomotive brake is released and
  the locomotive's own share of the train brake is let off with the
  releaser;
- the power is applied against the braked train (Ready does not hold
  it back meanwhile, and the rule that brakes a train slipping back
  is off);
- the train brake is released only once the tractive force exceeds 1.1
  times the gradient force, the train moves forward, or after 45 s if
  the locomotive cannot hold the train on its own power.

Multiple units are not affected.
2026-11-07 18:10:47 +01:00
pwarszawski
8d1d9eec9b AI braking: smaller steps, earlier, while approaching a stop or a lower speed
Changes to how the AI works the train brake on the way to a lower speed
or a stop, so that it uses few, early applications instead of a late
deep one:

- Approaching a lower speed, the deceleration may fall short of the
  demand by only half of a step (fBrake_a1) before the brake is applied
  harder. With a full step the demand crept up meanwhile and a long G
  train got its next step many seconds too late.
- The shortfall is checked every 3 s. If it keeps growing at a handle
  left alone for longer than the brake takes to respond, the AI adds a
  small step at once instead of waiting until the margin calls for a
  deep one. A shortfall that shrinks on its own (brake still filling,
  blocks gripping harder at lower speed) does not trigger it.
- Releasing, a position short of the first one counts as giving the
  minimum stage of the distributor, not less.
- Holding the speed on a descent, the predicted excess speed is taken
  off over the time the brake takes to respond, not at once, so a slow
  brake does not get a deep application that then takes as long to
  release.
2026-11-07 18:10:47 +01:00
pwarszawski
f53e184949 AI braking: hold a train coming to a stand uphill
Uphill a long train often came to a stand with its brake on the way
off and rolled back several metres: the AI released the train brake
to 0 about 20 m short of the stop (the gradient alone would have
stopped the train short of the stopping window), applied only the
first step again at the last moment, and a G train cannot apply its
brake again within the few seconds the gradient takes to stop it.

Coming to a stand on an up gradient (also when only part of the train
is on it) the AI now:

- applies the brake before the train stops on the gradient alone, once
  the time left to the stand is no longer than half of what the brake
  takes to apply;
- does not let the train coast on or pull up while the brake is applied
  and the gradient would stop the train sooner than the brake of the
  consist can be released;
- does not release the train brake any further below 10 km/h on the
  way to a stand (unless the train is to be driven on);
- puts the locomotive brake on below 3 km/h when the train will reach
  the point it is to stop at (not when it has slowed down short of it
  and is to pull up), and at once if the train rolls back.
2026-11-07 18:10:47 +01:00
jerrrrycho
441caeed64 refactor(simulation): tidy the test mode code
The test manager is reached through simulation::test() instead of a global,
the result cell is owned by a unique_ptr until the memory table takes it, the
cell value is compared with a margin, strings are built with std::format and
the --test settings moved to apply_test_mode_settings(). The driver's signal
check is folded into UpdateSpeedPosition(), which updates a speed table entry
and reports a signal at stop the head of the train just passed. The test.*
keys are listed with the other settings at the start of the log.
2026-11-07 17:12:11 +01:00
jerrrrycho
02e29f6971 feat(simulation): test mode, --test runs a scenery unattended and exits with the result (eu07/maszyna#541)
eu07 --test -s <scenery> [--test-timeout <s>] runs the scenery in ghostview with
the null renderer (models loaded, no textures), a hidden window, no sound,
network or python, and in fixed steps of 0.03 s of simulation time per frame
(three 10 ms physics steps) as fast as it can. Without -seed it uses a fixed
seed, so two runs give byte-identical physicslogs.

The scenery reports its result to the __test.result memory cell, which the
simulator always creates: value 1 passes once every vehicle has stood still for
1 s, value 0 fails at once. The run ends with exit code
  0 pass, 1 fail,
  2 a train passed a signal at stop (SetVelocity 0 0, as seen in its driver's
    speed table; SetVelocity 0 x on automatic block doesn't count),
  3 timeout (test.timeout, default 3600 s of simulation time),
  4 standstill (every vehicle still for test.standstill s, default 300, with no
    result; a pass with test.pass_on_standstill yes),
  5 error (no -s, the scenery didn't load or has no vehicles, an exception).
The test.* keys go in the scenery's config block; test.fail_if_stop_overran no
only logs a signal passed at danger. Outside the test mode a signal passed at
danger is logged.

The null renderer gets a ui backend which draws nothing, hands out the null
texture and material instead of throwing, and ends the ui frame. A GL context
is still made for the hidden window, without asking for a version, as parts
of the ui create textures with gl calls of their own. No crash dialog or
message box in test mode; the window code no longer needs a monitor.
2026-11-07 16:20:42 +01:00
jerrrrycho
fe9e2f77c2 feat(log): vehicle speed column in the physicslog
The Velocity column is the wheel speed, which stays at 0 while the wheels
are locked in a skid, so a vehicle sliding on locked wheels looked as if
it stood still. Add the signed vehicle speed in km/h as the last column.
2026-11-07 16:20:42 +01:00
pwarszawski
439e892abd AI: use the locomotive releaser only when starting off
The rule "wyluzuj lokomotywe, to szybciej ruszymy" released the
locomotive's own brake whenever power was asked for and the locomotive
cylinder held more than 0.4 bar. It had no speed condition, so it also
fired in motion, at 50-75 km/h, right after an application. On a
locomotive with the EStED distributor (E186) this vented the control
reservoir; with the pipe not yet recharged the locomotive brake then
faded to nothing at the next application.

The rule is meant for starting off, so it now applies only below
1 km/h.
2026-11-07 15:35:35 +01:00
pwarszawski
18bc7e06bf AI braking: move the uphill power-off check into its own function
The condition added for holding the speed uphill near a stop pushed the
cognitive complexity of control_tractive_force() to 26, over the 25
SonarCloud allows. It now lives in is_too_fast_uphill(); the behaviour
is unchanged.
2026-11-02 16:43:16 +01:00