diff --git a/.flows.json.backup b/.flows.json.backup
index bd3be2c..3d46cd1 100644
--- a/.flows.json.backup
+++ b/.flows.json.backup
@@ -1,4 +1,12 @@
[
+ {
+ "id": "98d0499ebd4be017",
+ "type": "tab",
+ "label": "Injections",
+ "disabled": false,
+ "info": "",
+ "env": []
+ },
{
"id": "8e9c7f123e3fa72b",
"type": "tab",
@@ -95,14 +103,6 @@
"info": "",
"env": []
},
- {
- "id": "98d0499ebd4be017",
- "type": "tab",
- "label": "Injections",
- "disabled": false,
- "info": "",
- "env": []
- },
{
"id": "7a3b4c82bf031f40",
"type": "group",
@@ -785,6 +785,92 @@
"collapse": false,
"className": ""
},
+ {
+ "id": "70039c89dcf2eaf6",
+ "type": "mqtt out",
+ "z": "98d0499ebd4be017",
+ "name": "",
+ "topic": "zigbee_gfw/stw/groundfloor/motion_sensor",
+ "qos": "",
+ "retain": "",
+ "respTopic": "",
+ "contentType": "",
+ "userProps": "",
+ "correl": "",
+ "expiry": "",
+ "broker": "f6f673e95e75873d",
+ "x": 850,
+ "y": 140,
+ "wires": []
+ },
+ {
+ "id": "c78627b5148c5dbc",
+ "type": "inject",
+ "z": "98d0499ebd4be017",
+ "name": "Reset Motion Groundfloor",
+ "props": [
+ {
+ "p": "payload"
+ }
+ ],
+ "repeat": "",
+ "crontab": "",
+ "once": false,
+ "onceDelay": 0.1,
+ "topic": "",
+ "payload": "{\"occupancy\": false}",
+ "payloadType": "json",
+ "x": 310,
+ "y": 140,
+ "wires": [
+ [
+ "70039c89dcf2eaf6"
+ ]
+ ]
+ },
+ {
+ "id": "2e38c00186ef7f38",
+ "type": "mqtt out",
+ "z": "98d0499ebd4be017",
+ "name": "",
+ "topic": "zigbee_ffe/stw/firstfloor/motion_sensor",
+ "qos": "",
+ "retain": "",
+ "respTopic": "",
+ "contentType": "",
+ "userProps": "",
+ "correl": "",
+ "expiry": "",
+ "broker": "f6f673e95e75873d",
+ "x": 830,
+ "y": 200,
+ "wires": []
+ },
+ {
+ "id": "c38cd75574f141c3",
+ "type": "inject",
+ "z": "98d0499ebd4be017",
+ "name": "Reset Motion Firstfloor",
+ "props": [
+ {
+ "p": "payload"
+ }
+ ],
+ "repeat": "",
+ "crontab": "",
+ "once": false,
+ "onceDelay": 0.1,
+ "topic": "",
+ "payload": "{\"occupancy\": false}",
+ "payloadType": "json",
+ "x": 300,
+ "y": 200,
+ "wires": [
+ [
+ "2e38c00186ef7f38"
+ ]
+ ]
+ },
{
"id": "e3d908c71ec3e2b1",
"type": "mqtt in",
@@ -4124,7 +4210,7 @@
"animate": false,
"className": "",
"x": 650,
- "y": 1520,
+ "y": 1620,
"wires": [
[
"094924af49eeb941"
@@ -4151,7 +4237,7 @@
"step": 1,
"className": "",
"x": 650,
- "y": 1620,
+ "y": 1720,
"wires": [
[
"4c5309c159653dbc"
@@ -4178,7 +4264,7 @@
"step": 1,
"className": "",
"x": 650,
- "y": 1740,
+ "y": 1840,
"wires": [
[
"20898471447e5dcc"
@@ -4192,7 +4278,7 @@
"name": "Light Livingroom",
"info": "",
"x": 120,
- "y": 1460,
+ "y": 1560,
"wires": []
},
{
@@ -4222,7 +4308,7 @@
"animate": false,
"className": "",
"x": 670,
- "y": 1960,
+ "y": 2060,
"wires": [
[
"bbfa84d3e799a42f"
@@ -4246,7 +4332,7 @@
"name": "Floorlamp Livingroom",
"info": "",
"x": 140,
- "y": 1900,
+ "y": 2000,
"wires": []
},
{
@@ -4347,7 +4433,7 @@
"step": 1,
"className": "",
"x": 650,
- "y": 2060,
+ "y": 2160,
"wires": [
[
"c5fc2d13ceb4a406"
@@ -4374,7 +4460,7 @@
"step": 1,
"className": "",
"x": 650,
- "y": 2180,
+ "y": 2280,
"wires": [
[
"a71435af33db662e"
@@ -4535,7 +4621,7 @@
"expiry": "",
"broker": "f6f673e95e75873d",
"x": 1000,
- "y": 1520,
+ "y": 1620,
"wires": []
},
{
@@ -4552,7 +4638,7 @@
"rh": 0,
"inputs": 0,
"x": 180,
- "y": 1520,
+ "y": 1620,
"wires": [
[
"1d553d01044ff6e8",
@@ -4614,7 +4700,7 @@
"rh": 0,
"inputs": 0,
"x": 180,
- "y": 1960,
+ "y": 2060,
"wires": [
[
"8f28dea13532cd53",
@@ -4637,7 +4723,7 @@
"expiry": "",
"broker": "f6f673e95e75873d",
"x": 1010,
- "y": 1960,
+ "y": 2060,
"wires": []
},
{
@@ -5022,7 +5108,7 @@
"rh": 0,
"inputs": 0,
"x": 200,
- "y": 1620,
+ "y": 1720,
"wires": [
[
"692284677dfc5953"
@@ -5049,7 +5135,7 @@
"to": "",
"reg": false,
"x": 490,
- "y": 1660,
+ "y": 1760,
"wires": [
[
"692284677dfc5953",
@@ -5071,7 +5157,7 @@
"rh": 0,
"inputs": 0,
"x": 200,
- "y": 1740,
+ "y": 1840,
"wires": [
[
"4cbbf445ebaf4f72"
@@ -5093,7 +5179,7 @@
"expiry": "",
"broker": "f6f673e95e75873d",
"x": 1010,
- "y": 1620,
+ "y": 1720,
"wires": []
},
{
@@ -5111,7 +5197,7 @@
"expiry": "",
"broker": "f6f673e95e75873d",
"x": 1010,
- "y": 1740,
+ "y": 1840,
"wires": []
},
{
@@ -5128,7 +5214,7 @@
"rh": 0,
"inputs": 0,
"x": 190,
- "y": 2060,
+ "y": 2160,
"wires": [
[
"3c4a84f29e876723"
@@ -5155,7 +5241,7 @@
"to": "",
"reg": false,
"x": 490,
- "y": 2100,
+ "y": 2200,
"wires": [
[
"3c4a84f29e876723",
@@ -5177,7 +5263,7 @@
"rh": 0,
"inputs": 0,
"x": 200,
- "y": 2180,
+ "y": 2280,
"wires": [
[
"b5aabe037d1d66cc"
@@ -5199,7 +5285,7 @@
"expiry": "",
"broker": "f6f673e95e75873d",
"x": 1030,
- "y": 2060,
+ "y": 2160,
"wires": []
},
{
@@ -5217,7 +5303,7 @@
"expiry": "",
"broker": "f6f673e95e75873d",
"x": 1030,
- "y": 2180,
+ "y": 2280,
"wires": []
},
{
@@ -5266,7 +5352,7 @@
"id": "5dab3c1871874727",
"type": "ui_led",
"z": "bfed4666d7406ae3",
- "order": 7,
+ "order": 8,
"group": "18b818e5503ce061",
"width": 0,
"height": 0,
@@ -5297,7 +5383,7 @@
"id": "ba09a4d574fd25bb",
"type": "ui_led",
"z": "bfed4666d7406ae3",
- "order": 8,
+ "order": 9,
"group": "18b818e5503ce061",
"width": 0,
"height": 0,
@@ -5426,6 +5512,72 @@
]
]
},
+ {
+ "id": "0a2d1dca58725d7c",
+ "type": "ui_slider",
+ "z": "bfed4666d7406ae3",
+ "name": "Wardrobe",
+ "label": "Wardrobe",
+ "tooltip": "",
+ "group": "18b818e5503ce061",
+ "order": 7,
+ "width": 0,
+ "height": 0,
+ "passthru": false,
+ "outs": "end",
+ "topic": "brightness",
+ "topicType": "str",
+ "min": 0,
+ "max": "100",
+ "step": 1,
+ "className": "",
+ "x": 660,
+ "y": 1440,
+ "wires": [
+ [
+ "c131def78fd49d7e"
+ ]
+ ]
+ },
+ {
+ "id": "72e8727a503a3f11",
+ "type": "mqtt in",
+ "z": "bfed4666d7406ae3",
+ "name": "",
+ "topic": "videv/ffe/sleep/wardrobe_light/brightness",
+ "qos": "2",
+ "datatype": "auto-detect",
+ "broker": "f6f673e95e75873d",
+ "nl": false,
+ "rap": true,
+ "rh": 0,
+ "inputs": 0,
+ "x": 200,
+ "y": 1440,
+ "wires": [
+ [
+ "0a2d1dca58725d7c"
+ ]
+ ]
+ },
+ {
+ "id": "c131def78fd49d7e",
+ "type": "mqtt out",
+ "z": "bfed4666d7406ae3",
+ "name": "",
+ "topic": "videv/ffe/sleep/wardrobe_light/brightness/set",
+ "qos": "",
+ "retain": "",
+ "respTopic": "",
+ "contentType": "",
+ "userProps": "",
+ "correl": "",
+ "expiry": "",
+ "broker": "f6f673e95e75873d",
+ "x": 1010,
+ "y": 1440,
+ "wires": []
+ },
{
"id": "dd02256c0c3a5be7",
"type": "mqtt in",
@@ -13040,7 +13192,7 @@
"label": "Licht",
"tooltip": "",
"group": "221d261c8ef4127b",
- "order": 2,
+ "order": 1,
"width": 0,
"height": 0,
"passthru": false,
@@ -13123,7 +13275,7 @@
"label": "Automatic Mode",
"tooltip": "",
"group": "221d261c8ef4127b",
- "order": 1,
+ "order": 2,
"width": 0,
"height": 0,
"passthru": false,
@@ -13199,11 +13351,66 @@
"wires": []
},
{
- "id": "70039c89dcf2eaf6",
- "type": "mqtt out",
- "z": "98d0499ebd4be017",
+ "id": "4a4c1fa0bb4a0e9e",
+ "type": "ui_switch",
+ "z": "628e09f79c8ce28e",
"name": "",
- "topic": "zigbee_gfw/stw/groundfloor/motion_sensor",
+ "label": "Internet",
+ "tooltip": "",
+ "group": "221d261c8ef4127b",
+ "order": 3,
+ "width": 0,
+ "height": 0,
+ "passthru": false,
+ "decouple": "true",
+ "topic": "topic",
+ "topicType": "msg",
+ "style": "",
+ "onvalue": "true",
+ "onvalueType": "bool",
+ "onicon": "",
+ "oncolor": "",
+ "offvalue": "false",
+ "offvalueType": "bool",
+ "officon": "",
+ "offcolor": "",
+ "animate": false,
+ "className": "",
+ "x": 660,
+ "y": 420,
+ "wires": [
+ [
+ "95809753e063057a"
+ ]
+ ]
+ },
+ {
+ "id": "723a874ae31b5e52",
+ "type": "mqtt in",
+ "z": "628e09f79c8ce28e",
+ "name": "",
+ "topic": "videv/gar/garden/repeater/state",
+ "qos": "2",
+ "datatype": "auto-detect",
+ "broker": "f6f673e95e75873d",
+ "nl": false,
+ "rap": true,
+ "rh": 0,
+ "inputs": 0,
+ "x": 170,
+ "y": 420,
+ "wires": [
+ [
+ "4a4c1fa0bb4a0e9e"
+ ]
+ ]
+ },
+ {
+ "id": "95809753e063057a",
+ "type": "mqtt out",
+ "z": "628e09f79c8ce28e",
+ "name": "",
+ "topic": "videv/gar/garden/repeater/state/set",
"qos": "",
"retain": "",
"respTopic": "",
@@ -13212,76 +13419,18 @@
"correl": "",
"expiry": "",
"broker": "f6f673e95e75873d",
- "x": 850,
- "y": 140,
+ "x": 960,
+ "y": 420,
"wires": []
},
{
- "id": "c78627b5148c5dbc",
- "type": "inject",
- "z": "98d0499ebd4be017",
- "name": "Reset Motion Groundfloor",
- "props": [
- {
- "p": "payload"
- }
- ],
- "repeat": "",
- "crontab": "",
- "once": false,
- "onceDelay": 0.1,
- "topic": "",
- "payload": "{\"occupancy\": false}",
- "payloadType": "json",
- "x": 310,
- "y": 140,
- "wires": [
- [
- "70039c89dcf2eaf6"
- ]
- ]
- },
- {
- "id": "2e38c00186ef7f38",
- "type": "mqtt out",
- "z": "98d0499ebd4be017",
- "name": "",
- "topic": "zigbee_ffe/stw/firstfloor/motion_sensor",
- "qos": "",
- "retain": "",
- "respTopic": "",
- "contentType": "",
- "userProps": "",
- "correl": "",
- "expiry": "",
- "broker": "f6f673e95e75873d",
- "x": 830,
- "y": 200,
+ "id": "241387e2720d9d23",
+ "type": "comment",
+ "z": "628e09f79c8ce28e",
+ "name": "Repeater",
+ "info": "",
+ "x": 100,
+ "y": 360,
"wires": []
- },
- {
- "id": "c38cd75574f141c3",
- "type": "inject",
- "z": "98d0499ebd4be017",
- "name": "Reset Motion Firstfloor",
- "props": [
- {
- "p": "payload"
- }
- ],
- "repeat": "",
- "crontab": "",
- "once": false,
- "onceDelay": 0.1,
- "topic": "",
- "payload": "{\"occupancy\": false}",
- "payloadType": "json",
- "x": 300,
- "y": 200,
- "wires": [
- [
- "2e38c00186ef7f38"
- ]
- ]
}
]
\ No newline at end of file
diff --git a/flows.json b/flows.json
index 6fe2736..a605c3f 100644
--- a/flows.json
+++ b/flows.json
@@ -4210,7 +4210,7 @@
"animate": false,
"className": "",
"x": 650,
- "y": 1520,
+ "y": 1620,
"wires": [
[
"094924af49eeb941"
@@ -4237,7 +4237,7 @@
"step": 1,
"className": "",
"x": 650,
- "y": 1620,
+ "y": 1720,
"wires": [
[
"4c5309c159653dbc"
@@ -4264,7 +4264,7 @@
"step": 1,
"className": "",
"x": 650,
- "y": 1740,
+ "y": 1840,
"wires": [
[
"20898471447e5dcc"
@@ -4278,7 +4278,7 @@
"name": "Light Livingroom",
"info": "",
"x": 120,
- "y": 1460,
+ "y": 1560,
"wires": []
},
{
@@ -4308,7 +4308,7 @@
"animate": false,
"className": "",
"x": 670,
- "y": 1960,
+ "y": 2060,
"wires": [
[
"bbfa84d3e799a42f"
@@ -4332,7 +4332,7 @@
"name": "Floorlamp Livingroom",
"info": "",
"x": 140,
- "y": 1900,
+ "y": 2000,
"wires": []
},
{
@@ -4433,7 +4433,7 @@
"step": 1,
"className": "",
"x": 650,
- "y": 2060,
+ "y": 2160,
"wires": [
[
"c5fc2d13ceb4a406"
@@ -4460,7 +4460,7 @@
"step": 1,
"className": "",
"x": 650,
- "y": 2180,
+ "y": 2280,
"wires": [
[
"a71435af33db662e"
@@ -4621,7 +4621,7 @@
"expiry": "",
"broker": "f6f673e95e75873d",
"x": 1000,
- "y": 1520,
+ "y": 1620,
"wires": []
},
{
@@ -4638,7 +4638,7 @@
"rh": 0,
"inputs": 0,
"x": 180,
- "y": 1520,
+ "y": 1620,
"wires": [
[
"1d553d01044ff6e8",
@@ -4700,7 +4700,7 @@
"rh": 0,
"inputs": 0,
"x": 180,
- "y": 1960,
+ "y": 2060,
"wires": [
[
"8f28dea13532cd53",
@@ -4723,7 +4723,7 @@
"expiry": "",
"broker": "f6f673e95e75873d",
"x": 1010,
- "y": 1960,
+ "y": 2060,
"wires": []
},
{
@@ -5108,7 +5108,7 @@
"rh": 0,
"inputs": 0,
"x": 200,
- "y": 1620,
+ "y": 1720,
"wires": [
[
"692284677dfc5953"
@@ -5135,7 +5135,7 @@
"to": "",
"reg": false,
"x": 490,
- "y": 1660,
+ "y": 1760,
"wires": [
[
"692284677dfc5953",
@@ -5157,7 +5157,7 @@
"rh": 0,
"inputs": 0,
"x": 200,
- "y": 1740,
+ "y": 1840,
"wires": [
[
"4cbbf445ebaf4f72"
@@ -5179,7 +5179,7 @@
"expiry": "",
"broker": "f6f673e95e75873d",
"x": 1010,
- "y": 1620,
+ "y": 1720,
"wires": []
},
{
@@ -5197,7 +5197,7 @@
"expiry": "",
"broker": "f6f673e95e75873d",
"x": 1010,
- "y": 1740,
+ "y": 1840,
"wires": []
},
{
@@ -5214,7 +5214,7 @@
"rh": 0,
"inputs": 0,
"x": 190,
- "y": 2060,
+ "y": 2160,
"wires": [
[
"3c4a84f29e876723"
@@ -5241,7 +5241,7 @@
"to": "",
"reg": false,
"x": 490,
- "y": 2100,
+ "y": 2200,
"wires": [
[
"3c4a84f29e876723",
@@ -5263,7 +5263,7 @@
"rh": 0,
"inputs": 0,
"x": 200,
- "y": 2180,
+ "y": 2280,
"wires": [
[
"b5aabe037d1d66cc"
@@ -5285,7 +5285,7 @@
"expiry": "",
"broker": "f6f673e95e75873d",
"x": 1030,
- "y": 2060,
+ "y": 2160,
"wires": []
},
{
@@ -5303,7 +5303,7 @@
"expiry": "",
"broker": "f6f673e95e75873d",
"x": 1030,
- "y": 2180,
+ "y": 2280,
"wires": []
},
{
@@ -5352,7 +5352,7 @@
"id": "5dab3c1871874727",
"type": "ui_led",
"z": "bfed4666d7406ae3",
- "order": 7,
+ "order": 8,
"group": "18b818e5503ce061",
"width": 0,
"height": 0,
@@ -5383,7 +5383,7 @@
"id": "ba09a4d574fd25bb",
"type": "ui_led",
"z": "bfed4666d7406ae3",
- "order": 8,
+ "order": 9,
"group": "18b818e5503ce061",
"width": 0,
"height": 0,
@@ -5512,6 +5512,72 @@
]
]
},
+ {
+ "id": "0a2d1dca58725d7c",
+ "type": "ui_slider",
+ "z": "bfed4666d7406ae3",
+ "name": "Wardrobe",
+ "label": "Kleiderschrank",
+ "tooltip": "",
+ "group": "18b818e5503ce061",
+ "order": 7,
+ "width": 0,
+ "height": 0,
+ "passthru": false,
+ "outs": "end",
+ "topic": "brightness",
+ "topicType": "str",
+ "min": 0,
+ "max": "100",
+ "step": 1,
+ "className": "",
+ "x": 660,
+ "y": 1440,
+ "wires": [
+ [
+ "c131def78fd49d7e"
+ ]
+ ]
+ },
+ {
+ "id": "72e8727a503a3f11",
+ "type": "mqtt in",
+ "z": "bfed4666d7406ae3",
+ "name": "",
+ "topic": "videv/ffe/sleep/wardrobe_light/brightness",
+ "qos": "2",
+ "datatype": "auto-detect",
+ "broker": "f6f673e95e75873d",
+ "nl": false,
+ "rap": true,
+ "rh": 0,
+ "inputs": 0,
+ "x": 200,
+ "y": 1440,
+ "wires": [
+ [
+ "0a2d1dca58725d7c"
+ ]
+ ]
+ },
+ {
+ "id": "c131def78fd49d7e",
+ "type": "mqtt out",
+ "z": "bfed4666d7406ae3",
+ "name": "",
+ "topic": "videv/ffe/sleep/wardrobe_light/brightness/set",
+ "qos": "",
+ "retain": "",
+ "respTopic": "",
+ "contentType": "",
+ "userProps": "",
+ "correl": "",
+ "expiry": "",
+ "broker": "f6f673e95e75873d",
+ "x": 1010,
+ "y": 1440,
+ "wires": []
+ },
{
"id": "dd02256c0c3a5be7",
"type": "mqtt in",
@@ -13126,7 +13192,7 @@
"label": "Licht",
"tooltip": "",
"group": "221d261c8ef4127b",
- "order": 2,
+ "order": 1,
"width": 0,
"height": 0,
"passthru": false,
@@ -13209,7 +13275,7 @@
"label": "Automatic Mode",
"tooltip": "",
"group": "221d261c8ef4127b",
- "order": 1,
+ "order": 2,
"width": 0,
"height": 0,
"passthru": false,
@@ -13283,5 +13349,88 @@
"x": 90,
"y": 200,
"wires": []
+ },
+ {
+ "id": "4a4c1fa0bb4a0e9e",
+ "type": "ui_switch",
+ "z": "628e09f79c8ce28e",
+ "name": "",
+ "label": "Internet",
+ "tooltip": "",
+ "group": "221d261c8ef4127b",
+ "order": 3,
+ "width": 0,
+ "height": 0,
+ "passthru": false,
+ "decouple": "true",
+ "topic": "topic",
+ "topicType": "msg",
+ "style": "",
+ "onvalue": "true",
+ "onvalueType": "bool",
+ "onicon": "",
+ "oncolor": "",
+ "offvalue": "false",
+ "offvalueType": "bool",
+ "officon": "",
+ "offcolor": "",
+ "animate": false,
+ "className": "",
+ "x": 660,
+ "y": 420,
+ "wires": [
+ [
+ "95809753e063057a"
+ ]
+ ]
+ },
+ {
+ "id": "723a874ae31b5e52",
+ "type": "mqtt in",
+ "z": "628e09f79c8ce28e",
+ "name": "",
+ "topic": "videv/gar/garden/repeater/state",
+ "qos": "2",
+ "datatype": "auto-detect",
+ "broker": "f6f673e95e75873d",
+ "nl": false,
+ "rap": true,
+ "rh": 0,
+ "inputs": 0,
+ "x": 170,
+ "y": 420,
+ "wires": [
+ [
+ "4a4c1fa0bb4a0e9e"
+ ]
+ ]
+ },
+ {
+ "id": "95809753e063057a",
+ "type": "mqtt out",
+ "z": "628e09f79c8ce28e",
+ "name": "",
+ "topic": "videv/gar/garden/repeater/state/set",
+ "qos": "",
+ "retain": "",
+ "respTopic": "",
+ "contentType": "",
+ "userProps": "",
+ "correl": "",
+ "expiry": "",
+ "broker": "f6f673e95e75873d",
+ "x": 960,
+ "y": 420,
+ "wires": []
+ },
+ {
+ "id": "241387e2720d9d23",
+ "type": "comment",
+ "z": "628e09f79c8ce28e",
+ "name": "Repeater",
+ "info": "",
+ "x": 100,
+ "y": 360,
+ "wires": []
}
]
\ No newline at end of file