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

PN brake cuts off ED braking

Browse Source
This commit is contained in:
Królik Uszasty
2018-07-08 11:55:15 +02:00
committed by tmj-fstate
parent ff1a85fe5d
commit d611622fad
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
McZapkie/Mover.cpp
View File

@@ -5029,6 +5029,7 @@ double TMoverParameters::TractionForce( double dt ) {
dtrans = Hamulec->GetEDBCP() * eimc[eimc_p_abed]; // stala napedu dtrans = Hamulec->GetEDBCP() * eimc[eimc_p_abed]; // stala napedu
if ((DynamicBrakeFlag)) if ((DynamicBrakeFlag))
{ {
// ustalanie współczynnika blendingu do luzowania hamulca PN
if (eimv[eimv_Fmax] * Sign(V) * DirAbsolute < -1) if (eimv[eimv_Fmax] * Sign(V) * DirAbsolute < -1)
{ {
PosRatio = -Sign(V) * DirAbsolute * eimv[eimv_Fr] / PosRatio = -Sign(V) * DirAbsolute * eimv[eimv_Fr] /
@@ -5036,18 +5037,26 @@ double TMoverParameters::TractionForce( double dt ) {
Max0R(Max0R(dtrans,0.01) / MaxBrakePress[0], AnPos) /*dizel_fill*/); Max0R(Max0R(dtrans,0.01) / MaxBrakePress[0], AnPos) /*dizel_fill*/);
} }
else else
{
PosRatio = 0; PosRatio = 0;
PosRatio = Round(20.0 * PosRatio) / 20.0; }
PosRatio = Round(20.0 * PosRatio) / 20.0; //stopniowanie PN/ED
if (PosRatio < 19.5 / 20.0) if (PosRatio < 19.5 / 20.0)
PosRatio *= 0.9; PosRatio *= 0.9;
// if PosRatio<0 then Hamulec->SetED(Max0R(0.0, std::min(PosRatio, 1.0))); //ustalenie stopnia zmniejszenia ciśnienia
// PosRatio:=2+PosRatio-2; // ustalanie siły hamowania ED
Hamulec->SetED(Max0R(0.0, std::min(PosRatio, 1.0))); if ((Hamulec->GetEDBCP() > 0.25) && (eimc[eimc_p_abed] < 0.001)) //jeśli PN wyłącza ED
// (Hamulec as TLSt).SetLBP(LocBrakePress*(1-PosRatio)); {
PosRatio = 0;
eimv[eimv_Fzad] = 0;
}
else
{
PosRatio = -std::max(std::min(dtrans * 1.0 / MaxBrakePress[0], 1.0), AnPos) * PosRatio = -std::max(std::min(dtrans * 1.0 / MaxBrakePress[0], 1.0), AnPos) *
std::max(0.0, std::min(1.0, (Vel - eimc[eimc_p_Vh0]) / std::max(0.0, std::min(1.0, (Vel - eimc[eimc_p_Vh0]) /
(eimc[eimc_p_Vh1] - eimc[eimc_p_Vh0]))); (eimc[eimc_p_Vh1] - eimc[eimc_p_Vh0])));
eimv[eimv_Fzad] = -std::max(LocalBrakeRatio(), dtrans / MaxBrakePress[0]); eimv[eimv_Fzad] = -std::max(LocalBrakeRatio(), dtrans / MaxBrakePress[0]);
}
tmp = 5; tmp = 5;
} }
else else