frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

make proto uses priorityRegister

Browse Source
This commit is contained in:
redpanther
2016-07-16 22:51:31 +02:00
parent 505b83f028
commit a8da7acd14
11 changed files with 69 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libsrc/jsonserver/JsonClientConnection.cpp
View File

@@ -387,6 +387,7 @@ void JsonClientConnection::handleServerInfoCommand(const Json::Value &)
Json::Value & priorities = info["priorities"] = Json::Value(Json::arrayValue);
uint64_t now = QDateTime::currentMSecsSinceEpoch();
QList<int> activePriorities = _hyperion->getActivePriorities();
const Hyperion::PriorityRegister& priorityRegister = _hyperion->getPriorityRegister();
foreach (int priority, activePriorities) {
const Hyperion::InputInfo & priorityInfo = _hyperion->getPriorityInfo(priority);
Json::Value & item = priorities[priorities.size()];
@@ -395,6 +396,16 @@ void JsonClientConnection::handleServerInfoCommand(const Json::Value &)
{
item["duration_ms"] = Json::Value::UInt(priorityInfo.timeoutTime_ms - now);
}
item["owner"] = "unknown";
for(auto const &entry : priorityRegister)
{
if (entry.second == priority)
{
item["owner"] = entry.first;
break;
}
}
}
// collect temperature correction information