diff --git a/libguh/guhsettings.cpp b/libguh/guhsettings.cpp index 1077dc05..7d8660cc 100644 --- a/libguh/guhsettings.cpp +++ b/libguh/guhsettings.cpp @@ -293,7 +293,6 @@ void GuhSettings::remove(const QString &key) /*! Sets the \a value of setting \a key to value. If the \a key already exists, the previous value is overwritten. */ void GuhSettings::setValue(const QString &key, const QVariant &value) { - //Q_ASSERT_X(m_role != GuhSettings::SettingsRoleGlobal, "GuhSettings", "Bad settings usage. The global settings file should be read only."); m_settings->setValue(key, value); } diff --git a/libguh/plugin/deviceclass.cpp b/libguh/plugin/deviceclass.cpp index 85265b86..679036db 100644 --- a/libguh/plugin/deviceclass.cpp +++ b/libguh/plugin/deviceclass.cpp @@ -146,6 +146,8 @@ \value DeviceIconMail \value DeviceIconNetwork \value DeviceIconCloud + \value DeviceIconGarage, + \value DeviceIconRollerShutter */ /*! \fn void DeviceClass::setBasicTags(const QList &basicTags); diff --git a/libguh/plugin/deviceclass.h b/libguh/plugin/deviceclass.h index 0d30a8bf..240f1def 100644 --- a/libguh/plugin/deviceclass.h +++ b/libguh/plugin/deviceclass.h @@ -112,7 +112,9 @@ public: DeviceIconGateway, DeviceIconMail, DeviceIconNetwork, - DeviceIconCloud + DeviceIconCloud, + DeviceIconGarage, + DeviceIconRollerShutter }; DeviceClass(const PluginId &pluginId = PluginId(), const VendorId &vendorId = VendorId(), const DeviceClassId &id = DeviceClassId()); diff --git a/plugins/deviceplugins/awattar/devicepluginawattar.json b/plugins/deviceplugins/awattar/devicepluginawattar.json index 680d0fef..1288a5fc 100644 --- a/plugins/deviceplugins/awattar/devicepluginawattar.json +++ b/plugins/deviceplugins/awattar/devicepluginawattar.json @@ -52,6 +52,7 @@ "type": "double", "index": 0, "unit": "EuroCentPerKiloWattHour", + "graphRelevant": true, "defaultValue": 0 }, { @@ -61,6 +62,7 @@ "index": 1, "type": "int", "unit": "Percentage", + "graphRelevant": true, "defaultValue": 0 }, { @@ -70,6 +72,8 @@ "index": 2, "unit": "UnixTime", "type": "int", + "ruleRelevant": false, + "eventRuleRelevant": false, "defaultValue": 0 }, { @@ -79,6 +83,7 @@ "index": 3, "type": "double", "unit": "EuroCentPerKiloWattHour", + "graphRelevant": true, "defaultValue": 0 }, { @@ -88,6 +93,8 @@ "index": 4, "type": "double", "unit": "EuroCentPerKiloWattHour", + "ruleRelevant": false, + "eventRuleRelevant": false, "defaultValue": 0 }, { @@ -97,6 +104,8 @@ "index": 5, "type": "double", "unit": "EuroCentPerKiloWattHour", + "ruleRelevant": false, + "eventRuleRelevant": false, "defaultValue": 0 }, { @@ -136,6 +145,8 @@ "name": "sync mode", "index": 9, "type": "QString", + "ruleRelevant": false, + "eventRuleRelevant": false, "possibleValues": [ "auto", "manual" diff --git a/plugins/deviceplugins/dollhouse/deviceplugindollhouse.json b/plugins/deviceplugins/dollhouse/deviceplugindollhouse.json index 23682b8e..9df892b6 100644 --- a/plugins/deviceplugins/dollhouse/deviceplugindollhouse.json +++ b/plugins/deviceplugins/dollhouse/deviceplugindollhouse.json @@ -79,6 +79,8 @@ "index": 0, "type": "QColor", "defaultValue": "#fff30a", + "ruleRelevant": false, + "eventRuleRelevant": false, "writable": true }, { @@ -91,6 +93,8 @@ "minValue": 0, "maxValue": 100, "defaultValue": 100, + "ruleRelevant": false, + "eventRuleRelevant": false, "writable": true }, { diff --git a/plugins/deviceplugins/elgato/devicepluginelgato.json b/plugins/deviceplugins/elgato/devicepluginelgato.json index f3224c54..b54f2e64 100644 --- a/plugins/deviceplugins/elgato/devicepluginelgato.json +++ b/plugins/deviceplugins/elgato/devicepluginelgato.json @@ -51,7 +51,12 @@ "minimumValue": 0, "maximumValue": 100, "defaultValue": 100, - "writable": true + "ruleRelevant": false, + "eventRuleRelevant": false, + "writable": { + "minValue": 0, + "maxValue": 100 + } }, { "id": "2073b44b-2f99-4abf-8d9f-6b33be8e1763", @@ -62,7 +67,12 @@ "minimumValue": 0, "maximumValue": 100, "defaultValue": 100, - "writable": true + "ruleRelevant": false, + "eventRuleRelevant": false, + "writable": { + "minValue": 0, + "maxValue": 100 + } } ], "actionTypes": [ diff --git a/plugins/deviceplugins/eq-3/deviceplugineq-3.json b/plugins/deviceplugins/eq-3/deviceplugineq-3.json index ba2fdaad..b63fc753 100644 --- a/plugins/deviceplugins/eq-3/deviceplugineq-3.json +++ b/plugins/deviceplugins/eq-3/deviceplugineq-3.json @@ -60,6 +60,8 @@ "name": "portal enabled", "index": 1, "type": "bool", + "ruleRelevant": false, + "eventRuleRelevant": false, "defaultValue": false } ] @@ -160,6 +162,8 @@ "type": "double", "index": 1, "unit": "DegreeCelsius", + "ruleRelevant": false, + "eventRuleRelevant": false, "defaultValue": 0 }, { @@ -169,6 +173,8 @@ "type": "double", "index": 2, "unit": "DegreeCelsius", + "ruleRelevant": false, + "eventRuleRelevant": false, "defaultValue": 0 }, { @@ -178,6 +184,8 @@ "type": "double", "index": 3, "unit": "DegreeCelsius", + "ruleRelevant": false, + "eventRuleRelevant": false, "defaultValue": 0 }, { @@ -218,6 +226,8 @@ "name": "panel locked", "type": "bool", "index": 8, + "ruleRelevant": false, + "eventRuleRelevant": false, "defaultValue": false }, { @@ -226,6 +236,8 @@ "name": "gateway known", "type": "bool", "index": 9, + "ruleRelevant": false, + "eventRuleRelevant": false, "defaultValue": false }, { @@ -234,6 +246,8 @@ "name": "dts active", "type": "bool", "index": 10, + "ruleRelevant": false, + "eventRuleRelevant": false, "defaultValue": false }, { @@ -362,6 +376,8 @@ "name": "max setpoint", "unit": "DegreeCelsius", "type": "double", + "ruleRelevant": false, + "eventRuleRelevant": false, "defaultValue": 0, "index": 2 }, @@ -371,6 +387,8 @@ "name": "min setpoint", "unit": "DegreeCelsius", "type": "double", + "ruleRelevant": false, + "eventRuleRelevant": false, "defaultValue": 0, "index": 3 }, @@ -400,7 +418,7 @@ }, { "id": "aff38be8-7ea6-4fd8-b0fa-e987ab05c719", - "idName": "batteryLow", + "idName": "linkStatusOk", "name": "link status ok", "type": "bool", "defaultValue": false, @@ -411,6 +429,8 @@ "idName": "panelLocked", "name": "panel locked", "type": "bool", + "ruleRelevant": false, + "eventRuleRelevant": false, "defaultValue": false, "index": 8 }, @@ -419,6 +439,8 @@ "idName": "gatewayKnown", "name": "gateway known", "type": "bool", + "ruleRelevant": false, + "eventRuleRelevant": false, "defaultValue": false, "index": 9 }, @@ -427,6 +449,8 @@ "idName": "dtsActive", "name": "dts active", "type": "bool", + "ruleRelevant": false, + "eventRuleRelevant": false, "defaultValue": false, "index": 10 }, @@ -487,6 +511,8 @@ "name": "boost duration", "unit": "Seconds", "type": "int", + "ruleRelevant": false, + "eventRuleRelevant": false, "defaultValue": 0, "index": 17 }, @@ -496,6 +522,8 @@ "name": "discalc weekday", "type": "QString", "defaultValue": "", + "ruleRelevant": false, + "eventRuleRelevant": false, "index": 18 }, { diff --git a/plugins/deviceplugins/kodi/devicepluginkodi.json b/plugins/deviceplugins/kodi/devicepluginkodi.json index 7a24b65b..b2a360df 100644 --- a/plugins/deviceplugins/kodi/devicepluginkodi.json +++ b/plugins/deviceplugins/kodi/devicepluginkodi.json @@ -55,6 +55,8 @@ "index": 1, "type": "bool", "defaultValue": true, + "ruleRelevant": false, + "eventRuleRelevant": false, "writable": true }, { @@ -66,6 +68,8 @@ "index": 2, "minValue": 0, "maxValue": 100, + "ruleRelevant": false, + "eventRuleRelevant": false, "defaultValue": 50, "writable": true } diff --git a/plugins/deviceplugins/lgsmarttv/devicepluginlgsmarttv.json b/plugins/deviceplugins/lgsmarttv/devicepluginlgsmarttv.json index 78701a2a..9985447c 100644 --- a/plugins/deviceplugins/lgsmarttv/devicepluginlgsmarttv.json +++ b/plugins/deviceplugins/lgsmarttv/devicepluginlgsmarttv.json @@ -82,6 +82,8 @@ "name": "volume level", "index": 2, "type": "int", + "ruleRelevant": false, + "eventRuleRelevant": false, "unit": "Percentage", "defaultValue": 0 }, @@ -130,6 +132,8 @@ "idName": "tvInputSourceIndex", "name": "input source index", "index": 8, + "ruleRelevant": false, + "eventRuleRelevant": false, "type": "int", "defaultValue": 0 }, @@ -138,6 +142,8 @@ "idName": "tvInputSourceLabelName", "name": "input source label", "index": 9, + "ruleRelevant": false, + "eventRuleRelevant": false, "type": "QString", "defaultValue": "-" } diff --git a/plugins/deviceplugins/mock/devicepluginmock.json b/plugins/deviceplugins/mock/devicepluginmock.json index 9885486d..f7a108d7 100644 --- a/plugins/deviceplugins/mock/devicepluginmock.json +++ b/plugins/deviceplugins/mock/devicepluginmock.json @@ -385,6 +385,8 @@ "index": 0, "type": "QColor", "defaultValue": "#000000", + "ruleRelevant": false, + "eventRuleRelevant": false, "writable": true }, { @@ -395,6 +397,7 @@ "index": 1, "unit": "Percentage", "defaultValue": 0, + "ruleRelevant": false, "minValue": 0, "maxValue": 100, "writable": true diff --git a/plugins/deviceplugins/netatmo/devicepluginnetatmo.json b/plugins/deviceplugins/netatmo/devicepluginnetatmo.json index b480e9f4..b5fa1b5d 100644 --- a/plugins/deviceplugins/netatmo/devicepluginnetatmo.json +++ b/plugins/deviceplugins/netatmo/devicepluginnetatmo.json @@ -94,6 +94,8 @@ "index": 0, "unit": "UnixTime", "type": "int", + "ruleRelevant": false, + "eventRuleRelevant": false, "defaultValue": 0 }, { @@ -102,6 +104,7 @@ "name": "temperature", "index": 1, "unit": "DegreeCelsius", + "graphRelevant": true, "type": "double", "defaultValue": 0 }, @@ -128,6 +131,7 @@ "idName": "humidity", "name": "humidity", "index": 4, + "graphRelevant": true, "unit": "Percentage", "type": "int", "defaultValue": 0 @@ -138,6 +142,7 @@ "name": "pressure", "index": 5, "unit": "MilliBar", + "graphRelevant": true, "type": "double", "defaultValue": 0 }, @@ -146,6 +151,7 @@ "idName": "noise", "name": "noise", "index": 6, + "graphRelevant": true, "unit": "Dezibel", "type": "int", "defaultValue": 0 @@ -155,6 +161,7 @@ "idName": "co2", "name": "co2", "index": 7, + "graphRelevant": true, "unit": "PartsPerMillion", "type": "int", "defaultValue": 0 @@ -164,6 +171,8 @@ "idName": "wifiStrength", "name": "wifi signal strength", "index": 8, + "ruleRelevant": false, + "eventRuleRelevant": false, "unit": "Percentage", "type": "int", "defaultValue": 0 @@ -220,6 +229,8 @@ "name": "last update", "index": 0, "unit": "UnixTime", + "ruleRelevant": false, + "eventRuleRelevant": false, "type": "int", "defaultValue": 0 }, @@ -227,6 +238,7 @@ "id": "3cb25538-e463-40ae-92f9-8f34f0c06b92", "idName": "temperature", "name": "temperature", + "graphRelevant": true, "index": 1, "unit": "DegreeCelsius", "type": "double", @@ -254,6 +266,7 @@ "id": "e2db5f01-196a-48d1-8874-6b8cbfe0d8c9", "idName": "humidity", "name": "humidity", + "graphRelevant": true, "index": 4, "unit": "Percentage", "type": "int", @@ -265,6 +278,8 @@ "name": "signal strength", "index": 5, "unit": "Percentage", + "ruleRelevant": false, + "eventRuleRelevant": false, "type": "int", "defaultValue": 0 }, diff --git a/plugins/deviceplugins/openweathermap/devicepluginopenweathermap.json b/plugins/deviceplugins/openweathermap/devicepluginopenweathermap.json index f3340050..21c66b7e 100644 --- a/plugins/deviceplugins/openweathermap/devicepluginopenweathermap.json +++ b/plugins/deviceplugins/openweathermap/devicepluginopenweathermap.json @@ -65,6 +65,8 @@ "name": "last update", "index": 0, "unit": "UnixTime", + "ruleRelevant": false, + "eventRuleRelevant": false, "type": "int", "defaultValue": 0 }, @@ -74,6 +76,7 @@ "name": "temperature", "index": 1, "unit": "DegreeCelsius", + "graphRelevant": true, "type": "double", "defaultValue": 0 }, @@ -108,6 +111,7 @@ "id": "4a42eea9-00eb-440b-915e-dbe42180f83b", "idName": "pressure", "name": "pressure", + "graphRelevant": true, "index": 5, "unit": "HectoPascal", "type": "double", @@ -119,6 +123,7 @@ "name": "wind speed", "index": 6, "unit": "MeterPerSecond", + "graphRelevant": true, "type": "double", "defaultValue": 0 }, @@ -136,6 +141,7 @@ "idName": "cloudiness", "name": "cloudiness", "unit": "Percentage", + "graphRelevant": true, "index": 8, "type": "int", "defaultValue": 0 @@ -146,6 +152,7 @@ "name": "visibility", "index": 9, "unit": "Meter", + "graphRelevant": true, "type": "int", "defaultValue": 0 }, diff --git a/plugins/deviceplugins/philipshue/devicepluginphilipshue.json b/plugins/deviceplugins/philipshue/devicepluginphilipshue.json index 588bb542..8d1669ae 100644 --- a/plugins/deviceplugins/philipshue/devicepluginphilipshue.json +++ b/plugins/deviceplugins/philipshue/devicepluginphilipshue.json @@ -83,6 +83,8 @@ "idName": "apiVersion", "name": "api version", "index": 1, + "ruleRelevant": false, + "eventRuleRelevant": false, "defaultValue": "-", "type": "QString" }, @@ -90,6 +92,8 @@ "id": "4c707b18-6604-4e6d-b6bc-4e27769c2adc", "idName": "softwareVersion", "name": "software version", + "ruleRelevant": false, + "eventRuleRelevant": false, "index": 2, "defaultValue": "-", "type": "QString" @@ -99,6 +103,7 @@ "idName": "updateStatus", "name": "update status", "index": 3, + "ruleRelevant": false, "type": "QString", "defaultValue": "Up to date", "possibleValues": [ @@ -221,6 +226,8 @@ "index": 2, "unit": "Mired", "defaultValue": 170, + "ruleRelevant": false, + "eventRuleRelevant": false, "minValue": 153, "maxValue": 500, "writable": true @@ -231,6 +238,8 @@ "name": "color", "index": 3, "type": "QColor", + "ruleRelevant": false, + "eventRuleRelevant": false, "defaultValue": "#000000", "writable": true @@ -241,6 +250,8 @@ "name": "brightness", "type": "int", "index": 4, + "ruleRelevant": false, + "eventRuleRelevant": false, "unit": "Percentage", "defaultValue": 0, "minValue": 0, @@ -253,6 +264,8 @@ "idName": "hueEffect", "name": "effect", "index": 5, + "ruleRelevant": false, + "eventRuleRelevant": false, "type": "QString", "defaultValue": "none", "possibleValues": [ @@ -371,6 +384,8 @@ "name": "brightness", "index": 2, "type": "int", + "ruleRelevant": false, + "eventRuleRelevant": false, "unit": "Percentage", "defaultValue": 0, "minValue": 0, diff --git a/plugins/deviceplugins/plantcare/devicepluginplantcare.json b/plugins/deviceplugins/plantcare/devicepluginplantcare.json index 44f08126..0d0b2429 100644 --- a/plugins/deviceplugins/plantcare/devicepluginplantcare.json +++ b/plugins/deviceplugins/plantcare/devicepluginplantcare.json @@ -51,6 +51,7 @@ "name": "moisture", "index": 1, "type": "int", + "graphRelevant": true, "unit": "Percentage", "defaultValue": 0 }, diff --git a/plugins/deviceplugins/wemo/devicepluginwemo.json b/plugins/deviceplugins/wemo/devicepluginwemo.json index 3d23f5ba..fa80042c 100644 --- a/plugins/deviceplugins/wemo/devicepluginwemo.json +++ b/plugins/deviceplugins/wemo/devicepluginwemo.json @@ -54,7 +54,6 @@ "type": "bool", "defaultValue": false, "writable": true - }, { "id": "ec2f5b49-585c-4455-a233-b7aa4c608dbc", diff --git a/plugins/deviceplugins/ws2812/devicepluginws2812.json b/plugins/deviceplugins/ws2812/devicepluginws2812.json index 742b4a45..ee78d304 100644 --- a/plugins/deviceplugins/ws2812/devicepluginws2812.json +++ b/plugins/deviceplugins/ws2812/devicepluginws2812.json @@ -59,6 +59,8 @@ "name": "color", "index": 2, "type": "QColor", + "ruleRelevant": false, + "eventRuleRelevant": false, "defaultValue": "#000000", "writable": true @@ -72,6 +74,8 @@ "unit": "Percentage", "defaultValue": 0, "minValue": 0, + "ruleRelevant": false, + "eventRuleRelevant": false, "maxValue": 100, "writable": true }, @@ -84,6 +88,8 @@ "defaultValue": 240, "minValue": 0, "maxValue": 240, + "ruleRelevant": false, + "eventRuleRelevant": false, "writable": true }, { @@ -95,6 +101,8 @@ "defaultValue": 60, "minValue": 60, "maxValue": 240, + "ruleRelevant": false, + "eventRuleRelevant": false, "writable": true }, { @@ -104,6 +112,8 @@ "index": 5, "type": "QString", "writable": true, + "ruleRelevant": false, + "eventRuleRelevant": false, "possibleValues": [ "Off", "Color On", @@ -124,6 +134,8 @@ "idName": "tcolor1", "index": 6, "type": "QColor", + "ruleRelevant": false, + "eventRuleRelevant": false, "defaultValue": "#000000", "writable": true @@ -134,6 +146,8 @@ "idName": "tcolor2", "index": 7, "type": "QColor", + "ruleRelevant": false, + "eventRuleRelevant": false, "defaultValue": "#000000", "writable": true @@ -144,6 +158,8 @@ "idName": "tcolor3", "index": 8, "type": "QColor", + "ruleRelevant": false, + "eventRuleRelevant": false, "defaultValue": "#000000", "writable": true } diff --git a/server/logging/logengine.cpp b/server/logging/logengine.cpp index 472441a4..736d0584 100644 --- a/server/logging/logengine.cpp +++ b/server/logging/logengine.cpp @@ -223,7 +223,6 @@ void LogEngine::logSystemEvent(const QDateTime &dateTime, bool active, Logging:: { LogEntry entry(dateTime, level, Logging::LoggingSourceSystem); entry.setActive(active); - qCDebug(dcLogEngine) << entry; appendLogEntry(entry); }