ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #315: Fix grouping by base interface

Browse Source
This commit is contained in:
Jenkins nymea 2020-01-31 01:01:10 +01:00
commit 4cbd4f2531
1 changed files with 52 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
libnymea-common/types/deviceclass.cpp
View File

@ -112,59 +112,60 @@ void DeviceClass::setInterfaces(const QStringList &interfaces)
QString DeviceClass::baseInterface() const QString DeviceClass::baseInterface() const
{ {
if (m_interfaces.contains("gateway")) { foreach (const QString &interface, m_interfaces) {
return "gateway"; if (interface == "gateway") {
} return "gateway";
if (m_interfaces.contains("shutter")) { }
return "shutter"; if (interface == "shutter") {
} return "shutter";
if (m_interfaces.contains("blind")) { }
return "blind"; if (interface == "blind") {
} return "blind";
if (m_interfaces.contains("garagegate")) { }
return "garagegate"; if (interface == "garagegate") {
} return "garagegate";
if (m_interfaces.contains("inputtrigger")) { }
return "inputtrigger"; if (interface == "inputtrigger") {
} return "inputtrigger";
if (m_interfaces.contains("awning")) { }
return "awning"; if (interface == "awning") {
} return "awning";
if (m_interfaces.contains("outputtrigger")) { }
return "outputtrigger"; if (interface == "outputtrigger") {
} return "outputtrigger";
if (m_interfaces.contains("light")) { }
return "light"; if (interface == "light") {
} return "light";
if (m_interfaces.contains("sensor")) { }
return "sensor"; if (interface == "sensor") {
} return "sensor";
if (m_interfaces.contains("weather")) { }
return "weather"; if (interface == "weather") {
} return "weather";
if (m_interfaces.contains("media")) { }
return "media"; if (interface == "media") {
} return "media";
if (m_interfaces.contains("button") || m_interfaces.contains("powerswitch")) { }
return "button"; if (interface == "button" || interface == "powerswitch") {
} return "button";
if (m_interfaces.contains("notifications")) { }
return "notifications"; if (interface == "notifications") {
} return "notifications";
if (m_interfaces.contains("smartmeter")) { }
return "smartmeter"; if (interface == "powersocket") {
} return "powersocket";
if (m_interfaces.contains("heating")) { }
return "heating"; if (interface == "smartmeter") {
} return "smartmeter";
if (m_interfaces.contains("evcharger")) { }
return "evcharger"; if (interface == "heating") {
} return "heating";
if (m_interfaces.contains("powersocket")) { }
return "powersocket"; if (interface == "evcharger") {
return "evcharger";
}
} }
return "uncategorized"; return "uncategorized";
} }
bool DeviceClass::browsable() const bool DeviceClass::browsable() const