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

build 210426. announcements soundproofing, releaser control logic tweak, minor bug fixes

Browse Source
This commit is contained in:
tmj-fstate
2021-04-27 16:18:12 +02:00
parent 3775d20e0c
commit 87aa760c20
5 changed files with 58 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Driver.cpp
View File

@@ -7622,7 +7622,7 @@ void TController::control_tractive_force() {
auto const velocity { DirectionalVel() };
// jeśli przyspieszenie pojazdu jest mniejsze niż żądane oraz...
if( ( AccDesired > EU07_AI_NOACCELERATION ) // don't add power if not asked for actual speed-up
&& ( AccDesired - AbsAccS > 0.05 )
&& ( AbsAccS < AccDesired /* - 0.05 */ )
&& ( false == TestFlag( iDrivigFlags, movePress ) ) ) {
// ...jeśli prędkość w kierunku czoła jest mniejsza od dozwolonej o margines...
if( velocity < (
@@ -7652,7 +7652,7 @@ void TController::control_tractive_force() {
else if( ( velocity > VelDesired + SpeedCtrlMargin)
|| ( fAccGravity < -0.01 ?
AccDesired < 0.0 :
(AbsAccS > AccDesired + 0.05) )
( AbsAccS > AccDesired + 0.05 ) )
|| ( IsAnyCouplerStretched ) ) {
// jak za bardzo przyspiesza albo prędkość przekroczona
// dodany wyjatek na "pelna w przod"
@@ -7817,11 +7817,12 @@ void TController::control_releaser() {
if( mvOccupied->BrakeSystem != TBrakeSystem::Pneumatic ) { return; }
auto const hasreleaser {
( mvOccupied->BrakeHandle == TBrakeHandle::FV4a )
|| ( mvOccupied->BrakeHandle == TBrakeHandle::MHZ_6P )
|| ( mvOccupied->BrakeHandle == TBrakeHandle::MHZ_K5P )
|| ( mvOccupied->BrakeHandle == TBrakeHandle::MHZ_K8P )
|| ( mvOccupied->BrakeHandle == TBrakeHandle::M394 ) };
( false == ( is_dmu() || is_emu() ) ) // TODO: a more refined test than rejecting these types wholesale
&& ( ( mvOccupied->BrakeHandle == TBrakeHandle::FV4a )
|| ( mvOccupied->BrakeHandle == TBrakeHandle::MHZ_6P )
|| ( mvOccupied->BrakeHandle == TBrakeHandle::MHZ_K5P )
|| ( mvOccupied->BrakeHandle == TBrakeHandle::MHZ_K8P )
|| ( mvOccupied->BrakeHandle == TBrakeHandle::M394 ) ) };
if( false == hasreleaser ) { return; }