Fixed zigbee2mqtt map, added path to lovelace pages

diff --git a/.gitignore b/.gitignore
index c4734515b5568b27c4b02b1af322cfb66c08e46f..d794f7917348038dd812dd0cdea54c98ab65104a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@
 .storage
 .uuid
 deps/
-home-assistant.log
+home-assistant.log*
 home-assistant_v2.db*
 image/
 tts/

diff --git a/.storage/lovelace b/.storage/lovelace
index 9dee909f1cf0520d6f675146b4836e1535e67964..b50f2ea2ac49caf9137612c61119f7233fb030e2 100644 (file)
--- a/.storage/lovelace
+++ b/.storage/lovelace
@@ -9,6 +9,7 @@
                     "icon": "mdi:home",
                     "id": "main",
                     "title": "Principale",
+                    "path": "main",
                     "badges": [
                         {
                             "entity": "person.giorgio"
@@ -365,16 +366,38 @@
                     ]
                 },
                 {
+                    "icon": "mdi:lightbulb",
+                    "id": "lights",
+                    "title": "Luci",
+                    "path": "lights",
                     "badges": [
-                        "light.luce_cucina",
-                        "light.luce_corridoio",
-                        "light.luce_sala",
-                        "light.luce_divano",
-                        "light.luce_bagno",
-                        "light.luce_specchio",
-                        "light.luce_studio",
-                        "light.luce_camera",
-                        "light.luce_balcone"
+                        {
+                            "entity": "light.luce_cucina"
+                        },
+                        {
+                            "entity": "light.luce_corridoio"
+                        },
+                        {
+                            "entity": "light.luce_sala"
+                        },
+                        {
+                            "entity": "light.luce_divano"
+                        },
+                        {
+                            "entity": "light.luce_bagno"
+                        },
+                        {
+                            "entity": "light.luce_specchio"
+                        },
+                        {
+                            "entity": "light.luce_studio"
+                        },
+                        {
+                            "entity": "light.luce_camera"
+                        },
+                        {
+                            "entity": "light.luce_balcone"
+                        }
                     ],
                     "cards": [
                         {
@@ -451,17 +474,26 @@
                             "name": "Luce Balcone",
                             "type": "light"
                         }
-                    ],
-                    "icon": "mdi:lightbulb",
-                    "id": "light",
-                    "title": "Luci"
+                    ]
                 },
                 {
+                    "icon": "mdi:window-shutter",
+                    "id": "covers",
+                    "title": "Tapparelle",
+                    "path": "covers",
                     "badges": [
-                        "sensor.tapparella_cucina",
-                        "sensor.tapparella_sala",
-                        "sensor.tapparella_studio",
-                        "sensor.tapparella_camera"
+                        {
+                            "entity": "sensor.tapparella_cucina"
+                        },
+                        {
+                            "entity": "sensor.tapparella_sala"
+                        },
+                        {
+                            "entity": "sensor.tapparella_studio"
+                        },
+                        {
+                            "entity": "sensor.tapparella_camera"
+                        }
                     ],
                     "cards": [
                         {
@@ -508,15 +540,13 @@
                             ],
                             "type": "custom:shutter-card"
                         }
-                    ],
-                    "icon": "mdi:window-shutter",
-                    "id": "covers",
-                    "title": "Tapparelle"
+                    ]
                 },
                 {
                     "icon": "mdi:thermometer",
                     "id": "climate",
                     "title": "Termostato",
+                    "path": "climate",
                     "badges": [
                         {
                             "entity": "sensor.valve_cucina_temperature"
@@ -737,11 +767,23 @@
                     ]
                 },
                 {
+                    "icon": "mdi:account-multiple",
+                    "id": "people",
+                    "title": "People",
+                    "path": "people",
                     "badges": [
-                        "person.giorgio",
-                        "person.laura",
-                        "person.anna",
-                        "person.assunta"
+                        {
+                            "entity": "person.giorgio"
+                        },
+                        {
+                            "entity": "person.laura"
+                        },
+                        {
+                            "entity": "person.anna"
+                        },
+                        {
+                            "entity": "person.assunta"
+                        }
                     ],
                     "cards": [
                         {
@@ -776,10 +818,7 @@
                             "hours_to_show": 24,
                             "type": "map"
                         }
-                    ],
-                    "icon": "mdi:account-multiple",
-                    "id": "people",
-                    "title": "People"
+                    ]
                 },
                 {
                     "title": "Auto",
@@ -796,6 +835,8 @@
                         }
                     },
                     "icon": "mdi:car",
+                    "id": "car",
+                    "path": "car",
                     "badges": [],
                     "cards": [
                         {
@@ -1290,9 +1331,10 @@
                 },
                 {
                     "icon": "mdi:flash",
-                    "id": "power",
+                    "id": "energy",
                     "title": "Monitoraggio Energetico",
                     "type": "sidebar",
+                    "path": "energy",
                     "badges": [
                         {
                             "entity": "sensor.shelly_em_channel_1_power"
@@ -1330,7 +1372,7 @@
                             "unit": "kWh",
                             "severity": {
                                 "green": 0,
-                                "yellow": 3,
+                                "yellow": 4,
                                 "red": 5
                             },
                             "needle": true,
@@ -1385,29 +1427,42 @@
                     ]
                 },
                 {
+                    "icon": "mdi:alarm-light-outline",
+                    "id": "alarms",
+                    "title": "Allarmi",
+                    "path": "alarms",
                     "badges": [
-                        "binary_sensor.alarms"
+                        {
+                            "entity": "binary_sensor.alarms"
+                        }
                     ],
                     "cards": [
                         {
                             "entities": [
-                                "group.alarms",
-                                "input_boolean.generic_alarm",
-                                "input_boolean.door_alarm"
+                                {
+                                    "entity": "group.alarms"
+                                },
+                                {
+                                    "entity": "input_boolean.generic_alarm"
+                                },
+                                {
+                                    "entity": "input_boolean.door_alarm"
+                                },
+                                {
+                                    "entity": "input_boolean.car_alarm"
+                                }
                             ],
                             "show_header_toggle": false,
                             "title": "Allarmi Casa",
                             "type": "entities"
                         }
-                    ],
-                    "icon": "mdi:alarm-light-outline",
-                    "id": "allarmi",
-                    "title": "Allarmi"
+                    ]
                 },
                 {
+                    "icon": "mdi:home-thermometer",
+                    "id": "temperature",
                     "title": "Temperature",
                     "path": "temperature",
-                    "icon": "mdi:home-thermometer",
                     "badges": [],
                     "cards": [
                         {
@@ -1876,8 +1931,9 @@
                 },
                 {
                     "icon": "mdi:weather-sunny",
-                    "id": "meteo",
+                    "id": "weather",
                     "title": "Meteo",
+                    "path": "weather",
                     "badges": [
                         {
                             "entity": "sun.sun"

diff --git a/.storage/lovelace.lovelace_dispositivi b/.storage/lovelace.lovelace_dispositivi
index 4ef301df6419a30bfebebc92f91ab0559fa5f990..4a5eeb506da7c334161be2443bba9f77cdf0eaac 100644 (file)
--- a/.storage/lovelace.lovelace_dispositivi
+++ b/.storage/lovelace.lovelace_dispositivi
@@ -170,16 +170,16 @@
                             "layout": "vertical",
                             "cards": [
                                 {
-                                    "css": ":host {\n  --zigbee2mqtt-networkmap-node-color: rgba(18, 120, 98, .7);\n  --zigbee2mqtt-networkmap-node-fill-color: #dcfaf3;\n  --zigbee2mqtt-networkmap-node-pinned-color: rgba(190, 56, 93, .6);\n  --zigbee2mqtt-networkmap-link-color: rgba(18, 120, 98, .5);\n  --zigbee2mqtt-networkmap-hover-color: #be385d;\n  --zigbee2mqtt-networkmap-link-selected-color: rgba(202, 164, 85, .6);\n  --zigbee2mqtt-networkmap-label-color: #127862;\n  --zigbee2mqtt-networkmap-arrow-color: rgba(18, 120, 98, 0.7);\n  --zigbee2mqtt-networkmap-node-coordinator-color: rgba(224, 78, 93, .7);\n  --zigbee2mqtt-networkmap-node-router-color: rgba(0, 165, 255, .7);\n}\n",
+                                    "title": "Zigbee2mqtt Network Map",
+                                    "type": "custom:zigbee2mqtt-networkmap",
                                     "entity": "sensor.zigbee2mqtt_networkmap",
-                                    "font_size": 12,
-                                    "force": 3000,
-                                    "height": 400,
-                                    "link_width": 2,
                                     "mqtt_base_topic": "zigbee2mqtt",
+                                    "force": 3000,
                                     "node_size": 16,
-                                    "title": "Zigbee2mqtt Network Map",
-                                    "type": "custom:zigbee2mqtt-networkmap"
+                                    "font_size": 12,
+                                    "link_width": 2,
+                                    "height": 400,
+                                    "css": ":host {\n  --zigbee2mqtt-networkmap-node-color: rgba(18, 120, 98, .7);\n  --zigbee2mqtt-networkmap-node-fill-color: #dcfaf3;\n  --zigbee2mqtt-networkmap-node-pinned-color: rgba(190, 56, 93, .6);\n  --zigbee2mqtt-networkmap-link-color: rgba(18, 120, 98, .5);\n  --zigbee2mqtt-networkmap-hover-color: #be385d;\n  --zigbee2mqtt-networkmap-link-selected-color: rgba(202, 164, 85, .6);\n  --zigbee2mqtt-networkmap-label-color: #127862;\n  --zigbee2mqtt-networkmap-arrow-color: rgba(18, 120, 98, 0.7);\n  --zigbee2mqtt-networkmap-node-coordinator-color: rgba(224, 78, 93, .7);\n  --zigbee2mqtt-networkmap-node-router-color: rgba(0, 165, 255, .7);\n}\n"
                                 }
                             ]
                         }
@@ -280,6 +280,7 @@
                         }
                     },
                     "icon": "mdi:alpha-s-box",
+                    "path": "shelly",
                     "badges": [],
                     "cards": [
                         {

diff --git a/.storage/lovelace.lovelace_settings b/.storage/lovelace.lovelace_settings
index c750a7738fb01954f2980d1c88013239ac92e1c3..ce08f6f824a20ca47e9bd6ee33cc180dd930f848 100644 (file)
--- a/.storage/lovelace.lovelace_settings
+++ b/.storage/lovelace.lovelace_settings
@@ -6,6 +6,9 @@
             "title": "Sistema Home Assistant",
             "views": [
                 {
+                    "icon": "mdi:cog",
+                    "title": "Configurazione",
+                    "path": "config",
                     "badges": [
                         {
                             "entity": "binary_sensor.home_mode"
@@ -93,14 +96,13 @@
                             ],
                             "type": "vertical-stack"
                         }
-                    ],
-                    "icon": "mdi:cog",
-                    "title": "Configurazione"
+                    ]
                 },
                 {
                     "icon": "mdi:lan",
                     "title": "Dispositivi di Rete",
                     "type": "sidebar",
+                    "path": "network",
                     "badges": [],
                     "cards": [
                         {
@@ -165,6 +167,9 @@
                     ]
                 },
                 {
+                    "icon": "mdi:zigbee",
+                    "title": "Zigbee",
+                    "path": "zigbee",
                     "badges": [],
                     "cards": [
                         {
@@ -293,20 +298,25 @@
                             ]
                         },
                         {
-                            "css": ":host {\n  --zigbee2mqtt-networkmap-node-color: rgba(18, 120, 98, .7);\n  --zigbee2mqtt-networkmap-node-fill-color: #dcfaf3;\n  --zigbee2mqtt-networkmap-node-pinned-color: rgba(190, 56, 93, .6);\n  --zigbee2mqtt-networkmap-link-color: rgba(18, 120, 98, .5);\n  --zigbee2mqtt-networkmap-hover-color: #be385d;\n  --zigbee2mqtt-networkmap-link-selected-color: rgba(202, 164, 85, .6);\n  --zigbee2mqtt-networkmap-label-color: #127862;\n  --zigbee2mqtt-networkmap-arrow-color: rgba(18, 120, 98, 0.7);\n  --zigbee2mqtt-networkmap-node-coordinator-color: rgba(224, 78, 93, .7);\n  --zigbee2mqtt-networkmap-node-router-color: rgba(0, 165, 255, .7);\n}\n",
-                            "entity": "sensor.zigbee2mqtt_networkmap",
-                            "font_size": 12,
-                            "force": 3000,
-                            "height": 400,
-                            "link_width": 2,
-                            "mqtt_base_topic": "zigbee2mqtt",
-                            "node_size": 16,
-                            "title": "Zigbee2mqtt Network Map",
-                            "type": "custom:zigbee2mqtt-networkmap"
+                            "type": "vertical-stack",
+                            "title": "Mappa Dispositivi",
+                            "layout": "vertical",
+                            "cards": [
+                                {
+                                    "title": "Zigbee2mqtt Network Map",
+                                    "type": "custom:zigbee2mqtt-networkmap",
+                                    "entity": "sensor.zigbee2mqtt_networkmap",
+                                    "mqtt_base_topic": "zigbee2mqtt",
+                                    "force": 3000,
+                                    "node_size": 16,
+                                    "font_size": 12,
+                                    "link_width": 2,
+                                    "height": 400,
+                                    "css": ":host {\n  --zigbee2mqtt-networkmap-node-color: rgba(18, 120, 98, .7);\n  --zigbee2mqtt-networkmap-node-fill-color: #dcfaf3;\n  --zigbee2mqtt-networkmap-node-pinned-color: rgba(190, 56, 93, .6);\n  --zigbee2mqtt-networkmap-link-color: rgba(18, 120, 98, .5);\n  --zigbee2mqtt-networkmap-hover-color: #be385d;\n  --zigbee2mqtt-networkmap-link-selected-color: rgba(202, 164, 85, .6);\n  --zigbee2mqtt-networkmap-label-color: #127862;\n  --zigbee2mqtt-networkmap-arrow-color: rgba(18, 120, 98, 0.7);\n  --zigbee2mqtt-networkmap-node-coordinator-color: rgba(224, 78, 93, .7);\n  --zigbee2mqtt-networkmap-node-router-color: rgba(0, 165, 255, .7);\n}\n"
+                                }
+                            ]
                         }
-                    ],
-                    "icon": "mdi:zigbee",
-                    "title": "Zigbee"
+                    ]
                 }
             ]
         }

diff --git a/.storage/lovelace_resources b/.storage/lovelace_resources
index 4e6aeae3307581f9208614d64a3477daac97bdc6..df0079026d7447bb9a18a00ddabfbb016955848f 100644 (file)
--- a/.storage/lovelace_resources
+++ b/.storage/lovelace_resources
@@ -18,15 +18,10 @@
                 "type": "module",
                 "url": "/hacsfiles/lovelace-slider-entity-row/slider-entity-row.js"
             },
-            {
-                "id": "30e56555d1eb432abe3fcc5b9cb16be1",
-                "type": "module",
-                "url": "/hacsfiles/zigbee2mqtt-networkmap/zigbee2mqtt-networkmap.js"
-            },
             {
                 "id": "6c8988516c824aa99cbd556a0b4ff39c",
                 "type": "module",
-                "url": "/hacsfiles/lovelace-layout-card/layout-card.js?hacstag=156434866230"
+                "url": "/hacsfiles/lovelace-layout-card/layout-card.js?hacstag=156434866231"
             },
             {
                 "id": "b28e5c5a648145f0828a10f89b1b7770",
@@ -52,6 +47,11 @@
                 "url": "/hacsfiles/mini-graph-card/mini-graph-card-bundle.js",
                 "type": "module",
                 "id": "e4685ccd929f4e71a561d0d397f8ae80"
+            },
+            {
+                "url": "/hacsfiles/zigbee2mqtt-networkmap/zigbee2mqtt-networkmap.js?hacstag=201292040070",
+                "type": "module",
+                "id": "746f4aa8840a4986b284e7ac56c83789"
             }
         ]
     }

diff --git a/packages/zigbee2mqtt.yaml b/packages/zigbee2mqtt.yaml
index 3a19d3e533a7dd5a0bc6d35b7fb730349121be93..f9780569edcc105bd0f0d4e9ce2e99a7428f03c8 100644 (file)
--- a/packages/zigbee2mqtt.yaml
+++ b/packages/zigbee2mqtt.yaml
@@ -19,7 +19,7 @@ sensor:
     state_topic: "zigbee2mqtt/bridge/config"\r
     value_template: "{{ value_json.permit_join }}"\r
     icon: mdi:link-lock\r
-    \r
+\r
   ######################################################################\r
   # Sensor for monitoring the log_level state\r
   ######################################################################\r
@@ -78,18 +78,19 @@ sensor:
   # Zigbee2mqtt Networkmap\r
   ######################################################################\r
   - platform: mqtt\r
-    name: "Zigbee2mqtt: Networkmap"\r
-    state_topic: zigbee2mqtt/bridge/networkmap/raw\r
+    name: Zigbee2mqtt Networkmap\r
+    state_topic: zigbee2mqtt/bridge/response/networkmap\r
     value_template: >-\r
       {{ now().strftime('%Y-%m-%d %H:%M:%S') }}\r
-    json_attributes_topic: zigbee2mqtt/bridge/networkmap/raw\r
+    json_attributes_topic: zigbee2mqtt/bridge/response/networkmap\r
+    json_attributes_template: "{{ value_json.data.value | tojson }}"\r
 \r
 ######################################################################\r
 # Zigbee2mqtt Package - Switch\r
 ######################################################################\r
 \r
 switch:\r
-  # Switch for enabling joining \r
+  # Switch for enabling joining\r
   - platform: mqtt\r
     name: "Zigbee2mqtt: Abilita join"\r
     state_topic: "zigbee2mqtt/bridge/config/permit_join"\r