Added support for dimming via core:LightIntensityState

Excodibur · Aug 26, 2022 · 97a8c5f · 97a8c5f
1 parent c8f175f
commit 97a8c5f
Show file tree

Hide file tree

Showing 8 changed files with 9,362 additions and 195 deletions.
diff --git a/.github/workflows/build-test-release.yml b/.github/workflows/build-test-release.yml
@@ -21,7 +21,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                node-version: [14.x]
+                node-version: [14.x, 16.x]
 
         steps:
             - uses: actions/checkout@v3

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,9 @@
 	Placeholder for the next version (add instead of version-number-headline below):
 	## **WORK IN PROGRESS**
 -->
+## 0.8.0 (2022-08-26)
+- Added support for dimming via core:LightIntensityState
+
 ## 0.7.2 (2022-06-15)
 - Fix switching between local and online api
 

diff --git a/io-package.json b/io-package.json
diff --git a/lib/tahoma.js b/lib/tahoma.js
@@ -199,6 +199,13 @@ Tahoma.prototype.getCreateStateOptions4Widget = function (widget) {
                 "role": "sensor"
             };
 
+        case "DimmerLight":
+            return {
+                "role": "light.dimmer",
+                "features": {
+                    "intensity": true
+                }
+            };
         default:
             return {
                 "role": "state"
@@ -253,6 +260,16 @@ Tahoma.prototype.getCreateStateOptions4State = function (widget, stateName) {
             "write": true, // mandatory, default true
             "role": "switch" // mandatory
         };
+    } else if (stateName === "core:LightIntensityState") {
+        return {
+            "type": "number", // optional,  default "number"
+            "read": true, // mandatory, default true
+            "write": true, // mandatory, default true
+            "min": 0, // optional,  default 0
+            "max": 100, // optional,  default 100
+            "unit": "W", // optional,  default W
+            "role": "level.dimmer" // mandatory
+        };
     } else {
         return {
             "read": true,
@@ -1299,11 +1316,11 @@ Tahoma.prototype.updateDeviceState = function (event) {
             if (object.type === "channel") {
                 try {
                     let subStates;
-                    if(typeof value === "object") {
+                    if (typeof value === "object")
                         subStates = value;
-                    } else {
+                    else
                         subStates = JSON.parse(value);
-                    }
+
                     const channelPath = key;
                     for (const [attrName, attrValue] of Object.entries(subStates)) {
                         controller.ackStateValues[channelPath + "." + attrName] = attrValue;
@@ -1382,6 +1399,9 @@ Tahoma.prototype.onApplyChange = function (attribute, id, value, slow) {
     } else if (attribute === "onoff") {
         commandName = "setOnOff";
         stateName = "core:OnOffState";
+    } else if (attribute === "intensity") {
+        commandName = "setIntensity";
+        stateName = "core:LightIntensityState";
     }
 
     controller.context.getState(id.substr(0, id.indexOf(".states.")) + ".deviceURL", function (err, state) {
@@ -1547,6 +1567,10 @@ Tahoma.prototype.onOnOffStateChange = function (id, value) {
     return controller.onApplyChange("onoff", id, value);
 };
 
+Tahoma.prototype.onIntensityStateChange = function (id, value) {
+    return controller.onApplyChange("intensity", id, value);
+};
+
 Tahoma.prototype.onExecuteCommand = function (id) {
     controller.context.getState(id.substr(0, id.indexOf(".commands.")) + ".oid", function (err, state) {
         if (!err && state) {

diff --git a/main.js b/main.js
@@ -174,6 +174,8 @@ function processStateChange (id, value) {
         controller.onSetOrientation(id, value);
     else if (id.match(/^actionGroups.*\.commands\.execute/) && value)
         controller.onExecuteCommand(id, value);
+    else if (id.match(/^devices.*\.states\.core:LightIntensityState$/))
+        controller.onIntensityStateChange(id, value);
     else if (id.match(/^devices.*\.commands\./) && value) {
         if (id.endsWith(":slow")) {
             adapter.log.debug("Triggered command with slow mode: " + id);