updating configuration

2026-07-14 14:12:07 +00:00
parent 456f43d435
commit 6199c62362
83 changed files with 552 additions and 364 deletions
@@ -21,55 +21,65 @@
 #           {{ states('sensor.dishwasher_program_progress') + "%" }}
 #         {% endif %}

-mqtt:
-  sensor:
-    - name: hc_dishwasher_state
-      unique_id: hc_dishwasher_state
-      state_topic: "homeconnect/dishwasher/state"
-      value_template: "{{ value_json.state }}"
-      json_attributes_topic: "homeconnect/dishwasher/state"
-    - name: hc_dishwasher_remaining
-      unique_id: hc_dishwasher_remaining
-      state_topic: "homeconnect/dishwasher/state"
-      value_template: "{{ value_json.remaining }}"
-      json_attributes_topic: "homeconnect/dishwasher/state"
-  binary_sensor:
-    - state_topic: "homeconnect/dishwasher/state"
-      name: hc_dishwasher_door
-      unique_id: hc_dishwasher_door
-      device_class: opening
-      payload_on: "Open"
-      payload_off: "Closed"
-      value_template: "{{ value_json.door }}"
-      json_attributes_topic: "homeconnect/dishwasher/state"
-    - state_topic: "homeconnect/dishwasher/state"
-      name: hc_dishwasher_power
-      unique_id: hc_dishwasher_power
-      payload_on: true
-      payload_off: false
-      value_template: "{{ value_json.power }}"
-      json_attributes_topic: "homeconnect/dishwasher/state"
+# mqtt:
+#   sensor:
+#     - name: hc_dishwasher_state
+#       unique_id: hc_dishwasher_state
+#       state_topic: "homeconnect/dishwasher/state"
+#       value_template: "{{ value_json.state }}"
+#       json_attributes_topic: "homeconnect/dishwasher/state"
+#     - name: hc_dishwasher_remaining
+#       unique_id: hc_dishwasher_remaining
+#       state_topic: "homeconnect/dishwasher/state"
+#       value_template: "{{ value_json.remaining }}"
+#       json_attributes_topic: "homeconnect/dishwasher/state"
+#   binary_sensor:
+#     - state_topic: "homeconnect/dishwasher/state"
+#       name: hc_dishwasher_door
+#       unique_id: hc_dishwasher_door
+#       device_class: opening
+#       payload_on: "Open"
+#       payload_off: "Closed"
+#       value_template: "{{ value_json.door }}"
+#       json_attributes_topic: "homeconnect/dishwasher/state"
+#     - state_topic: "homeconnect/dishwasher/state"
+#       name: hc_dishwasher_power
+#       unique_id: hc_dishwasher_power
+#       payload_on: true
+#       payload_off: false
+#       value_template: "{{ value_json.power }}"
+#       json_attributes_topic: "homeconnect/dishwasher/state"
 template:
  binary_sensor:
-    - name: hc_dishwasher_running
-      unique_id: hc_dishwasher_running
-      state: "{{ is_state('sensor.hc_dishwasher_state', 'Run') }}"
+    - name: bosch_dishwasher_running
+      unique_id: bosch_dishwasher_running
+      state: "{{ is_state('sensor.bosch_dishwasher_operation_state', 'Run') }}"

 counter:
-  dishwasher_door_open_count:
-    name: dishwasher_door_open_count
+  bosch_dishwasher_door_open_count:
+    name: bosch_dishwasher_door_open_count
+
+input_select:
+  bosch_dishwasher_state_extended:
+    name: bosch_dishwasher_state_extended
+    options:
+      - 'Empty'
+      - 'Washing'
+      - 'Washed'
+      - 'Collecting Dishes'
+      - 'Ready to wash'

 homeassistant:
  customize:
-    sensor.hc_dishwasher_state:
+    sensor.bosch_dishwasher_state:
      friendly_name: Посудомойка Статус
-    binary_sensor.hc_dishwasher_door:
+    binary_sensor.bosch_dishwasher_door:
      friendly_name: Посудомойка Дверца
-    binary_sensor.hc_dishwasher_remaining:
+    binary_sensor.bosch_dishwasher_remaining:
      friendly_name: Посудомойка До конца программы
-    sensor.hc_dishwasher_running:
+    sensor.bosch_dishwasher_running:
      friendly_name: Посудомоечная машина
-    binary_sensor.hc_dishwasher_power:
+    binary_sensor.bosch_dishwasher_power:
      friendly_name: Посудомойка Питание


@@ -1,21 +1,14 @@
-telegram_bot:
-  - platform: polling
-    api_key: !secret telegram_key
-    allowed_chat_ids:
-      - !secret telegram_group_chat
-      - !secret telegram_monster_chat
-      - !secret telegram_sveta_chat
-
-notify:
-  - platform: telegram
-    name: telegram
-    chat_id: !secret telegram_group_chat
-    parse_mode: html
-  - platform: telegram
-    name: telegram_monster
-    chat_id: !secret telegram_monster_chat
-    parse_mode: html
-  - platform: telegram
-    name: telegram_sveta
-    chat_id: !secret telegram_sveta_chat
-    parse_mode: html
+# telegram_bot: секция удалена — интеграция уже настроена через config entry
+# (UI, импортирован 2025-12-28), YAML-платформа с ней конфликтовала:
+#   ERROR integration telegram_bot cannot be merged, expected a dict
+#
+# notify: платформы (legacy, deprecated) тоже убраны — все appdaemon-скрипты
+# мигрированы на entity-based telegram_bot.send_message/send_photo (см.
+# appdaemon/settings/apps/globals.py: TELEGRAM_TARGETS, send_telegram(),
+# send_telegram_photo()). Проверено: тестовые сообщения через новый механизм
+# успешно доставлены во все 3 чата (группа, Monster, Svetlana) 2026-07-14.
+#
+# Telegram bot notify-сущности теперь берутся из config entry:
+#   notify.home_assistant_fonvizina_fonvizina_18_1001567589226
+#   notify.home_assistant_fonvizina_monster_123622180
+#   notify.home_assistant_fonvizina_svetlana_205225134
@@ -0,0 +1,21 @@
+telegram_bot:
+  - platform: polling
+    api_key: !secret telegram_key
+    allowed_chat_ids:
+      - !secret telegram_group_chat
+      - !secret telegram_monster_chat
+      - !secret telegram_sveta_chat
+
+notify:
+  - platform: telegram
+    name: telegram
+    chat_id: !secret telegram_group_chat
+    parse_mode: html
+  - platform: telegram
+    name: telegram_monster
+    chat_id: !secret telegram_monster_chat
+    parse_mode: html
+  - platform: telegram
+    name: telegram_sveta
+    chat_id: !secret telegram_sveta_chat
+    parse_mode: html