diff --git a/configuration.yaml b/configuration.yaml index 68f4ab4..b8d45f5 100644 --- a/configuration.yaml +++ b/configuration.yaml @@ -9,12 +9,31 @@ tts: - platform: google_translate language: "cs" +# Example configuration.yaml entry +google_assistant: + project_id: home-assistant-65612 + service_account: !include home-assistant-65612-d69ecfd0f735.json + report_state: true + exposed_domains: + - switch + - light + entity_config: + switch.kitchen: + name: CUSTOM_NAME_FOR_GOOGLE_ASSISTANT + aliases: + - BRIGHT_LIGHTS + - ENTRY_LIGHTS + light.living_room: + expose: false + room: LIVING_ROOM + group: !include groups.yaml automation: !include automations.yaml script: !include scripts.yaml scene: !include scenes.yaml template: !include template.yaml sensor: !include sensors.yaml +input_select: !include input_select.yaml http: use_x_forwarded_for: true @@ -24,7 +43,7 @@ http: # MariaDB - 30 day data recorder: db_url: !secret mariadb_url - purge_keep_days: 30 + purge_keep_days: 7 commit_interval: 20 history: @@ -49,10 +68,10 @@ light: - platform: group name: Obývák entities: - - light.0xb4e3f9fffe102c1f - - light.0xb4e3f9fffe102c12 - - light.0x84fd27fffe80415b - - light.0x84fd27fffed7b8a4 + - light.livingroom_mainlight_aquarium + - light.livingroom_mainlight_gramophone + - light.livingroom_mainlight_library + - light.livingroom_mainlight_fireplace camera: - platform: xiaomi_cloud_map_extractor @@ -63,3 +82,11 @@ camera: draw: ["all"] attributes: - calibration_points + map_transformation: + scale: 2 + rotate: 90 + trim: + top: 20 + bottom: 20 + left: 20 + right: 20 diff --git a/input_select.yaml b/input_select.yaml new file mode 100644 index 0000000..f5388d5 --- /dev/null +++ b/input_select.yaml @@ -0,0 +1,10 @@ +air_conditioner: + name: Klimatizace + options: + - livingroom + - bathroom + - bedroom + - childrensroom + - guestroom + initial: livingroom + icon: mdi:air-conditioner \ No newline at end of file diff --git a/node-red/.config.nodes.json b/node-red/.config.nodes.json index e133751..f30a522 100644 --- a/node-red/.config.nodes.json +++ b/node-red/.config.nodes.json @@ -810,7 +810,7 @@ }, "node-red-dashboard": { "name": "node-red-dashboard", - "version": "3.1.5", + "version": "3.3.1", "local": true, "user": true, "nodes": { diff --git a/node-red/.config.users.json b/node-red/.config.users.json index 756f020..fa4001c 100644 --- a/node-red/.config.users.json +++ b/node-red/.config.users.json @@ -23,7 +23,7 @@ "filter": "filterAll" }, "menu-deploymenu-item-flow": false, - "menu-deploymenu-item-full": false, - "menu-deploymenu-item-node": true + "menu-deploymenu-item-full": true, + "menu-deploymenu-item-node": false } } \ No newline at end of file diff --git a/node-red/flows.json b/node-red/flows.json index d917d01..4231381 100644 --- a/node-red/flows.json +++ b/node-red/flows.json @@ -1 +1 @@ -[{"id":"af32a28ba9e46f29","type":"tab","label":"Living room","disabled":false,"info":"","env":[]},{"id":"e58cc30d.0bb9","type":"server","name":"Home Assistant","version":2,"addon":true,"rejectUnauthorizedCerts":true,"ha_boolean":"y|yes|true|on|home|open","connectionDelay":true,"cacheJson":true,"heartbeat":false,"heartbeatInterval":"30"},{"id":"a07f98a5c7ec3274","type":"mqtt-broker","name":"mosquitto","broker":"core-mosquitto","port":"1883","clientid":"nodered","autoConnect":true,"usetls":false,"protocolVersion":"4","keepalive":"60","cleansession":true,"birthTopic":"","birthQos":"0","birthPayload":"","birthMsg":{},"closeTopic":"","closeQos":"0","closePayload":"","closeMsg":{},"willTopic":"","willQos":"0","willPayload":"","willMsg":{},"sessionExpiry":""},{"id":"dbe202dbcec1134a","type":"mqtt in","z":"af32a28ba9e46f29","name":"","topic":"zigbee2mqtt/livingroom/scene_switch","qos":"2","datatype":"json","broker":"a07f98a5c7ec3274","nl":false,"rap":true,"rh":0,"inputs":0,"x":190,"y":60,"wires":[["e73dbc5cf9e4c229","b97b7b166ff889f4"]]},{"id":"e73dbc5cf9e4c229","type":"switch","z":"af32a28ba9e46f29","name":"","property":"payload.action","propertyType":"msg","rules":[{"t":"eq","v":"1_single","vt":"str"},{"t":"eq","v":"2_single","vt":"str"},{"t":"eq","v":"3_single","vt":"str"},{"t":"eq","v":"4_single","vt":"str"},{"t":"eq","v":"1_double","vt":"str"},{"t":"eq","v":"2_double","vt":"str"},{"t":"eq","v":"3_double","vt":"str"},{"t":"eq","v":"4_double","vt":"str"},{"t":"eq","v":"1_hold","vt":"str"},{"t":"eq","v":"2_hold","vt":"str"},{"t":"eq","v":"3_hold","vt":"str"},{"t":"eq","v":"4_hold","vt":"str"}],"checkall":"true","repair":false,"outputs":12,"x":150,"y":400,"wires":[["4fac346c3d066f8f"],["23049ee5d70a7992"],["f66dd231bac152b9"],["c77a5b62ecc09046"],[],[],[],[],[],[],[],[]]},{"id":"5ac058fedde86732","type":"mqtt out","z":"af32a28ba9e46f29","name":"","topic":"","qos":"","retain":"","respTopic":"","contentType":"","userProps":"","correl":"","expiry":"","broker":"a07f98a5c7ec3274","x":1310,"y":140,"wires":[]},{"id":"4860bb0911a4b518","type":"change","z":"af32a28ba9e46f29","name":"","rules":[{"t":"set","p":"topic","pt":"msg","to":"\"zigbee2mqtt/livingroom/main_light_2/set\"","tot":"jsonata"}],"action":"","property":"","from":"","to":"","reg":false,"x":390,"y":380,"wires":[["19f51c0d8c733dec"]]},{"id":"ebef887b98106c6c","type":"change","z":"af32a28ba9e46f29","name":"","rules":[{"t":"set","p":"topic","pt":"msg","to":"\"zigbee2mqtt/livingroom/main_light_1/set\"","tot":"jsonata"}],"action":"","property":"","from":"","to":"","reg":false,"x":810,"y":460,"wires":[["77db2ac50a130285"]]},{"id":"77db2ac50a130285","type":"change","z":"af32a28ba9e46f29","name":"","rules":[{"t":"set","p":"payload","pt":"msg","to":"{\"brightness\":254,\"color_temp\":463,\"state\":\"ON\"}","tot":"jsonata"}],"action":"","property":"","from":"","to":"","reg":false,"x":960,"y":260,"wires":[[]]},{"id":"b5c290e4d668cca3","type":"change","z":"af32a28ba9e46f29","name":"","rules":[{"t":"set","p":"topic","pt":"msg","to":"\"zigbee2mqtt/livingroom/main_light_3/set\"","tot":"jsonata"}],"action":"","property":"","from":"","to":"","reg":false,"x":390,"y":420,"wires":[[]]},{"id":"166f158e7450c9fc","type":"change","z":"af32a28ba9e46f29","name":"","rules":[{"t":"set","p":"topic","pt":"msg","to":"\"zigbee2mqtt/livingroom/main_light_4/set\"","tot":"jsonata"}],"action":"","property":"","from":"","to":"","reg":false,"x":390,"y":460,"wires":[[]]},{"id":"b8926c4a994bfe9a","type":"debug","z":"af32a28ba9e46f29","name":"","active":true,"tosidebar":true,"console":false,"tostatus":false,"complete":"true","targetType":"full","statusVal":"","statusType":"auto","x":1290,"y":360,"wires":[]},{"id":"4fac346c3d066f8f","type":"ha-device","z":"af32a28ba9e46f29","name":"","server":"e58cc30d.0bb9","version":0,"exposeToHomeAssistant":false,"haConfig":[{"property":"name","value":""},{"property":"icon","value":""}],"inputs":1,"deviceType":"action","device":"68bc07dee263ff26a97db77cf19fb386","event":{"type":"toggle","device_id":"68bc07dee263ff26a97db77cf19fb386","entity_id":"light.0xb4e3f9fffe102c1f","domain":"light"},"capabilities":[],"outputProperties":[],"x":430,"y":140,"wires":[[]]},{"id":"35b67c9fd149c560","type":"change","z":"af32a28ba9e46f29","name":"","rules":[{"t":"set","p":"payload","pt":"msg","to":"{\t \"brightness\": 254,\t \"color_mode\": \"color_temp\",\t \"color_temp\": 454,\t \"state\": state\t}\t\t\t","tot":"jsonata"}],"action":"","property":"","from":"","to":"","reg":false,"x":980,"y":200,"wires":[["5ac058fedde86732","b8926c4a994bfe9a"]]},{"id":"0884a251ca1add3e","type":"function","z":"af32a28ba9e46f29","name":"","func":"if(msg.payload.state==\"ON\"){\n msg.payload.state=\"OFF\"\n} else {\n msg.payload.state=\"ON\"\n}\n\nreturn msg;","outputs":1,"noerr":0,"initialize":"","finalize":"","libs":[],"x":300,"y":560,"wires":[[]]},{"id":"739ce27373dcbdf0","type":"inject","z":"af32a28ba9e46f29","name":"","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payload":"","payloadType":"date","x":300,"y":520,"wires":[[]]},{"id":"e01925178734cf09","type":"change","z":"af32a28ba9e46f29","name":"","rules":[{"t":"set","p":"payload","pt":"msg","to":"{\t \"state\": \"ON\"\t}","tot":"jsonata"}],"action":"","property":"","from":"","to":"","reg":false,"x":780,"y":220,"wires":[["35b67c9fd149c560"]]},{"id":"b97b7b166ff889f4","type":"debug","z":"af32a28ba9e46f29","name":"","active":true,"tosidebar":true,"console":false,"tostatus":false,"complete":"true","targetType":"full","statusVal":"","statusType":"auto","x":530,"y":60,"wires":[]},{"id":"19f51c0d8c733dec","type":"api-current-state","z":"af32a28ba9e46f29","name":"","server":"e58cc30d.0bb9","version":3,"outputs":2,"halt_if":"ON","halt_if_type":"str","halt_if_compare":"is","entity_id":"light.0xb4e3f9fffe102c1f","state_type":"str","blockInputOverrides":false,"outputProperties":[{"property":"payload","propertyType":"msg","value":"","valueType":"entityState"},{"property":"data","propertyType":"msg","value":"","valueType":"entity"}],"for":0,"forType":"num","forUnits":"minutes","override_topic":false,"state_location":"payload","override_payload":"msg","entity_location":"data","override_data":"msg","x":650,"y":380,"wires":[["3c9ea731c2cd44a5"],["e01925178734cf09"]]},{"id":"3c9ea731c2cd44a5","type":"change","z":"af32a28ba9e46f29","name":"","rules":[{"t":"set","p":"payload","pt":"msg","to":"{\t \"state\": \"OFF\"\t}","tot":"jsonata"}],"action":"","property":"","from":"","to":"","reg":false,"x":780,"y":180,"wires":[["35b67c9fd149c560"]]},{"id":"23049ee5d70a7992","type":"ha-device","z":"af32a28ba9e46f29","name":"","server":"e58cc30d.0bb9","version":0,"exposeToHomeAssistant":false,"haConfig":[{"property":"name","value":""},{"property":"icon","value":""}],"inputs":1,"deviceType":"action","device":"b5da09933af5095776729bbb8ef116ea","event":{"type":"toggle","device_id":"b5da09933af5095776729bbb8ef116ea","entity_id":"light.0xb4e3f9fffe102c12","domain":"light"},"capabilities":[],"outputProperties":[],"x":430,"y":200,"wires":[[]]},{"id":"f66dd231bac152b9","type":"ha-device","z":"af32a28ba9e46f29","name":"","server":"e58cc30d.0bb9","version":0,"exposeToHomeAssistant":false,"haConfig":[{"property":"name","value":""},{"property":"icon","value":""}],"inputs":1,"deviceType":"action","device":"1146c4d46415b1965df40b247e75e3bf","event":{"type":"toggle","device_id":"1146c4d46415b1965df40b247e75e3bf","entity_id":"light.0x84fd27fffe80415b","domain":"light"},"capabilities":[],"outputProperties":[],"x":430,"y":260,"wires":[[]]},{"id":"c77a5b62ecc09046","type":"ha-device","z":"af32a28ba9e46f29","name":"","server":"e58cc30d.0bb9","version":0,"exposeToHomeAssistant":false,"haConfig":[{"property":"name","value":""},{"property":"icon","value":""}],"inputs":1,"deviceType":"action","device":"c89bf0613661789cc7e714323b4844a7","event":{"type":"toggle","device_id":"c89bf0613661789cc7e714323b4844a7","entity_id":"light.0x84fd27fffed7b8a4","domain":"light"},"capabilities":[],"outputProperties":[],"x":430,"y":320,"wires":[[]]}] \ No newline at end of file +[{"id":"af32a28ba9e46f29","type":"tab","label":"Living room - Main light","disabled":false,"info":"Obývák - hlavní světla\r\n\r\n4x RGB žárovka\r\n1x scene switch\r\n\r\n1-click: toggle\r\n2-click:\r\npush:","env":[]},{"id":"8850e193.e1712","type":"subflow","name":"SaveChart","info":"","category":"","in":[{"x":80,"y":140,"wires":[{"id":"40784bb1.204934"}]}],"out":[{"x":820,"y":120,"wires":[{"id":"a6525d2.cb354a","port":0}]}]},{"id":"e58cc30d.0bb9","type":"server","name":"Home Assistant","version":5,"addon":true,"rejectUnauthorizedCerts":true,"ha_boolean":"y|yes|true|on|home|open","connectionDelay":true,"cacheJson":true,"heartbeat":false,"heartbeatInterval":"30","areaSelector":"friendlyName","deviceSelector":"friendlyName","entitySelector":"friendlyName","statusSeparator":"at: ","statusYear":"hidden","statusMonth":"short","statusDay":"numeric","statusHourCycle":"h23","statusTimeFormat":"h:m","enableGlobalContextStore":true},{"id":"a07f98a5c7ec3274","type":"mqtt-broker","name":"mosquitto","broker":"core-mosquitto","port":"1883","clientid":"nodered","autoConnect":true,"usetls":false,"protocolVersion":"4","keepalive":"60","cleansession":true,"birthTopic":"","birthQos":"0","birthPayload":"","birthMsg":{},"closeTopic":"","closeQos":"0","closePayload":"","closeMsg":{},"willTopic":"","willQos":"0","willPayload":"","willMsg":{},"sessionExpiry":""},{"id":"a0f72417.ea2838","type":"file","z":"8850e193.e1712","name":"backup","filename":"","appendNewline":false,"createDir":true,"overwriteFile":"true","x":700,"y":160,"wires":[[]]},{"id":"70a2db09.6ff354","type":"file in","z":"8850e193.e1712","name":"restore","filename":"","format":"utf8","sendError":true,"x":530,"y":120,"wires":[["a6525d2.cb354a"]]},{"id":"922d4285.5f7e1","type":"json","z":"8850e193.e1712","name":"","property":"payload","action":"str","pretty":false,"x":530,"y":160,"wires":[["a0f72417.ea2838"]]},{"id":"a6525d2.cb354a","type":"json","z":"8850e193.e1712","name":"","property":"payload","action":"str","pretty":false,"x":690,"y":120,"wires":[[]]},{"id":"40784bb1.204934","type":"function","z":"8850e193.e1712","name":"LoadSave","func":"var strSafe=msg.topic;\nif(strSafe)\n{\n msg.filename =\"/share/chart.save\";\n var loaded=context.get(strSafe)||0;\n \n if(0===loaded||strSafe==\"restore\")\n {\n //node.warn(\"Loading chart\");\n msg.payload=\"load\";\n context.set(strSafe,1);\n }\n else\n {\n //node.warn(\"Writing chart\");\n //node.warn(msg.payload);\n }\n return msg;\n \n}\nreturn null;","outputs":1,"noerr":0,"initialize":"","finalize":"","x":230,"y":140,"wires":[["51fb3038.7afb6"]]},{"id":"51fb3038.7afb6","type":"switch","z":"8850e193.e1712","name":"Load data","property":"payload","propertyType":"msg","rules":[{"t":"eq","v":"load","vt":"str"},{"t":"else"}],"checkall":"false","repair":false,"outputs":2,"x":380,"y":140,"wires":[["70a2db09.6ff354"],["922d4285.5f7e1"]]},{"id":"dbe202dbcec1134a","type":"mqtt in","z":"af32a28ba9e46f29","name":"","topic":"zigbee2mqtt/livingroom/scene_switch","qos":"1","datatype":"json","broker":"a07f98a5c7ec3274","nl":false,"rap":true,"rh":0,"inputs":0,"x":190,"y":60,"wires":[["e73dbc5cf9e4c229","b97b7b166ff889f4"]]},{"id":"e73dbc5cf9e4c229","type":"switch","z":"af32a28ba9e46f29","name":"","property":"payload.action","propertyType":"msg","rules":[{"t":"eq","v":"1_single","vt":"str"},{"t":"eq","v":"2_single","vt":"str"},{"t":"eq","v":"3_single","vt":"str"},{"t":"eq","v":"4_single","vt":"str"},{"t":"eq","v":"1_double","vt":"str"},{"t":"eq","v":"2_double","vt":"str"},{"t":"eq","v":"3_double","vt":"str"},{"t":"eq","v":"4_double","vt":"str"},{"t":"eq","v":"1_hold","vt":"str"},{"t":"eq","v":"2_hold","vt":"str"},{"t":"eq","v":"3_hold","vt":"str"},{"t":"eq","v":"4_hold","vt":"str"}],"checkall":"true","repair":false,"outputs":12,"x":150,"y":400,"wires":[["4fac346c3d066f8f"],["23049ee5d70a7992"],["f66dd231bac152b9"],["c77a5b62ecc09046"],[],[],[],[],[],[],[],[]]},{"id":"5ac058fedde86732","type":"mqtt out","z":"af32a28ba9e46f29","name":"","topic":"","qos":"","retain":"","respTopic":"","contentType":"","userProps":"","correl":"","expiry":"","broker":"a07f98a5c7ec3274","x":1310,"y":140,"wires":[]},{"id":"4860bb0911a4b518","type":"change","z":"af32a28ba9e46f29","name":"","rules":[{"t":"set","p":"topic","pt":"msg","to":"\"zigbee2mqtt/livingroom/main_light_2/set\"","tot":"jsonata"}],"action":"","property":"","from":"","to":"","reg":false,"x":390,"y":380,"wires":[["19f51c0d8c733dec"]]},{"id":"ebef887b98106c6c","type":"change","z":"af32a28ba9e46f29","name":"","rules":[{"t":"set","p":"topic","pt":"msg","to":"\"zigbee2mqtt/livingroom/main_light_1/set\"","tot":"jsonata"}],"action":"","property":"","from":"","to":"","reg":false,"x":810,"y":460,"wires":[["77db2ac50a130285"]]},{"id":"77db2ac50a130285","type":"change","z":"af32a28ba9e46f29","name":"","rules":[{"t":"set","p":"payload","pt":"msg","to":"{\"brightness\":254,\"color_temp\":463,\"state\":\"ON\"}","tot":"jsonata"}],"action":"","property":"","from":"","to":"","reg":false,"x":960,"y":260,"wires":[[]]},{"id":"b5c290e4d668cca3","type":"change","z":"af32a28ba9e46f29","name":"","rules":[{"t":"set","p":"topic","pt":"msg","to":"\"zigbee2mqtt/livingroom/main_light_3/set\"","tot":"jsonata"}],"action":"","property":"","from":"","to":"","reg":false,"x":390,"y":420,"wires":[[]]},{"id":"166f158e7450c9fc","type":"change","z":"af32a28ba9e46f29","name":"","rules":[{"t":"set","p":"topic","pt":"msg","to":"\"zigbee2mqtt/livingroom/main_light_4/set\"","tot":"jsonata"}],"action":"","property":"","from":"","to":"","reg":false,"x":390,"y":460,"wires":[[]]},{"id":"b8926c4a994bfe9a","type":"debug","z":"af32a28ba9e46f29","name":"","active":true,"tosidebar":true,"console":false,"tostatus":false,"complete":"true","targetType":"full","statusVal":"","statusType":"auto","x":1290,"y":360,"wires":[]},{"id":"4fac346c3d066f8f","type":"ha-device","z":"af32a28ba9e46f29","name":"","server":"e58cc30d.0bb9","version":0,"exposeToHomeAssistant":false,"haConfig":[{"property":"name","value":""},{"property":"icon","value":""}],"inputs":1,"deviceType":"action","device":"68bc07dee263ff26a97db77cf19fb386","event":{"type":"toggle","device_id":"68bc07dee263ff26a97db77cf19fb386","entity_id":"light.livingroom_mainlight_aquarium","domain":"light","metadata":{"secondary":false}},"capabilities":[],"outputProperties":[],"x":430,"y":140,"wires":[[]]},{"id":"35b67c9fd149c560","type":"change","z":"af32a28ba9e46f29","name":"","rules":[{"t":"set","p":"payload","pt":"msg","to":"{\t \"brightness\": 254,\t \"color_mode\": \"color_temp\",\t \"color_temp\": 454,\t \"state\": state\t}\t\t\t","tot":"jsonata"}],"action":"","property":"","from":"","to":"","reg":false,"x":980,"y":200,"wires":[["5ac058fedde86732","b8926c4a994bfe9a"]]},{"id":"0884a251ca1add3e","type":"function","z":"af32a28ba9e46f29","name":"","func":"if(msg.payload.state==\"ON\"){\n msg.payload.state=\"OFF\"\n} else {\n msg.payload.state=\"ON\"\n}\n\nreturn msg;","outputs":1,"noerr":0,"initialize":"","finalize":"","libs":[],"x":300,"y":560,"wires":[[]]},{"id":"739ce27373dcbdf0","type":"inject","z":"af32a28ba9e46f29","name":"","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payload":"","payloadType":"date","x":300,"y":520,"wires":[[]]},{"id":"e01925178734cf09","type":"change","z":"af32a28ba9e46f29","name":"","rules":[{"t":"set","p":"payload","pt":"msg","to":"{\t \"state\": \"ON\"\t}","tot":"jsonata"}],"action":"","property":"","from":"","to":"","reg":false,"x":780,"y":220,"wires":[["35b67c9fd149c560"]]},{"id":"b97b7b166ff889f4","type":"debug","z":"af32a28ba9e46f29","name":"","active":true,"tosidebar":true,"console":false,"tostatus":false,"complete":"true","targetType":"full","statusVal":"","statusType":"auto","x":530,"y":60,"wires":[]},{"id":"19f51c0d8c733dec","type":"api-current-state","z":"af32a28ba9e46f29","name":"","server":"e58cc30d.0bb9","version":3,"outputs":2,"halt_if":"ON","halt_if_type":"str","halt_if_compare":"is","entity_id":"light.0xb4e3f9fffe102c1f","state_type":"str","blockInputOverrides":false,"outputProperties":[{"property":"payload","propertyType":"msg","value":"","valueType":"entityState"},{"property":"data","propertyType":"msg","value":"","valueType":"entity"}],"for":0,"forType":"num","forUnits":"minutes","override_topic":false,"state_location":"payload","override_payload":"msg","entity_location":"data","override_data":"msg","x":650,"y":380,"wires":[["3c9ea731c2cd44a5"],["e01925178734cf09"]]},{"id":"3c9ea731c2cd44a5","type":"change","z":"af32a28ba9e46f29","name":"","rules":[{"t":"set","p":"payload","pt":"msg","to":"{\t \"state\": \"OFF\"\t}","tot":"jsonata"}],"action":"","property":"","from":"","to":"","reg":false,"x":780,"y":180,"wires":[["35b67c9fd149c560"]]},{"id":"23049ee5d70a7992","type":"ha-device","z":"af32a28ba9e46f29","name":"","server":"e58cc30d.0bb9","version":0,"exposeToHomeAssistant":false,"haConfig":[{"property":"name","value":""},{"property":"icon","value":""}],"inputs":1,"deviceType":"action","device":"b5da09933af5095776729bbb8ef116ea","event":{"type":"toggle","device_id":"b5da09933af5095776729bbb8ef116ea","entity_id":"light.livingroom_mainlight_gramophone","domain":"light","metadata":{"secondary":false}},"capabilities":[],"outputProperties":[],"x":430,"y":200,"wires":[[]]},{"id":"f66dd231bac152b9","type":"ha-device","z":"af32a28ba9e46f29","name":"","server":"e58cc30d.0bb9","version":0,"exposeToHomeAssistant":false,"haConfig":[{"property":"name","value":""},{"property":"icon","value":""}],"inputs":1,"deviceType":"action","device":"1146c4d46415b1965df40b247e75e3bf","event":{"type":"toggle","device_id":"1146c4d46415b1965df40b247e75e3bf","entity_id":"light.livingroom_mainlight_library","domain":"light","metadata":{"secondary":false}},"capabilities":[],"outputProperties":[],"x":430,"y":260,"wires":[[]]},{"id":"c77a5b62ecc09046","type":"ha-device","z":"af32a28ba9e46f29","name":"","server":"e58cc30d.0bb9","version":0,"exposeToHomeAssistant":false,"haConfig":[{"property":"name","value":""},{"property":"icon","value":""}],"inputs":1,"deviceType":"action","device":"c89bf0613661789cc7e714323b4844a7","event":{"type":"toggle","device_id":"c89bf0613661789cc7e714323b4844a7","entity_id":"light.livingroom_mainlight_fireplace","domain":"light","metadata":{"secondary":false}},"capabilities":[],"outputProperties":[],"x":430,"y":320,"wires":[[]]}] \ No newline at end of file diff --git a/node-red/node-red-contrib-home-assistant-websocket.json b/node-red/node-red-contrib-home-assistant-websocket.json index f7a835f..6e7b266 100644 --- a/node-red/node-red-contrib-home-assistant-websocket.json +++ b/node-red/node-red-contrib-home-assistant-websocket.json @@ -1,3 +1,16 @@ { - "nodes": {} + "nodes": { + "4fac346c3d066f8f": { + "isEnabled": true + }, + "23049ee5d70a7992": { + "isEnabled": true + }, + "f66dd231bac152b9": { + "isEnabled": true + }, + "c77a5b62ecc09046": { + "isEnabled": true + } + } } \ No newline at end of file diff --git a/node-red/package-lock.json b/node-red/package-lock.json index 435157e..433117b 100644 --- a/node-red/package-lock.json +++ b/node-red/package-lock.json @@ -9,21 +9,13 @@ "version": "0.0.1", "dependencies": { "node-red-contrib-mytimeout": "~3.2.2", - "node-red-dashboard": "~3.1.5" + "node-red-dashboard": "~3.3.1" } }, - "node_modules/@socket.io/base64-arraybuffer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@socket.io/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz", - "integrity": "sha512-dOlCBKnDw4iShaIsH/bxujKTM18+2TOAsYz+KSc11Am38H4q5Xw8Bbz97ZYdrVNM+um3p7w86Bvvmcn9q+5+eQ==", - "engines": { - "node": ">= 0.6.0" - } - }, - "node_modules/@types/component-emitter": { - "version": "1.2.11", - "resolved": "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.11.tgz", - "integrity": "sha512-SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ==" + "node_modules/@socket.io/component-emitter": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz", + "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==" }, "node_modules/@types/cookie": { "version": "0.4.1", @@ -31,14 +23,17 @@ "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==" }, "node_modules/@types/cors": { - "version": "2.8.12", - "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz", - "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==" + "version": "2.8.13", + "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.13.tgz", + "integrity": "sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==", + "dependencies": { + "@types/node": "*" + } }, "node_modules/@types/node": { - "version": "17.0.13", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.13.tgz", - "integrity": "sha512-Y86MAxASe25hNzlDbsviXl8jQHb0RDvKt4c40ZJQ1Don0AAL0STLZSs4N+6gLEO55pedy7r2cLwS+ZDxPm/2Bw==" + "version": "18.11.18", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz", + "integrity": "sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==" }, "node_modules/accepts": { "version": "1.3.7", @@ -68,11 +63,6 @@ "node": ">= 0.8" } }, - "node_modules/component-emitter": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", - "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==" - }, "node_modules/compressible": { "version": "2.0.18", "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", @@ -102,9 +92,9 @@ } }, "node_modules/cookie": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz", - "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==", + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz", + "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==", "engines": { "node": ">= 0.6" } @@ -130,35 +120,39 @@ } }, "node_modules/depd": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", "engines": { - "node": ">= 0.6" + "node": ">= 0.8" } }, "node_modules/destroy": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", - "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", + "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", + "engines": { + "node": ">= 0.8", + "npm": "1.2.8000 || >= 1.4.16" + } }, "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", "engines": { "node": ">= 0.8" } }, "node_modules/engine.io": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.1.2.tgz", - "integrity": "sha512-v/7eGHxPvO2AWsksyx2PUsQvBafuvqs0jJJQ0FdmJG1b9qIvgSbqDRGwNhfk2XHaTTbTXiC4quRE8Q9nRjsrQQ==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.1.tgz", + "integrity": "sha512-ECceEFcAaNRybd3lsGQKas3ZlMVjN3cyWwMP25D2i0zWfyiytVbTpRPa34qrr+FHddtpBVOmq4H/DCv1O0lZRA==", "dependencies": { "@types/cookie": "^0.4.1", "@types/cors": "^2.8.12", @@ -168,7 +162,7 @@ "cookie": "~0.4.1", "cors": "~2.8.5", "debug": "~4.3.1", - "engine.io-parser": "~5.0.0", + "engine.io-parser": "~5.0.3", "ws": "~8.2.3" }, "engines": { @@ -176,20 +170,17 @@ } }, "node_modules/engine.io-parser": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.3.tgz", - "integrity": "sha512-BtQxwF27XUNnSafQLvDi0dQ8s3i6VgzSoQMJacpIcGNrlUdfHSKbgm3jmjCVvQluGzqwujQMPAoMai3oYSTurg==", - "dependencies": { - "@socket.io/base64-arraybuffer": "~1.0.2" - }, + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.6.tgz", + "integrity": "sha512-tjuoZDMAdEhVnSFleYPCtdL2GXwVTGtNjoeJd9IhIG3C1xs9uwxqRNEu5WpnDZCaozwVlK/nuQhpodhXSIMaxw==", "engines": { "node": ">=10.0.0" } }, "node_modules/engine.io/node_modules/debug": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", - "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dependencies": { "ms": "2.1.2" }, @@ -210,12 +201,12 @@ "node_modules/escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" + "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==" }, "node_modules/etag": { "version": "1.8.1", "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", + "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", "engines": { "node": ">= 0.6" } @@ -223,7 +214,7 @@ "node_modules/fresh": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=", + "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", "engines": { "node": ">= 0.6" } @@ -237,18 +228,18 @@ } }, "node_modules/http-errors": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz", - "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", + "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", "dependencies": { - "depd": "~1.1.2", + "depd": "2.0.0", "inherits": "2.0.4", "setprototypeof": "1.2.0", - "statuses": ">= 1.5.0 < 2", + "statuses": "2.0.1", "toidentifier": "1.0.1" }, "engines": { - "node": ">= 0.6" + "node": ">= 0.8" } }, "node_modules/inherits": { @@ -313,14 +304,14 @@ } }, "node_modules/node-red-dashboard": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/node-red-dashboard/-/node-red-dashboard-3.1.5.tgz", - "integrity": "sha512-Npw6TCe97TzyeCe5CLAWsRklxop00ijmJYrYBagvZqVWHR8+ZXStS8l/7bOstzrkNY2Mvz6Xj9Ne4a+Z3h4V5g==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/node-red-dashboard/-/node-red-dashboard-3.3.1.tgz", + "integrity": "sha512-d7d6nWrM9On4N+ah3R26Jregp1gpJmQgtt7s3EeLHzfCi7WmH1qAVgJe5ucj/U8azr+zF0NXFWD779lIOX+vrQ==", "dependencies": { "compression": "^1.7.4", "gridstack": "^0.6.4", - "serve-static": "^1.14.2", - "socket.io": "~4.4.1" + "serve-static": "^1.15.0", + "socket.io": "^4.5.4" }, "engines": { "node": ">=12" @@ -329,15 +320,15 @@ "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", "engines": { "node": ">=0.10.0" } }, "node_modules/on-finished": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", "dependencies": { "ee-first": "1.1.1" }, @@ -375,23 +366,23 @@ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "node_modules/send": { - "version": "0.17.2", - "resolved": "https://registry.npmjs.org/send/-/send-0.17.2.tgz", - "integrity": "sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==", + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", + "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", "dependencies": { "debug": "2.6.9", - "depd": "~1.1.2", - "destroy": "~1.0.4", + "depd": "2.0.0", + "destroy": "1.2.0", "encodeurl": "~1.0.2", "escape-html": "~1.0.3", "etag": "~1.8.1", "fresh": "0.5.2", - "http-errors": "1.8.1", + "http-errors": "2.0.0", "mime": "1.6.0", "ms": "2.1.3", - "on-finished": "~2.3.0", + "on-finished": "2.4.1", "range-parser": "~1.2.1", - "statuses": "~1.5.0" + "statuses": "2.0.1" }, "engines": { "node": ">= 0.8.0" @@ -403,14 +394,14 @@ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "node_modules/serve-static": { - "version": "1.14.2", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz", - "integrity": "sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==", + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", + "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", "dependencies": { "encodeurl": "~1.0.2", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.17.2" + "send": "0.18.0" }, "engines": { "node": ">= 0.8.0" @@ -422,33 +413,32 @@ "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" }, "node_modules/socket.io": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.4.1.tgz", - "integrity": "sha512-s04vrBswdQBUmuWJuuNTmXUVJhP0cVky8bBDhdkf8y0Ptsu7fKU2LuLbts9g+pdmAdyMMn8F/9Mf1/wbtUN0fg==", + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.4.tgz", + "integrity": "sha512-m3GC94iK9MfIEeIBfbhJs5BqFibMtkRk8ZpKwG2QwxV0m/eEhPIV4ara6XCF1LWNAus7z58RodiZlAH71U3EhQ==", "dependencies": { "accepts": "~1.3.4", "base64id": "~2.0.0", "debug": "~4.3.2", - "engine.io": "~6.1.0", - "socket.io-adapter": "~2.3.3", - "socket.io-parser": "~4.0.4" + "engine.io": "~6.2.1", + "socket.io-adapter": "~2.4.0", + "socket.io-parser": "~4.2.1" }, "engines": { "node": ">=10.0.0" } }, "node_modules/socket.io-adapter": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.3.3.tgz", - "integrity": "sha512-Qd/iwn3VskrpNO60BeRyCyr8ZWw9CPZyitW4AQwmRZ8zCiyDiL+znRnWX6tDHXnWn1sJrM1+b6Mn6wEDJJ4aYQ==" + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz", + "integrity": "sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==" }, "node_modules/socket.io-parser": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz", - "integrity": "sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.2.tgz", + "integrity": "sha512-DJtziuKypFkMMHCm2uIshOYC7QaylbtzQwiMYDuCKy3OPkjLzu4B2vAhTlqipRHHzrI0NJeBAizTK7X+6m1jVw==", "dependencies": { - "@types/component-emitter": "^1.2.10", - "component-emitter": "~1.3.0", + "@socket.io/component-emitter": "~3.1.0", "debug": "~4.3.1" }, "engines": { @@ -456,9 +446,9 @@ } }, "node_modules/socket.io-parser/node_modules/debug": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", - "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dependencies": { "ms": "2.1.2" }, @@ -477,9 +467,9 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "node_modules/socket.io/node_modules/debug": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", - "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dependencies": { "ms": "2.1.2" }, @@ -498,11 +488,11 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "node_modules/statuses": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", "engines": { - "node": ">= 0.6" + "node": ">= 0.8" } }, "node_modules/toidentifier": { @@ -543,15 +533,10 @@ } }, "dependencies": { - "@socket.io/base64-arraybuffer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@socket.io/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz", - "integrity": "sha512-dOlCBKnDw4iShaIsH/bxujKTM18+2TOAsYz+KSc11Am38H4q5Xw8Bbz97ZYdrVNM+um3p7w86Bvvmcn9q+5+eQ==" - }, - "@types/component-emitter": { - "version": "1.2.11", - "resolved": "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.11.tgz", - "integrity": "sha512-SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ==" + "@socket.io/component-emitter": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz", + "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==" }, "@types/cookie": { "version": "0.4.1", @@ -559,14 +544,17 @@ "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==" }, "@types/cors": { - "version": "2.8.12", - "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz", - "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==" + "version": "2.8.13", + "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.13.tgz", + "integrity": "sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==", + "requires": { + "@types/node": "*" + } }, "@types/node": { - "version": "17.0.13", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.13.tgz", - "integrity": "sha512-Y86MAxASe25hNzlDbsviXl8jQHb0RDvKt4c40ZJQ1Don0AAL0STLZSs4N+6gLEO55pedy7r2cLwS+ZDxPm/2Bw==" + "version": "18.11.18", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz", + "integrity": "sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==" }, "accepts": { "version": "1.3.7", @@ -587,11 +575,6 @@ "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=" }, - "component-emitter": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", - "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==" - }, "compressible": { "version": "2.0.18", "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", @@ -615,9 +598,9 @@ } }, "cookie": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz", - "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==" + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz", + "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==" }, "cors": { "version": "2.8.5", @@ -637,29 +620,29 @@ } }, "depd": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==" }, "destroy": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", - "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", + "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==" }, "ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=" + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==" }, "engine.io": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.1.2.tgz", - "integrity": "sha512-v/7eGHxPvO2AWsksyx2PUsQvBafuvqs0jJJQ0FdmJG1b9qIvgSbqDRGwNhfk2XHaTTbTXiC4quRE8Q9nRjsrQQ==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.1.tgz", + "integrity": "sha512-ECceEFcAaNRybd3lsGQKas3ZlMVjN3cyWwMP25D2i0zWfyiytVbTpRPa34qrr+FHddtpBVOmq4H/DCv1O0lZRA==", "requires": { "@types/cookie": "^0.4.1", "@types/cors": "^2.8.12", @@ -669,14 +652,14 @@ "cookie": "~0.4.1", "cors": "~2.8.5", "debug": "~4.3.1", - "engine.io-parser": "~5.0.0", + "engine.io-parser": "~5.0.3", "ws": "~8.2.3" }, "dependencies": { "debug": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", - "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "requires": { "ms": "2.1.2" } @@ -689,27 +672,24 @@ } }, "engine.io-parser": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.3.tgz", - "integrity": "sha512-BtQxwF27XUNnSafQLvDi0dQ8s3i6VgzSoQMJacpIcGNrlUdfHSKbgm3jmjCVvQluGzqwujQMPAoMai3oYSTurg==", - "requires": { - "@socket.io/base64-arraybuffer": "~1.0.2" - } + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.6.tgz", + "integrity": "sha512-tjuoZDMAdEhVnSFleYPCtdL2GXwVTGtNjoeJd9IhIG3C1xs9uwxqRNEu5WpnDZCaozwVlK/nuQhpodhXSIMaxw==" }, "escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" + "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==" }, "etag": { "version": "1.8.1", "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" + "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==" }, "fresh": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" + "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==" }, "gridstack": { "version": "0.6.4", @@ -720,14 +700,14 @@ } }, "http-errors": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz", - "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", + "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", "requires": { - "depd": "~1.1.2", + "depd": "2.0.0", "inherits": "2.0.4", "setprototypeof": "1.2.0", - "statuses": ">= 1.5.0 < 2", + "statuses": "2.0.1", "toidentifier": "1.0.1" } }, @@ -775,25 +755,25 @@ "integrity": "sha512-WNzDnG6HKudOl43fZHa8oSfKR1xw3yny5Opr2EdVfOEPcQrI1AZgafJZFCeYkM6GcIruQD3qZBI9WbzWNW5mrQ==" }, "node-red-dashboard": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/node-red-dashboard/-/node-red-dashboard-3.1.5.tgz", - "integrity": "sha512-Npw6TCe97TzyeCe5CLAWsRklxop00ijmJYrYBagvZqVWHR8+ZXStS8l/7bOstzrkNY2Mvz6Xj9Ne4a+Z3h4V5g==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/node-red-dashboard/-/node-red-dashboard-3.3.1.tgz", + "integrity": "sha512-d7d6nWrM9On4N+ah3R26Jregp1gpJmQgtt7s3EeLHzfCi7WmH1qAVgJe5ucj/U8azr+zF0NXFWD779lIOX+vrQ==", "requires": { "compression": "^1.7.4", "gridstack": "^0.6.4", - "serve-static": "^1.14.2", - "socket.io": "~4.4.1" + "serve-static": "^1.15.0", + "socket.io": "^4.5.4" } }, "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==" }, "on-finished": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", "requires": { "ee-first": "1.1.1" } @@ -819,23 +799,23 @@ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "send": { - "version": "0.17.2", - "resolved": "https://registry.npmjs.org/send/-/send-0.17.2.tgz", - "integrity": "sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==", + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", + "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", "requires": { "debug": "2.6.9", - "depd": "~1.1.2", - "destroy": "~1.0.4", + "depd": "2.0.0", + "destroy": "1.2.0", "encodeurl": "~1.0.2", "escape-html": "~1.0.3", "etag": "~1.8.1", "fresh": "0.5.2", - "http-errors": "1.8.1", + "http-errors": "2.0.0", "mime": "1.6.0", "ms": "2.1.3", - "on-finished": "~2.3.0", + "on-finished": "2.4.1", "range-parser": "~1.2.1", - "statuses": "~1.5.0" + "statuses": "2.0.1" }, "dependencies": { "ms": { @@ -846,14 +826,14 @@ } }, "serve-static": { - "version": "1.14.2", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz", - "integrity": "sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==", + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", + "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", "requires": { "encodeurl": "~1.0.2", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.17.2" + "send": "0.18.0" } }, "setprototypeof": { @@ -862,22 +842,22 @@ "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" }, "socket.io": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.4.1.tgz", - "integrity": "sha512-s04vrBswdQBUmuWJuuNTmXUVJhP0cVky8bBDhdkf8y0Ptsu7fKU2LuLbts9g+pdmAdyMMn8F/9Mf1/wbtUN0fg==", + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.4.tgz", + "integrity": "sha512-m3GC94iK9MfIEeIBfbhJs5BqFibMtkRk8ZpKwG2QwxV0m/eEhPIV4ara6XCF1LWNAus7z58RodiZlAH71U3EhQ==", "requires": { "accepts": "~1.3.4", "base64id": "~2.0.0", "debug": "~4.3.2", - "engine.io": "~6.1.0", - "socket.io-adapter": "~2.3.3", - "socket.io-parser": "~4.0.4" + "engine.io": "~6.2.1", + "socket.io-adapter": "~2.4.0", + "socket.io-parser": "~4.2.1" }, "dependencies": { "debug": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", - "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "requires": { "ms": "2.1.2" } @@ -890,24 +870,23 @@ } }, "socket.io-adapter": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.3.3.tgz", - "integrity": "sha512-Qd/iwn3VskrpNO60BeRyCyr8ZWw9CPZyitW4AQwmRZ8zCiyDiL+znRnWX6tDHXnWn1sJrM1+b6Mn6wEDJJ4aYQ==" + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz", + "integrity": "sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==" }, "socket.io-parser": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz", - "integrity": "sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.2.tgz", + "integrity": "sha512-DJtziuKypFkMMHCm2uIshOYC7QaylbtzQwiMYDuCKy3OPkjLzu4B2vAhTlqipRHHzrI0NJeBAizTK7X+6m1jVw==", "requires": { - "@types/component-emitter": "^1.2.10", - "component-emitter": "~1.3.0", + "@socket.io/component-emitter": "~3.1.0", "debug": "~4.3.1" }, "dependencies": { "debug": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", - "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "requires": { "ms": "2.1.2" } @@ -920,9 +899,9 @@ } }, "statuses": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==" }, "toidentifier": { "version": "1.0.1", diff --git a/node-red/package.json b/node-red/package.json index 6edc6ee..f3e4080 100644 --- a/node-red/package.json +++ b/node-red/package.json @@ -5,6 +5,6 @@ "private": true, "dependencies": { "node-red-contrib-mytimeout": "~3.2.2", - "node-red-dashboard": "~3.1.5" + "node-red-dashboard": "~3.3.1" } } diff --git a/sensors.yaml b/sensors.yaml index 4ad98b5..93b3209 100644 --- a/sensors.yaml +++ b/sensors.yaml @@ -9,3 +9,4 @@ unit_of_measurement: MB # InfluxDB 2.x Database Size Sensor + diff --git a/template.yaml b/template.yaml index 52e6a5f..9baa1b9 100644 --- a/template.yaml +++ b/template.yaml @@ -29,4 +29,31 @@ |int }} unit_of_measurement: "%" device_class: power_factor - state_class: measurement \ No newline at end of file + state_class: measurement + +# Klimatizace - aktuální teplota + - name: "AC Livingroom Current temperature" + unique_id: ac_livingroom_current_temperature + unit_of_measurement: "°C" + state: > + {{ state_attr('climate.ac_livingroom', 'current_temperature') }} + - name: "AC Bathroom Current temperature" + unique_id: ac_bathroom_current_temperature + unit_of_measurement: "°C" + state: > + {{ state_attr('climate.ac_bathroom', 'current_temperature') }} + - name: "AC Bedroom Current temperature" + unique_id: ac_bedroom_current_temperature + unit_of_measurement: "°C" + state: > + {{ state_attr('climate.ac_bedroom', 'current_temperature') }} + - name: "AC Childrensroom Current temperature" + unique_id: ac_childrensroom_current_temperature + unit_of_measurement: "°C" + state: > + {{ state_attr('climate.ac_childrensroom', 'current_temperature') }} + - name: "AC Guestroom Current temperature" + unique_id: ac_guestroom_current_temperature + unit_of_measurement: "°C" + state: > + {{ state_attr('climate.ac_guestroom', 'current_temperature') }} \ No newline at end of file diff --git a/zigbee2mqtt/devices.yaml b/zigbee2mqtt/devices.yaml index 05ff874..2cc4316 100644 --- a/zigbee2mqtt/devices.yaml +++ b/zigbee2mqtt/devices.yaml @@ -1,10 +1,10 @@ '0xb4e3f9fffe102c12': - friendly_name: livingroom/main_light_2 + friendly_name: livingroom/mainlight_gramophone '0x84fd27fffed7b8a4': - friendly_name: livingroom/main_light_4 + friendly_name: livingroom/mainlight_fireplace '0x84fd27fffe80415b': - friendly_name: livingroom/main_light_3 + friendly_name: livingroom/mainlight_library '0xb4e3f9fffe102c1f': - friendly_name: livingroom/main_light_1 + friendly_name: livingroom/mainlight_aquarium '0x60a423fffefc9539': friendly_name: livingroom/scene_switch