DimmerBed/dn-hold-ct.rule.json

@@ -1,5 +1,5 @@
 {
-	"name": "BASENAME.dn-0-hold-ct",
+	"name": "BASENAME.dn-hold-ct",
 	"conditions": [
 		{
 			"address": "/sensors/MEMORY/state/status",

DimmerBed/dn-hold-hue.rule.json

@@ -1,10 +1,10 @@
 {
-	"name": "BASENAME.dn-1-hold-hue",
+	"name": "BASENAME.dn-hold-hue",
 	"conditions": [
 		{
 			"address": "/sensors/MEMORY/state/status",
-			"operator": "gt",
+			"operator": "eq",
-			"value": "0"
+			"value": "1"
 		},
 		{
 			"address": "/sensors/DIMMER/state/buttonevent",

DimmerBed/dn-hold-sat.rule.json

@@ -1,15 +1,15 @@
 {
-	"name": "BASENAME.dn-1-short-sat",
+	"name": "BASENAME.dn-hold-sat",
 	"conditions": [
 		{
 			"address": "/sensors/MEMORY/state/status",
 			"operator": "gt",
-			"value": "0"
+			"value": "1"
 		},
 		{
 			"address": "/sensors/DIMMER/state/buttonevent",
 			"operator": "eq",
-			"value": "3002"
+			"value": "3001"
 		},
 		{
 			"address": "/sensors/DIMMER/state/lastupdated",

DimmerBed/dn-short.rule.json

@@ -1,11 +1,6 @@
 {
-	"name": "BASENAME.dn-0-short-bri",
+	"name": "BASENAME.dn-short",
 	"conditions": [
-		{
-			"address": "/sensors/MEMORY/state/status",
-			"operator": "lt",
-			"value": "1"
-		},
 		{
 			"address": "/sensors/DIMMER/state/buttonevent",
 			"operator": "eq",

DimmerBed/on-long-ct.rule.json

@@ -1,10 +1,10 @@
 {
-	"name": "BASENAME.on-1-long",
+	"name": "BASENAME.on-long-ct",
 	"conditions": [
 		{
 			"address": "/sensors/MEMORY/state/status",
 			"operator": "gt",
-			"value": "0"
+			"value": "1"
 		},
 		{
 			"address": "/sensors/DIMMER/state/buttonevent",
@@ -17,6 +17,14 @@
 		}
 	],
 	"actions": [
+		{
+			"address": "/groups/GROUP/action",
+			"method": "PUT",
+			"body": {
+				"transitiontime": 1,
+				"ct_inc": 96
+			}
+		},
 		{
 			"address": "/sensors/MEMORY/state",
 			"method": "PUT",

DimmerBed/on-long-hue.rule.json

@@ -1,5 +1,5 @@
 {
-	"name": "BASENAME.on-0-long",
+	"name": "BASENAME.on-long-hue",
 	"conditions": [
 		{
 			"address": "/sensors/MEMORY/state/status",
@@ -17,6 +17,15 @@
 		}
 	],
 	"actions": [
+		{
+			"address": "/groups/GROUP/action",
+			"method": "PUT",
+			"body": {
+				"transitiontime": 1,
+				"hue_inc": 40000,
+				"sat_inc": 100
+			}
+		},
 		{
 			"address": "/sensors/MEMORY/state",
 			"method": "PUT",

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
+			}
+		}
+	]
+}

DimmerBed/up-hold-ct.rule.json

@@ -1,5 +1,5 @@
 {
-	"name": "BASENAME.up-0-hold-ct",
+	"name": "BASENAME.up-hold-ct",
 	"conditions": [
 		{
 			"address": "/sensors/MEMORY/state/status",

DimmerBed/up-hold-hue.rule.json

@@ -1,10 +1,10 @@
 {
-	"name": "BASENAME.up-1-hold-hue",
+	"name": "BASENAME.up-hold-hue",
 	"conditions": [
 		{
 			"address": "/sensors/MEMORY/state/status",
-			"operator": "gt",
+			"operator": "eq",
-			"value": "0"
+			"value": "1"
 		},
 		{
 			"address": "/sensors/DIMMER/state/buttonevent",

DimmerBed/up-hold-sat.rule.json

@@ -1,15 +1,15 @@
 {
-	"name": "BASENAME.up-1-short-sat",
+	"name": "BASENAME.up-hold-sat",
 	"conditions": [
 		{
 			"address": "/sensors/MEMORY/state/status",
 			"operator": "gt",
-			"value": "0"
+			"value": "1"
 		},
 		{
 			"address": "/sensors/DIMMER/state/buttonevent",
 			"operator": "eq",
-			"value": "2002"
+			"value": "2001"
 		},
 		{
 			"address": "/sensors/DIMMER/state/lastupdated",

DimmerBed/up-short.rule.json

@@ -1,11 +1,6 @@
 {
-	"name": "BASENAME.up-0-short-bri",
+	"name": "BASENAME.up-short",
 	"conditions": [
-		{
-			"address": "/sensors/MEMORY/state/status",
-			"operator": "lt",
-			"value": "1"
-		},
 		{
 			"address": "/sensors/DIMMER/state/buttonevent",
 			"operator": "eq",