From 139c8002f2546c022b1465f89fcb904227a8ba4d Mon Sep 17 00:00:00 2001 From: Adrian Date: Thu, 31 May 2018 00:26:02 +0200 Subject: [PATCH 1/2] DimmerBed: Add saturisation control Other changes: * Set mode 0 = ct, 1 = hue, 2 = sat * on-long-* only change colors relatively for visual feedback --- DimmerBed/README.md | 4 ++-- DimmerBed/dn-hold-ct.rule.json | 4 ++-- DimmerBed/dn-hold-hue.rule.json | 2 +- DimmerBed/dn-hold-sat.rule.json | 29 ++++++++++++++++++++++++++ DimmerBed/on-long-ct.rule.json | 7 +++---- DimmerBed/on-long-hue.rule.json | 5 +++-- DimmerBed/on-long-sat.rule.json | 36 +++++++++++++++++++++++++++++++++ DimmerBed/up-hold-ct.rule.json | 4 ++-- DimmerBed/up-hold-hue.rule.json | 2 +- DimmerBed/up-hold-sat.rule.json | 29 ++++++++++++++++++++++++++ 10 files changed, 108 insertions(+), 14 deletions(-) create mode 100644 DimmerBed/dn-hold-sat.rule.json create mode 100644 DimmerBed/on-long-sat.rule.json create mode 100644 DimmerBed/up-hold-sat.rule.json diff --git a/DimmerBed/README.md b/DimmerBed/README.md index 5058417..6df28f3 100644 --- a/DimmerBed/README.md +++ b/DimmerBed/README.md @@ -6,10 +6,10 @@ This may be the case in the bedroom. The on and off buttons work as expected. -Pressing the on button longer toggles color and temperature mode. +Pressing the on button longer cycles temperature, color, and saturisation mode. Pressing the brightness buttons change the brightness, -holding the brightness buttons change the color or temperature accordingly. +holding the brightness buttons change the temperature, color, and saturisation respectively. ## Devices diff --git a/DimmerBed/dn-hold-ct.rule.json b/DimmerBed/dn-hold-ct.rule.json index de32c28..6bb56df 100644 --- a/DimmerBed/dn-hold-ct.rule.json +++ b/DimmerBed/dn-hold-ct.rule.json @@ -3,8 +3,8 @@ "conditions": [ { "address": "/sensors/MEMORY/state/status", - "operator": "gt", - "value": "0" + "operator": "lt", + "value": "1" }, { "address": "/sensors/DIMMER/state/buttonevent", diff --git a/DimmerBed/dn-hold-hue.rule.json b/DimmerBed/dn-hold-hue.rule.json index ad1864d..be1627f 100644 --- a/DimmerBed/dn-hold-hue.rule.json +++ b/DimmerBed/dn-hold-hue.rule.json @@ -3,7 +3,7 @@ "conditions": [ { "address": "/sensors/MEMORY/state/status", - "operator": "lt", + "operator": "eq", "value": "1" }, { diff --git a/DimmerBed/dn-hold-sat.rule.json b/DimmerBed/dn-hold-sat.rule.json new file mode 100644 index 0000000..85c009b --- /dev/null +++ b/DimmerBed/dn-hold-sat.rule.json @@ -0,0 +1,29 @@ +{ + "name": "BASENAME.dn-hold-sat", + "conditions": [ + { + "address": "/sensors/MEMORY/state/status", + "operator": "gt", + "value": "1" + }, + { + "address": "/sensors/DIMMER/state/buttonevent", + "operator": "eq", + "value": "3001" + }, + { + "address": "/sensors/DIMMER/state/lastupdated", + "operator": "dx" + } + ], + "actions": [ + { + "address": "/groups/GROUP/action", + "method": "PUT", + "body": { + "transitiontime": 1, + "sat_inc": -25 + } + } + ] +} diff --git a/DimmerBed/on-long-ct.rule.json b/DimmerBed/on-long-ct.rule.json index 46eb1d9..be75726 100644 --- a/DimmerBed/on-long-ct.rule.json +++ b/DimmerBed/on-long-ct.rule.json @@ -4,7 +4,7 @@ { "address": "/sensors/MEMORY/state/status", "operator": "gt", - "value": "0" + "value": "1" }, { "address": "/sensors/DIMMER/state/buttonevent", @@ -21,9 +21,8 @@ "address": "/groups/GROUP/action", "method": "PUT", "body": { - "bri": 203, - "hue": 60000, - "sat": 240 + "transitiontime": 1, + "ct_inc": 96 } }, { diff --git a/DimmerBed/on-long-hue.rule.json b/DimmerBed/on-long-hue.rule.json index 1dc800f..f2cb7fd 100644 --- a/DimmerBed/on-long-hue.rule.json +++ b/DimmerBed/on-long-hue.rule.json @@ -21,8 +21,9 @@ "address": "/groups/GROUP/action", "method": "PUT", "body": { - "bri": 203, - "ct": 357 + "transitiontime": 1, + "hue_inc": 40000, + "sat_inc": 100 } }, { diff --git a/DimmerBed/on-long-sat.rule.json b/DimmerBed/on-long-sat.rule.json new file mode 100644 index 0000000..5c22d3f --- /dev/null +++ b/DimmerBed/on-long-sat.rule.json @@ -0,0 +1,36 @@ +{ + "name": "BASENAME.on-long-sat", + "conditions": [ + { + "address": "/sensors/MEMORY/state/status", + "operator": "eq", + "value": "1" + }, + { + "address": "/sensors/DIMMER/state/buttonevent", + "operator": "eq", + "value": "1003" + }, + { + "address": "/sensors/DIMMER/state/lastupdated", + "operator": "dx" + } + ], + "actions": [ + { + "address": "/groups/GROUP/action", + "method": "PUT", + "body": { + "transitiontime": 1, + "sat_inc": -100 + } + }, + { + "address": "/sensors/MEMORY/state", + "method": "PUT", + "body": { + "status": 2 + } + } + ] +} diff --git a/DimmerBed/up-hold-ct.rule.json b/DimmerBed/up-hold-ct.rule.json index 46a0048..1e7534f 100644 --- a/DimmerBed/up-hold-ct.rule.json +++ b/DimmerBed/up-hold-ct.rule.json @@ -3,8 +3,8 @@ "conditions": [ { "address": "/sensors/MEMORY/state/status", - "operator": "gt", - "value": "0" + "operator": "lt", + "value": "1" }, { "address": "/sensors/DIMMER/state/buttonevent", diff --git a/DimmerBed/up-hold-hue.rule.json b/DimmerBed/up-hold-hue.rule.json index 774055c..7ca8b4c 100644 --- a/DimmerBed/up-hold-hue.rule.json +++ b/DimmerBed/up-hold-hue.rule.json @@ -3,7 +3,7 @@ "conditions": [ { "address": "/sensors/MEMORY/state/status", - "operator": "lt", + "operator": "eq", "value": "1" }, { diff --git a/DimmerBed/up-hold-sat.rule.json b/DimmerBed/up-hold-sat.rule.json new file mode 100644 index 0000000..1614427 --- /dev/null +++ b/DimmerBed/up-hold-sat.rule.json @@ -0,0 +1,29 @@ +{ + "name": "BASENAME.up-hold-sat", + "conditions": [ + { + "address": "/sensors/MEMORY/state/status", + "operator": "gt", + "value": "1" + }, + { + "address": "/sensors/DIMMER/state/buttonevent", + "operator": "eq", + "value": "2001" + }, + { + "address": "/sensors/DIMMER/state/lastupdated", + "operator": "dx" + } + ], + "actions": [ + { + "address": "/groups/GROUP/action", + "method": "PUT", + "body": { + "transitiontime": 1, + "sat_inc": 25 + } + } + ] +} From f5e99a06d19ce46379301a58db2d4c819f420ee3 Mon Sep 17 00:00:00 2001 From: Adrian Date: Wed, 13 Jun 2018 11:35:25 +0200 Subject: [PATCH 2/2] Improved Moods * Timer middle color is blue instead of yellow for better visibility in daylight * More duration variants * More channels for a smoother transition with more lights * Improved colors --- LampShade.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/LampShade.md b/LampShade.md index bb6f683..5d70a34 100644 --- a/LampShade.md +++ b/LampShade.md @@ -2,6 +2,14 @@ * [Disco Red](http://lampshade.io/share?AfHHAAAAAKAAAA8AmACAAgBQAGTyL34AXkM-ivtAAICa_Icfl7aHr78fHACgJv_jpyDv4cvIwQAAqMn_-eS6rnkxpDIAAAowABMQZBAEKZGmULFU5QIiJQmWETFQ7AAGbRm2AIAH) -* [Timer 20 min](http://lampshade.io/share?AQKgAWkA6A4AAAAIFoCKAXAIANIA0B0ADgFIAwCkAUACAwDQyT_4QmtT-NGmawEAdPIPvl-4Or53Nk8AAJ38g5_LYoovrJkOAEABDaJEihYxaiRoEKBAXLpQqYIti5RpxIpBiAAAAA==) +* [Off slow 2 min](http://lampshade.io/share?AQFAAQAAgC8AmABAZAA4BIACAwCTyVH54eip-SYsHgCYACAACQUNLRRIYAAAAA==) -* [Wake up 10 min](http://lampshade.io/share?AQRAAAAA4BAAFQOANABk8nm-He9bvg1bagCHmFyLH44DhG8DchGgOyb_4wuwMuBLepgDII3JsfixKQL4huBKAUgDQMBMBAkAAAA=) +* [Timer 05 min](http://lampshade.io/share?AQJAABwCgDQAAACgOwB48g8-ikUK3jcyIAAADQwAQCf_4OeymOILa6YDAFCAQCkgMpAIqwUAAA==) + +* [Timer 10 min](http://lampshade.io/share?AQLAAGkA0B0AAADgEACkASANAHjyDz6KRQreNzIgAAANDABAJ__g57KY4gtrpgMAUIBBKAgGmgWjA4mgUgAAAA==) + +* [Timer 20 min](http://lampshade.io/share?AQKgAWkA6A4AAAAIFoCKAXAIANIA0B0ADgFIAwCkAUAm_-CjWKTgfSMDAgDQwAAAdPIPvtDaFH606VoAAJ38g5_LYoovrJkOAEABDZIkSpYwaSJkCJAgHDpQqIAtg4RpxIpBigQAAA==) + +* [Wake up 05 min](http://lampshade.io/share?AQHAAXAIAAAASANAGgAgDQBpANIAQCb_4wuwMuBLepgDII3JtfjhOED4NiAXAUhjcix-bIoAviG4UgBIm7yQb4f0mG_O0QFAGgABFEJGLFUJNGQRNm3ZtjFw0OABAAAA) + +* [Wake up 10 min](http://lampshade.io/share?AQHAAWkAAAAASANAGgCQBiANADgEQCbH4semCOAbgisFQJrJC_l2SI_55hwdANJgci1-OA4Qvg3IRQBpmPyPL8DKgC_pYQ5AGgABBCIGlCRo8mALJUuVLgETFmwYAAAA)