From b6c75afd257fcc5fcaacf8b15e7ab6763ed54a53 Mon Sep 17 00:00:00 2001 From: maciek001 Date: Wed, 22 Feb 2017 22:37:22 +0100 Subject: [PATCH] =?UTF-8?q?PRZYWR=C3=93CONO=20Console::ModeSet()!!!=20Nie?= =?UTF-8?q?=20dzia=C5=82a=C5=82=20przez=20to=20PoKeys!=20Dodano=20zmienn?= =?UTF-8?q?=C4=85=20dla=20MWD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Globals.cpp | 12 +++++++++--- Globals.h | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Globals.cpp b/Globals.cpp index 14f3968f..0677fe18 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -204,6 +204,7 @@ double Global::fMWDpg[2] = { 0.8, 1023 }; double Global::fMWDph[2] = { 0.6, 1023 }; double Global::fMWDvolt[2] = { 4000, 1023 }; double Global::fMWDamp[2] = { 800, 1023 }; +double Global::fMWDlowVolt[2] = { 150, 1023 }; int Global::iMWDdivider = 5; //--------------------------------------------------------------------------- @@ -893,6 +894,11 @@ void Global::ConfigParse(cParser &Parser) Parser >> fMWDamp[0] >> 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") { Parser.getTokens(1, false); Parser >> iMWDdivider; @@ -931,9 +937,9 @@ void Global::ConfigParse(cParser &Parser) /* this won't execute anymore with the old parser removed // TBD: remove, or launch depending on passed flag? if (qp) - { // to poniżej wykonywane tylko raz, jedynie po wczytaniu eu07.ini - Console::ModeSet(iFeedbackMode, iFeedbackPort); // tryb pracy konsoli sterowniczej - iFpsRadiusMax = 0.000025 * fFpsRadiusMax * + { // to poniżej wykonywane tylko raz, jedynie po wczytaniu eu07.ini*/ + Console::ModeSet(iFeedbackMode, iFeedbackPort); // tryb pracy konsoli sterowniczej + /*iFpsRadiusMax = 0.000025 * fFpsRadiusMax * fFpsRadiusMax; // maksymalny promień renderowania 3000.0 -> 225 if (iFpsRadiusMax > 400) iFpsRadiusMax = 400; diff --git a/Globals.h b/Globals.h index c2b2b708..cb8aecfd 100644 --- a/Globals.h +++ b/Globals.h @@ -346,6 +346,7 @@ class Global static double fMWDph[2]; static double fMWDvolt[2]; static double fMWDamp[2]; + static double fMWDlowVolt[2]; static int iMWDdivider; }; //---------------------------------------------------------------------------