16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 05:49:19 +02:00

tmj merge

This commit is contained in:
milek7
2017-10-30 16:30:04 +01:00
73 changed files with 9521 additions and 7735 deletions

View File

@@ -413,6 +413,7 @@ void TBrake::ForceEmptiness()
{
ValveRes->CreatePress(0);
BrakeRes->CreatePress(0);
ValveRes->Act();
BrakeRes->Act();
}
@@ -757,6 +758,17 @@ double TESt::GetCRP()
return CntrlRes->P();
}
void TESt::ForceEmptiness() {
ValveRes->CreatePress( 0 );
BrakeRes->CreatePress( 0 );
CntrlRes->CreatePress( 0 );
ValveRes->Act();
BrakeRes->Act();
CntrlRes->Act();
}
//---EP2---
void TEStEP2::Init( double const PP, double const HPP, double const LPP, double const BP, int const BDF )
@@ -1462,9 +1474,15 @@ double TEStED::GetPF( double const PP, double const dt, double const Vel )
// powtarzacz — podwojny zawor zwrotny
temp = Max0R(LoadC * BCP / temp * Min0R(Max0R(1 - EDFlag, 0), 1), LBP);
double speed = 1;
if ((ASBP < 0.1) && ((BrakeStatus & b_asb) == b_asb))
{
temp = 0;
speed = 3;
}
if ((BrakeCyl->P() > temp))
dv = -PFVd(BrakeCyl->P(), 0, 0.02 * SizeBC, temp) * dt;
dv = -PFVd(BrakeCyl->P(), 0, 0.02 * SizeBC * speed, temp) * dt;
else if ((BrakeCyl->P() < temp))
dv = PFVa(BVP, BrakeCyl->P(), 0.02 * SizeBC, temp) * dt;
else
@@ -1721,6 +1739,17 @@ double TCV1::GetCRP()
return CntrlRes->P();
}
void TCV1::ForceEmptiness() {
ValveRes->CreatePress( 0 );
BrakeRes->CreatePress( 0 );
CntrlRes->CreatePress( 0 );
ValveRes->Act();
BrakeRes->Act();
CntrlRes->Act();
}
//---CV1-L-TR---
void TCV1L_TR::SetLBP( double const P )
@@ -1995,7 +2024,8 @@ double TKE::GetPF( double const PP, double const dt, double const Vel )
// luzowanie CH
// temp:=Max0R(BCP,LBP);
IMP = Max0R(IMP / temp, Max0R(LBP, ASBP * int((BrakeStatus & b_asb) == b_asb)));
if ((ASBP < 0.1) && ((BrakeStatus & b_asb) == b_asb))
IMP = 0;
// luzowanie CH
if ((BCP > IMP + 0.005) || (Max0R(ImplsRes->P(), 8 * LBP) < 0.25))
dv = PFVd(BCP, 0, 0.05, IMP) * dt;
@@ -2090,6 +2120,21 @@ void TKE::SetLBP( double const P )
LBP = P;
}
void TKE::ForceEmptiness() {
ValveRes->CreatePress( 0 );
BrakeRes->CreatePress( 0 );
CntrlRes->CreatePress( 0 );
ImplsRes->CreatePress( 0 );
Brak2Res->CreatePress( 0 );
ValveRes->Act();
BrakeRes->Act();
CntrlRes->Act();
ImplsRes->Act();
Brak2Res->Act();
}
//---KRANY---
double TDriverHandle::GetPF(double const i_bcp, double PP, double HP, double dt, double ep)