eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

configurable releaser lock, minor bug fixes

Browse Source
This commit is contained in:
tmj-fstate
2020-09-03 13:24:06 +02:00
parent c4ef056102
commit 5247e6c224
5 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
McZapkie/Mover.cpp
View File

@@ -3510,7 +3510,7 @@ bool TMoverParameters::MainSwitchCheck() const {
&& ( true == NoVoltRelay )
&& ( true == OvervoltageRelay )
&& ( LastSwitchingTime > CtrlDelay )
&& ( HasCamshaft ? IsMainCtrlActualNoPowerPos() : ( LineBreakerClosesAtNoPowerPosOnly ? IsMainCtrlNoPowerPos() : true ) )
&& ( HasCamshaft ? IsMainCtrlActualNoPowerPos() : ( LineBreakerClosesOnlyAtNoPowerPos ? IsMainCtrlNoPowerPos() : true ) )
&& ( false == TestFlag( DamageFlag, dtrain_out ) )
&& ( false == TestFlag( EngDmgFlag, 1 ) ) );
}
@@ -3820,7 +3820,7 @@ bool TMoverParameters::BrakeReleaser(int state)
bool OK = true; //false tylko jeśli nie uda się wysłać, GF 20161124
if( state != 0 ) {
// additional limitations imposed by pressure switch
if( ( false == ControlPressureSwitch ) || ( true == IsMainCtrlNoPowerPos() ) ) {
if( ( false == ControlPressureSwitch ) || ( false == ReleaserEnabledOnlyAtNoPowerPos ) || ( true == IsMainCtrlNoPowerPos() ) ) {
Hamulec->Releaser( state );
}
}
@@ -9751,6 +9751,10 @@ void TMoverParameters::LoadFIZ_Brake( std::string const &line ) {
// the parameter is provided in form of a multiplier, where 1.0 means the default rate of 0.01
AirLeakRate *= 0.01;
}
extract_value(
ReleaserEnabledOnlyAtNoPowerPos, "ReleaserPowerPosLock", line,
( ( EngineType == TEngineType::DieselEngine ) || ( EngineType == TEngineType::DieselElectric ) ) ? "yes" : "no" );
}
void TMoverParameters::LoadFIZ_Doors( std::string const &line ) {