From 1bb6e601980e8a97b240b1df7c32e3be35c1bc5a Mon Sep 17 00:00:00 2001 From: theautomation Date: Sat, 27 Jan 2024 19:38:52 +0100 Subject: [PATCH] Fix #24 Duplicated messages vacuum --- src/data/flows/notification_vacuum.json | 214 +++++------ src/data/flows/vacuum_cleaner.json | 473 ++++++++++-------------- 2 files changed, 307 insertions(+), 380 deletions(-) diff --git a/src/data/flows/notification_vacuum.json b/src/data/flows/notification_vacuum.json index afbc96c..a4fb070 100644 --- a/src/data/flows/notification_vacuum.json +++ b/src/data/flows/notification_vacuum.json @@ -43,6 +43,111 @@ ] ] }, + { + "id": "b560dfc6f3c2aec1", + "type": "template", + "z": "8d2de69b4c0fd2b9", + "g": "bb1cc6878bf6f696", + "name": "notification id", + "field": "notify.notification_id", + "fieldType": "msg", + "format": "handlebars", + "syntax": "mustache", + "template": "vacuum", + "output": "str", + "x": 1450, + "y": 140, + "wires": [ + [ + "344ad3f982a92730" + ] + ] + }, + { + "id": "344ad3f982a92730", + "type": "join", + "z": "8d2de69b4c0fd2b9", + "g": "bb1cc6878bf6f696", + "name": "", + "mode": "custom", + "build": "merged", + "property": "notify", + "propertyType": "msg", + "key": "topic", + "joiner": "\\n", + "joinerType": "str", + "accumulate": false, + "timeout": "", + "count": "4", + "reduceRight": false, + "reduceExp": "", + "reduceInit": "", + "reduceInitType": "", + "reduceFixup": "", + "x": 1630, + "y": 120, + "wires": [ + [ + "372e878f27b4b2b2" + ] + ] + }, + { + "id": "372e878f27b4b2b2", + "type": "link out", + "z": "8d2de69b4c0fd2b9", + "g": "bb1cc6878bf6f696", + "name": "link_out_notify_basement_ventilation", + "mode": "link", + "links": [ + "8ed3b0974336e55b", + "aeee8468f3d1b7ad", + "c4660dc11fb0e5b8" + ], + "x": 1725, + "y": 120, + "wires": [] + }, + { + "id": "c0d0c36d39f527e2", + "type": "template", + "z": "8d2de69b4c0fd2b9", + "g": "bb1cc6878bf6f696", + "name": "title", + "field": "notify.title", + "fieldType": "msg", + "format": "handlebars", + "syntax": "mustache", + "template": "Stofzuiger", + "output": "str", + "x": 1430, + "y": 60, + "wires": [ + [ + "344ad3f982a92730" + ] + ] + }, + { + "id": "db50c5b6f4f302b4", + "type": "template", + "z": "8d2de69b4c0fd2b9", + "g": "bb1cc6878bf6f696", + "name": "icon", + "field": "notify.icon", + "fieldType": "msg", + "format": "handlebars", + "syntax": "mustache", + "template": "", + "output": "str", + "x": 1430, + "y": 100, + "wires": [ + [ + "344ad3f982a92730" + ] + ] + }, { "id": "bb86ef9c9939267f", "type": "template", @@ -199,7 +304,7 @@ "fieldType": "msg", "format": "handlebars", "syntax": "mustache", - "template": "KNMI Waarschuwing", + "template": "Stofzuiger", "output": "str", "x": 1030, "y": 240, @@ -218,7 +323,7 @@ "fieldType": "msg", "format": "handlebars", "syntax": "mustache", - "template": "weather", + "template": "vacuum", "output": "str", "x": 1190, "y": 240, @@ -260,111 +365,6 @@ "y": 240, "wires": [] }, - { - "id": "db50c5b6f4f302b4", - "type": "template", - "z": "8d2de69b4c0fd2b9", - "g": "bb1cc6878bf6f696", - "name": "icon", - "field": "notify.icon", - "fieldType": "msg", - "format": "handlebars", - "syntax": "mustache", - "template": "", - "output": "str", - "x": 1430, - "y": 100, - "wires": [ - [ - "344ad3f982a92730" - ] - ] - }, - { - "id": "c0d0c36d39f527e2", - "type": "template", - "z": "8d2de69b4c0fd2b9", - "g": "bb1cc6878bf6f696", - "name": "title", - "field": "notify.title", - "fieldType": "msg", - "format": "handlebars", - "syntax": "mustache", - "template": "Stofzuiger", - "output": "str", - "x": 1430, - "y": 60, - "wires": [ - [ - "344ad3f982a92730" - ] - ] - }, - { - "id": "372e878f27b4b2b2", - "type": "link out", - "z": "8d2de69b4c0fd2b9", - "g": "bb1cc6878bf6f696", - "name": "link_out_notify_basement_ventilation", - "mode": "link", - "links": [ - "8ed3b0974336e55b", - "aeee8468f3d1b7ad", - "c4660dc11fb0e5b8" - ], - "x": 1725, - "y": 120, - "wires": [] - }, - { - "id": "344ad3f982a92730", - "type": "join", - "z": "8d2de69b4c0fd2b9", - "g": "bb1cc6878bf6f696", - "name": "", - "mode": "custom", - "build": "merged", - "property": "notify", - "propertyType": "msg", - "key": "topic", - "joiner": "\\n", - "joinerType": "str", - "accumulate": false, - "timeout": "", - "count": "4", - "reduceRight": false, - "reduceExp": "", - "reduceInit": "", - "reduceInitType": "", - "reduceFixup": "", - "x": 1630, - "y": 120, - "wires": [ - [ - "372e878f27b4b2b2" - ] - ] - }, - { - "id": "b560dfc6f3c2aec1", - "type": "template", - "z": "8d2de69b4c0fd2b9", - "g": "bb1cc6878bf6f696", - "name": "notification id", - "field": "notify.notification_id", - "fieldType": "msg", - "format": "handlebars", - "syntax": "mustache", - "template": "vacuum", - "output": "str", - "x": 1450, - "y": 140, - "wires": [ - [ - "344ad3f982a92730" - ] - ] - }, { "id": "9920356dd5442dce", "type": "template", diff --git a/src/data/flows/vacuum_cleaner.json b/src/data/flows/vacuum_cleaner.json index bc96218..2eb6e76 100644 --- a/src/data/flows/vacuum_cleaner.json +++ b/src/data/flows/vacuum_cleaner.json @@ -7,25 +7,26 @@ "info": "" }, { - "id": "faf17088fd1a6b16", + "id": "33fea7faee8e1f82", "type": "group", "z": "55da1471.fda0fc", - "name": "notify", + "name": "notify two actions", "style": { "label": true }, "nodes": [ - "c8bc013c45f3ae72", - "035b931bd0cea26e", - "57488cc36dcd2d00", - "051f31139e799468", - "07d3b997feaf3f7b", - "8205d58f610c05d0" + "8f3e39fd9d879f86", + "d5ae8df68946471a", + "d7f92782a71d3837", + "b5cc0d26cf3e7ab2", + "237a19020921825d", + "09d4cdb039e852de", + "0e83125ead481334" ], "x": 1654, - "y": 639, + "y": 419, "w": 472, - "h": 162 + "h": 202 }, { "id": "deb17c414e79ec63", @@ -49,39 +50,39 @@ "h": 162 }, { - "id": "33fea7faee8e1f82", + "id": "faf17088fd1a6b16", "type": "group", "z": "55da1471.fda0fc", - "name": "notify two actions", + "name": "notify", "style": { "label": true }, "nodes": [ - "8f3e39fd9d879f86", - "d5ae8df68946471a", - "d7f92782a71d3837", - "b5cc0d26cf3e7ab2", - "237a19020921825d", - "09d4cdb039e852de", - "0e83125ead481334" + "c8bc013c45f3ae72", + "035b931bd0cea26e", + "57488cc36dcd2d00", + "051f31139e799468", + "07d3b997feaf3f7b", + "8205d58f610c05d0" ], "x": 1654, - "y": 419, + "y": 639, "w": 472, - "h": 202 + "h": 162 }, { - "id": "07d3b997feaf3f7b", + "id": "237a19020921825d", "type": "junction", "z": "55da1471.fda0fc", - "g": "faf17088fd1a6b16", + "g": "33fea7faee8e1f82", "x": 1680, - "y": 700, + "y": 500, "wires": [ [ - "035b931bd0cea26e", - "c8bc013c45f3ae72", - "8205d58f610c05d0" + "d5ae8df68946471a", + "8f3e39fd9d879f86", + "09d4cdb039e852de", + "0e83125ead481334" ] ] }, @@ -101,18 +102,17 @@ ] }, { - "id": "237a19020921825d", + "id": "07d3b997feaf3f7b", "type": "junction", "z": "55da1471.fda0fc", - "g": "33fea7faee8e1f82", + "g": "faf17088fd1a6b16", "x": 1680, - "y": 500, + "y": 700, "wires": [ [ - "d5ae8df68946471a", - "8f3e39fd9d879f86", - "09d4cdb039e852de", - "0e83125ead481334" + "035b931bd0cea26e", + "c8bc013c45f3ae72", + "8205d58f610c05d0" ] ] }, @@ -129,30 +129,65 @@ ] }, { - "id": "8205d58f610c05d0", + "id": "8f3e39fd9d879f86", "type": "template", "z": "55da1471.fda0fc", - "g": "faf17088fd1a6b16", - "name": "notification id", - "field": "notify.notification_id", + "g": "33fea7faee8e1f82", + "name": "icon", + "field": "notify.icon", "fieldType": "msg", "format": "handlebars", "syntax": "mustache", - "template": "vacuum", + "template": "", "output": "str", - "x": 1810, - "y": 760, + "x": 1770, + "y": 540, "wires": [ [ - "051f31139e799468" + "b5cc0d26cf3e7ab2" ] ] }, { - "id": "051f31139e799468", + "id": "d5ae8df68946471a", + "type": "template", + "z": "55da1471.fda0fc", + "g": "33fea7faee8e1f82", + "name": "title", + "field": "notify.title", + "fieldType": "msg", + "format": "handlebars", + "syntax": "mustache", + "template": "Stofzuiger", + "output": "str", + "x": 1770, + "y": 460, + "wires": [ + [ + "b5cc0d26cf3e7ab2" + ] + ] + }, + { + "id": "d7f92782a71d3837", + "type": "link out", + "z": "55da1471.fda0fc", + "g": "33fea7faee8e1f82", + "name": "link_out_notify_guest_mode", + "mode": "link", + "links": [ + "c76d311bb4b6991b", + "d1753081ba6b4004" + ], + "x": 2085, + "y": 500, + "wires": [] + }, + { + "id": "b5cc0d26cf3e7ab2", "type": "join", "z": "55da1471.fda0fc", - "g": "faf17088fd1a6b16", + "g": "33fea7faee8e1f82", "name": "", "mode": "custom", "build": "merged", @@ -163,59 +198,94 @@ "joinerType": "str", "accumulate": false, "timeout": "", - "count": "4", + "count": "8", "reduceRight": false, "reduceExp": "", "reduceInit": "", "reduceInitType": "", "reduceFixup": "", "x": 1990, - "y": 720, + "y": 500, "wires": [ [ - "57488cc36dcd2d00" + "d7f92782a71d3837" ] ] }, { - "id": "57488cc36dcd2d00", - "type": "link out", + "id": "09d4cdb039e852de", + "type": "change", "z": "55da1471.fda0fc", - "g": "faf17088fd1a6b16", - "name": "link_out_notify_basement_ventilation", - "mode": "link", - "links": [ - "c4660dc11fb0e5b8" + "g": "33fea7faee8e1f82", + "name": "action titles", + "rules": [ + { + "t": "set", + "p": "notify.action_1_title", + "pt": "msg", + "to": "JA", + "tot": "str" + }, + { + "t": "set", + "p": "notify.action_2_title", + "pt": "msg", + "to": "NEE", + "tot": "str" + }, + { + "t": "set", + "p": "notify.action_1", + "pt": "msg", + "to": "IGNORE", + "tot": "str" + }, + { + "t": "set", + "p": "notify.action_2", + "pt": "msg", + "to": "VACUUM_AUTOCLEANING_OFF", + "tot": "str" + } ], - "x": 2085, - "y": 720, - "wires": [] + "action": "", + "property": "", + "from": "", + "to": "", + "reg": false, + "x": 1790, + "y": 500, + "wires": [ + [ + "b5cc0d26cf3e7ab2" + ] + ] }, { - "id": "035b931bd0cea26e", + "id": "0e83125ead481334", "type": "template", "z": "55da1471.fda0fc", - "g": "faf17088fd1a6b16", - "name": "title", - "field": "notify.title", + "g": "33fea7faee8e1f82", + "name": "notification id", + "field": "notify.notification_id", "fieldType": "msg", "format": "handlebars", "syntax": "mustache", - "template": "Stofzuiger", + "template": "vacuum", "output": "str", "x": 1790, - "y": 680, + "y": 580, "wires": [ [ - "051f31139e799468" + "b5cc0d26cf3e7ab2" ] ] }, { - "id": "c8bc013c45f3ae72", + "id": "f60ecb3be0ebc2af", "type": "template", "z": "55da1471.fda0fc", - "g": "faf17088fd1a6b16", + "g": "deb17c414e79ec63", "name": "icon", "field": "notify.icon", "fieldType": "msg", @@ -224,33 +294,49 @@ "template": "", "output": "str", "x": 1790, - "y": 720, + "y": 320, "wires": [ [ - "051f31139e799468" + "ba409d3499824364" ] ] }, { - "id": "0fa8b59e2735c07d", + "id": "dec04d7f3b819fb2", "type": "template", "z": "55da1471.fda0fc", "g": "deb17c414e79ec63", - "name": "notification id", - "field": "notify.notification_id", + "name": "title", + "field": "notify.title", "fieldType": "msg", "format": "handlebars", "syntax": "mustache", - "template": "vacuum", + "template": "Stofzuiger", "output": "str", - "x": 1810, - "y": 360, + "x": 1790, + "y": 280, "wires": [ [ "ba409d3499824364" ] ] }, + { + "id": "c5f04c8242157305", + "type": "link out", + "z": "55da1471.fda0fc", + "g": "deb17c414e79ec63", + "name": "link_out_notify_basement_ventilation", + "mode": "link", + "links": [ + "8ed3b0974336e55b", + "aeee8468f3d1b7ad", + "c4660dc11fb0e5b8" + ], + "x": 2085, + "y": 340, + "wires": [] + }, { "id": "ba409d3499824364", "type": "join", @@ -281,35 +367,19 @@ ] }, { - "id": "c5f04c8242157305", - "type": "link out", - "z": "55da1471.fda0fc", - "g": "deb17c414e79ec63", - "name": "link_out_notify_basement_ventilation", - "mode": "link", - "links": [ - "8ed3b0974336e55b", - "aeee8468f3d1b7ad", - "c4660dc11fb0e5b8" - ], - "x": 2085, - "y": 340, - "wires": [] - }, - { - "id": "dec04d7f3b819fb2", + "id": "0fa8b59e2735c07d", "type": "template", "z": "55da1471.fda0fc", "g": "deb17c414e79ec63", - "name": "title", - "field": "notify.title", + "name": "notification id", + "field": "notify.notification_id", "fieldType": "msg", "format": "handlebars", "syntax": "mustache", - "template": "Stofzuiger", + "template": "vacuum", "output": "str", - "x": 1790, - "y": 280, + "x": 1810, + "y": 360, "wires": [ [ "ba409d3499824364" @@ -317,10 +387,10 @@ ] }, { - "id": "f60ecb3be0ebc2af", + "id": "c8bc013c45f3ae72", "type": "template", "z": "55da1471.fda0fc", - "g": "deb17c414e79ec63", + "g": "faf17088fd1a6b16", "name": "icon", "field": "notify.icon", "fieldType": "msg", @@ -329,87 +399,52 @@ "template": "", "output": "str", "x": 1790, - "y": 320, + "y": 720, "wires": [ [ - "ba409d3499824364" + "051f31139e799468" ] ] }, { - "id": "0e83125ead481334", + "id": "035b931bd0cea26e", "type": "template", "z": "55da1471.fda0fc", - "g": "33fea7faee8e1f82", - "name": "notification id", - "field": "notify.notification_id", + "g": "faf17088fd1a6b16", + "name": "title", + "field": "notify.title", "fieldType": "msg", "format": "handlebars", "syntax": "mustache", - "template": "vacuum", + "template": "Stofzuiger", "output": "str", "x": 1790, - "y": 580, + "y": 680, "wires": [ [ - "b5cc0d26cf3e7ab2" + "051f31139e799468" ] ] }, { - "id": "09d4cdb039e852de", - "type": "change", + "id": "57488cc36dcd2d00", + "type": "link out", "z": "55da1471.fda0fc", - "g": "33fea7faee8e1f82", - "name": "action titles", - "rules": [ - { - "t": "set", - "p": "notify.action_1_title", - "pt": "msg", - "to": "JA", - "tot": "str" - }, - { - "t": "set", - "p": "notify.action_2_title", - "pt": "msg", - "to": "NEE", - "tot": "str" - }, - { - "t": "set", - "p": "notify.action_1", - "pt": "msg", - "to": "IGNORE", - "tot": "str" - }, - { - "t": "set", - "p": "notify.action_2", - "pt": "msg", - "to": "VACUUM_AUTOCLEANING_OFF", - "tot": "str" - } + "g": "faf17088fd1a6b16", + "name": "link_out_notify_basement_ventilation", + "mode": "link", + "links": [ + "c4660dc11fb0e5b8" ], - "action": "", - "property": "", - "from": "", - "to": "", - "reg": false, - "x": 1790, - "y": 500, - "wires": [ - [ - "b5cc0d26cf3e7ab2" - ] - ] + "x": 2085, + "y": 720, + "wires": [] }, { - "id": "b5cc0d26cf3e7ab2", + "id": "051f31139e799468", "type": "join", "z": "55da1471.fda0fc", - "g": "33fea7faee8e1f82", + "g": "faf17088fd1a6b16", "name": "", "mode": "custom", "build": "merged", @@ -420,72 +455,37 @@ "joinerType": "str", "accumulate": false, "timeout": "", - "count": "8", + "count": "4", "reduceRight": false, "reduceExp": "", "reduceInit": "", "reduceInitType": "", "reduceFixup": "", "x": 1990, - "y": 500, - "wires": [ - [ - "d7f92782a71d3837" - ] - ] - }, - { - "id": "d7f92782a71d3837", - "type": "link out", - "z": "55da1471.fda0fc", - "g": "33fea7faee8e1f82", - "name": "link_out_notify_guest_mode", - "mode": "link", - "links": [ - "c76d311bb4b6991b", - "d1753081ba6b4004" - ], - "x": 2085, - "y": 500, - "wires": [] - }, - { - "id": "d5ae8df68946471a", - "type": "template", - "z": "55da1471.fda0fc", - "g": "33fea7faee8e1f82", - "name": "title", - "field": "notify.title", - "fieldType": "msg", - "format": "handlebars", - "syntax": "mustache", - "template": "Stofzuiger", - "output": "str", - "x": 1770, - "y": 460, + "y": 720, "wires": [ [ - "b5cc0d26cf3e7ab2" + "57488cc36dcd2d00" ] ] }, { - "id": "8f3e39fd9d879f86", + "id": "8205d58f610c05d0", "type": "template", "z": "55da1471.fda0fc", - "g": "33fea7faee8e1f82", - "name": "icon", - "field": "notify.icon", + "g": "faf17088fd1a6b16", + "name": "notification id", + "field": "notify.notification_id", "fieldType": "msg", "format": "handlebars", "syntax": "mustache", - "template": "", + "template": "vacuum", "output": "str", - "x": 1770, - "y": 540, + "x": 1810, + "y": 760, "wires": [ [ - "b5cc0d26cf3e7ab2" + "051f31139e799468" ] ] }, @@ -1023,60 +1023,6 @@ "y": 40, "wires": [] }, - { - "id": "a236a61.195e958", - "type": "server-state-changed", - "z": "55da1471.fda0fc", - "name": "Vacuum State is error", - "server": "4ba92433.2478cc", - "version": 5, - "outputs": 2, - "exposeAsEntityConfig": "", - "entityId": "vacuum.roborock_s6_pure", - "entityIdType": "exact", - "outputInitially": true, - "stateType": "str", - "ifState": "error", - "ifStateType": "str", - "ifStateOperator": "is", - "outputOnlyOnStateChange": true, - "for": "", - "forType": "num", - "forUnits": "minutes", - "ignorePrevStateNull": false, - "ignorePrevStateUnknown": false, - "ignorePrevStateUnavailable": false, - "ignoreCurrentStateUnknown": false, - "ignoreCurrentStateUnavailable": false, - "outputProperties": [ - { - "property": "payload", - "propertyType": "msg", - "value": "", - "valueType": "entityState" - }, - { - "property": "data", - "propertyType": "msg", - "value": "", - "valueType": "eventData" - }, - { - "property": "topic", - "propertyType": "msg", - "value": "", - "valueType": "triggerId" - } - ], - "x": 120, - "y": 400, - "wires": [ - [ - "b555794d.5740c8" - ], - [] - ] - }, { "id": "173b8941.c73507", "type": "server-state-changed", @@ -1190,25 +1136,6 @@ ] ] }, - { - "id": "b555794d.5740c8", - "type": "template", - "z": "55da1471.fda0fc", - "name": "message", - "field": "notify.message", - "fieldType": "msg", - "format": "handlebars", - "syntax": "mustache", - "template": "De stofzuiger zit vast en heeft hulp nodig.", - "output": "str", - "x": 1520, - "y": 380, - "wires": [ - [ - "60b0a5eab5b0a9d6" - ] - ] - }, { "id": "934221e4.b2d0d", "type": "stoptimer",