merge from 4.2.0

This commit is contained in:
2020-04-07 15:14:27 +02:00
parent ab9fed45fb
commit 9f3ad4e2f4
11 changed files with 119 additions and 125 deletions

View File

@ -11,7 +11,7 @@ std::string ToString(const defs::runStatus s) {
case defs::RUNNING:
return std::string("running");
case defs::TRANSMITTING:
return std::string("data");
return std::string("transmitting");
case defs::RUN_FINISHED:
return std::string("finished");
case defs::STOPPED: