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

git changes

Browse Source
This commit is contained in:
milek7
2017-09-26 15:38:08 +02:00
parent 5add2c5f1c
commit 8dd119066f
3 changed files with 58 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Globals.cpp
View File

@@ -749,7 +749,6 @@ void Global::ConfigParse(cParser &Parser)
Global::uart_conf.enable = true;
Parser >> Global::uart_conf.port;
Parser >> Global::uart_conf.baud;
Parser >> Global::uart_conf.interval;
Parser >> Global::uart_conf.updatetime;
}
else if (token == "uarttune")
@@ -770,6 +769,19 @@ void Global::ConfigParse(cParser &Parser)
>> Global::uart_conf.currentmax
>> Global::uart_conf.currentuart;
}
else if (token == "uartfeature")
{
Parser.getTokens(4);
Parser >> Global::uart_conf.mainenable
>> Global::uart_conf.scndenable
>> Global::uart_conf.trainenable
>> Global::uart_conf.localenable;
}
else if (token == "uartdebug")
{
Parser.getTokens(1);
Parser >> Global::uart_conf.debug;
}
} while ((token != "") && (token != "endconfig")); //(!Parser->EndOfFile)
// na koniec trochę zależności
if (!bLoadTraction) // wczytywanie drutów i słupów