diff --git a/automations.yaml b/automations.yaml index 258e88e..a92b738 100644 --- a/automations.yaml +++ b/automations.yaml @@ -165,52 +165,55 @@ - id: '1670163273121' alias: Mikroovn Låge Åbnet description: '' - trigger: - - platform: numeric_state - entity_id: sensor.mikroovn_plug_power + triggers: + - entity_id: + - sensor.mikroovn_energi for: hours: 0 minutes: 0 seconds: 10 above: 10 below: 50 - condition: + trigger: numeric_state + conditions: - condition: state entity_id: input_boolean.mikroovn_lage_aben state: 'off' - action: - - service: input_boolean.turn_on - data: {} + actions: + - data: {} target: entity_id: input_boolean.mikroovn_lage_aben + action: input_boolean.turn_on mode: single - id: '1670163454486' alias: Mikroovn Låge Lukket description: '' - trigger: - - platform: numeric_state - entity_id: sensor.mikroovn_plug_power + triggers: + - entity_id: + - sensor.mikroovn_energi for: hours: 0 minutes: 0 seconds: 10 above: 50 - - platform: numeric_state - entity_id: sensor.mikroovn_plug_power + trigger: numeric_state + - entity_id: + - sensor.mikroovn_energi for: hours: 0 minutes: 0 seconds: 10 below: 10 - condition: + trigger: numeric_state + conditions: - condition: state entity_id: input_boolean.mikroovn_lage_aben state: 'on' - action: - - service: input_boolean.turn_off - data: {} + actions: + - data: {} target: entity_id: input_boolean.mikroovn_lage_aben + action: input_boolean.turn_off mode: single - id: '1670355835523' alias: TAG - Lemmingerne @@ -470,3 +473,92 @@ target: entity_id: media_player.dining_room mode: restart +- id: '1718915737578' + alias: ESP32 Tænd display + description: '' + trigger: + - type: turned_on + platform: device + device_id: a3ef2a94c8f60d65e73db64b8bba1ee3 + entity_id: 87c0adf8a7ee931a49000273d382e605 + domain: binary_sensor + condition: [] + action: + - type: turn_on + device_id: a3ef2a94c8f60d65e73db64b8bba1ee3 + entity_id: 8367c8261243a26680e98f160339f197 + domain: light + mode: single +- id: '1718915765806' + alias: ESP32 Sluk display + description: '' + trigger: + - type: turned_off + platform: device + device_id: a3ef2a94c8f60d65e73db64b8bba1ee3 + entity_id: 87c0adf8a7ee931a49000273d382e605 + domain: binary_sensor + condition: [] + action: + - type: turn_off + device_id: a3ef2a94c8f60d65e73db64b8bba1ee3 + entity_id: 8367c8261243a26680e98f160339f197 + domain: light + mode: single +- id: '1728638495977' + alias: Højt Vandforbrug, Byhøjtoften + description: '' + triggers: + - trigger: numeric_state + entity_id: + - sensor.water_pulse_meter + for: + hours: 0 + minutes: 10 + seconds: 0 + above: 5 + conditions: [] + actions: + - variables: + volume: '{{ state_attr("media_player.dining_room", "volume_level") }}' + - data: + volume_level: 0.5 + target: + entity_id: media_player.dining_room + action: media_player.volume_set + enabled: false + - action: tts.google_translate_say + metadata: {} + data: + cache: false + entity_id: media_player.dining_room + message: Højt vandforbrug i over 10 minutter + language: da + enabled: false + - delay: + hours: 0 + minutes: 0 + seconds: 5 + milliseconds: 0 + enabled: false + - data: + volume_level: '{{ volume }}' + target: + entity_id: media_player.dining_room + action: media_player.volume_set + enabled: false + - repeat: + sequence: + - action: notify.mobile_app_rolf_mobil + data: + message: Højt vandforbrug + - delay: + hours: 0 + minutes: 1 + seconds: 0 + milliseconds: 0 + until: + - condition: numeric_state + entity_id: sensor.water_pulse_meter + below: 5 + mode: single diff --git a/blueprints/template/homeassistant/inverted_binary_sensor.yaml b/blueprints/template/homeassistant/inverted_binary_sensor.yaml new file mode 100644 index 0000000..5be1840 --- /dev/null +++ b/blueprints/template/homeassistant/inverted_binary_sensor.yaml @@ -0,0 +1,27 @@ +blueprint: + name: Invert a binary sensor + description: Creates a binary_sensor which holds the inverted value of a reference binary_sensor + domain: template + source_url: https://github.com/home-assistant/core/blob/dev/homeassistant/components/template/blueprints/inverted_binary_sensor.yaml + input: + reference_entity: + name: Binary sensor to be inverted + description: The binary_sensor which needs to have its value inverted + selector: + entity: + domain: binary_sensor +variables: + reference_entity: !input reference_entity +binary_sensor: + state: > + {% if states(reference_entity) == 'on' %} + off + {% elif states(reference_entity) == 'off' %} + on + {% else %} + {{ states(reference_entity) }} + {% endif %} + # delay_on: not_used in this example + # delay_off: not_used in this example + # auto_off: not_used in this example + availability: "{{ states(reference_entity) not in ('unknown', 'unavailable') }}" diff --git a/configuration.yaml b/configuration.yaml index b53d07a..ac43fbb 100644 --- a/configuration.yaml +++ b/configuration.yaml @@ -49,7 +49,7 @@ frontend: themes: !include_dir_merge_named themes/ extra_module_url: - - /community/lovelace-card-mod/card-mod.js + - /local/community/lovelace-card-mod/card-mod.js tts: - platform: google_translate @@ -117,6 +117,7 @@ unit_of_measurement: "DKK/m³" device_class: monetary value_template: "{{ value | replace(',', '.') | float(0) }}" + state_class: measurement sensor: !include_dir_merge_list sensors/ diff --git a/esphome/esp32-s3-box-3-05b914.yaml b/esphome/esp32-s3-box-3-05b914.yaml new file mode 100644 index 0000000..e82b525 --- /dev/null +++ b/esphome/esp32-s3-box-3-05b914.yaml @@ -0,0 +1,25 @@ +substitutions: + name: esp32-s3-box-3-05b914 + friendly_name: ESP32 S3 Box 3 05b914 + micro_wake_word_model: hey_jarvis + +packages: + esphome.voice-assistant: github://esphome/firmware/wake-word-voice-assistant/esp32-s3-box-3.yaml@main + +esphome: + name: ${name} + name_add_mac_suffix: false + friendly_name: ${friendly_name} + +api: + encryption: + key: vWtpBBNpAz2kbHVHCfvuj8P3+usSZ10yA1nOvKew+B8= + +wifi: + ssid: !secret wifi_ssid + password: !secret wifi_password + +voice_assistant: + noise_suppression_level: 2 + auto_gain: 31dBFS + volume_multiplier: 2.0 \ No newline at end of file diff --git a/esphome/kokkenbt.yaml b/esphome/kokkenbt.yaml index 7a82aa5..dbcd225 100644 --- a/esphome/kokkenbt.yaml +++ b/esphome/kokkenbt.yaml @@ -15,6 +15,7 @@ api: ota: + platform: esphome password: "03bdb91f990a4f77a925da3c16eb655b" wifi: diff --git a/esphome/nilan300.yaml b/esphome/nilan300.yaml index d10e54a..e4532b6 100644 --- a/esphome/nilan300.yaml +++ b/esphome/nilan300.yaml @@ -15,6 +15,7 @@ api: ota: + platform: esphome password: "9939debfff235f69eb37720d836f209c" wifi: diff --git a/esphome/smartcard.yaml b/esphome/smartcard.yaml index 6392713..dd7ba55 100644 --- a/esphome/smartcard.yaml +++ b/esphome/smartcard.yaml @@ -15,6 +15,7 @@ key: "kA9qErLxzAH8VQB84Li1WRVvsHdFlOKVNdz6vEtqfyI=" ota: + platform: esphome password: "7a876bd40942451be286989b1dece5d7" wifi: diff --git a/esphome/sovebt.yaml b/esphome/sovebt.yaml index 9952021..02d58e0 100644 --- a/esphome/sovebt.yaml +++ b/esphome/sovebt.yaml @@ -18,6 +18,7 @@ ota: password: "03bdb91f990a4f77a925da3c16eb655b" + platform: esphome wifi: ssid: !secret wifi_ssid diff --git a/esphome/waterproxy.yaml b/esphome/waterproxy.yaml index edbb338..86fc11d 100644 --- a/esphome/waterproxy.yaml +++ b/esphome/waterproxy.yaml @@ -13,6 +13,7 @@ api: ota: + platform: esphome password: "b939363a379d690163ccf26abb97f3b0" wifi: diff --git a/esphome/wavin9000.yaml b/esphome/wavin9000.yaml index 2a63b65..7775562 100644 --- a/esphome/wavin9000.yaml +++ b/esphome/wavin9000.yaml @@ -15,6 +15,7 @@ api: ota: + platform: esphome password: "78e75f9b6126ee57de681fd33aeba979" wifi: diff --git a/sensors/energy.yaml b/sensors/energy.yaml index f4531f5..776f7ef 100644 --- a/sensors/energy.yaml +++ b/sensors/energy.yaml @@ -23,8 +23,8 @@ round: 4 - platform: integration - source: sensor.opvaskemaskine_energi - name: opvaskemaskine_power_used + source: sensor.mikroovn_energi + name: mikroovn_power_used method: left unit_prefix: k unit_time: h diff --git a/template/mikroovn.yaml b/template/mikroovn.yaml index 755c8f7..be51d17 100644 --- a/template/mikroovn.yaml +++ b/template/mikroovn.yaml @@ -1,18 +1,24 @@ - sensor: - name: Mikroovn Plug Power Factor - availability: "{{ states.sensor.mikroovn_plug_current.state | float(0) > 0 }}" + availability: "{{ states.switch['mikroovn_plug_switch'].attributes['voltage'] | float(0) > 0 }}" state: | {# Calculate power factor #} - {% set v = states.sensor.mikroovn_plug_voltage.state | default(0) | float(0) %} - {% set a = states.sensor.mikroovn_plug_current.state | default(0) | float(0) %} - {% set wp = states.sensor.mikroovn_plug_power.state | default(0) | float(0) %} - {% set ap = v * a %} + {% set v = states.switch['mikroovn_plug_switch'].attributes['voltage'] | default(0) | float(0) %} + {% set a = states.switch['mikroovn_plug_switch'].attributes['current'] | default(0) | float(0) %} + {% set wp = states.switch['mikroovn_plug_switch'].attributes['current_consumption'] | default(0) | float(0) %} + {% set ap = v * (a/1000.0) %} {% if ap > 0 %} {% set pf = wp / ap * 100 %} {{ pf | round(2) }} {% else %} - 0 + {{ 0 }} {% endif %} unit_of_measurement: "%" device_class: power_factor state_class: measurement + + - name: Mikroovn Energi + state: "{{ states.switch['mikroovn_plug_switch'].attributes['current_consumption'] | default(0) | float(0) }}" + unit_of_measurement: "W" + device_class: power + state_class: measurement diff --git a/template/opvaskemaskine.yaml b/template/opvaskemaskine.yaml deleted file mode 100644 index 9bd914d..0000000 --- a/template/opvaskemaskine.yaml +++ /dev/null @@ -1,36 +0,0 @@ -- sensor: - - name: Opvaskemaskine Spænding - state: "{{ (states.switch.opvaskemaskine_switch.attributes.voltage) | default(0) | float(0) }}" - unit_of_measurement: "V" - device_class: voltage - state_class: measurement - - - name: Opvaskemaskine Strøm - state: "{{ (states.switch.opvaskemaskine_switch.attributes.current) | default(0) | float(0) * 0.001 }}" - unit_of_measurement: "A" - device_class: current - state_class: measurement - - - name: Opvaskemaskine Energi - state: "{{ (states.switch.opvaskemaskine_switch.attributes.current_consumption) | default(0) | float(0) }}" - unit_of_measurement: "W" - device_class: power - state_class: measurement - - - name: Opvaskemaskine Power Factor - availability: "{{ states.sensor.opvaskemaskine_strom.state | float(0) > 0 }}" - state: | - {# Calculate power factor #} - {% set v = states.sensor.opvaskemaskine_spaending.state | float %} - {% set a = states.sensor.opvaskemaskine_strom.state | float %} - {% set wp = states.sensor.opvaskemaskine_energi.state | float %} - {% set ap = v * a %} - {% if ap > 0 %} - {% set pf = wp / ap * 100 %} - {{ pf | round(2) }} - {% else %} - 0 - {% endif %} - unit_of_measurement: "%" - device_class: power_factor - state_class: measurement diff --git a/zigbee2mqtt/configuration.yaml b/zigbee2mqtt/configuration.yaml index 0ba2a09..4fd4b10 100644 --- a/zigbee2mqtt/configuration.yaml +++ b/zigbee2mqtt/configuration.yaml @@ -1,4 +1,5 @@ -homeassistant: true +homeassistant: + enabled: true mqtt: server: mqtt://core-mosquitto:1883 user: addons @@ -6,11 +7,9 @@ serial: port: /dev/ttyUSB0 frontend: + enabled: true port: 8099 advanced: - homeassistant_legacy_entity_attributes: false - legacy_api: false - legacy_availability_payload: false log_syslog: app_name: Zigbee2MQTT eol: /n @@ -24,17 +23,13 @@ channel: 15 log_level: debug last_seen: ISO_8601_local -device_options: - legacy: false + transmit_power: 15 +device_options: {} devices: '0x000b57fffeda5b94': friendly_name: Bryggers - '0xa4c1387b259019f2': - friendly_name: Mikroovn_Plug '0xf082c0fffe9be262': friendly_name: TeknikRepeater - '0x00000000e203d9a9': - friendly_name: Elmåler '0x84b4dbfffec3d1df': friendly_name: Kontor_Plug '0x00124b002920814b': @@ -45,15 +40,21 @@ friendly_name: Bryggers Vindue '0xb4e3f9fffe68034a': friendly_name: PytKnap - '0x8cf681fffe2871c5': - friendly_name: TVBænkKnap - '0x00124b00292067e9': - friendly_name: Temp3 '0x00124b0029203033': friendly_name: Temp2 + '0x00124b00292067e9': + friendly_name: Temp3 + '0x00000000e203d9a9': + friendly_name: Elmåler + '0x8cf681fffe2871c5': + friendly_name: TVBænkKnap availability: + enabled: true active: timeout: 10 passive: timeout: 1500 blocklist: [] +ota: + disable_automatic_update_check: true +version: 4 diff --git a/zigbee2mqtt/configuration_backup_v1.yaml b/zigbee2mqtt/configuration_backup_v1.yaml new file mode 100644 index 0000000..0b84eab --- /dev/null +++ b/zigbee2mqtt/configuration_backup_v1.yaml @@ -0,0 +1,61 @@ +homeassistant: true +mqtt: + server: mqtt://core-mosquitto:1883 + user: addons + password: Looreeru0jaiLuWohciechiep7mojah4ge7eineeraiz6ieth0Oochaich8Aecha +serial: + port: /dev/ttyUSB0 +frontend: + port: 8099 +advanced: + homeassistant_legacy_entity_attributes: false + legacy_api: false + legacy_availability_payload: false + log_syslog: + app_name: Zigbee2MQTT + eol: /n + host: localhost + localhost: localhost + path: /dev/log + pid: process.pid + port: 123 + protocol: tcp4 + type: '5424' + channel: 15 + log_level: warning + last_seen: ISO_8601_local + transmit_power: 15 +device_options: + legacy: false +devices: + '0x000b57fffeda5b94': + friendly_name: Bryggers + '0xf082c0fffe9be262': + friendly_name: TeknikRepeater + '0x84b4dbfffec3d1df': + friendly_name: Kontor_Plug + '0x00124b002920814b': + friendly_name: Temp4 + '0x00124b0029209f8c': + friendly_name: Temp1 + '0x00124b0029117198': + friendly_name: Bryggers Vindue + '0xb4e3f9fffe68034a': + friendly_name: PytKnap + '0x00124b0029203033': + friendly_name: Temp2 + '0x00124b00292067e9': + friendly_name: Temp3 + '0x00000000e203d9a9': + friendly_name: Elmåler + '0x8cf681fffe2871c5': + friendly_name: TVBænkKnap +availability: + active: + timeout: 10 + passive: + timeout: 1500 +blocklist: [] +ota: + ikea_ota_use_test_url: false + disable_automatic_update_check: true diff --git a/zigbee2mqtt/configuration_backup_v2.yaml b/zigbee2mqtt/configuration_backup_v2.yaml new file mode 100644 index 0000000..ea08976 --- /dev/null +++ b/zigbee2mqtt/configuration_backup_v2.yaml @@ -0,0 +1,58 @@ +homeassistant: true +mqtt: + server: mqtt://core-mosquitto:1883 + user: addons + password: Looreeru0jaiLuWohciechiep7mojah4ge7eineeraiz6ieth0Oochaich8Aecha +serial: + port: /dev/ttyUSB0 +frontend: + enabled: true + port: 8099 +advanced: + log_syslog: + app_name: Zigbee2MQTT + eol: /n + host: localhost + localhost: localhost + path: /dev/log + pid: process.pid + port: 123 + protocol: tcp4 + type: '5424' + channel: 15 + log_level: warning + last_seen: ISO_8601_local + transmit_power: 15 +device_options: {} +devices: + '0x000b57fffeda5b94': + friendly_name: Bryggers + '0xf082c0fffe9be262': + friendly_name: TeknikRepeater + '0x84b4dbfffec3d1df': + friendly_name: Kontor_Plug + '0x00124b002920814b': + friendly_name: Temp4 + '0x00124b0029209f8c': + friendly_name: Temp1 + '0x00124b0029117198': + friendly_name: Bryggers Vindue + '0xb4e3f9fffe68034a': + friendly_name: PytKnap + '0x00124b0029203033': + friendly_name: Temp2 + '0x00124b00292067e9': + friendly_name: Temp3 + '0x00000000e203d9a9': + friendly_name: Elmåler + '0x8cf681fffe2871c5': + friendly_name: TVBænkKnap +availability: + active: + timeout: 10 + passive: + timeout: 1500 +blocklist: [] +ota: + disable_automatic_update_check: true +version: 2 diff --git a/zigbee2mqtt/configuration_backup_v3.yaml b/zigbee2mqtt/configuration_backup_v3.yaml new file mode 100644 index 0000000..ee1aea7 --- /dev/null +++ b/zigbee2mqtt/configuration_backup_v3.yaml @@ -0,0 +1,60 @@ +homeassistant: + enabled: true +mqtt: + server: mqtt://core-mosquitto:1883 + user: addons + password: Looreeru0jaiLuWohciechiep7mojah4ge7eineeraiz6ieth0Oochaich8Aecha +serial: + port: /dev/ttyUSB0 +frontend: + enabled: true + port: 8099 +advanced: + log_syslog: + app_name: Zigbee2MQTT + eol: /n + host: localhost + localhost: localhost + path: /dev/log + pid: process.pid + port: 123 + protocol: tcp4 + type: '5424' + channel: 15 + log_level: warning + last_seen: ISO_8601_local + transmit_power: 15 +device_options: {} +devices: + '0x000b57fffeda5b94': + friendly_name: Bryggers + '0xf082c0fffe9be262': + friendly_name: TeknikRepeater + '0x84b4dbfffec3d1df': + friendly_name: Kontor_Plug + '0x00124b002920814b': + friendly_name: Temp4 + '0x00124b0029209f8c': + friendly_name: Temp1 + '0x00124b0029117198': + friendly_name: Bryggers Vindue + '0xb4e3f9fffe68034a': + friendly_name: PytKnap + '0x00124b0029203033': + friendly_name: Temp2 + '0x00124b00292067e9': + friendly_name: Temp3 + '0x00000000e203d9a9': + friendly_name: Elmåler + '0x8cf681fffe2871c5': + friendly_name: TVBænkKnap +availability: + enabled: true + active: + timeout: 10 + passive: + timeout: 1500 +blocklist: [] +ota: + disable_automatic_update_check: true +version: 3 diff --git a/zigbee2mqtt/coordinator_backup.json b/zigbee2mqtt/coordinator_backup.json index d9be9e4..b002807 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.30.0", + "source": "zigbee-herdsman@3.2.1", "internal": { - "date": "2024-01-09T13:31:24.712Z", + "date": "2025-01-09T17:34:56.628Z", "znpVersion": 1 } }, @@ -25,7 +25,7 @@ "network_key": { "key": "01030507090b0d0f00020406080a0c0d", "sequence_number": 0, - "frame_counter": 40513560 + "frame_counter": 61541491 }, "devices": [ { @@ -35,7 +35,7 @@ "link_key": { "key": "2dbd06f2c925d1440e77baca95187bb8", "rx_counter": 0, - "tx_counter": 2698 + "tx_counter": 12775 } }, { @@ -45,7 +45,7 @@ "link_key": { "key": "6a56d62baee038ec499c6a13f2dd9210", "rx_counter": 0, - "tx_counter": 2676 + "tx_counter": 12753 } }, { @@ -54,8 +54,8 @@ "is_child": false, "link_key": { "key": "12112468ae69e11eee32eed49635dcb4", - "rx_counter": 48440757, - "tx_counter": 2741 + "rx_counter": 75082962, + "tx_counter": 12842 } }, { @@ -65,7 +65,7 @@ "link_key": { "key": "a358f80d1da831f869e4c0512002cddb", "rx_counter": 0, - "tx_counter": 2698 + "tx_counter": 12775 } }, { @@ -75,7 +75,7 @@ "link_key": { "key": "d2ccd31ef76ff9518ef179e2d4a54569", "rx_counter": 0, - "tx_counter": 2665 + "tx_counter": 12742 } }, { @@ -85,25 +85,25 @@ "link_key": { "key": "90c55cfc516ba81cb30fe0c40d5602e0", "rx_counter": 0, - "tx_counter": 2665 + "tx_counter": 12742 } }, { "nwk_address": "df63", "ieee_address": "00124b0029209f8c", - "is_child": true, + "is_child": false, "link_key": { "key": "818230c908ff5fd5ddbf9a352b35e3ed", "rx_counter": 0, - "tx_counter": 2665 + "tx_counter": 12742 } }, { - "nwk_address": "b0e0", + "nwk_address": "3326", "ieee_address": "00124b0029203033", "is_child": false, "link_key": { - "key": "de3d3d39e043a64de66100931c606cf1", + "key": "23d0289d4d9e4320892c0b57f1a61f1d", "rx_counter": 0, "tx_counter": 0 } @@ -115,15 +115,15 @@ "link_key": { "key": "ffccf57820f10e2b3570cd241d5bf208", "rx_counter": 0, - "tx_counter": 2665 + "tx_counter": 12742 } }, { - "nwk_address": "5bf4", + "nwk_address": "fc7c", "ieee_address": "00124b00292067e9", "is_child": false, "link_key": { - "key": "096f9464d51a32baf54c5ed8ed460f10", + "key": "5d2af57820f10e2b9796cd241d5bf208", "rx_counter": 0, "tx_counter": 0 } @@ -135,7 +135,7 @@ "link_key": { "key": "50383e2bdf25d14473f2821383187bb8", "rx_counter": 0, - "tx_counter": 2533 + "tx_counter": 12610 } }, { @@ -145,7 +145,7 @@ "link_key": { "key": "571388f64bb436e56ab974d581080eb9", "rx_counter": 0, - "tx_counter": 2511 + "tx_counter": 12590 } }, { @@ -155,7 +155,7 @@ "link_key": { "key": "ee0fd913f29ce66ccdc5652baea14c90", "rx_counter": 2, - "tx_counter": 20 + "tx_counter": 10140 } } ]