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

Merge branch 'milek-dev' into gfx-work

Browse Source
This commit is contained in:
milek7
2019-03-23 12:42:20 +01:00
parent b75adc24f2 aaf67caae2
commit 65eec2ad84
5 changed files with 51 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Driver.cpp
View File

@@ -4996,6 +4996,7 @@ TController::UpdateSituation(double dt) {
TableClear(); // skanowanie od nowa TableClear(); // skanowanie od nowa
iDrivigFlags &= ~moveStartHorn; // bez trąbienia przed ruszeniem iDrivigFlags &= ~moveStartHorn; // bez trąbienia przed ruszeniem
SetVelocity(fShuntVelocity, fShuntVelocity); // ustawienie prędkości jazdy SetVelocity(fShuntVelocity, fShuntVelocity); // ustawienie prędkości jazdy
mvOccupied->BrakeReleaser(0); // wyłączyć luzowanie
} }
} }

1
McZapkie/MOVER.h
View File

@@ -1307,6 +1307,7 @@ public:
double eimic = 0; /*aktualna pozycja zintegrowanego sterowania jazda i hamowaniem*/ double eimic = 0; /*aktualna pozycja zintegrowanego sterowania jazda i hamowaniem*/
double eimic_real = 0; /*faktycznie uzywana pozycja zintegrowanego sterowania jazda i hamowaniem*/ double eimic_real = 0; /*faktycznie uzywana pozycja zintegrowanego sterowania jazda i hamowaniem*/
int EIMCtrlType = 0; /*rodzaj wariantu zadajnika jazdy*/ int EIMCtrlType = 0; /*rodzaj wariantu zadajnika jazdy*/
bool SpeedCtrlTypeTime = false; /*czy tempomat sterowany czasowo*/
double eimv_pr = 0; /*realizowany procent dostepnej sily rozruchu/hamowania*/ double eimv_pr = 0; /*realizowany procent dostepnej sily rozruchu/hamowania*/
double eimv[21]; double eimv[21];
static std::vector<std::string> const eimv_labels; static std::vector<std::string> const eimv_labels;

43
McZapkie/Mover.cpp
View File

@@ -5021,7 +5021,44 @@ double TMoverParameters::TractionForce( double dt ) {
{ {
if( true == Mains ) { if( true == Mains ) {
//tempomat //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) if (ScndCtrlPos != NewSpeed)
{ {
@@ -8619,6 +8656,10 @@ void TMoverParameters::LoadFIZ_Cntrl( std::string const &line ) {
// speed control // speed control
extract_value( SpeedCtrlDelay, "SpeedCtrlDelay", line, "" ); extract_value( SpeedCtrlDelay, "SpeedCtrlDelay", line, "" );
SpeedCtrlTypeTime =
(extract_value("SpeedCtrlType", line) == "Time") ?
true :
false;
// converter // converter
{ {

6
McZapkie/hamulce.cpp
View File

@@ -481,6 +481,12 @@ double TWest::GetPF( double const PP, double const dt, double const Vel )
dv = 0; dv = 0;
BrakeCyl->Flow(-dv); BrakeCyl->Flow(-dv);
if ((BrakeStatus & b_rls) == b_rls) //odluzniacz
dv = PF(0, CVP, 0.1 * SizeBC) * dt;
else
dv = 0;
BrakeCyl->Flow(-dv);
// hamulec EP // hamulec EP
temp = BVP * int(EPS > 0); temp = BVP * int(EPS > 0);
dv = PF(temp, LBP, 0.0015) * dt * EPS * EPS * int(LBP * EPS < MaxBP * LoadC); dv = PF(temp, LBP, 0.0015) * dt * EPS * EPS * int(LBP * EPS < MaxBP * LoadC);

1
Train.cpp
View File

@@ -462,6 +462,7 @@ dictionary_source *TTrain::GetTrainState() {
dict->insert( "main_ctrl_actual_pos", mover->MainCtrlActualPos ); dict->insert( "main_ctrl_actual_pos", mover->MainCtrlActualPos );
dict->insert( "scndctrl_pos", mover->ScndCtrlPos ); dict->insert( "scndctrl_pos", mover->ScndCtrlPos );
dict->insert( "scnd_ctrl_actual_pos", mover->ScndCtrlActualPos ); dict->insert( "scnd_ctrl_actual_pos", mover->ScndCtrlActualPos );
dict->insert( "new_speed", mover->NewSpeed);
// brakes // brakes
dict->insert( "manual_brake", ( mvOccupied->ManualBrakePos > 0 ) ); dict->insert( "manual_brake", ( mvOccupied->ManualBrakePos > 0 ) );
bool const bEP = ( mvControlled->LocHandle->GetCP() > 0.2 ) || ( fEIMParams[ 0 ][ 2 ] > 0.01 ); bool const bEP = ( mvControlled->LocHandle->GetCP() > 0.2 ) || ( fEIMParams[ 0 ][ 2 ] > 0.01 );