diff --git a/assets/webconfig/i18n/de.json b/assets/webconfig/i18n/de.json index 655f6485..a87e3c75 100644 --- a/assets/webconfig/i18n/de.json +++ b/assets/webconfig/i18n/de.json @@ -352,6 +352,7 @@ "edt_dev_spec_lightid_itemtitle" : "ID", "edt_dev_spec_transistionTime_title" : "Übergangszeit", "edt_dev_spec_switchOffOnBlack_title" : "Aus bei schwarz", + "edt_dev_spec_brightnessFactor_title" : "Helligkeitsfaktor", "edt_dev_spec_uid_title" : "UID", "edt_dev_spec_intervall_title" : "Intervall", "edt_dev_spec_latchtime_title" : "Sperrzeit", diff --git a/assets/webconfig/i18n/en.json b/assets/webconfig/i18n/en.json index bcb4202f..7bbf0173 100644 --- a/assets/webconfig/i18n/en.json +++ b/assets/webconfig/i18n/en.json @@ -353,6 +353,7 @@ "edt_dev_spec_lightid_itemtitle" : "ID", "edt_dev_spec_transistionTime_title" : "Transistion time", "edt_dev_spec_switchOffOnBlack_title" : "Switch off on black", + "edt_dev_spec_brightnessFactor_title" : "Brightness factor", "edt_dev_spec_uid_title" : "UID", "edt_dev_spec_intervall_title" : "Intervall", "edt_dev_spec_latchtime_title" : "Latch time", diff --git a/libsrc/leddevice/LedDevicePhilipsHue.cpp b/libsrc/leddevice/LedDevicePhilipsHue.cpp index ce4e1d68..3231ea04 100755 --- a/libsrc/leddevice/LedDevicePhilipsHue.cpp +++ b/libsrc/leddevice/LedDevicePhilipsHue.cpp @@ -328,7 +328,7 @@ bool LedDevicePhilipsHue::init(const QJsonObject &deviceConfig) bridge = { _log, manager, deviceConfig["output"].toString(), deviceConfig["username"].toString("newdeveloper")}; switchOffOnBlack = deviceConfig["switchOffOnBlack"].toBool(true); - brightnessFactor = (float) deviceConfig["transitiontime"].toDouble(1.0); + brightnessFactor = (float) deviceConfig["brightnessFactor"].toDouble(1.0); transitionTime = deviceConfig["transitiontime"].toInt(1); lightIds.clear(); QJsonArray lArray = deviceConfig["lightIds"].toArray(); diff --git a/libsrc/leddevice/schemas/schema-philipshue.json b/libsrc/leddevice/schemas/schema-philipshue.json index 0e1dd1e0..9685e641 100644 --- a/libsrc/leddevice/schemas/schema-philipshue.json +++ b/libsrc/leddevice/schemas/schema-philipshue.json @@ -13,6 +13,27 @@ "default": "newdeveloper", "propertyOrder" : 2 }, + "transitiontime": { + "type": "integer", + "title":"edt_dev_spec_transistionTime_title", + "default" : 1, + "append" : "x100ms", + "propertyOrder" : 3 + }, + "switchOffOnBlack": { + "type": "boolean", + "title":"edt_dev_spec_switchOffOnBlack_title", + "default" : true, + "propertyOrder" : 4 + }, + "brightnessFactor": { + "type": "number", + "title":"edt_dev_spec_brightnessFactor_title", + "default" : 1.0, + "minimum" : 0.0, + "maximum" : 1.0, + "propertyOrder" : 5 + }, "lightIds": { "type": "array", "title":"edt_dev_spec_lightid_title", @@ -20,25 +41,6 @@ "type" : "integer", "title" : "edt_dev_spec_lightid_itemtitle" }, - "propertyOrder" : 3 - }, - "transitiontime": { - "type": "integer", - "title":"edt_dev_spec_transistionTime_title", - "default" : 1, - "append" : "x100ms", - "propertyOrder" : 4 - }, - "switchOffOnBlack": { - "type": "boolean", - "title":"edt_dev_spec_switchOffOnBlack_title", - "default" : true, - "propertyOrder" : 5 - }, - "brightnessFactor": { - "type": "number", - "title":"edt_dev_spec_brightnessFactor_title", - "default" : 1.0, "propertyOrder" : 6 } },