From 741d1743e0718244d7b76aa3700d563b424143ba Mon Sep 17 00:00:00 2001 From: maciek001 Date: Thu, 16 Feb 2017 14:26:32 +0100 Subject: [PATCH 1/3] Zabezpieczenie przed dzieleniem modulo przez zero! (iMWDdivider) --- Globals.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Globals.cpp b/Globals.cpp index d8cabf78..7c31e329 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -896,6 +896,12 @@ void Global::ConfigParse(cParser &Parser) else if (token == "mwddivider") { Parser.getTokens(1, false); Parser >> iMWDdivider; + if (iMWDdivider == 0) + { + WriteLog("Dzielnik nie może być równy ZERO! Ustawiam na 1!"); + iMWDdivider = 1; + } + if (bMWDdebugEnable) WriteLog("Divider = " + to_string(iMWDdivider)); } } while ((token != "") && (token != "endconfig")); //(!Parser->EndOfFile) // na koniec trochę zależności From b3e8002290861a6cab7405a84b938d8b76c273d9 Mon Sep 17 00:00:00 2001 From: maciek001 Date: Thu, 16 Feb 2017 14:40:15 +0100 Subject: [PATCH 2/3] =?UTF-8?q?Poprawione=20b=C5=82=C4=99dy=20log=C3=B3w?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Console/MWD.cpp | 4 ++-- Globals.cpp | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Console/MWD.cpp b/Console/MWD.cpp index 5f546ce3..2c8c891b 100644 --- a/Console/MWD.cpp +++ b/Console/MWD.cpp @@ -29,8 +29,8 @@ TMWDComm::TMWDComm() // konstruktor MWDTime = 0; bSHPstate = false; bPrzejazdSHP = false; - bKabina1 = true; // pasuje wyciągnąć dane na temat kabiny i ustawiać te dwa parametry! - bKabina2 = false; + bKabina1 = true; // pasuje wyciągnąć dane na temat kabiny + bKabina2 = false; // i ustawiać te dwa parametry! bHamowanie = false; bCzuwak = false; diff --git a/Globals.cpp b/Globals.cpp index 7c31e329..14f3968f 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -856,42 +856,42 @@ void Global::ConfigParse(cParser &Parser) else if (token == "mwdlocbreakconfig") { // ustawienia hamulca lokomotywy Parser.getTokens(2, false); Parser >> fMWDAnalogInCalib[1][0] >> fMWDAnalogInCalib[1][1]; - if (bMWDdebugEnable) WriteLog("Locomotive break settings: " + to_string(fMWDAnalogInCalib[1][0]) + to_string(" ") + to_string(fMWDAnalogInCalib[1][1])); + if (bMWDdebugEnable) WriteLog("Locomotive break settings: " + to_string(fMWDAnalogInCalib[1][0]) + (" ") + to_string(fMWDAnalogInCalib[1][1])); } else if (token == "mwdanalogin1config") { // ustawienia hamulca zespolonego Parser.getTokens(2, false); Parser >> fMWDAnalogInCalib[2][0] >> fMWDAnalogInCalib[2][1]; - if (bMWDdebugEnable) WriteLog("Analog input 1 settings: " + to_string(fMWDAnalogInCalib[2][0]) + to_string(" ") + to_string(fMWDAnalogInCalib[2][1])); + if (bMWDdebugEnable) WriteLog("Analog input 1 settings: " + to_string(fMWDAnalogInCalib[2][0]) + (" ") + to_string(fMWDAnalogInCalib[2][1])); } else if (token == "mwdanalogin2config") { // ustawienia hamulca lokomotywy Parser.getTokens(2, false); Parser >> fMWDAnalogInCalib[3][0] >> fMWDAnalogInCalib[3][1]; - if (bMWDdebugEnable) WriteLog("Analog input 2 settings: " + to_string(fMWDAnalogInCalib[3][0]) + to_string(" ") + to_string(fMWDAnalogInCalib[3][1])); + if (bMWDdebugEnable) WriteLog("Analog input 2 settings: " + to_string(fMWDAnalogInCalib[3][0]) + (" ") + to_string(fMWDAnalogInCalib[3][1])); } else if (token == "mwdmaintankpress") { // max ciśnienie w zbiorniku głownym i rozdzielczość Parser.getTokens(2, false); Parser >> fMWDzg[0] >> fMWDzg[1]; - if (bMWDdebugEnable) WriteLog("MainAirTank settings: " + to_string(fMWDzg[0]) + to_string(" ") + to_string(fMWDzg[1])); + if (bMWDdebugEnable) WriteLog("MainAirTank settings: " + to_string(fMWDzg[0]) + (" ") + to_string(fMWDzg[1])); } else if (token == "mwdmainpipepress") { // max ciśnienie w przewodzie głownym i rozdzielczość Parser.getTokens(2, false); Parser >> fMWDpg[0] >> fMWDpg[1]; - if (bMWDdebugEnable) WriteLog("MainAirPipe settings: " + to_string(fMWDpg[0]) + to_string(" ") + to_string(fMWDpg[1])); + if (bMWDdebugEnable) WriteLog("MainAirPipe settings: " + to_string(fMWDpg[0]) + (" ") + to_string(fMWDpg[1])); } else if (token == "mwdbreakpress") { // max ciśnienie w hamulcach i rozdzielczość Parser.getTokens(2, false); Parser >> fMWDph[0] >> fMWDph[1]; - if (bMWDdebugEnable) WriteLog("AirPipe settings: " + to_string(fMWDph[0]) + to_string(" ") + to_string(fMWDph[1])); + if (bMWDdebugEnable) WriteLog("AirPipe settings: " + to_string(fMWDph[0]) + (" ") + to_string(fMWDph[1])); } else if (token == "mwdhivoltmeter") { // max napięcie na woltomierzu WN Parser.getTokens(2, false); Parser >> fMWDvolt[0] >> fMWDvolt[1]; - if (bMWDdebugEnable) WriteLog("VoltMeter settings: " + to_string(fMWDvolt[0]) + to_string(" ") + to_string(fMWDvolt[1])); + if (bMWDdebugEnable) WriteLog("VoltMeter settings: " + to_string(fMWDvolt[0]) + (" ") + to_string(fMWDvolt[1])); } else if (token == "mwdhiampmeter") { Parser.getTokens(2, false); Parser >> fMWDamp[0] >> fMWDamp[1]; - if (bMWDdebugEnable) WriteLog("Amp settings: " + to_string(fMWDamp[0]) + to_string(" ") + to_string(fMWDamp[1])); + if (bMWDdebugEnable) WriteLog("Amp settings: " + to_string(fMWDamp[0]) + (" ") + to_string(fMWDamp[1])); } else if (token == "mwddivider") { Parser.getTokens(1, false); From b7c728155ada861372d8c373581d71798fec7f0d Mon Sep 17 00:00:00 2001 From: maciek001 Date: Thu, 16 Feb 2017 18:08:55 +0100 Subject: [PATCH 3/3] poprawa logowania pozycji kranu zespolonego --- Console.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Console.cpp b/Console.cpp index 00157d5f..d38bb4e9 100644 --- a/Console.cpp +++ b/Console.cpp @@ -477,7 +477,8 @@ float Console::AnalogCalibrateGet(int x) b = (b - Global::fMWDAnalogInCalib[x][0]) / (Global::fMWDAnalogInCalib[x][1] - Global::fMWDAnalogInCalib[x][0]); switch (x) { - case 0: return (b * 8 - 2); + case 0: if (Global::bMWDdebugEnable && Global::iMWDDebugMode & 4) WriteLog("Pozycja kranu = " + to_string(b * 8 - 2)); + return (b * 8 - 2); break; case 1: return (b * 10); break;