diff --git a/dashboards/minimal/views/bryggers.yaml b/dashboards/minimal/views/bryggers.yaml index f891755..f98e052 100644 --- a/dashboards/minimal/views/bryggers.yaml +++ b/dashboards/minimal/views/bryggers.yaml @@ -1,5 +1,9 @@ title: Bryggers path: bryggers +type: custom:masonry-layout +layout: + width: 300 + max_cols: 1 cards: - type: custom:decluttering-card template: subpanel_title_template diff --git a/dashboards/minimal/views/el.yaml b/dashboards/minimal/views/el.yaml index 6d41c04..cb67223 100644 --- a/dashboards/minimal/views/el.yaml +++ b/dashboards/minimal/views/el.yaml @@ -1,5 +1,9 @@ title: El path: el +type: custom:masonry-layout +layout: + width: 300 + max_cols: 1 cards: - type: custom:decluttering-card template: subpanel_title_template diff --git a/dashboards/minimal/views/hjem.yaml b/dashboards/minimal/views/hjem.yaml index 02a598f..6bd1990 100644 --- a/dashboards/minimal/views/hjem.yaml +++ b/dashboards/minimal/views/hjem.yaml @@ -1,4 +1,8 @@ title: Hjem +type: custom:masonry-layout +layout: + width: 300 + max_cols: 1 cards: - type: custom:stack-in-card cards: diff --git a/dashboards/minimal/views/jens.yaml b/dashboards/minimal/views/jens.yaml index df2ded8..1f57523 100644 --- a/dashboards/minimal/views/jens.yaml +++ b/dashboards/minimal/views/jens.yaml @@ -1,5 +1,9 @@ title: Jens path: jens +type: custom:masonry-layout +layout: + width: 300 + max_cols: 1 cards: - type: custom:decluttering-card template: subpanel_title_template @@ -10,7 +14,7 @@ - type: custom:decluttering-card template: temperature_chart_template variables: - - entity: climate.wavin_9000_jens_vaerelse + - entity: climate.wavin_9000_jens_vaerelse_2 - type: custom:decluttering-card template: humidity_chart_template diff --git a/dashboards/minimal/views/kokken.yaml b/dashboards/minimal/views/kokken.yaml index fc3cf61..af7ee2c 100644 --- a/dashboards/minimal/views/kokken.yaml +++ b/dashboards/minimal/views/kokken.yaml @@ -1,5 +1,9 @@ title: Køkken path: kokken +type: custom:masonry-layout +layout: + width: 300 + max_cols: 1 cards: - type: custom:decluttering-card template: subpanel_title_template @@ -10,7 +14,7 @@ - type: custom:decluttering-card template: temperature_chart_template variables: - - entity: climate.wavin_9000_kokken + - entity: climate.wavin_9000_kokken_2 - type: custom:decluttering-card template: humidity_chart_template diff --git a/dashboards/minimal/views/lys.yaml b/dashboards/minimal/views/lys.yaml index 0d283c8..bf4ad30 100644 --- a/dashboards/minimal/views/lys.yaml +++ b/dashboards/minimal/views/lys.yaml @@ -1,5 +1,9 @@ title: Lys path: lys +type: custom:masonry-layout +layout: + width: 300 + max_cols: 1 cards: - type: custom:decluttering-card template: subpanel_title_template diff --git a/dashboards/minimal/views/niels.yaml b/dashboards/minimal/views/niels.yaml index 5837f6e..49ee59a 100644 --- a/dashboards/minimal/views/niels.yaml +++ b/dashboards/minimal/views/niels.yaml @@ -1,5 +1,9 @@ title: Niels path: niels +type: custom:masonry-layout +layout: + width: 300 + max_cols: 1 cards: - type: custom:decluttering-card template: subpanel_title_template @@ -10,7 +14,7 @@ - type: custom:decluttering-card template: temperature_chart_template variables: - - entity: climate.wavin_9000_niels_vaerelse + - entity: climate.wavin_9000_niels_vaerelse_2 - type: custom:decluttering-card template: humidity_chart_template diff --git a/dashboards/minimal/views/sove.yaml b/dashboards/minimal/views/sove.yaml index dfc5533..b95cd25 100644 --- a/dashboards/minimal/views/sove.yaml +++ b/dashboards/minimal/views/sove.yaml @@ -1,5 +1,9 @@ title: Soveværelse path: sove +type: custom:masonry-layout +layout: + width: 300 + max_cols: 1 cards: - type: custom:decluttering-card template: subpanel_title_template @@ -10,7 +14,7 @@ - type: custom:decluttering-card template: temperature_chart_template variables: - - entity: climate.wavin_9000_sovevaerelse + - entity: climate.wavin_9000_sovevaerelse_2 - type: custom:decluttering-card template: humidity_chart_template diff --git a/dashboards/minimal/views/stue.yaml b/dashboards/minimal/views/stue.yaml index ac01c01..5c53e4f 100644 --- a/dashboards/minimal/views/stue.yaml +++ b/dashboards/minimal/views/stue.yaml @@ -1,5 +1,9 @@ title: Stue path: stue +type: custom:masonry-layout +layout: + width: 300 + max_cols: 1 cards: - type: custom:decluttering-card template: subpanel_title_template diff --git a/dashboards/minimal/views/varme.yaml b/dashboards/minimal/views/varme.yaml index ab65020..2e1868c 100644 --- a/dashboards/minimal/views/varme.yaml +++ b/dashboards/minimal/views/varme.yaml @@ -1,8 +1,44 @@ title: Varme path: varme +type: custom:masonry-layout +layout: + width: 300 + max_cols: 1 cards: - type: custom:decluttering-card template: subpanel_title_template variables: - title: Varme - alignment: start + - type: custom:auto-entities + card: + type: custom:layout-card + layout_type: custom:grid + card_param: cards + filter: + template: |- + [ + {% for entity in states.climate | selectattr('entity_id', 'contains', 'wavin') %} + {{ + { + "type": "custom:simple-thermostat", + "entity": entity.entity_id, + "header": { + "name": entity.attributes.friendly_name + }, + "control": false, + "layout": { + "step": "row", + "mode": { + "icons": true, + "names": false, + "headings": false + }, + "sensors": { + "labels": false + } + } + } + }}, + {% endfor %} + ] diff --git a/esphome/wavin9000.yaml b/esphome/wavin9000.yaml index e8f9419..2a63b65 100644 --- a/esphome/wavin9000.yaml +++ b/esphome/wavin9000.yaml @@ -1,6 +1,3 @@ -external_components: - - source: github://bendikwa/esphome-igrill@v1.2 - esphome: name: wavin9000 @@ -29,7 +26,7 @@ packages: remote_package: url: https://github.com/dkgof/esphome_components - ref: dev + ref: main files: - components/wavinahc9000v2/configs/basic.yaml # REQUIRED FOR WAVIN AHC 9000 - components/wavinahc9000v2/configs/channel_01.yaml @@ -72,19 +69,6 @@ bluetooth_proxy: active: true -ble_client: - - mac_address: 70:91:8F:XX:XX:XX - id: igrill_device - -sensor: - - platform: igrill - ble_client_id: igrill_device - update_interval: 5s # default - battery_level: - name: "iGrill Mini battery" - temperature_probe1: - name: "iGrill Mini temp probe 1" - sensor: - platform: uptime name: "Wavin9000 Uptime" diff --git a/zigbee2mqtt/configuration.yaml b/zigbee2mqtt/configuration.yaml index 7e89f14..0ba2a09 100644 --- a/zigbee2mqtt/configuration.yaml +++ b/zigbee2mqtt/configuration.yaml @@ -22,7 +22,7 @@ protocol: tcp4 type: '5424' channel: 15 - log_level: info + log_level: debug last_seen: ISO_8601_local device_options: legacy: false @@ -39,20 +39,18 @@ friendly_name: Kontor_Plug '0x00124b002920814b': friendly_name: Temp4 - '0x00124b00292067e9': - friendly_name: Temp3 - '0x00124b0029203033': - friendly_name: Temp2 '0x00124b0029209f8c': friendly_name: Temp1 '0x00124b0029117198': friendly_name: Bryggers Vindue - '0xa4c138d2c6cf467b': - friendly_name: AirconZigbee '0xb4e3f9fffe68034a': friendly_name: PytKnap '0x8cf681fffe2871c5': friendly_name: TVBænkKnap + '0x00124b00292067e9': + friendly_name: Temp3 + '0x00124b0029203033': + friendly_name: Temp2 availability: active: timeout: 10 diff --git a/zigbee2mqtt/coordinator_backup.json b/zigbee2mqtt/coordinator_backup.json index 2ad73f8..bd89798 100644 --- a/zigbee2mqtt/coordinator_backup.json +++ b/zigbee2mqtt/coordinator_backup.json @@ -2,9 +2,9 @@ "metadata": { "format": "zigpy/open-coordinator-backup", "version": 1, - "source": "zigbee-herdsman@0.21.0", + "source": "zigbee-herdsman@0.30.0", "internal": { - "date": "2023-12-02T05:25:46.172Z", + "date": "2024-01-07T13:31:11.511Z", "znpVersion": 1 } }, @@ -25,7 +25,7 @@ "network_key": { "key": "01030507090b0d0f00020406080a0c0d", "sequence_number": 0, - "frame_counter": 37431389 + "frame_counter": 40315350 }, "devices": [ { @@ -35,7 +35,7 @@ "link_key": { "key": "2dbd06f2c925d1440e77baca95187bb8", "rx_counter": 0, - "tx_counter": 187 + "tx_counter": 2698 } }, { @@ -45,7 +45,7 @@ "link_key": { "key": "6a56d62baee038ec499c6a13f2dd9210", "rx_counter": 0, - "tx_counter": 165 + "tx_counter": 2676 } }, { @@ -54,8 +54,8 @@ "is_child": false, "link_key": { "key": "12112468ae69e11eee32eed49635dcb4", - "rx_counter": 20150285, - "tx_counter": 222 + "rx_counter": 48440757, + "tx_counter": 2741 } }, { @@ -65,7 +65,7 @@ "link_key": { "key": "a358f80d1da831f869e4c0512002cddb", "rx_counter": 0, - "tx_counter": 187 + "tx_counter": 2698 } }, { @@ -75,7 +75,7 @@ "link_key": { "key": "d2ccd31ef76ff9518ef179e2d4a54569", "rx_counter": 0, - "tx_counter": 154 + "tx_counter": 2665 } }, { @@ -85,7 +85,7 @@ "link_key": { "key": "90c55cfc516ba81cb30fe0c40d5602e0", "rx_counter": 0, - "tx_counter": 154 + "tx_counter": 2665 } }, { @@ -95,17 +95,17 @@ "link_key": { "key": "818230c908ff5fd5ddbf9a352b35e3ed", "rx_counter": 0, - "tx_counter": 154 + "tx_counter": 2665 } }, { - "nwk_address": "cd2a", + "nwk_address": "23b1", "ieee_address": "00124b0029203033", "is_child": false, "link_key": { - "key": "c2dd2d3410ab1ab47ee57109ba57397e", + "key": "de3d3d39e043a64de66100931c606cf1", "rx_counter": 0, - "tx_counter": 192 + "tx_counter": 0 } }, { @@ -115,17 +115,17 @@ "link_key": { "key": "ffccf57820f10e2b3570cd241d5bf208", "rx_counter": 0, - "tx_counter": 154 + "tx_counter": 2665 } }, { - "nwk_address": "4846", + "nwk_address": "765a", "ieee_address": "00124b00292067e9", - "is_child": true, + "is_child": false, "link_key": { - "key": "f987289d4d9e4320537b0b57f1a61f1d", + "key": "096f9464d51a32baf54c5ed8ed460f10", "rx_counter": 0, - "tx_counter": 164 + "tx_counter": 0 } }, { @@ -135,27 +135,27 @@ "link_key": { "key": "50383e2bdf25d14473f2821383187bb8", "rx_counter": 0, - "tx_counter": 22 + "tx_counter": 2533 } }, { "nwk_address": "ef29", "ieee_address": "b4e3f9fffe68034a", - "is_child": true, + "is_child": false, "link_key": { "key": "571388f64bb436e56ab974d581080eb9", "rx_counter": 0, - "tx_counter": 0 + "tx_counter": 2511 } }, { - "nwk_address": "f96d", + "nwk_address": "1cf9", "ieee_address": "8cf681fffe2871c5", - "is_child": true, + "is_child": false, "link_key": { - "key": "d95a560f128ceb9c25799cb32ad0d636", - "rx_counter": 4098, - "tx_counter": 10 + "key": "ee0fd913f29ce66ccdc5652baea14c90", + "rx_counter": 2, + "tx_counter": 20 } } ]