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 cycles temperature, color, and saturisation mode.
+Pressing the on button longer toggles color and temperature mode.
 
 Pressing the brightness buttons change the brightness,
-holding the brightness buttons change the temperature, color, and saturisation respectively.
+holding the brightness buttons change the color or temperature accordingly.
 
 
 ## Devices

DimmerBed/dn-hold-ct.rule.json

@@ -3,8 +3,8 @@
 	"conditions": [
 		{
 			"address": "/sensors/MEMORY/state/status",
-			"operator": "lt",
+			"operator": "gt",
-			"value": "1"
+			"value": "0"
 		},
 		{
 			"address": "/sensors/DIMMER/state/buttonevent",

DimmerBed/dn-hold-hue.rule.json

@@ -3,7 +3,7 @@
 	"conditions": [
 		{
 			"address": "/sensors/MEMORY/state/status",
-			"operator": "eq",
+			"operator": "lt",
 			"value": "1"
 		},
 		{

DimmerBed/dn-hold-sat.rule.json

@@ -1,29 +0,0 @@
-{
-	"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
-			}
-		}
-	]
-}

DimmerBed/on-long-ct.rule.json

@@ -4,7 +4,7 @@
 		{
 			"address": "/sensors/MEMORY/state/status",
 			"operator": "gt",
-			"value": "1"
+			"value": "0"
 		},
 		{
 			"address": "/sensors/DIMMER/state/buttonevent",
@@ -21,8 +21,9 @@
 			"address": "/groups/GROUP/action",
 			"method": "PUT",
 			"body": {
-				"transitiontime": 1,
+				"bri": 203,
-				"ct_inc": 96
+				"hue": 60000,
+				"sat": 240
 			}
 		},
 		{

DimmerBed/on-long-hue.rule.json

@@ -21,9 +21,8 @@
 			"address": "/groups/GROUP/action",
 			"method": "PUT",
 			"body": {
-				"transitiontime": 1,
+				"bri": 203,
-				"hue_inc": 40000,
+				"ct": 357
-				"sat_inc": 100
 			}
 		},
 		{

DimmerBed/on-long-sat.rule.json

@@ -1,36 +0,0 @@
-{
-	"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
-			}
-		}
-	]
-}

DimmerBed/up-hold-ct.rule.json

@@ -3,8 +3,8 @@
 	"conditions": [
 		{
 			"address": "/sensors/MEMORY/state/status",
-			"operator": "lt",
+			"operator": "gt",
-			"value": "1"
+			"value": "0"
 		},
 		{
 			"address": "/sensors/DIMMER/state/buttonevent",

DimmerBed/up-hold-hue.rule.json

@@ -3,7 +3,7 @@
 	"conditions": [
 		{
 			"address": "/sensors/MEMORY/state/status",
-			"operator": "eq",
+			"operator": "lt",
 			"value": "1"
 		},
 		{

DimmerBed/up-hold-sat.rule.json

@@ -1,29 +0,0 @@
-{
-	"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
-			}
-		}
-	]
-}

LampShade.md

@@ -2,14 +2,6 @@
 
 * [Disco Red](http://lampshade.io/share?AfHHAAAAAKAAAA8AmACAAgBQAGTyL34AXkM-ivtAAICa_Icfl7aHr78fHACgJv_jpyDv4cvIwQAAqMn_-eS6rnkxpDIAAAowABMQZBAEKZGmULFU5QIiJQmWETFQ7AAGbRm2AIAH)
 
-* [Off slow 2 min](http://lampshade.io/share?AQFAAQAAgC8AmABAZAA4BIACAwCTyVH54eip-SYsHgCYACAACQUNLRRIYAAAAA==)
+* [Timer 20 min](http://lampshade.io/share?AQKgAWkA6A4AAAAIFoCKAXAIANIA0B0ADgFIAwCkAUACAwDQyT_4QmtT-NGmawEAdPIPvl-4Or53Nk8AAJ38g5_LYoovrJkOAEABDaJEihYxaiRoEKBAXLpQqYIti5RpxIpBiAAAAA==)
 
-* [Timer 05 min](http://lampshade.io/share?AQJAABwCgDQAAACgOwB48g8-ikUK3jcyIAAADQwAQCf_4OeymOILa6YDAFCAQCkgMpAIqwUAAA==)
+* [Wake up 10 min](http://lampshade.io/share?AQRAAAAA4BAAFQOANABk8nm-He9bvg1bagCHmFyLH44DhG8DchGgOyb_4wuwMuBLepgDII3JsfixKQL4huBKAUgDQMBMBAkAAAA=)
-
-* [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)