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

Merge remote-tracking branch 'youby/master' into sim

Browse Source
This commit is contained in:
milek7
2022-02-02 22:36:11 +01:00
parent 77e2ab8bca 31ca7a18a7
commit 39656b23fd
9 changed files with 503 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
McZapkie/MOVER.h
View File

@@ -1318,6 +1318,7 @@ public:
int InvertersNo = 0; // number of inverters
double InvertersRatio = 0.0;
std::vector<inverter> Inverters; //all inverters
int InverterControlCouplerFlag = 4; //which coupling flag is necessary to controll inverters
/* -dla pojazdów z blendingiem EP/ED (MED) */
double MED_Vmax = 0; // predkosc maksymalna dla obliczen chwilowej sily hamowania EP w MED
double MED_Vmin = 0; // predkosc minimalna dla obliczen chwilowej sily hamowania EP w MED

3
McZapkie/Mover.cpp
View File

@@ -10854,7 +10854,8 @@ void TMoverParameters::LoadFIZ_Engine( std::string const &Input ) {
extract_value( eimc[ eimc_p_abed ], "abed", Input, "" );
extract_value( eimc[ eimc_p_eped ], "edep", Input, "" );
extract_value( EIMCLogForce, "eimclf", Input, "" );
extract_value( InvertersNo, "InvNo", Input, "");
extract_value( InvertersNo, "InvNo", Input, "" );
extract_value( InverterControlCouplerFlag, "InvCtrCplFlag", Input, "" );
extract_value( Flat, "Flat", Input, "");