From 55880380a09b8628ace572eb81298ccac5557ae3 Mon Sep 17 00:00:00 2001 From: Mahasri Kalavala Date: Mon, 7 Sep 2020 22:02:44 -0400 Subject: [PATCH] minor updates. --- lovelace/00_myhome_view.yaml | 36 +++++++++++++++++--------- lovelace/09_settings_view.yaml | 2 +- packages/motion_counts.yaml | 30 ++++++++++++++-------- packages/notify.yaml | 14 +++++++++++ packages/scripts.yaml | 4 +++ packages/xiaomi_aqara.yaml | 9 +++++-- zwcfg_0xd89c4f0c.xml | 46 +++++++++++++++++----------------- 7 files changed, 92 insertions(+), 49 deletions(-) diff --git a/lovelace/00_myhome_view.yaml b/lovelace/00_myhome_view.yaml index 64236be..9093b42 100644 --- a/lovelace/00_myhome_view.yaml +++ b/lovelace/00_myhome_view.yaml @@ -294,18 +294,29 @@ cards: title: Xiaomi Motion Sensors show_header_toggle: false entities: - - binary_sensor.motion_sensor_158d00016c2d0e - - binary_sensor.motion_sensor_158d00016db6d2 - - binary_sensor.motion_sensor_158d0001a25041 - - binary_sensor.motion_sensor_158d0001a662fe - - binary_sensor.motion_sensor_158d00024e57d3 - - binary_sensor.motion_sensor_158d00024e57fb - - binary_sensor.motion_sensor_158d00024e842c - - binary_sensor.motion_sensor_158d00024ee084 - - binary_sensor.motion_sensor_158d000272bed1 - - binary_sensor.motion_sensor_158d000272bf48 - - binary_sensor.motion_sensor_158d000272bfd7 - - binary_sensor.motion_sensor_158d00047b6f69 + - binary_sensor.motion_sensor_158d00016c2d0e # Dining Room + - binary_sensor.motion_sensor_158d00016db6d2 # Front Room + - binary_sensor.motion_sensor_158d0001a25041 # Family Room + - binary_sensor.motion_sensor_158d0001a662fe # Kitchen + - binary_sensor.motion_sensor_158d00024e57d3 # Master Bedroom + - binary_sensor.motion_sensor_158d00024e842c # Backyard + - binary_sensor.motion_sensor_158d00024ee084 # Front Door + - binary_sensor.motion_sensor_158d000272bed1 # Srinika's Bedroom + - binary_sensor.motion_sensor_158d000272bf48 # Inside Garage + - binary_sensor.motion_sensor_158d000272bfd7 # Office Room + - binary_sensor.motion_sensor_158d00047b6f69 # Hasika's Bedroom + - binary_sensor.motion_sensor_158d00024e57fb # Driveway + + - type: entities + title: Xiaomi Door Sensors + show_header_toggle: false + entities: + - entity: binary_sensor.door_window_sensor_158d000424a6d6 + name: Front Door + - entity: binary_sensor.door_window_sensor_158d000424718f + name: Master Bathroom Door + - entity: binary_sensor.door_window_sensor_158d00040ad8ec + name: Pill Box - type: entity-filter title: Motion Sensors @@ -431,6 +442,7 @@ cards: - input_label.motion_sensor_158d00024e842c - input_label.motion_sensor_158d00024ee084 - input_label.motion_sensor_158d000272bed1 + - input_label.motion_sensor_158d00047b6f69 - input_label.motion_sensor_158d000272bf48 - input_label.motion_sensor_158d000272bfd7 - input_label.garage_motion diff --git a/lovelace/09_settings_view.yaml b/lovelace/09_settings_view.yaml index 0c3f076..c981d20 100644 --- a/lovelace/09_settings_view.yaml +++ b/lovelace/09_settings_view.yaml @@ -1,5 +1,5 @@ title: Settings -icon: mdi:settings +icon: mdi:cog cards: - type: vertical-stack cards: diff --git a/packages/motion_counts.yaml b/packages/motion_counts.yaml index 66686fa..85ffbe3 100644 --- a/packages/motion_counts.yaml +++ b/packages/motion_counts.yaml @@ -38,6 +38,8 @@ homeassistant: unit_of_measurement: "count" input_label.motion_sensor_158d000272bed1: unit_of_measurement: "count" + input_label.motion_sensor_158d00047b6f69: + unit_of_measurement: "count" input_label.motion_sensor_158d000272bf48: unit_of_measurement: "count" input_label.motion_sensor_158d000272bfd7: @@ -84,37 +86,41 @@ input_label: name: Kitchen Motion icon: mdi:run-fast motion_sensor_158d00016c2d0e: - name: Dining Room Motion (X) + name: Dining Room Motion (Xiaomi) icon: mdi:run-fast motion_sensor_158d00016db6d2: - name: Study Room Motion (X) + name: Front Room Motion (Xiaomi) icon: mdi:run-fast motion_sensor_158d0001a25041: - name: Family Room (X) + name: Family Room (Xiaomi) icon: mdi:run-fast motion_sensor_158d0001a662fe: - name: Kitchen (X) + name: Kitchen (Xiaomi) icon: mdi:run-fast motion_sensor_158d00024e57d3: - name: Master Bedroom (X) + name: Master Bedroom (Xiaomi) icon: mdi:run-fast motion_sensor_158d00024e57fb: - name: Driveway Motion (X) + name: Driveway Motion (Xiaomi) icon: mdi:run-fast motion_sensor_158d00024e842c: - name: Backyard Motion (X) + name: Backyard Motion (Xiaomi) icon: mdi:run-fast motion_sensor_158d00024ee084: - name: Front Door Motion (X) + name: Front Door Motion (Xiaomi) icon: mdi:run-fast motion_sensor_158d000272bed1: - name: Srinika Bedroom (X) + name: Srinika Bedroom (Xiaomi) icon: mdi:run-fast + motion_sensor_158d00047b6f69: + name: Hasika Bedroom (Xiaomi) + icon: mdi:run-fast + motion_sensor_158d000272bf48: - name: Garage Motion (X) + name: Garage Motion (Xiaomi) icon: mdi:run-fast motion_sensor_158d000272bfd7: - name: Office Room Motion (X) + name: Office Room Motion (Xiaomi) icon: mdi:run-fast single_car_garage_door_tilt_sensor_sensor: @@ -155,6 +161,7 @@ automation: - binary_sensor.motion_sensor_158d00024e842c - binary_sensor.motion_sensor_158d00024ee084 - binary_sensor.motion_sensor_158d000272bed1 + - binary_sensor.motion_sensor_158d00047b6f69 - binary_sensor.motion_sensor_158d000272bf48 - binary_sensor.motion_sensor_158d000272bfd7 - binary_sensor.single_car_garage_door_tilt_sensor_sensor @@ -197,6 +204,7 @@ automation: - input_label.motion_sensor_158d00024e842c - input_label.motion_sensor_158d00024ee084 - input_label.motion_sensor_158d000272bed1 + - input_label.motion_sensor_158d00047b6f69 - input_label.motion_sensor_158d000272bf48 - input_label.motion_sensor_158d000272bfd7 - input_label.single_car_garage_door_tilt_sensor_sensor diff --git a/packages/notify.yaml b/packages/notify.yaml index c7b0ea6..421c3ed 100644 --- a/packages/notify.yaml +++ b/packages/notify.yaml @@ -40,6 +40,10 @@ notify: platform: file filename: debug.log + - name: telegram + platform: telegram + chat_id: !secret telegram_chatid + tts: - platform: amazon_polly aws_access_key_id: !secret aws_access_key_id @@ -48,8 +52,18 @@ tts: text_type: ssml voice: Joanna +# +# Telegram Configuration +# telegram_bot: + # Setup Broadcast for sending messages - platform: broadcast api_key: !secret telegram_apikey allowed_chat_ids: - !secret telegram_chatid + + # Add Polling + - platform: polling + api_key: !secret telegram_apikey + allowed_chat_ids: + - !secret telegram_chatid diff --git a/packages/scripts.yaml b/packages/scripts.yaml index 9103d7a..0d6b9a9 100644 --- a/packages/scripts.yaml +++ b/packages/scripts.yaml @@ -121,6 +121,7 @@ script: data_template: entity_id: > {%- for state in states.switch if + state.entity_id != 'switch.3d_printer' and state.entity_id != 'switch.wemoswitch1' and state.entity_id != 'switch.wallmote_switch' and state.entity_id != 'switch.wemobackyardlightswitch' and @@ -308,6 +309,9 @@ script: - service: script.ifttt_notify data_template: message: "{{ message }}" + - service: notify.telegram + data_template: + message: "{{ message }}" good_night_tts: sequence: diff --git a/packages/xiaomi_aqara.yaml b/packages/xiaomi_aqara.yaml index ef5bb66..60cb708 100644 --- a/packages/xiaomi_aqara.yaml +++ b/packages/xiaomi_aqara.yaml @@ -14,9 +14,9 @@ homeassistant: friendly_name: Family Room Luminance (xiaomi) binary_sensor.motion_sensor_158d00016db6d2: - friendly_name: Study Room Motion Sensor (Xiaomi) + friendly_name: Front Room Motion Sensor (Xiaomi) sensor.Illumination_158d00016db6d2: - friendly_name: Study Room Luminance (Xiaomi) + friendly_name: Front Room Luminance (Xiaomi) binary_sensor.motion_sensor_158d00016c2d0e: friendly_name: Dining Room Motion Sensor (Xiaomi) @@ -58,6 +58,11 @@ homeassistant: sensor.illumination_158d000272bed1: friendly_name: Srinika's Bedroom Liminance (Xiaomi) + binary_sensor.motion_sensor_158d00047b6f69: + friendly_name: Hasika's Bedroom Motion Sensor (Xiaomi) + sensor.illumination_158d00047b6f69: + friendly_name: Hasika's Bedroom Liminance (Xiaomi) + sensor.Illumination_34ce008ad65d: friendly_name: Hallway Luminance (Xiaomi Aqara) diff --git a/zwcfg_0xd89c4f0c.xml b/zwcfg_0xd89c4f0c.xml index 8289558..f3f920c 100644 --- a/zwcfg_0xd89c4f0c.xml +++ b/zwcfg_0xd89c4f0c.xml @@ -48,7 +48,7 @@ - + @@ -273,7 +273,7 @@ - + @@ -289,9 +289,9 @@ - - - + + + @@ -575,11 +575,11 @@ - - - + + + - + @@ -749,7 +749,7 @@ - + @@ -758,8 +758,8 @@ - - + + @@ -779,7 +779,7 @@ - + @@ -805,7 +805,7 @@ - + @@ -835,7 +835,7 @@ - + @@ -1190,7 +1190,7 @@ - + @@ -1299,7 +1299,7 @@ - + @@ -1405,7 +1405,7 @@ - + @@ -1415,7 +1415,7 @@ - + @@ -1423,9 +1423,9 @@ - + - + @@ -1605,7 +1605,7 @@ - + @@ -1678,7 +1678,7 @@ - +