diff --git a/DimmerLiving/README.md b/DimmerLiving/README.md deleted file mode 100644 index 8e82173..0000000 --- a/DimmerLiving/README.md +++ /dev/null @@ -1,31 +0,0 @@ -# Dimmer Switch Ruleset for Two Light Groups - -This ruleset assumes two light groups inside the same room. - -The on button first turns on one group and then the other. -So does the off button in reverse order. - -The lights are only switched on without changing -the previously configured state. - -The lights can be reset to a bright but confortable mood for the evening -when pressing the on button longer. - -Pressing the brightness buttons change the brightness, -holding the brightness buttons change the color temperature. - - -## Devices - -```sh -# IDS="s/BASENAME/xxx/g; s/GROUP1/xxx/g; s/GROUP2/xxx/g; s/DIMMER/xxx/g; s/MEM/xxx/g" -``` - -Install the memory sensor and note its ID before proceding. -Use the `mem.sensor.json` file, replace the `BASENAME`, and POST it to the /api/KEY/sensors URL. - -* `BASENAME` Basename of the ruleset -* `GROUP1` ID of the first group to handle -* `GROUP2` ID of the second group to handle -* `DIMMER` ID of the dimmer switch -* `MEM` ID of the memory sensor diff --git a/DimmerLiving/mem.sensor.json b/DimmerLiving/mem.sensor.json deleted file mode 100644 index 71f3596..0000000 --- a/DimmerLiving/mem.sensor.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "BASENAME.mem", - "type": "CLIPGenericStatus", - "modelid": "Adrium Memory", - "manufacturername": "Adrium", - "swversion": "1.0", - "uniqueid": "d0:ac:4e:d3:93:3b:7a:00-01" -} diff --git a/MotionSimple/off.rule.json b/FloorMotion/off.rule.json similarity index 100% rename from MotionSimple/off.rule.json rename to FloorMotion/off.rule.json diff --git a/MotionSimple/on-bright.rule.json b/FloorMotion/on-bright.rule.json similarity index 100% rename from MotionSimple/on-bright.rule.json rename to FloorMotion/on-bright.rule.json diff --git a/MotionSimple/on-dim.rule.json b/FloorMotion/on-dim.rule.json similarity index 100% rename from MotionSimple/on-dim.rule.json rename to FloorMotion/on-dim.rule.json diff --git a/DimmerLiving/dn-hold.rule.json b/LivingDimmer/dn-hold.rule.json similarity index 92% rename from DimmerLiving/dn-hold.rule.json rename to LivingDimmer/dn-hold.rule.json index 3f4a400..181017f 100644 --- a/DimmerLiving/dn-hold.rule.json +++ b/LivingDimmer/dn-hold.rule.json @@ -16,14 +16,14 @@ "address": "/groups/GROUP1/action", "method": "PUT", "body": { - "ct_inc": 24 + "ct_inc": 100 } }, { "address": "/groups/GROUP2/action", "method": "PUT", "body": { - "ct_inc": 24 + "ct_inc": 100 } } ] diff --git a/DimmerLiving/dn-short.rule.json b/LivingDimmer/dn-short.rule.json similarity index 91% rename from DimmerLiving/dn-short.rule.json rename to LivingDimmer/dn-short.rule.json index 1ae9f8e..19e364c 100644 --- a/DimmerLiving/dn-short.rule.json +++ b/LivingDimmer/dn-short.rule.json @@ -16,14 +16,14 @@ "address": "/groups/GROUP1/action", "method": "PUT", "body": { - "bri_inc": -25 + "bri_inc": -16 } }, { "address": "/groups/GROUP2/action", "method": "PUT", "body": { - "bri_inc": -25 + "bri_inc": -14 } } ] diff --git a/DimmerLiving/off-short.1.rule.json b/LivingDimmer/off-short.1.rule.json similarity index 100% rename from DimmerLiving/off-short.1.rule.json rename to LivingDimmer/off-short.1.rule.json diff --git a/DimmerLiving/off-short.2.rule.json b/LivingDimmer/off-short.2.rule.json similarity index 100% rename from DimmerLiving/off-short.2.rule.json rename to LivingDimmer/off-short.2.rule.json diff --git a/DimmerLiving/on-long.rule.json b/LivingDimmer/on-long.rule.json similarity index 98% rename from DimmerLiving/on-long.rule.json rename to LivingDimmer/on-long.rule.json index 302695f..92826f9 100644 --- a/DimmerLiving/on-long.rule.json +++ b/LivingDimmer/on-long.rule.json @@ -27,6 +27,6 @@ "bri": 203, "ct": 357 } - } + }, ] } diff --git a/DimmerLiving/on-short.1.rule.json b/LivingDimmer/on-short.1.rule.json similarity index 100% rename from DimmerLiving/on-short.1.rule.json rename to LivingDimmer/on-short.1.rule.json diff --git a/DimmerLiving/on-short.2.rule.json b/LivingDimmer/on-short.2.rule.json similarity index 100% rename from DimmerLiving/on-short.2.rule.json rename to LivingDimmer/on-short.2.rule.json diff --git a/DimmerLiving/up-hold.rule.json b/LivingDimmer/up-hold.rule.json similarity index 91% rename from DimmerLiving/up-hold.rule.json rename to LivingDimmer/up-hold.rule.json index c4822ca..b0dc947 100644 --- a/DimmerLiving/up-hold.rule.json +++ b/LivingDimmer/up-hold.rule.json @@ -16,14 +16,14 @@ "address": "/groups/GROUP1/action", "method": "PUT", "body": { - "ct_inc": -24 + "ct_inc": -100 } }, { "address": "/groups/GROUP2/action", "method": "PUT", "body": { - "ct_inc": -24 + "ct_inc": -100 } } ] diff --git a/DimmerLiving/up-short.rule.json b/LivingDimmer/up-short.rule.json similarity index 92% rename from DimmerLiving/up-short.rule.json rename to LivingDimmer/up-short.rule.json index b50cf30..62a787d 100644 --- a/DimmerLiving/up-short.rule.json +++ b/LivingDimmer/up-short.rule.json @@ -16,14 +16,14 @@ "address": "/groups/GROUP1/action", "method": "PUT", "body": { - "bri_inc": 25 + "bri_inc": 16 } }, { "address": "/groups/GROUP2/action", "method": "PUT", "body": { - "bri_inc": 25 + "bri_inc": 15 } } ] diff --git a/MotionSimple/README.md b/MotionSimple/README.md deleted file mode 100644 index aa9edd0..0000000 --- a/MotionSimple/README.md +++ /dev/null @@ -1,19 +0,0 @@ -# Simple Motion Sensor Ruleset - -This ruleset is a simple configuration that turns on a -group of lights when the motion sensor registers movement. - -It does not trigger an action, if a light in the group is already switched on. - -In the night, it only turns on the lights dim. - -## Devices - -```sh -IDS="s/BASENAME/xxx/g; s/GROUP/xxx/g; s/MOTION/xxx/g; s/AMBIENT/xxx/g" -``` - -* `BASENAME` Basename of the ruleset -* `GROUP` ID of the group to handle -* `MOTION` ID of the motion sensor -* `AMBIENT` ID of the ambient light sensor inside the motion sensor diff --git a/TapSimple/1.rule.json b/SimpleTap/1.rule.json similarity index 100% rename from TapSimple/1.rule.json rename to SimpleTap/1.rule.json diff --git a/TapSimple/2.rule.json b/SimpleTap/2.rule.json similarity index 100% rename from TapSimple/2.rule.json rename to SimpleTap/2.rule.json diff --git a/TapSimple/3.rule.json b/SimpleTap/3.rule.json similarity index 100% rename from TapSimple/3.rule.json rename to SimpleTap/3.rule.json diff --git a/TapSimple/4.rule.json b/SimpleTap/4.rule.json similarity index 100% rename from TapSimple/4.rule.json rename to SimpleTap/4.rule.json diff --git a/TapSimple/README.md b/TapSimple/README.md deleted file mode 100644 index 4608607..0000000 --- a/TapSimple/README.md +++ /dev/null @@ -1,15 +0,0 @@ -# Simple Tap Button Ruleset - -This ruleset is a simple configuration that turns on a -group of lights with an increasing brightness on the buttons. - - -## Devices - -```sh -IDS="s/BASENAME/xxx/g; s/GROUP/xxx/g; s/TAP/xxx/g" -``` - -* `BASENAME` Basename of the ruleset -* `GROUP` ID of the group to handle -* `TAP` ID of the tap button