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

Fix for fix

Browse Source
This commit is contained in:
Królik Uszasty
2019-06-15 17:22:45 +02:00
committed by tmj-fstate
parent 66fc5ad835
commit a8511c89b3
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Driver.cpp
View File

@@ -3552,7 +3552,6 @@ void TController::SetTimeControllers()
DesiredPercentage = clamp(DesiredPercentage, 0.0, 1.0); DesiredPercentage = clamp(DesiredPercentage, 0.0, 1.0);
if (VelDesired < 0.5 * mvControlling->Vmax && VelDesired - mvControlling->Vel < 10) if (VelDesired < 0.5 * mvControlling->Vmax && VelDesired - mvControlling->Vel < 10)
DesiredPercentage = std::min(DesiredPercentage, 0.75); DesiredPercentage = std::min(DesiredPercentage, 0.75);
if (VelDesired < mvControlling->hydro_TC_LockupSpeed) DizelPercentage = std::min(DizelPercentage,1);
int DizelActualPercentage = 100.4 * mvControlling->eimic_real; int DizelActualPercentage = 100.4 * mvControlling->eimic_real;
int PosInc = mvControlling->MainCtrlPosNo; int PosInc = mvControlling->MainCtrlPosNo;
int PosDec = 0; int PosDec = 0;
@@ -3563,7 +3562,7 @@ void TController::SetTimeControllers()
break; break;
} }
DizelPercentage_Speed = round(double(DizelPercentage*DesiredPercentage)); DizelPercentage_Speed = round(double(DizelPercentage*DesiredPercentage));
if (VelDesired < std::min(mvControlling->hydro_TC_LockupSpeed,mvControlling->Vmax/5)) DizelPercentage = std::min(DizelPercentage_Speed, 1); if (VelDesired < std::min(mvControlling->hydro_TC_LockupSpeed,mvControlling->Vmax / 5)) DizelPercentage = std::min(DizelPercentage_Speed, 1);
if (abs(DizelPercentage_Speed - DizelActualPercentage)>(DizelPercentage>1?3:0)) if (abs(DizelPercentage_Speed - DizelActualPercentage)>(DizelPercentage>1?3:0))
{ {
if (((DizelPercentage_Speed == 0 && DizelActualPercentage > 10) || (DizelActualPercentage - DizelPercentage_Speed > 50)) && PosDec > 0) PosDec -= 1; //pozycję wczesniej powinno byc szybkie zejscie, jeśli trzeba if (((DizelPercentage_Speed == 0 && DizelActualPercentage > 10) || (DizelActualPercentage - DizelPercentage_Speed > 50)) && PosDec > 0) PosDec -= 1; //pozycję wczesniej powinno byc szybkie zejscie, jeśli trzeba