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

Separate FFList from DEList, add FFEDList (ffBrakeList)

Added a new optional section to .fiz files: `ffBrakeList`. It is used instead of `ffList` whenever the vehicle has its ED braking engaged.

Example (dynamic/pkp/elf_v1/inverter_kp.fiz):
```
ffList: Size=3
0	2.0
33.7	2.08
34.0	2.12
130.4	8.10
endff

ffBrakeList: Size=4
0	2.0
33.7	2.08
34.8	2.08
34.8	2.17
130.4	8.10
endff
```
This commit is contained in:
jakubg1
2025-09-04 04:36:26 +02:00
parent baadd5f14c
commit dc8de9aa07
2 changed files with 84 additions and 35 deletions

View File

@@ -609,6 +609,13 @@ struct TDEScheme
double Umax = 0.0; /*napiecie maksymalne*/
double Imax = 0.0; /*prad maksymalny*/
};
typedef TDEScheme TDESchemeTable[33]; /*tablica WWList dla silnikow spalinowych*/
struct TFFScheme
{
double v = 0.0; // parametr wejsciowy
double freq = 0.0; // wyjscie: czestotliwosc falownika
};
typedef TFFScheme TFFSchemeTable[33];
struct TWiperScheme
{
@@ -619,8 +626,6 @@ struct TWiperScheme
};
typedef TWiperScheme TWiperSchemeTable[16];
typedef TDEScheme TDESchemeTable[33]; /*tablica rezystorow rozr.*/
struct TShuntScheme
{
double Umin = 0.0;
@@ -1373,6 +1378,10 @@ class TMoverParameters
bool Flat = false;
double Vhyp = 1.0;
TDESchemeTable DElist;
TFFSchemeTable FFlist;
int FFListSize = 0;
TFFSchemeTable FFEDlist;
int FFEDListSize = 0;
TWiperSchemeTable WiperList;
int WiperListSize;
@@ -2063,6 +2072,7 @@ private:
void LoadFIZ_UCList(std::string const &Input);
void LoadFIZ_DList( std::string const &Input );
void LoadFIZ_FFList( std::string const &Input );
void LoadFIZ_FFEDList( std::string const &Input );
void LoadFIZ_WiperList(std::string const &Input);
void LoadFIZ_LightsList( std::string const &Input );
void LoadFIZ_CompressorList(std::string const &Input);
@@ -2084,6 +2094,7 @@ private:
bool readHTCList(std::string const &line);
bool readPmaxList(std::string const &line);
bool readFFList( std::string const &line );
bool readFFEDList( std::string const &line );
bool readWWList( std::string const &line );
bool readWiperList( std::string const &line );
bool readLightsList( std::string const &Input );