From 0fbdebae8ccd3d850dd93b177dd99a1abd626661 Mon Sep 17 00:00:00 2001 From: maciek001 Date: Fri, 16 Dec 2016 16:49:30 +0100 Subject: [PATCH] =?UTF-8?q?Dodana=20blokada=20odbioru=20danych=20(wpis=20w?= =?UTF-8?q?=20pliku=20eu07.ini)=20UWAGA!=20nie=20testowane=20bo=20nie=20mo?= =?UTF-8?q?g=C4=99=20otworzy=C4=87=20projektu.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Console/MWD.cpp | 2 +- Globals.cpp | 2 ++ Globals.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Console/MWD.cpp b/Console/MWD.cpp index 1ff3827a..5ba6a48b 100644 --- a/Console/MWD.cpp +++ b/Console/MWD.cpp @@ -174,7 +174,7 @@ bool MWDComm::Run() // wywo if(GetMWDState()) { SendData(); - ReadData(); + if (Global::bMWDInputDataEnable) ReadData(); return 1; }else { diff --git a/Globals.cpp b/Globals.cpp index 73e94160..bf849dd1 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -552,6 +552,8 @@ void Global::ConfigParse(TQueryParserComp *qp, cParser *cp) if (bMWDdebugEnable) WriteLog("PortName " + AnsiString(iMWDBaudrate)); }else if (str == AnsiString("mwdbreakenable")){ // czy włączyć obsługę hamulców bMWDBreakEnable = (GetNextSymbol().LowerCase() == AnsiString("yes")); + }else if (str == AnsiString("mwdinputenable")){ + bMWDInputDataEnable = (GetNextSymbol().LowerCase() == AnsiString("yes")); }else if(str == AnsiString("mwdbreak")) // wartość max dla potencjometru hamulca zasadniczego { i = GetNextSymbol().ToIntDef(-1); // numer wejścia diff --git a/Globals.h b/Globals.h index a9115ddb..258e7a1d 100644 --- a/Globals.h +++ b/Globals.h @@ -330,6 +330,7 @@ class Global static unsigned long int iMWDBaudrate; static AnsiString sMWDPortId; static bool bMWDBreakEnable; + static bool bMWDInputDataEnable; static double fMWDAnalogCalib[4][3]; static double fMWDzg[2]; static double fMWDpg[2];