Invert color temperature percentage range

Signed-off-by: Michael Krug <[email protected]>
openhab · Oct 10, 2023 · d152447 · d152447
1 parent 229f057
commit d152447
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/functions/commands/colorabsolutetemperature.js b/functions/commands/colorabsolutetemperature.js
@@ -42,10 +42,7 @@ class ColorAbsoluteTemperature extends DefaultCommand {
           return convertMired(params.color.temperature).toString();
         }
         const { temperatureMinK, temperatureMaxK } = SpecialColorLight.getAttributes(item).colorTemperatureRange;
-        return (
-          100 -
-          ((params.color.temperature - temperatureMinK) / (temperatureMaxK - temperatureMinK)) * 100
-        ).toString();
+        return (((params.color.temperature - temperatureMinK) / (temperatureMaxK - temperatureMinK)) * 100).toString();
       } catch (error) {
         return '0';
       }

diff --git a/functions/devices/specialcolorlight.js b/functions/devices/specialcolorlight.js
@@ -94,7 +94,7 @@ class SpecialColorLight extends DefaultDevice {
               state.color = {
                 temperatureK:
                   temperatureMinK +
-                  Math.round(((temperatureMaxK - temperatureMinK) / 100) * (100 - Number(members[member].state)) || 0)
+                  Math.round(((temperatureMaxK - temperatureMinK) / 100) * Number(members[member].state) || 0)
               };
             }
           } catch (error) {

diff --git a/tests/commands/colorabsolutetemperature.test.js b/tests/commands/colorabsolutetemperature.test.js
@@ -54,7 +54,7 @@ describe('ColorAbsoluteTemperature Command', () => {
         }
       };
       const device = { customData: { deviceType: 'SpecialColorLight' } };
-      expect(Command.convertParamsToValue(params, item, device)).toBe('75');
+      expect(Command.convertParamsToValue(params, item, device)).toBe('25');
       expect(Command.convertParamsToValue(params, { state: '100,100,50' }, device)).toBe('0');
     });
 

diff --git a/tests/devices/specialcolorlight.test.js b/tests/devices/specialcolorlight.test.js
@@ -305,7 +305,7 @@ describe('SpecialColorLight Device', () => {
             }
           },
           {
-            state: '23',
+            state: '77',
             metadata: {
               ga: {
                 value: 'lightColorTemperature'
@@ -422,7 +422,7 @@ describe('SpecialColorLight Device', () => {
             }
           },
           {
-            state: '20',
+            state: '80',
             metadata: {
               ga: {
                 value: 'lightColorTemperature'
@@ -469,7 +469,7 @@ describe('SpecialColorLight Device', () => {
             }
           },
           {
-            state: '20',
+            state: '80',
             metadata: {
               ga: {
                 value: 'lightColorTemperature'
@@ -567,7 +567,7 @@ describe('SpecialColorLight Device', () => {
             }
           },
           {
-            state: '20',
+            state: '80',
             metadata: {
               ga: {
                 value: 'lightColorTemperature'