eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'd8170c932b448ba6888e702746b5ae22632062d8' into sim

Browse Source
This commit is contained in:
milek7
2022-01-05 01:02:56 +01:00
parent ff3c38a506 d8170c932b
commit 5bafa31f9d
76 changed files with 9277 additions and 5749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
McZapkie/hamulce.cpp
View File

@@ -2287,6 +2287,11 @@ double TDriverHandle::GetEP()
return 0;
}
double TDriverHandle::GetRP()
{
return 0;
}
double TDriverHandle::GetSound(int i)
{
return 0;
@@ -2562,6 +2567,11 @@ double TFV4aM::GetCP()
return TP;
}
double TFV4aM::GetRP()
{
return 5.0 +TP * 0.08 + RedAdj;
}
double TFV4aM::LPP_RP(double pos) // cisnienie z zaokraglonej pozycji;
{
int const i_pos = 2 + std::floor( pos ); // zaokraglone w dol
@@ -2698,6 +2708,11 @@ double TMHZ_EN57::GetCP()
return RP;
}
double TMHZ_EN57::GetRP()
{
return 5.0 + RedAdj;
}
double TMHZ_EN57::GetEP(double pos)
{
if (pos < 9.5)
@@ -2760,7 +2775,7 @@ double TMHZ_K5P::GetPF(double i_bcp, double PP, double HP, double dt, double ep)
}
else
{
TP = 0;
//TP = 0; //tu nie powinno być nic, ciśnienie zostaje jak było
}
if (EQ(i_bcp, 1)) //odcięcie - nie rób nic
@@ -2846,6 +2861,11 @@ double TMHZ_K5P::GetCP()
return CP;
}
double TMHZ_K5P::GetRP()
{
return 5.0 + TP + RedAdj;
}
void TMHZ_K5P::SetParams(bool AO, bool MO, double OverP, double, double OMP, double OPD)
{
AutoOvrld = AO;
@@ -2890,7 +2910,7 @@ double TMHZ_6P::GetPF(double i_bcp, double PP, double HP, double dt, double ep)
}
else
{
TP = 0;
//TP = 0; //tu nie powinno być nic, ciśnienie zostaje jak było
}
if (EQ(i_bcp, 2)) //odcięcie - nie rób nic
@@ -2982,6 +3002,11 @@ double TMHZ_6P::GetCP()
return CP;
}
double TMHZ_6P::GetRP()
{
return 5.0 + TP + RedAdj;
}
void TMHZ_6P::SetParams(bool AO, bool MO, double OverP, double, double OMP, double OPD)
{
AutoOvrld = AO;
@@ -3065,6 +3090,11 @@ double TM394::GetCP()
return CP;
}
double TM394::GetRP()
{
return std::max(5.0, CP) + RedAdj;
}
double TM394::GetPos(int i)
{
return pos_table[i];
@@ -3121,6 +3151,11 @@ double TH14K1::GetCP()
return CP;
}
double TH14K1::GetRP()
{
return 5.0 + RedAdj;
}
double TH14K1::GetPos(int i)
{
return pos_table[i];
@@ -3179,6 +3214,11 @@ double TSt113::GetCP()
return CP;
}
double TSt113::GetRP()
{
return 5.0 + RedAdj;
}
double TSt113::GetEP()
{
return EPS;
@@ -3351,6 +3391,11 @@ double TFVel6::GetCP()
return CP;
}
double TFVel6::GetRP()
{
return 5.0;
}
double TFVel6::GetEP()
{
return EPS;
@@ -3428,6 +3473,11 @@ double TFVE408::GetEP()
return EPS;
}
double TFVE408::GetRP()
{
return 5.0;
}
double TFVE408::GetPos(int i)
{
return pos_table[i];