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

Dodana blokada odbioru danych (wpis w pliku eu07.ini) UWAGA! nie testowane bo nie mogę otworzyć projektu.

Browse Source
This commit is contained in:
maciek001
2016-12-16 16:49:30 +01:00
parent 7bdab303bb
commit 0fbdebae8c
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Console/MWD.cpp
View File

@@ -174,7 +174,7 @@ bool MWDComm::Run() // wywo
if(GetMWDState()) if(GetMWDState())
{ {
SendData(); SendData();
ReadData(); if (Global::bMWDInputDataEnable) ReadData();
return 1; return 1;
}else }else
{ {

2
Globals.cpp
View File

@@ -552,6 +552,8 @@ void Global::ConfigParse(TQueryParserComp *qp, cParser *cp)
if (bMWDdebugEnable) WriteLog("PortName " + AnsiString(iMWDBaudrate)); if (bMWDdebugEnable) WriteLog("PortName " + AnsiString(iMWDBaudrate));
}else if (str == AnsiString("mwdbreakenable")){ // czy w³¹czyæ obs³ugê hamulców }else if (str == AnsiString("mwdbreakenable")){ // czy w³¹czyæ obs³ugê hamulców
bMWDBreakEnable = (GetNextSymbol().LowerCase() == AnsiString("yes")); 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 }else if(str == AnsiString("mwdbreak")) // wartoϾ max dla potencjometru hamulca zasadniczego
{ {
i = GetNextSymbol().ToIntDef(-1); // numer wejœcia i = GetNextSymbol().ToIntDef(-1); // numer wejœcia

1
Globals.h
View File

@@ -330,6 +330,7 @@ class Global
static unsigned long int iMWDBaudrate; static unsigned long int iMWDBaudrate;
static AnsiString sMWDPortId; static AnsiString sMWDPortId;
static bool bMWDBreakEnable; static bool bMWDBreakEnable;
static bool bMWDInputDataEnable;
static double fMWDAnalogCalib[4][3]; static double fMWDAnalogCalib[4][3];
static double fMWDzg[2]; static double fMWDzg[2];
static double fMWDpg[2]; static double fMWDpg[2];