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

PRZYWRÓCONO Console::ModeSet()!!!

Browse Source 
Nie działał przez to PoKeys!
Dodano zmienną dla MWD
This commit is contained in:
maciek001
2017-02-22 22:37:22 +01:00
parent 9c242d3590
commit b6c75afd25
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Globals.cpp
View File

@@ -204,6 +204,7 @@ double Global::fMWDpg[2] = { 0.8, 1023 };
double Global::fMWDph[2] = { 0.6, 1023 }; double Global::fMWDph[2] = { 0.6, 1023 };
double Global::fMWDvolt[2] = { 4000, 1023 }; double Global::fMWDvolt[2] = { 4000, 1023 };
double Global::fMWDamp[2] = { 800, 1023 }; double Global::fMWDamp[2] = { 800, 1023 };
double Global::fMWDlowVolt[2] = { 150, 1023 };
int Global::iMWDdivider = 5; int Global::iMWDdivider = 5;
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@@ -893,6 +894,11 @@ void Global::ConfigParse(cParser &Parser)
Parser >> fMWDamp[0] >> fMWDamp[1]; Parser >> fMWDamp[0] >> fMWDamp[1];
if (bMWDdebugEnable) WriteLog("Amp settings: " + to_string(fMWDamp[0]) + (" ") + to_string(fMWDamp[1])); if (bMWDdebugEnable) WriteLog("Amp settings: " + to_string(fMWDamp[0]) + (" ") + to_string(fMWDamp[1]));
} }
else if (token == "mwdlowvoltmeter") {
Parser.getTokens(2, false);
Parser >> fMWDlowVolt[0] >> fMWDlowVolt[1];
if (bMWDdebugEnable) WriteLog("Low VoltMeter settings: " + to_string(fMWDlowVolt[0]) + (" ") + to_string(fMWDlowVolt[1]));
}
else if (token == "mwddivider") { else if (token == "mwddivider") {
Parser.getTokens(1, false); Parser.getTokens(1, false);
Parser >> iMWDdivider; Parser >> iMWDdivider;
@@ -931,9 +937,9 @@ void Global::ConfigParse(cParser &Parser)
/* this won't execute anymore with the old parser removed /* this won't execute anymore with the old parser removed
// TBD: remove, or launch depending on passed flag? // TBD: remove, or launch depending on passed flag?
if (qp) if (qp)
{ // to poniżej wykonywane tylko raz, jedynie po wczytaniu eu07.ini { // to poniżej wykonywane tylko raz, jedynie po wczytaniu eu07.ini*/
Console::ModeSet(iFeedbackMode, iFeedbackPort); // tryb pracy konsoli sterowniczej Console::ModeSet(iFeedbackMode, iFeedbackPort); // tryb pracy konsoli sterowniczej
iFpsRadiusMax = 0.000025 * fFpsRadiusMax * /*iFpsRadiusMax = 0.000025 * fFpsRadiusMax *
fFpsRadiusMax; // maksymalny promień renderowania 3000.0 -> 225 fFpsRadiusMax; // maksymalny promień renderowania 3000.0 -> 225
if (iFpsRadiusMax > 400) if (iFpsRadiusMax > 400)
iFpsRadiusMax = 400; iFpsRadiusMax = 400;

1
Globals.h
View File

@@ -346,6 +346,7 @@ class Global
static double fMWDph[2]; static double fMWDph[2];
static double fMWDvolt[2]; static double fMWDvolt[2];
static double fMWDamp[2]; static double fMWDamp[2];
static double fMWDlowVolt[2];
static int iMWDdivider; static int iMWDdivider;
}; };
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------