eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-19 09:59:18 +02:00
Code Issues 121 Wiki Activity

Additionl 0 position for EIM EMUs, configurable Elf controller, first try of speedcontrol for EN57A

Browse Source
This commit is contained in:
Królik Uszasty
2019-05-08 21:44:19 +02:00
committed by tmj-fstate
parent 9185030b4b
commit 2db964ea40
3 changed files with 63 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Driver.cpp
View File

@@ -2844,20 +2844,20 @@ bool TController::IncBrake()
bool TController::IncBrakeEIM()
{ // zwiększenie hamowania
bool OK = false;
switch (mvControlling->EIMCtrlType)
switch (mvOccupied->EIMCtrlType)
{
case 0:
OK = mvControlling->IncLocalBrakeLevel(1);
OK = mvOccupied->IncLocalBrakeLevel(1);
break;
case 1:
OK = mvControlling->MainCtrlPos > 0;
OK = mvOccupied->MainCtrlPos > 0;
if (OK)
mvControlling->MainCtrlPos = 0;
mvOccupied->MainCtrlPos = 0;
break;
case 2:
OK = mvControlling->MainCtrlPos > 1;
OK = mvOccupied->MainCtrlPos > 1;
if (OK)
mvControlling->MainCtrlPos = 1;
mvOccupied->MainCtrlPos = 1;
break;
}
return OK;
@@ -2936,20 +2936,20 @@ bool TController::DecBrake()
bool TController::DecBrakeEIM()
{ // zmniejszenie siły hamowania
bool OK = false;
switch (mvControlling->EIMCtrlType)
switch (mvOccupied->EIMCtrlType)
{
case 0:
OK = mvControlling->DecLocalBrakeLevel(1);
OK = mvOccupied->DecLocalBrakeLevel(1);
break;
case 1:
OK = mvControlling->MainCtrlPos < 2;
OK = mvOccupied->MainCtrlPos < 2;
if (OK)
mvControlling->MainCtrlPos = 2;
mvOccupied->MainCtrlPos = 2;
break;
case 2:
OK = mvControlling->MainCtrlPos < 3;
OK = mvOccupied->MainCtrlPos < 3;
if (OK)
mvControlling->MainCtrlPos = 3;
mvOccupied->MainCtrlPos = 3;
break;
}
return OK;