eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

(uart) handle none arg in uartfeature; use new syntax in config debug output

Browse Source
This commit is contained in:
Marcin Nowak
2022-11-05 11:48:43 +02:00
committed by Milek7
parent 9b1e0d5090
commit 556af193ac
2 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Globals.cpp
View File

@@ -749,20 +749,11 @@ global_settings::ConfigParse(cParser &Parser) {
Parser.getTokens(1);
std::string firstToken = Parser.peek();
std::map<std::string, bool*> features_map = {
{"main", &uart_conf.mainenable},
{"scnd", &uart_conf.scndenable},
{"train", &uart_conf.trainenable},
{"local", &uart_conf.localenable},
{"radiovolume", &uart_conf.radiovolumeenable},
{"radiochannel", &uart_conf.radiochannelenable}
};
if(firstToken.find('|') != std::string::npos || features_map.count(firstToken)) {
if(firstToken.find('|') != std::string::npos || firstToken == "none" || uartfeatures_map.count(firstToken)) {
// new format (features delimited by pipe)
// all settings should be disabled initially
for(auto const &x : features_map) {
for(auto const &x : uartfeatures_map) {
*(x.second) = false;
}
@@ -773,8 +764,8 @@ global_settings::ConfigParse(cParser &Parser) {
while(!firstTokenStream.eof()) {
std::getline(firstTokenStream, key, '|');
if(features_map.count(key)) {
*(features_map[key]) = true;
if(uartfeatures_map.count(key)) {
*(uartfeatures_map[key]) = true;
}
}
} else {
@@ -1399,12 +1390,25 @@ global_settings::export_as_text( std::ostream &Output ) const {
<< uart_conf.lvmax << " "
<< uart_conf.lvuart << "\n";
export_as_text( Output, "uarttachoscale", uart_conf.tachoscale );
Output
<< "uartfeature "
<< uart_conf.mainenable << " "
<< uart_conf.scndenable << " "
<< uart_conf.trainenable << " "
<< uart_conf.localenable << "\n";
std::vector<std::string> enabled_uartfeatures;
for(auto const &x : uartfeatures_map) {
if(*(x.second)) {
enabled_uartfeatures.push_back(x.first);
}
}
Output << "uartfeature ";
if(enabled_uartfeatures.empty()) {
Output << "none\n";
} else {
for(auto const &feature : enabled_uartfeatures) {
Output << feature;
if(&feature != &enabled_uartfeatures.back()) {
Output << "|";
}
}
Output << "\n";
}
export_as_text( Output, "uartdebug", uart_conf.debug );
#endif

8
Globals.h
View File

@@ -200,6 +200,14 @@ struct global_settings {
int iPoKeysPWM[ 7 ] = { 0, 1, 2, 3, 4, 5, 6 }; // numery wejść dla PWM
#ifdef WITH_UART
uart_input::conf_t uart_conf;
std::map<std::string, bool *> uartfeatures_map = {
{"main", &uart_conf.mainenable},
{"scnd", &uart_conf.scndenable},
{"train", &uart_conf.trainenable},
{"local", &uart_conf.localenable},
{"radiovolume", &uart_conf.radiovolumeenable},
{"radiochannel", &uart_conf.radiochannelenable}
};
#endif
#ifdef WITH_ZMQ
std::string zmq_address;