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

build 180127. minor bug fixes

Browse Source
This commit is contained in:
tmj-fstate
2018-01-27 16:05:19 +01:00
parent 0124032d3b
commit 1b655fac9b
6 changed files with 71 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
McZapkie/Mover.cpp
View File

@@ -4259,19 +4259,20 @@ double TMoverParameters::TractionForce(double dt)
}
case 2: { // automatic
auto const motorcurrent{ std::min<double>( ImaxHi, std::abs( Im ) ) };
if( ( std::abs( Itot ) > RVentMinI )
&& ( RList[ MainCtrlActualPos ].R > RVentCutOff ) ) {
RventRot +=
( RVentnmax
* std::min( 1.0, ( ( Im / NPoweredAxles ) / RVentMinI ) )
* Im / ImaxLo
* std::min( 1.0, ( ( motorcurrent / NPoweredAxles ) / RVentMinI ) )
* motorcurrent / ImaxLo
- RventRot )
* RVentSpeed * dt;
}
else if( ( DynamicBrakeType == dbrake_automatic )
&& ( true == DynamicBrakeFlag ) ) {
RventRot += ( RVentnmax * Im / ImaxLo - RventRot ) * RVentSpeed * dt;
RventRot += ( RVentnmax * motorcurrent / ImaxLo - RventRot ) * RVentSpeed * dt;
}
else {
RventRot *= std::max( 0.0, 1.0 - RVentSpeed * dt );