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

Merge branch 'master' of https://github.com/Xoov/maszyna into milek-dev

Browse Source
This commit is contained in:
milek7
2019-03-23 12:41:34 +01:00
parent f117801edc 511d1c57d9
commit aaf67caae2
5 changed files with 51 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
McZapkie/Mover.cpp
View File

@@ -5021,7 +5021,44 @@ double TMoverParameters::TractionForce( double dt ) {
{
if( true == Mains ) {
//tempomat
if (ScndCtrlPosNo > 1)
if (ScndCtrlPosNo == 4 && SpeedCtrlTypeTime)
{
switch (ScndCtrlPos) {
case 0:
NewSpeed = 0;
ScndCtrlActualPos = 0;
SpeedCtrlTimer = 10;
break;
case 1:
if (SpeedCtrlTimer > SpeedCtrlDelay) {
SpeedCtrlTimer = 0;
NewSpeed -= 10;
if (NewSpeed < 0) NewSpeed = 0;
}
else
SpeedCtrlTimer += dt;
break;
case 2:
SpeedCtrlTimer = 10;
ScndCtrlActualPos = NewSpeed;
break;
case 3:
if (SpeedCtrlTimer > SpeedCtrlDelay) {
SpeedCtrlTimer = 0;
NewSpeed += 10;
if (NewSpeed > Vmax) NewSpeed = Vmax;
}
else
SpeedCtrlTimer += dt;
break;
case 4:
NewSpeed = Vmax;
ScndCtrlActualPos = Vmax;
SpeedCtrlTimer = 10;
break;
}
}
else if (ScndCtrlPosNo > 1)
{
if (ScndCtrlPos != NewSpeed)
{
@@ -8619,6 +8656,10 @@ void TMoverParameters::LoadFIZ_Cntrl( std::string const &line ) {
// speed control
extract_value( SpeedCtrlDelay, "SpeedCtrlDelay", line, "" );
SpeedCtrlTypeTime =
(extract_value("SpeedCtrlType", line) == "Time") ?
true :
false;
// converter
{