eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-04 13:45:49 +01:00
Code Issues 156 Wiki Activity

Merge branch 'master' into refactor/split-oncommands-train

Browse Source 
Brings the branch up to date after ~6 weeks of drift (51 commits).

The only real conflict was vehicle/Train.cpp, deleted here and modified
on master by 763a76d4, which added a dynamicbrake_pos entry to
GetTrainState. That line is re-applied in its new home,
vehicle/train/TrainState.cpp; the file deletion is kept.

utilities/uart.cpp and vehicle/Driver.cpp merged cleanly: master edited
function bodies, this branch only rewrote the Train.h include paths.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
jerrrrycho
2026-09-06 16:02:39 +02:00
parent 019095a80e c3007e3237
commit 3040ecbac3
25 changed files with 417 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
vehicle/train/TrainState.cpp
View File

@@ -694,6 +694,7 @@ std::shared_ptr<dictionary_source> TTrain::GetTrainState(dictionary_source const
dict->insert("mainctrl_pos_count", mvControlled->MainCtrlPosNo);
dict->insert("main_ctrl_actual_pos", mvControlled->MainCtrlActualPos);
dict->insert("scndctrl_pos", mvControlled->ScndCtrlPos);
dict->insert("dynamicbrake_pos", mvControlled->DynamicBrakeCtrlPos);
dict->insert("scnd_ctrl_actual_pos", mvControlled->ScndCtrlActualPos);
dict->insert("brakectrl_pos", mvControlled->fBrakeCtrlPos);
dict->insert("localbrake_pos", mvControlled->LocalBrakePosA);