From 470b5f5a8eed7daae33fb4914f1ed48ad47023ee Mon Sep 17 00:00:00 2001 From: rxf Date: Mon, 6 Jul 2026 10:49:48 +0200 Subject: [PATCH] Daten in Influx: - optischen Anpassungen - Kaffeemaschine dazu --- flows.json | 1804 ++++++++----------------- flows_cred.json | 2 +- flows_cred.json.bak-fix-1783185892699 | 1 + 3 files changed, 570 insertions(+), 1237 deletions(-) create mode 100644 flows_cred.json.bak-fix-1783185892699 diff --git a/flows.json b/flows.json index 6d0d2b0..8cd3bc0 100644 --- a/flows.json +++ b/flows.json @@ -71,14 +71,6 @@ "info": "# Licht im Esszimmer\n\nWird mit dem Bewegungsmelder über der Türe \n**Ein** geschaltet, wenn der Helligkeits-Sensor \neine Helligkeit über _helltop_ meldet. Andernfalls ist das Auslösen gesperrt.\n**AUS** geschaltet wird nur mit dem Schalter. Wird der Schalter auf **AUS** geschaltet, \nwird das Wiedereinschalten durch den BW-Melder für 5 sec gesperrt.\nLiegt die Helligkeit unter _hellbot_, so wird das schalten durch den BW freigegeben\n\n## Versionen\nV1.0.1 2026-04-19 rxf\n - Schalte für Licht auf dem Dashboard\n \nV1.0.0 2025-06-30 rxf\n - Erster Versuch\n\n\n", "env": [] }, - { - "id": "f3d03e63c0a7d73a", - "type": "tab", - "label": "TV-Szene_old", - "disabled": false, - "info": "", - "env": [] - }, { "id": "50665df0b8356ca9", "type": "tab", @@ -207,8 +199,8 @@ "y": 2780, "wires": [ [ - "4b70842673899382", - "8b9ab3a5f87659ca" + "8b9ab3a5f87659ca", + "4b70842673899382" ] ] }, @@ -220,8 +212,8 @@ "y": 380, "wires": [ [ - "0fed74f96c718b5f", - "4ec35d1ec93a275d" + "4ec35d1ec93a275d", + "0fed74f96c718b5f" ] ] }, @@ -229,12 +221,12 @@ "id": "19c631abc815d4c7", "type": "junction", "z": "86a9e7aa0c304b46", - "x": 940, + "x": 960, "y": 120, "wires": [ [ - "e7113fd1f1cb5375", - "057123c49327e982" + "057123c49327e982", + "e7113fd1f1cb5375" ] ] }, @@ -243,7 +235,7 @@ "type": "junction", "z": "86a9e7aa0c304b46", "x": 880, - "y": 1180, + "y": 1480, "wires": [ [ "df52eb75d71fc1d0" @@ -267,26 +259,14 @@ "id": "c46bc662805c3ea3", "type": "junction", "z": "86a9e7aa0c304b46", - "x": 520, - "y": 2180, + "x": 540, + "y": 2280, "wires": [ [ "7371b0de49444879" ] ] }, - { - "id": "21a3752d5b338a61", - "type": "junction", - "z": "86a9e7aa0c304b46", - "x": 1100, - "y": 1300, - "wires": [ - [ - "af03a5e1a841517a" - ] - ] - }, { "id": "b023da7344e3bad8", "type": "junction", @@ -638,6 +618,31 @@ ] ] }, + { + "id": "4e55b9bbc76b88d1", + "type": "junction", + "z": "86a9e7aa0c304b46", + "x": 1240, + "y": 1480, + "wires": [ + [ + "56b1402383445da7" + ] + ] + }, + { + "id": "de71f2c5f6b434a8", + "type": "junction", + "z": "86a9e7aa0c304b46", + "x": 1140, + "y": 1080, + "wires": [ + [ + "7fc3aa347ffa61d0", + "40b7e603ef1e9c58" + ] + ] + }, { "id": "c46833d59903b816", "type": "mqtt-broker", @@ -677,212 +682,10 @@ "usetls": false, "tls": "", "influxdbVersion": "2.0", - "url": "http://192.168.178.92:8086", + "url": "http://influxdb:8086", + "timeout": "", "rejectUnauthorized": true }, - { - "id": "6718450508849828", - "type": "ui_base", - "theme": { - "name": "theme-light", - "lightTheme": { - "default": "#0094CE", - "baseColor": "#0094CE", - "baseFont": "-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen-Sans,Ubuntu,Cantarell,Helvetica Neue,sans-serif", - "edited": true, - "reset": false - }, - "darkTheme": { - "default": "#097479", - "baseColor": "#097479", - "baseFont": "-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen-Sans,Ubuntu,Cantarell,Helvetica Neue,sans-serif", - "edited": true, - "reset": false - }, - "customTheme": { - "name": "Untitled Theme 1", - "default": "#4B7930", - "baseColor": "#4B7930", - "baseFont": "-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen-Sans,Ubuntu,Cantarell,Helvetica Neue,sans-serif", - "reset": false - }, - "themeState": { - "base-color": { - "default": "#0094CE", - "value": "#0094CE", - "edited": false - }, - "page-titlebar-backgroundColor": { - "value": "#0094CE", - "edited": false - }, - "page-backgroundColor": { - "value": "#fafafa", - "edited": false - }, - "page-sidebar-backgroundColor": { - "value": "#ffffff", - "edited": false - }, - "group-textColor": { - "value": "#1bbfff", - "edited": false - }, - "group-borderColor": { - "value": "#ffffff", - "edited": false - }, - "group-backgroundColor": { - "value": "#ffffff", - "edited": false - }, - "widget-textColor": { - "value": "#111111", - "edited": false - }, - "widget-backgroundColor": { - "value": "#0094ce", - "edited": false - }, - "widget-borderColor": { - "value": "#ffffff", - "edited": false - }, - "base-font": { - "value": "-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen-Sans,Ubuntu,Cantarell,Helvetica Neue,sans-serif" - } - }, - "angularTheme": { - "primary": "indigo", - "accents": "blue", - "warn": "red", - "background": "grey", - "palette": "light" - } - }, - "site": { - "name": "Node-RED Dashboard", - "hideToolbar": "false", - "allowSwipe": "false", - "lockMenu": "false", - "allowTempTheme": "true", - "dateFormat": "DD/MM/YYYY", - "sizes": { - "sx": 48, - "sy": 48, - "gx": 3, - "gy": 3, - "cx": 3, - "cy": 3, - "px": 0, - "py": 0 - } - } - }, - { - "id": "c398618f77baaf6f", - "type": "ewelink-credentials" - }, - { - "id": "874361936f1ce815", - "type": "mongodb4-client", - "name": "", - "protocol": "mongodb", - "hostname": "mongodb", - "port": "", - "dbName": "smarthome", - "appName": "", - "authSource": "", - "authMechanism": "DEFAULT", - "tls": false, - "tlsCAFile": "", - "tlsCertificateKeyFile": "", - "tlsInsecure": false, - "connectTimeoutMS": "30000", - "socketTimeoutMS": "0", - "minPoolSize": "0", - "maxPoolSize": "100", - "maxIdleTimeMS": "0", - "uri": "", - "advanced": "{}", - "uriTabActive": "tab-uri-simple" - }, - { - "id": "512b6562849dadee", - "type": "ui_tab", - "name": "Bad", - "icon": "dashboard", - "order": 2, - "disabled": false, - "hidden": false - }, - { - "id": "c7cf83a81a522047", - "type": "mqtt-broker", - "name": "", - "broker": "192.168.178.92", - "port": "1883", - "clientid": "", - "autoConnect": true, - "usetls": false, - "protocolVersion": "3", - "keepalive": "60", - "cleansession": true, - "birthTopic": "", - "birthQos": "0", - "birthPayload": "", - "birthMsg": {}, - "closeTopic": "", - "closeQos": "0", - "closePayload": "", - "closeMsg": {}, - "willTopic": "", - "willQos": "0", - "willPayload": "", - "willMsg": {}, - "userProps": "", - "sessionExpiry": "" - }, - { - "id": "8a3b8c7fb995c0cc", - "type": "ui_tab", - "name": "Außen", - "icon": "dashboard", - "order": 5, - "disabled": false, - "hidden": false - }, - { - "id": "650272fe9af6cd24", - "type": "ui_group", - "name": "Außen", - "tab": "8a3b8c7fb995c0cc", - "order": 1, - "disp": true, - "width": 8, - "collapse": false, - "className": "" - }, - { - "id": "553e9caf7ebabdd6", - "type": "ui_tab", - "name": "AMS", - "icon": "dashboard", - "order": 3, - "disabled": false, - "hidden": false - }, - { - "id": "0da5c56696a7e8e9", - "type": "ui_group", - "name": "Leistung/Energie", - "tab": "553e9caf7ebabdd6", - "order": 3, - "disp": true, - "width": "6", - "collapse": false, - "className": "" - }, { "id": "a8dc70a6237173a2", "type": "ui-base", @@ -922,118 +725,6 @@ "widgetGap": "12px" } }, - { - "id": "e3645fc2dca1359f", - "type": "ui_spacer", - "z": "c4c5067b315c581d", - "name": "spacer", - "group": "0da5c56696a7e8e9", - "order": 3, - "width": 1, - "height": 1 - }, - { - "id": "99402d723b2b1e21", - "type": "ui_spacer", - "z": "c4c5067b315c581d", - "name": "spacer", - "group": "0da5c56696a7e8e9", - "order": 5, - "width": 1, - "height": 1 - }, - { - "id": "3f1a3bcbb0c8aa3b", - "type": "ui_spacer", - "z": "c4c5067b315c581d", - "name": "spacer", - "group": "0da5c56696a7e8e9", - "order": 6, - "width": 1, - "height": 1 - }, - { - "id": "500baab117305070", - "type": "ui_spacer", - "z": "c4c5067b315c581d", - "name": "spacer", - "group": "0da5c56696a7e8e9", - "order": 7, - "width": 1, - "height": 1 - }, - { - "id": "2a375d53c7031e98", - "type": "ui_spacer", - "z": "c4c5067b315c581d", - "name": "spacer", - "group": "0da5c56696a7e8e9", - "order": 8, - "width": 1, - "height": 1 - }, - { - "id": "adf34916dc6801e6", - "type": "ui_spacer", - "z": "c4c5067b315c581d", - "name": "spacer", - "group": "0da5c56696a7e8e9", - "order": 9, - "width": 1, - "height": 1 - }, - { - "id": "4e5d8ea99e128609", - "type": "ui_spacer", - "z": "0f906ba2e4239518", - "name": "spacer", - "group": "650272fe9af6cd24", - "order": 1, - "width": 1, - "height": 1 - }, - { - "id": "7e0b4d54629e83fd", - "type": "ui_spacer", - "z": "0f906ba2e4239518", - "name": "spacer", - "group": "650272fe9af6cd24", - "order": 3, - "width": 1, - "height": 1 - }, - { - "id": "5496b07c554bcd4d", - "type": "ui_spacer", - "z": "0f906ba2e4239518", - "name": "spacer", - "group": "650272fe9af6cd24", - "order": 4, - "width": 1, - "height": 1 - }, - { - "id": "b156ad0584ac7fbb", - "type": "ui_spacer", - "z": "0f906ba2e4239518", - "name": "spacer", - "group": "650272fe9af6cd24", - "order": 6, - "width": 1, - "height": 1 - }, - { - "id": "dbdce4bcc146f440", - "type": "config-log", - "logname": "bwlog.config", - "logdir": "logs", - "stamp": "utc", - "logstyle": "plain", - "logrotate": true, - "logcompress": false, - "logrotatecount": "5", - "logsize": "1000" - }, { "id": "9a5095b780d6917f", "type": "ui-page", @@ -1070,13 +761,6 @@ "visible": true, "disabled": false }, - { - "id": "tab1", - "type": "ui_tab", - "name": "Haussteuerung", - "icon": "dashboard", - "order": 1 - }, { "id": "176338afeb8a7b58", "type": "ui-group", @@ -1091,14 +775,6 @@ "disabled": "false", "groupType": "default" }, - { - "id": "261c60c1322869d9", - "type": "ui_tab", - "name": "CL", - "icon": "dashboard", - "disabled": false, - "hidden": false - }, { "id": "1d0cfd7b0bb56a24", "type": "ui-group", @@ -1219,57 +895,6 @@ "disabled": "false", "groupType": "default" }, - { - "id": "51bf0475.ddfd2c", - "type": "ui_group", - "name": "", - "tab": "512b6562849dadee", - "order": 2, - "disp": true, - "width": "8", - "collapse": false, - "className": "" - }, - { - "id": "f77e63041443e335", - "type": "ui_spacer", - "z": "c23febdb48bc9327", - "name": "spacer", - "group": "51bf0475.ddfd2c", - "order": 1, - "width": 1, - "height": 1 - }, - { - "id": "00567b32fc89bd1e", - "type": "ui_spacer", - "z": "c23febdb48bc9327", - "name": "spacer", - "group": "51bf0475.ddfd2c", - "order": 3, - "width": 1, - "height": 1 - }, - { - "id": "8c01f9a37aebd235", - "type": "ui_spacer", - "z": "c23febdb48bc9327", - "name": "spacer", - "group": "51bf0475.ddfd2c", - "order": 4, - "width": 1, - "height": 1 - }, - { - "id": "09ded2e5c01ce729", - "type": "ui_spacer", - "z": "c23febdb48bc9327", - "name": "spacer", - "group": "51bf0475.ddfd2c", - "order": 6, - "width": 1, - "height": 1 - }, { "id": "3c175ef314bf5b6c", "type": "ui-group", @@ -1463,6 +1088,309 @@ "disabled": "false", "groupType": "default" }, + { + "id": "6718450508849828", + "type": "ui_base", + "theme": { + "name": "theme-light", + "lightTheme": { + "default": "#0094CE", + "baseColor": "#0094CE", + "baseFont": "-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen-Sans,Ubuntu,Cantarell,Helvetica Neue,sans-serif", + "edited": true, + "reset": false + }, + "darkTheme": { + "default": "#097479", + "baseColor": "#097479", + "baseFont": "-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen-Sans,Ubuntu,Cantarell,Helvetica Neue,sans-serif", + "edited": true, + "reset": false + }, + "customTheme": { + "name": "Untitled Theme 1", + "default": "#4B7930", + "baseColor": "#4B7930", + "baseFont": "-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen-Sans,Ubuntu,Cantarell,Helvetica Neue,sans-serif", + "reset": false + }, + "themeState": { + "base-color": { + "default": "#0094CE", + "value": "#0094CE", + "edited": false + }, + "page-titlebar-backgroundColor": { + "value": "#0094CE", + "edited": false + }, + "page-backgroundColor": { + "value": "#fafafa", + "edited": false + }, + "page-sidebar-backgroundColor": { + "value": "#ffffff", + "edited": false + }, + "group-textColor": { + "value": "#1bbfff", + "edited": false + }, + "group-borderColor": { + "value": "#ffffff", + "edited": false + }, + "group-backgroundColor": { + "value": "#ffffff", + "edited": false + }, + "widget-textColor": { + "value": "#111111", + "edited": false + }, + "widget-backgroundColor": { + "value": "#0094ce", + "edited": false + }, + "widget-borderColor": { + "value": "#ffffff", + "edited": false + }, + "base-font": { + "value": "-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen-Sans,Ubuntu,Cantarell,Helvetica Neue,sans-serif" + } + }, + "angularTheme": { + "primary": "indigo", + "accents": "blue", + "warn": "red", + "background": "grey", + "palette": "light" + } + }, + "site": { + "name": "Node-RED Dashboard", + "hideToolbar": "false", + "allowSwipe": "false", + "lockMenu": "false", + "allowTempTheme": "true", + "dateFormat": "DD/MM/YYYY", + "sizes": { + "sx": 48, + "sy": 48, + "gx": 3, + "gy": 3, + "cx": 3, + "cy": 3, + "px": 0, + "py": 0 + } + } + }, + { + "id": "c398618f77baaf6f", + "type": "ewelink-credentials" + }, + { + "id": "512b6562849dadee", + "type": "ui_tab", + "name": "Bad", + "icon": "dashboard", + "order": 2, + "disabled": false, + "hidden": false + }, + { + "id": "8a3b8c7fb995c0cc", + "type": "ui_tab", + "name": "Außen", + "icon": "dashboard", + "order": 5, + "disabled": false, + "hidden": false + }, + { + "id": "650272fe9af6cd24", + "type": "ui_group", + "name": "Außen", + "tab": "8a3b8c7fb995c0cc", + "order": 1, + "disp": true, + "width": 8, + "collapse": false, + "className": "" + }, + { + "id": "553e9caf7ebabdd6", + "type": "ui_tab", + "name": "AMS", + "icon": "dashboard", + "order": 3, + "disabled": false, + "hidden": false + }, + { + "id": "0da5c56696a7e8e9", + "type": "ui_group", + "name": "Leistung/Energie", + "tab": "553e9caf7ebabdd6", + "order": 3, + "disp": true, + "width": "6", + "collapse": false, + "className": "" + }, + { + "id": "e3645fc2dca1359f", + "type": "ui_spacer", + "z": "c4c5067b315c581d", + "name": "spacer", + "group": "0da5c56696a7e8e9", + "order": 3, + "width": 1, + "height": 1 + }, + { + "id": "99402d723b2b1e21", + "type": "ui_spacer", + "z": "c4c5067b315c581d", + "name": "spacer", + "group": "0da5c56696a7e8e9", + "order": 5, + "width": 1, + "height": 1 + }, + { + "id": "3f1a3bcbb0c8aa3b", + "type": "ui_spacer", + "z": "c4c5067b315c581d", + "name": "spacer", + "group": "0da5c56696a7e8e9", + "order": 6, + "width": 1, + "height": 1 + }, + { + "id": "500baab117305070", + "type": "ui_spacer", + "z": "c4c5067b315c581d", + "name": "spacer", + "group": "0da5c56696a7e8e9", + "order": 7, + "width": 1, + "height": 1 + }, + { + "id": "2a375d53c7031e98", + "type": "ui_spacer", + "z": "c4c5067b315c581d", + "name": "spacer", + "group": "0da5c56696a7e8e9", + "order": 8, + "width": 1, + "height": 1 + }, + { + "id": "adf34916dc6801e6", + "type": "ui_spacer", + "z": "c4c5067b315c581d", + "name": "spacer", + "group": "0da5c56696a7e8e9", + "order": 9, + "width": 1, + "height": 1 + }, + { + "id": "4e5d8ea99e128609", + "type": "ui_spacer", + "z": "0f906ba2e4239518", + "name": "spacer", + "group": "650272fe9af6cd24", + "order": 1, + "width": 1, + "height": 1 + }, + { + "id": "7e0b4d54629e83fd", + "type": "ui_spacer", + "z": "0f906ba2e4239518", + "name": "spacer", + "group": "650272fe9af6cd24", + "order": 3, + "width": 1, + "height": 1 + }, + { + "id": "5496b07c554bcd4d", + "type": "ui_spacer", + "z": "0f906ba2e4239518", + "name": "spacer", + "group": "650272fe9af6cd24", + "order": 4, + "width": 1, + "height": 1 + }, + { + "id": "b156ad0584ac7fbb", + "type": "ui_spacer", + "z": "0f906ba2e4239518", + "name": "spacer", + "group": "650272fe9af6cd24", + "order": 6, + "width": 1, + "height": 1 + }, + { + "id": "51bf0475.ddfd2c", + "type": "ui_group", + "name": "", + "tab": "512b6562849dadee", + "order": 2, + "disp": true, + "width": "8", + "collapse": false, + "className": "" + }, + { + "id": "f77e63041443e335", + "type": "ui_spacer", + "z": "c23febdb48bc9327", + "name": "spacer", + "group": "51bf0475.ddfd2c", + "order": 1, + "width": 1, + "height": 1 + }, + { + "id": "00567b32fc89bd1e", + "type": "ui_spacer", + "z": "c23febdb48bc9327", + "name": "spacer", + "group": "51bf0475.ddfd2c", + "order": 3, + "width": 1, + "height": 1 + }, + { + "id": "8c01f9a37aebd235", + "type": "ui_spacer", + "z": "c23febdb48bc9327", + "name": "spacer", + "group": "51bf0475.ddfd2c", + "order": 4, + "width": 1, + "height": 1 + }, + { + "id": "09ded2e5c01ce729", + "type": "ui_spacer", + "z": "c23febdb48bc9327", + "name": "spacer", + "group": "51bf0475.ddfd2c", + "order": 6, + "width": 1, + "height": 1 + }, { "id": "4d2812cbd43e95b7", "type": "mqtt in", @@ -1616,11 +1544,10 @@ "rh": 0, "inputs": 0, "x": 250, - "y": 900, + "y": 840, "wires": [ [ - "cf55cbbf405be02b", - "980ffcb9b3562a71" + "cf55cbbf405be02b" ] ] }, @@ -1631,16 +1558,17 @@ "name": "Arbeit und Leistung aufbereiten", "func": "if(msg.topic.indexOf('chn0') != -1) {\n msg.payload = { 'arbeit' : msg.payload}\n}\nif (msg.topic.indexOf('chn1') != -1) {\n msg.payload = { 'leistung': msg.payload }\n}\nif (msg.topic.endsWith('id')) {\n return\n}\nreturn msg;", "outputs": 1, + "timeout": "", "noerr": 0, "initialize": "", "finalize": "", "libs": [], "x": 650, - "y": 900, + "y": 840, "wires": [ [ - "9b487a1cd42204f8", - "69596ad6efc4ec53" + "69596ad6efc4ec53", + "9b487a1cd42204f8" ] ] }, @@ -1715,7 +1643,7 @@ "rh": 0, "inputs": 0, "x": 320, - "y": 1240, + "y": 1460, "wires": [ [ "385274fd5a2c8804" @@ -1735,8 +1663,8 @@ "targetType": "full", "statusVal": "", "statusType": "auto", - "x": 1480, - "y": 1100, + "x": 1340, + "y": 1420, "wires": [] }, { @@ -1746,16 +1674,17 @@ "name": "extract die Messwerte", "func": "let value = msg.payload.val\nlet send = false\nif (msg.topic.endsWith('ENERGY_COUNTER')) {\n msg.payload = {'arbeit': value}\n send = true\n}\nif (msg.topic.endsWith('POWER')) {\n msg.payload = { 'leistung': value }\n send = true\n}\nif (msg.topic.endsWith('CURRENT')) {\n msg.payload = { 'strom': value }\n send = true\n}\nif (msg.topic.endsWith('VOLTAGE')) {\n msg.payload = { 'spannung': value }\n send = true\n}\nif (msg.topic.endsWith('FREQUENCY')) {\n msg.payload = { 'frequenz': value }\n send = true\n}\nif(send) {\n return msg;\n}", "outputs": 1, + "timeout": "", "noerr": 0, "initialize": "", "finalize": "", "libs": [], - "x": 1220, - "y": 1180, + "x": 1040, + "y": 1480, "wires": [ [ - "56b1402383445da7", - "3a825455dd3990c4" + "3a825455dd3990c4", + "4e55b9bbc76b88d1" ] ] }, @@ -1773,7 +1702,7 @@ "rh": 0, "inputs": 0, "x": 290, - "y": 1300, + "y": 1520, "wires": [ [ "fe861bd491c3e005" @@ -1800,11 +1729,10 @@ "to": "", "reg": false, "x": 620, - "y": 1300, + "y": 1520, "wires": [ [ - "4b7b9693aed95eb0", - "8a73c559561e08d5" + "4b7b9693aed95eb0" ] ] }, @@ -1828,11 +1756,10 @@ "to": "", "reg": false, "x": 620, - "y": 1240, + "y": 1460, "wires": [ [ - "4b7b9693aed95eb0", - "391f3b9a3bacdd88" + "4b7b9693aed95eb0" ] ] }, @@ -1850,7 +1777,7 @@ "rh": 0, "inputs": 0, "x": 280, - "y": 1660, + "y": 1820, "wires": [ [ "b602d56c5ecdf7fc", @@ -1871,7 +1798,7 @@ "statusVal": "", "statusType": "auto", "x": 1120, - "y": 1600, + "y": 1760, "wires": [] }, { @@ -1886,7 +1813,7 @@ "finalize": "", "libs": [], "x": 690, - "y": 1660, + "y": 1820, "wires": [ [ "ae107129cb3cf180", @@ -1984,7 +1911,7 @@ "org": "citysensor", "bucket": "strom", "x": 1190, - "y": 900, + "y": 840, "wires": [] }, { @@ -2019,8 +1946,8 @@ "retentionPolicyV18Flux": "", "org": "citysensor", "bucket": "keller", - "x": 1530, - "y": 1180, + "x": 1390, + "y": 1480, "wires": [] }, { @@ -2038,7 +1965,7 @@ "org": "citysensor", "bucket": "auto", "x": 1210, - "y": 1660, + "y": 1820, "wires": [] }, { @@ -2055,7 +1982,7 @@ "statusVal": "", "statusType": "auto", "x": 960, - "y": 880, + "y": 800, "wires": [] }, { @@ -2071,8 +1998,8 @@ "rap": true, "rh": 0, "inputs": 0, - "x": 220, - "y": 1860, + "x": 240, + "y": 1960, "wires": [ [ "c46bc662805c3ea3" @@ -2092,8 +2019,8 @@ "rap": true, "rh": 0, "inputs": 0, - "x": 220, - "y": 1920, + "x": 240, + "y": 2020, "wires": [ [ "c46bc662805c3ea3" @@ -2111,12 +2038,12 @@ "initialize": "", "finalize": "", "libs": [], - "x": 920, - "y": 2120, + "x": 940, + "y": 2220, "wires": [ [ - "3ccd32cf4a9e4b11", - "9bed2a1b764095c8" + "9bed2a1b764095c8", + "3ccd32cf4a9e4b11" ] ] }, @@ -2134,8 +2061,8 @@ "retentionPolicyV18Flux": "", "org": "citysensor", "bucket": "raumtemps", - "x": 1230, - "y": 2120, + "x": 1250, + "y": 2220, "wires": [] }, { @@ -2151,8 +2078,8 @@ "rap": true, "rh": 0, "inputs": 0, - "x": 220, - "y": 1980, + "x": 240, + "y": 2080, "wires": [ [ "c46bc662805c3ea3" @@ -2172,8 +2099,8 @@ "rap": true, "rh": 0, "inputs": 0, - "x": 220, - "y": 2040, + "x": 240, + "y": 2140, "wires": [ [ "c46bc662805c3ea3" @@ -2193,8 +2120,8 @@ "rap": true, "rh": 0, "inputs": 0, - "x": 230, - "y": 2340, + "x": 250, + "y": 2440, "wires": [ [ "c46bc662805c3ea3" @@ -2214,8 +2141,8 @@ "targetType": "full", "statusVal": "", "statusType": "auto", - "x": 1180, - "y": 2020, + "x": 1200, + "y": 2120, "wires": [] }, { @@ -2235,8 +2162,8 @@ "drop": true, "allowrate": false, "outputs": 1, - "x": 680, - "y": 2180, + "x": 700, + "y": 2280, "wires": [ [ "d9df2ad9c5de5c68" @@ -2270,17 +2197,17 @@ "name": "Stromverbrauch", "info": "", "x": 240, - "y": 860, + "y": 800, "wires": [] }, { "id": "f742570145e0755a", "type": "comment", "z": "86a9e7aa0c304b46", - "name": "Waschmaschine, Trockner, Spülaschine und Kühlschrank", + "name": "Waschmaschine, Trockner, Keller-Kühlschrankk", "info": "", - "x": 370, - "y": 1200, + "x": 340, + "y": 1420, "wires": [] }, { @@ -2290,7 +2217,7 @@ "name": "Auto laden", "info": "", "x": 220, - "y": 1620, + "y": 1780, "wires": [] }, { @@ -2299,8 +2226,8 @@ "z": "86a9e7aa0c304b46", "name": "Raum-Temperaturen und -Feuchte", "info": "", - "x": 300, - "y": 1820, + "x": 320, + "y": 1920, "wires": [] }, { @@ -2363,38 +2290,11 @@ "rh": 0, "inputs": 0, "x": 320, - "y": 1360, + "y": 1020, "wires": [ [ - "c0f6dadd964ce99a" - ] - ] - }, - { - "id": "c0f6dadd964ce99a", - "type": "change", - "z": "86a9e7aa0c304b46", - "name": "", - "rules": [ - { - "t": "set", - "p": "measurement", - "pt": "msg", - "to": "kuehlschrank", - "tot": "str" - } - ], - "action": "", - "property": "", - "from": "", - "to": "", - "reg": false, - "x": 620, - "y": 1360, - "wires": [ - [ - "4b7b9693aed95eb0", - "46d53fd1857f29b8" + "dbfbda5e610e0bbe", + "2102d56ac74708d4" ] ] }, @@ -2448,7 +2348,7 @@ "rh": 0, "inputs": 0, "x": 280, - "y": 1420, + "y": 1080, "wires": [ [ "8def8664ad59b9f1" @@ -2462,241 +2362,16 @@ "name": "extract die Messwerte", "func": "msg.payload = {\n 'arbeit': msg.payload.energy,\n 'leistung': msg.payload.power\n}\nmsg.measurement = 'spuelmaschine'\nreturn msg;\n", "outputs": 1, - "noerr": 0, - "initialize": "", - "finalize": "", - "libs": [], - "x": 780, - "y": 1420, - "wires": [ - [ - "6a8991fdab7a3434", - "56b1402383445da7", - "40b7e603ef1e9c58" - ] - ] - }, - { - "id": "fe04f6c77be768d2", - "type": "config", - "z": "86a9e7aa0c304b46", - "name": "", - "properties": [ - { - "p": "cnt", - "pt": "flow", - "to": "0", - "tot": "num" - }, - { - "p": "pl", - "pt": "flow", - "to": "[]", - "tot": "json" - } - ], - "active": true, - "x": 230, - "y": 800, - "wires": [] - }, - { - "id": "980ffcb9b3562a71", - "type": "function", - "z": "86a9e7aa0c304b46", - "name": "function 12", - "func": "if (msg.topic.indexOf('chn1') != -1) {\n msg.topic = 'Gesamt-Leistung [Wh]'\n return msg;\n}", - "outputs": 1, - "noerr": 0, - "initialize": "", - "finalize": "", - "libs": [], - "x": 590, - "y": 840, - "wires": [ - [] - ] - }, - { - "id": "6a8991fdab7a3434", - "type": "function", - "z": "86a9e7aa0c304b46", - "name": "function 13", - "func": "msg.maschine = \"spuelmaschine\"\nreturn msg;", - "outputs": 1, "timeout": "", "noerr": 0, "initialize": "", "finalize": "", "libs": [], - "x": 1150, - "y": 1420, + "x": 840, + "y": 1080, "wires": [ [ - "af03a5e1a841517a" - ] - ] - }, - { - "id": "af03a5e1a841517a", - "type": "change", - "z": "86a9e7aa0c304b46", - "name": "", - "rules": [ - { - "t": "set", - "p": "operation", - "pt": "msg", - "to": "insertOne", - "tot": "str" - }, - { - "t": "set", - "p": "collection", - "pt": "msg", - "to": "maschinen", - "tot": "str" - }, - { - "t": "set", - "p": "payload.maschine", - "pt": "msg", - "to": "measurement", - "tot": "msg" - } - ], - "action": "", - "property": "", - "from": "", - "to": "", - "reg": false, - "x": 1300, - "y": 1300, - "wires": [ - [ - "0b62dc3894e2849f" - ] - ] - }, - { - "id": "391f3b9a3bacdd88", - "type": "function", - "z": "86a9e7aa0c304b46", - "name": "function 14", - "func": "let plw = flow.get('plw') || {}\nlet cnt = flow.get('cntw') || 0\nlet value = msg.payload.val\nif (msg.topic.endsWith('ENERGY_COUNTER')) {\n plw.arbeit = value\n flow.set('plw', plw)\n cnt += 1\n flow.set('cntw', cnt)\n}\nif (msg.topic.endsWith('POWER')) {\n plw.leistung = value\n flow.set('plw', plw)\n cnt += 1\n flow.set('cntw', cnt)\n}\nif (msg.topic.endsWith('CURRENT')) {\n plw.strom = value\n flow.set('plw', plw)\n cnt += 1\n flow.set('cntw', cnt)\n}\nif (msg.topic.endsWith('VOLTAGE')) {\n plw.spannung = value\n flow.set('plw', plw)\n cnt += 1\n flow.set('cntw', cnt)\n}\nif (msg.topic.endsWith('FREQUENCY')) {\n plw.frequenz = value\n flow.set('plw', plw)\n cnt += 1\n flow.set('cntw', cnt)\n}\nif (cnt === 5) {\n cnt = 0\n msg.payload = plw\n plw = {}\n flow.set('plw', plw)\n flow.set('cntw', cnt)\n msg.payload.maschine = msg.measurement\n return msg\n}\n", - "outputs": 1, - "noerr": 0, - "initialize": "", - "finalize": "", - "libs": [], - "x": 930, - "y": 1240, - "wires": [ - [ - "21a3752d5b338a61" - ] - ] - }, - { - "id": "0b62dc3894e2849f", - "type": "debug", - "z": "86a9e7aa0c304b46", - "name": "debug 37", - "active": false, - "tosidebar": true, - "console": false, - "tostatus": false, - "complete": "true", - "targetType": "full", - "statusVal": "", - "statusType": "auto", - "x": 1500, - "y": 1260, - "wires": [] - }, - { - "id": "07c8e1eea03e88c0", - "type": "config", - "z": "86a9e7aa0c304b46", - "name": "", - "properties": [ - { - "p": "plw", - "pt": "flow", - "to": "{}", - "tot": "json" - }, - { - "p": "cntw", - "pt": "flow", - "to": "0", - "tot": "num" - }, - { - "p": "plt", - "pt": "flow", - "to": "{}", - "tot": "json" - }, - { - "p": "cntt", - "pt": "flow", - "to": "0", - "tot": "num" - }, - { - "p": "plk", - "pt": "flow", - "to": "{}", - "tot": "json" - }, - { - "p": "cntk", - "pt": "flow", - "to": "0", - "tot": "num" - } - ], - "active": true, - "x": 690, - "y": 1180, - "wires": [] - }, - { - "id": "8a73c559561e08d5", - "type": "function", - "z": "86a9e7aa0c304b46", - "name": "function 15", - "func": "let plt = flow.get('plt') || {}\nlet cnt = flow.get('cntt') || 0\nlet value = msg.payload.val\nif (msg.topic.endsWith('ENERGY_COUNTER')) {\n plt.arbeit = value\n flow.set('plt', plt)\n cnt += 1\n flow.set('cntt', cnt)\n}\nif (msg.topic.endsWith('POWER')) {\n plt.leistung = value\n flow.set('plt', plt)\n cnt += 1\n flow.set('cntt', cnt)\n}\nif (msg.topic.endsWith('CURRENT')) {\n plt.strom = value\n flow.set('plt', plt)\n cnt += 1\n flow.set('cntt', cnt)\n}\nif (msg.topic.endsWith('VOLTAGE')) {\n plt.spannung = value\n flow.set('plt', plt)\n cnt += 1\n flow.set('cntt', cnt)\n}\nif (msg.topic.endsWith('FREQUENCY')) {\n plt.frequenz = value\n flow.set('plt', plt)\n cnt += 1\n flow.set('cntt', cnt)\n}\nif (cnt === 5) {\n cnt = 0\n msg.payload = plt\n plt = {}\n flow.set('plt', plt)\n flow.set('cntt', cnt)\n msg.payload.maschine = msg.measurement\n return msg\n}\n", - "outputs": 1, - "noerr": 0, - "initialize": "", - "finalize": "", - "libs": [], - "x": 930, - "y": 1300, - "wires": [ - [ - "21a3752d5b338a61" - ] - ] - }, - { - "id": "46d53fd1857f29b8", - "type": "function", - "z": "86a9e7aa0c304b46", - "name": "function 16", - "func": "let plk = flow.get('plk') || {}\nlet cnt = flow.get('cntk') || 0\nlet value = msg.payload.val\nif (msg.topic.endsWith('ENERGY_COUNTER')) {\n plk.arbeit = value\n flow.set('plk', plk)\n cnt += 1\n flow.set('cntk', cnt)\n}\nif (msg.topic.endsWith('POWER')) {\n plk.leistung = value\n flow.set('plk', plk)\n cnt += 1\n flow.set('cntk', cnt)\n}\nif (msg.topic.endsWith('CURRENT')) {\n plk.strom = value\n flow.set('plk', plk)\n cnt += 1\n flow.set('cntk', cnt)\n}\nif (msg.topic.endsWith('VOLTAGE')) {\n plk.spannung = value\n flow.set('plk', plk)\n cnt += 1\n flow.set('cntk', cnt)\n}\nif (msg.topic.endsWith('FREQUENCY')) {\n plk.frequenz = value\n flow.set('plk', plk)\n cnt += 1\n flow.set('cntk', cnt)\n}\nif (cnt === 5) {\n cnt = 0\n msg.payload = plk\n plk = {}\n flow.set('plk', plk)\n flow.set('cntk', cnt)\n msg.payload.maschine = msg.measurement\n return msg\n}\n", - "outputs": 1, - "noerr": 0, - "initialize": "", - "finalize": "", - "libs": [], - "x": 930, - "y": 1360, - "wires": [ - [ - "21a3752d5b338a61" + "de71f2c5f6b434a8" ] ] }, @@ -3068,7 +2743,7 @@ "statusVal": "", "statusType": "auto", "x": 540, - "y": 1600, + "y": 1760, "wires": [] }, { @@ -3121,8 +2796,8 @@ "rap": true, "rh": 0, "inputs": 0, - "x": 220, - "y": 2100, + "x": 240, + "y": 2200, "wires": [ [ "c46bc662805c3ea3" @@ -3142,8 +2817,8 @@ "rap": true, "rh": 0, "inputs": 0, - "x": 220, - "y": 2160, + "x": 240, + "y": 2260, "wires": [ [ "c46bc662805c3ea3" @@ -3163,8 +2838,8 @@ "rap": true, "rh": 0, "inputs": 0, - "x": 240, - "y": 2400, + "x": 260, + "y": 2500, "wires": [ [ "c46bc662805c3ea3" @@ -3214,7 +2889,7 @@ "allowrate": false, "outputs": 1, "x": 560, - "y": 1420, + "y": 1080, "wires": [ [ "1a993a311e617f0a" @@ -3235,7 +2910,7 @@ "rh": 0, "inputs": 0, "x": 290, - "y": 1480, + "y": 1600, "wires": [ [ "66a5938c04feedd3", @@ -3261,7 +2936,7 @@ "allowrate": false, "outputs": 1, "x": 560, - "y": 1480, + "y": 1600, "wires": [ [ "18cd451ff71bedd4" @@ -3280,8 +2955,8 @@ "complete": "false", "statusVal": "", "statusType": "auto", - "x": 1300, - "y": 1540, + "x": 1180, + "y": 1600, "wires": [] }, { @@ -3297,7 +2972,7 @@ "statusVal": "", "statusType": "auto", "x": 540, - "y": 1540, + "y": 1660, "wires": [] }, { @@ -3307,17 +2982,17 @@ "name": "extract die Messwerte", "func": "msg.payload = {\n 'arbeit': msg.payload.energy * 1000,\n 'leistung': msg.payload.power\n}\nmsg.measurement = 'kellerkuehlschrank'\nreturn msg;\n", "outputs": 1, + "timeout": "", "noerr": 0, "initialize": "", "finalize": "", "libs": [], - "x": 780, - "y": 1480, + "x": 880, + "y": 1600, "wires": [ [ - "56b1402383445da7", "6f1a1a62f041e743", - "af03a5e1a841517a" + "4e55b9bbc76b88d1" ] ] }, @@ -3326,15 +3001,16 @@ "type": "debug", "z": "86a9e7aa0c304b46", "name": "debug 98", - "active": false, + "active": true, "tosidebar": true, "console": false, "tostatus": false, - "complete": "false", + "complete": "true", + "targetType": "full", "statusVal": "", "statusType": "auto", - "x": 1320, - "y": 1480, + "x": 1280, + "y": 1000, "wires": [] }, { @@ -3350,8 +3026,8 @@ "rap": true, "rh": 0, "inputs": 0, - "x": 220, - "y": 2220, + "x": 240, + "y": 2320, "wires": [ [ "c46bc662805c3ea3" @@ -3371,8 +3047,8 @@ "rap": true, "rh": 0, "inputs": 0, - "x": 220, - "y": 2280, + "x": 240, + "y": 2380, "wires": [ [ "c46bc662805c3ea3" @@ -3392,8 +3068,8 @@ "rap": true, "rh": 0, "inputs": 0, - "x": 230, - "y": 2460, + "x": 250, + "y": 2560, "wires": [ [ "c46bc662805c3ea3" @@ -3404,9 +3080,9 @@ "id": "ec3bf322733a6acd", "type": "comment", "z": "86a9e7aa0c304b46", - "name": "Daten in Influx- und Mongo-DB", - "info": "## Beschreibung\nAlle relevanten Daten einlesen und in die Influx sowie in die MongoDB eintragen\n\n## Version\nVersion | Datum | Author | Bemerkung\n-------|--------|-------|---\nV 1.0 | 2025-06-02 | rxf | erste versionierte Version\n", - "x": 190, + "name": "Daten in Influx-DB", + "info": "## Beschreibung\nAlle relevanten Daten einlesen und in die Influx eintragen\n\n## Version\nVersion | Datum | Author | Bemerkung\n-------|--------|-------|---\nV 1.0 | 2025-06-02 | rxf | erste versionierte Version\n", + "x": 150, "y": 40, "wires": [] }, @@ -3423,8 +3099,8 @@ "rap": true, "rh": 0, "inputs": 0, - "x": 220, - "y": 2520, + "x": 240, + "y": 2620, "wires": [ [ "c46bc662805c3ea3" @@ -3432,13 +3108,126 @@ ] }, { - "id": "57a1c06c3e4fa14a", + "id": "1beaa93c3a63b7d8", "type": "comment", "z": "86a9e7aa0c304b46", - "name": "ging hier mal auf ein chart", + "name": "Spülaschine, Kühlschrank, Kaffeemaschine", "info": "", + "x": 320, + "y": 980, + "wires": [] + }, + { + "id": "7fc3aa347ffa61d0", + "type": "influxdb out", + "z": "86a9e7aa0c304b46", + "influxdb": "db07a39246cf7003", + "name": "influx_nuccy", + "measurement": "", + "precision": "", + "retentionPolicy": "", + "database": "database", + "precisionV18FluxV20": "s", + "retentionPolicyV18Flux": "", + "org": "citysensor", + "bucket": "wohnung", + "x": 1410, + "y": 1080, + "wires": [] + }, + { + "id": "dbfbda5e610e0bbe", + "type": "debug", + "z": "86a9e7aa0c304b46", + "name": "debug 11", + "active": true, + "tosidebar": true, + "console": false, + "tostatus": false, + "complete": "true", + "targetType": "full", + "statusVal": "", + "statusType": "auto", + "x": 640, + "y": 960, + "wires": [] + }, + { + "id": "2102d56ac74708d4", + "type": "function", + "z": "86a9e7aa0c304b46", + "name": "extract die Messwerte", + "func": "msg.measurement = 'kuehlschrank'\nif (msg.topic == \"hm/status/Kuehlschrank_Messwerte:2/ENERGY_COUNTER\")\n{\n msg.payload = {\"energy\": msg.payload.val}\n return msg\n}\nif (msg.topic == \"hm/status/Kuehlschrank_Messwerte:2/POWER\") {\n msg.payload = { \"power\": msg.payload.val }\n return msg\n}\nif (msg.topic == \"hm/status/Kuehlschrank_Messwerte:2/CURRENT\") {\n msg.payload = { \"current\": msg.payload.val }\n return msg\n}\nif (msg.topic == \"hm/status/Kuehlschrank_Messwerte:2/VOLTAGE\") {\n msg.payload = { \"voltage\": msg.payload.val }\n return msg\n}\nreturn;\n", + "outputs": 1, + "timeout": "", + "noerr": 0, + "initialize": "", + "finalize": "", + "libs": [], + "x": 840, + "y": 1020, + "wires": [ + [ + "de71f2c5f6b434a8" + ] + ] + }, + { + "id": "b3b7e5b0fa2244dc", + "type": "mqtt in", + "z": "86a9e7aa0c304b46", + "name": "", + "topic": "tele/tasmota_5B2A60/SENSOR", + "qos": "0", + "datatype": "auto-detect", + "broker": "c46833d59903b816", + "nl": false, + "rap": true, + "rh": 0, + "inputs": 0, + "x": 290, + "y": 1160, + "wires": [ + [ + "805be96e2cda6961", + "6ac3a9029950922b" + ] + ] + }, + { + "id": "805be96e2cda6961", + "type": "function", + "z": "86a9e7aa0c304b46", + "name": "function 73", + "func": "const total = msg.payload.ENERGY.Total\nconst power = msg.payload.ENERGY.Power\nconst voltage = msg.payload.ENERGY.Voltage\nconst current = msg.payload.ENERGY.Current\nconst datetime = new Date(msg.payload.Time)\nmsg.payload = { arbeit: total, power: power, voltage: voltage, current: current, datetime: datetime}\nreturn msg;", + "outputs": 1, + "timeout": "", + "noerr": 0, + "initialize": "", + "finalize": "", + "libs": [], "x": 810, - "y": 840, + "y": 1160, + "wires": [ + [ + "de71f2c5f6b434a8" + ] + ] + }, + { + "id": "6ac3a9029950922b", + "type": "debug", + "z": "86a9e7aa0c304b46", + "name": "debug 197", + "active": false, + "tosidebar": true, + "console": false, + "tostatus": false, + "complete": "false", + "statusVal": "", + "statusType": "auto", + "x": 590, + "y": 1200, "wires": [] }, { @@ -4072,148 +3861,6 @@ ] ] }, - { - "id": "62d9999cfa88e04c", - "type": "debug", - "z": "5bea18a0180b611e", - "name": "debug 83", - "active": false, - "tosidebar": true, - "console": false, - "tostatus": false, - "complete": "payload", - "targetType": "msg", - "statusVal": "", - "statusType": "auto", - "x": 840, - "y": 1720, - "wires": [] - }, - { - "id": "101627ad20bd3221", - "type": "inject", - "z": "5bea18a0180b611e", - "name": "", - "props": [ - { - "p": "payload" - }, - { - "p": "topic", - "vt": "str" - } - ], - "repeat": "5", - "crontab": "", - "once": true, - "onceDelay": 0.1, - "topic": "", - "payload": "", - "payloadType": "date", - "x": 170, - "y": 1600, - "wires": [ - [ - "90b71633dbcf0508" - ] - ] - }, - { - "id": "90b71633dbcf0508", - "type": "moment", - "z": "5bea18a0180b611e", - "name": "", - "topic": "", - "input": "", - "inputType": "msg", - "inTz": "Europe/Berlin", - "adjAmount": 0, - "adjType": "days", - "adjDir": "add", - "format": "HH:mm dddd, DD.MMMM.YYYY", - "locale": "de-DE", - "output": "", - "outputType": "msg", - "outTz": "Europe/Berlin", - "x": 540, - "y": 1600, - "wires": [ - [ - "62d9999cfa88e04c", - "0b22b57891c28178", - "cd3d4752f89b88a7" - ] - ] - }, - { - "id": "0b22b57891c28178", - "type": "function", - "z": "5bea18a0180b611e", - "name": "function 27", - "func": "msg.payload = msg.payload.slice(0,5)\nreturn msg;", - "outputs": 1, - "noerr": 0, - "initialize": "", - "finalize": "", - "libs": [], - "x": 850, - "y": 1600, - "wires": [ - [ - "b66905309b53413c" - ] - ] - }, - { - "id": "ca109b34a75ebdd8", - "type": "ui_text", - "z": "5bea18a0180b611e", - "group": "51bf0475.ddfd2c", - "order": 2, - "width": 6, - "height": 1, - "name": "", - "label": "", - "format": "{{msg.payload}}", - "layout": "row-center", - "className": "", - "style": false, - "font": "", - "fontSize": 16, - "color": "#000000", - "x": 1090, - "y": 1660, - "wires": [] - }, - { - "id": "cd3d4752f89b88a7", - "type": "function", - "z": "5bea18a0180b611e", - "name": "function 28", - "func": "msg.payload = msg.payload.slice(6)\nreturn msg;", - "outputs": 1, - "noerr": 0, - "initialize": "", - "finalize": "", - "libs": [], - "x": 850, - "y": 1660, - "wires": [ - [ - "ca109b34a75ebdd8" - ] - ] - }, - { - "id": "9cf37ec3efd343f4", - "type": "comment", - "z": "5bea18a0180b611e", - "name": "Uhrzeit/Datum anzeigen", - "info": "", - "x": 200, - "y": 1540, - "wires": [] - }, { "id": "7666de38e0c78821", "type": "mqtt in", @@ -4386,27 +4033,6 @@ ] ] }, - { - "id": "b66905309b53413c", - "type": "ui_text", - "z": "5bea18a0180b611e", - "group": "51bf0475.ddfd2c", - "order": 5, - "width": 6, - "height": 1, - "name": "", - "label": "", - "format": "{{msg.payload}}", - "layout": "row-center", - "className": "", - "style": false, - "font": "", - "fontSize": 16, - "color": "#000000", - "x": 1090, - "y": 1600, - "wires": [] - }, { "id": "de26f47a8e122baa", "type": "inject", @@ -4499,25 +4125,6 @@ "y": 840, "wires": [] }, - { - "id": "1d61e05b26b9a2e0", - "type": "flogger", - "z": "5bea18a0180b611e", - "name": "Log", - "logfile": "bwbad.log", - "inputchoice": "object", - "inputobject": "payload", - "inputobjectType": "msg", - "inputmoustache": "Recieved payload {{payload}} and topic {{topic}}", - "loglevel": "INFO", - "logconfig": "dbdce4bcc146f440", - "sendpane": "", - "x": 810, - "y": 400, - "wires": [ - [] - ] - }, { "id": "39299c31e4d89e89", "type": "delay", @@ -4539,7 +4146,6 @@ "y": 400, "wires": [ [ - "1d61e05b26b9a2e0", "db3bdc733260e6d9" ] ] @@ -9513,187 +9119,6 @@ [] ] }, - { - "id": "60dea7cbf33ac553", - "type": "mqtt in", - "z": "f3d03e63c0a7d73a", - "name": "", - "topic": "hm/status/Fernbedienung_WZ:8/PRESS_SHORT", - "qos": "2", - "datatype": "auto-detect", - "broker": "c46833d59903b816", - "nl": false, - "rap": true, - "rh": 0, - "inputs": 0, - "x": 280, - "y": 180, - "wires": [ - [ - "d3f1c881b02e2c53" - ] - ] - }, - { - "id": "d3f1c881b02e2c53", - "type": "debug", - "z": "f3d03e63c0a7d73a", - "name": "debug 143", - "active": false, - "tosidebar": true, - "console": false, - "tostatus": false, - "complete": "false", - "statusVal": "", - "statusType": "auto", - "x": 630, - "y": 220, - "wires": [] - }, - { - "id": "d94c54cfe5cd1d51", - "type": "mqtt out", - "z": "f3d03e63c0a7d73a", - "name": "Switch TV", - "topic": "home66/TV_Set/tasmota_91EF90/cmnd/Power", - "qos": "0", - "retain": "", - "respTopic": "", - "contentType": "", - "userProps": "", - "correl": "", - "expiry": "", - "broker": "c7cf83a81a522047", - "x": 1120, - "y": 360, - "wires": [] - }, - { - "id": "cd4515f4520b5a09", - "type": "change", - "z": "f3d03e63c0a7d73a", - "name": "", - "rules": [ - { - "t": "set", - "p": "payload", - "pt": "msg", - "to": "TOGGLE", - "tot": "str" - } - ], - "action": "", - "property": "", - "from": "", - "to": "", - "reg": false, - "x": 690, - "y": 340, - "wires": [ - [ - "d94c54cfe5cd1d51", - "640884bd2ad77e87" - ] - ] - }, - { - "id": "640884bd2ad77e87", - "type": "debug", - "z": "f3d03e63c0a7d73a", - "name": "debug 144", - "active": false, - "tosidebar": true, - "console": false, - "tostatus": false, - "complete": "false", - "statusVal": "", - "statusType": "auto", - "x": 970, - "y": 220, - "wires": [] - }, - { - "id": "4d9ee0b3a98f9ecc", - "type": "mqtt in", - "z": "f3d03e63c0a7d73a", - "name": "", - "topic": "home66/TV_Set/tasmota_91EF90/RESULT", - "qos": "2", - "datatype": "auto-detect", - "broker": "c7cf83a81a522047", - "nl": false, - "rap": true, - "rh": 0, - "inputs": 0, - "x": 300, - "y": 460, - "wires": [ - [ - "7eb33a45338feef5" - ] - ] - }, - { - "id": "7eb33a45338feef5", - "type": "debug", - "z": "f3d03e63c0a7d73a", - "name": "debug 145", - "active": false, - "tosidebar": true, - "console": false, - "tostatus": false, - "complete": "false", - "statusVal": "", - "statusType": "auto", - "x": 650, - "y": 460, - "wires": [] - }, - { - "id": "d5abe885374036ff", - "type": "debug", - "z": "f3d03e63c0a7d73a", - "name": "debug 146", - "active": true, - "tosidebar": true, - "console": false, - "tostatus": false, - "complete": "false", - "statusVal": "", - "statusType": "auto", - "x": 570, - "y": 640, - "wires": [] - }, - { - "id": "4dd6f7360e609f7c", - "type": "amazon-echo-hub", - "z": "f3d03e63c0a7d73a", - "port": "80", - "processinput": 0, - "discovery": true, - "x": 110, - "y": 600, - "wires": [ - [ - "45162f25bf2a6d56" - ] - ] - }, - { - "id": "45162f25bf2a6d56", - "type": "amazon-echo-device", - "z": "f3d03e63c0a7d73a", - "name": "Fernsehzimmer", - "topic": "", - "x": 320, - "y": 600, - "wires": [ - [ - "d5abe885374036ff" - ] - ] - }, { "id": "e18430497d913cde", "type": "mqtt out", @@ -10110,6 +9535,23 @@ "y": 160, "wires": [] }, + { + "id": "624c24155886817a", + "type": "e-mail", + "z": "0ecc4a0267296324", + "server": "smtp.gmail.com", + "port": "465", + "authtype": "BASIC", + "saslformat": true, + "token": "oauth2Response.access_token", + "secure": true, + "tls": true, + "name": "rxf@gmx.de", + "dname": "SendMail", + "x": 820, + "y": 480, + "wires": [] + }, { "id": "5751328b8a4dfe7e", "type": "mqtt in", @@ -11078,6 +10520,7 @@ "name": "function 50", "func": "if (msg.payload.val) { // motion erkannt\n if (flow.get(\"brightness\") < flow.get(\"minhell\")) { //dunkel genug?\n msg.payload = true // also LICHT ein\n msg.trigger = \"START\" // und den Timer starten\n return msg\n }\n} // keine Bedingung erfüllt \nreturn null", "outputs": 1, + "timeout": "", "noerr": 0, "initialize": "", "finalize": "", @@ -14205,117 +13648,6 @@ "y": 100, "wires": [] }, - { - "id": "b3b7e5b0fa2244dc", - "type": "mqtt in", - "z": "0ad24e09828d2345", - "name": "", - "topic": "tele/tasmota_5B2A60/SENSOR", - "qos": "0", - "datatype": "auto-detect", - "broker": "c46833d59903b816", - "nl": false, - "rap": true, - "rh": 0, - "inputs": 0, - "x": 230, - "y": 240, - "wires": [ - [ - "805be96e2cda6961", - "6ac3a9029950922b" - ] - ] - }, - { - "id": "cbe5b8a83fe63d29", - "type": "debug", - "z": "0ad24e09828d2345", - "name": "debug 196", - "active": true, - "tosidebar": true, - "console": false, - "tostatus": false, - "complete": "true", - "targetType": "full", - "statusVal": "", - "statusType": "auto", - "x": 890, - "y": 160, - "wires": [] - }, - { - "id": "805be96e2cda6961", - "type": "function", - "z": "0ad24e09828d2345", - "name": "function 73", - "func": "const total = msg.payload.ENERGY.Total\nconst power = msg.payload.ENERGY.Power\nconst voltage = msg.payload.ENERGY.Voltage\nconst current = msg.payload.ENERGY.Current\nconst datetime = new Date(msg.payload.Time)\nmsg.operation = 'insertOne'\nmsg.collection = 'maschinen'\nmsg.payload = { maschine: \"kaffeemaschine\", arbeit: total, power: power, voltage: voltage, current: current, datetime: datetime}\nreturn msg;", - "outputs": 1, - "noerr": 0, - "initialize": "", - "finalize": "", - "libs": [], - "x": 650, - "y": 240, - "wires": [ - [ - "cbe5b8a83fe63d29", - "fb534012b4c8e611" - ] - ] - }, - { - "id": "6ac3a9029950922b", - "type": "debug", - "z": "0ad24e09828d2345", - "name": "debug 197", - "active": false, - "tosidebar": true, - "console": false, - "tostatus": false, - "complete": "false", - "statusVal": "", - "statusType": "auto", - "x": 610, - "y": 160, - "wires": [] - }, - { - "id": "fb534012b4c8e611", - "type": "mongodb4", - "z": "0ad24e09828d2345", - "clientNode": "874361936f1ce815", - "mode": "collection", - "collection": "", - "operation": "", - "output": "toArray", - "maxTimeMS": "0", - "handleDocId": false, - "name": "", - "x": 910, - "y": 240, - "wires": [ - [ - "81dae075f1dddb7b" - ] - ] - }, - { - "id": "81dae075f1dddb7b", - "type": "debug", - "z": "0ad24e09828d2345", - "name": "debug 198", - "active": false, - "tosidebar": true, - "console": false, - "tostatus": false, - "complete": "false", - "statusVal": "", - "statusType": "auto", - "x": 1130, - "y": 240, - "wires": [] - }, { "id": "968f5cdf742d7d7a", "type": "mqtt in", diff --git a/flows_cred.json b/flows_cred.json index bff024b..5b84e1f 100644 --- a/flows_cred.json +++ b/flows_cred.json @@ -1,3 +1,3 @@ { - "$": "791c214911d3fd008be311c29cd1858cWYsACWjJMXWtCwBntH089mikrp639GMm+N4HZz9tYF2+Ez1C0/wvDYz+CBCWwqr1WgdooEATTLieOWTtTDxF2y5PSf622EV5MPdFuNzi65KS8hAcPgap/ZJMSRftWld1Itc5SKX5IXyqyFdXhLjOvt59OPW1+C4Fysmrh/psVWzx9gMXXyoBP814yRrZCIu9QCcH/ps/T/EcoHxzpRuYoxN+qR674ky9T/fRoNKL4yML9hsSPql/GvKhuIH0aaVCrBofdaf1b1Q0t6ykfYDTljcXt/1UOfi1+C/nw49NBD2UlfxxCCjJ+mWdt0J2EPdsb7I5pJ1nGzIt+dZveB0JQVw6hZL6iQarR3xt781LcqBN8qNhaXp7cc6IjK/1pREQFyFp6caX/eQpvEn1cDdX5RTDKwWR3kYF/ZNq3HYk3/ar1dMjsvopKZbkMym41a9e1wv+8WtJgL1iUW0egvBIc1TQDEIC0qBG0yotE8Y1FJTfvky/4LouY6OUpM+Po2y0JPHv9kc1DgcbOshk3qHZFXOvtoxnzhkgwkQNWQELz7P1hn8KErLSJtCPyVCZoLOjvhKyHhPabvkJQuU3fHjfb8J0+P07BXx6XYqL63lQU3V0PCnfCeWesoR8VgAO8xzN67Xe8YZHG1EvWyf/UJm3YsE2sz7kKTUkdBTbSX/iURH0MeWt/yDSx9ei/E/kAio=" + "$": "826b8314d7e842a73a32aa1f5bf8a9beE2oNYBJbE/AuHr+TcLxzwSZLOW4BqDePmoY9UtKzFGlXWLZOe5unH1wq9cbKe9dIcF4Xdn3SoSR4leGxkEwqjWAP68tckfYsCNrQ4Nt6jj1fPyaT/c2RsYXZnzPl0TjBHf32F0nvLldE1roN6rwm3YuqEko/0WOvsMojuSbJppIO212ycjUVULMUvRCgF2r6MNapvfOvCeOlCCrtQlF+XPpt5RNWKhDQY4WNyWh0z2PVch/8rc1hNts9cxdMJjFO+2EsrLTLazrjn0Njo257uXlAS+uFMFQxZyxfjpQ2B6ug1YXHhvWG74roNjL8nfovuxv/AtloGhYeZnegyhzhMp41LPGkvG8krUAz36bpEDs5B+qxrggFLUQXG0iqQzqBLnqSzCf6z8+NhjCyzikRPblVdK8iKFNmI2BmpLxiZpLNoWBFctf0y52j/2pEazW88qgI+Xoh1ObfQ6A1t7Wg3KLc7KVgQC2n2mhHM1r9BKgF5J1I9nn/ZC/EKBCe1jaRRETG/kZs6FxzU5GLCNEfF5qc+uAqSyBTDOETWt+/DPDMtwmxiiA1Py9FYNLZrA2Q+7jqRkNg8r/iQSz6VFG0pDKeTFXPqUGMLgqaftKkqH8BNJpVelXv3Nv0UFAvWKurPctRLxcxPzQVY4rZpSeKnZ171dfgXFHeFdpMSnNIaFGQMIki8UvqkGrdevZvv33PNiN3+WvleS955fN12RSMHajvAcHL" } \ No newline at end of file diff --git a/flows_cred.json.bak-fix-1783185892699 b/flows_cred.json.bak-fix-1783185892699 new file mode 100644 index 0000000..8fcf61d --- /dev/null +++ b/flows_cred.json.bak-fix-1783185892699 @@ -0,0 +1 @@ +{"$":"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"} \ No newline at end of file