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

Changed speed control work on "no force" position

Browse Source
This commit is contained in:
Królik Uszasty
2019-10-12 22:13:00 +02:00
parent 0ec9d4b93c
commit db3d2a8509
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
McZapkie/Mover.cpp
View File

@@ -6521,15 +6521,15 @@ void TMoverParameters::CheckSpeedCtrl(double dt)
if (EngineType == TEngineType::DieselEngine) { if (EngineType == TEngineType::DieselEngine) {
if ((!SpeedCtrlUnit.Standby)) { if ((!SpeedCtrlUnit.Standby)) {
if (SpeedCtrlUnit.ManualStateOverride) { if (SpeedCtrlUnit.ManualStateOverride) {
if (MainCtrlPos < MainCtrlPosNo - 1) { /* if (MainCtrlPos < MainCtrlPosNo - 1) {
eimic = std::min(eimic, 0.0); eimic = std::min(eimic, 0.0);
eimicSpeedCtrlIntegral = 0.0; eimicSpeedCtrlIntegral = 0.0;
} }
else if (eimic > 0.009) eimic = 1.0; else*/ if (eimic > 0.009) eimic = 1.0;
} }
double error = (std::max(SpeedCtrlValue + SpeedCtrlUnit.Offset, 0.0) - Vel); double error = (std::max(SpeedCtrlValue + SpeedCtrlUnit.Offset, 0.0) - Vel);
double factorP = error > 0 ? SpeedCtrlUnit.FactorPpos : SpeedCtrlUnit.FactorPneg; double factorP = error > 0 ? SpeedCtrlUnit.FactorPpos : SpeedCtrlUnit.FactorPneg;
double eSCP = clamp(factorP * error, -1.2, 1.0); //P module double eSCP = clamp(factorP * error, -1.2, UniCtrlList[MainCtrlPos].MaxCtrlVal); //P module
if (eSCP < -1.0) if (eSCP < -1.0)
{ {
SpeedCtrlUnit.BrakeInterventionBraking = (eSCP < -1.1) && (Vel < hydro_TC_UnlockSpeed); SpeedCtrlUnit.BrakeInterventionBraking = (eSCP < -1.1) && (Vel < hydro_TC_UnlockSpeed);