From 5b6ae1e87203abee12325650af3ab4631a59048c Mon Sep 17 00:00:00 2001 From: Philipp Hansen Date: Wed, 24 Apr 2024 21:58:21 +0200 Subject: [PATCH] Many updates --- lovelace/dashboard/harmony/harmony.yaml | 0 .../dashboard/harmony/volume_control.yaml | 0 lovelace/dashboard/hello_world.yaml | 9 +-- lovelace/dashboard/kunibert.yaml | 0 lovelace/dashboard/laundry.yaml | 0 lovelace/dashboard/lights.yaml | 11 +++- lovelace/dashboard/sensors.yaml | 14 ++--- lovelace/dashboard/temperature.yaml | 0 packages/door_sensors/door_sensors.yaml | 0 packages/harmony/harmony.yaml | 2 +- packages/harmony/netflix.yaml | 8 +-- packages/harmony/turn_on_tv.yaml | 4 +- packages/harmony/volume_control.yaml | 0 packages/homeassistant/default_theme.yaml | 0 packages/homeassistant/homeassistant.yaml | 7 ++- packages/homeassistant/recorder.yaml | 0 .../html5_notification.yaml | 0 packages/laundry/laundry_timer.yaml | 0 packages/laundry/timer.yaml | 0 packages/light/adaptive.yaml | 3 +- packages/light/all_device_group.yaml | 0 packages/light/bedroom_group.yaml | 0 packages/light/buttons/bedrooms.yaml | 0 packages/light/livingroom_group.yaml | 1 + packages/light/motion.yaml | 0 packages/livingroom/button/button.yaml | 0 .../livingroom/remote/.~lock.remote.yaml# | 1 + packages/livingroom/remote/remote.yaml | 0 packages/mailbox/mailbox_received.yaml | 0 packages/mailbox/mailbox_taken_out.yaml | 0 packages/mailbox/switch.yaml | 0 packages/minimalist/minimalist_input.yaml | 0 packages/nursery/babycrydetection.yaml | 0 packages/nursery/nursery.yaml | 56 ++++++++----------- packages/office/button.yaml | 2 +- packages/office/wol.yaml | 0 packages/turn_off_everything.txt | 0 resources.yaml | 0 ui-lovelace.yaml | 0 39 files changed, 57 insertions(+), 61 deletions(-) mode change 100644 => 100755 lovelace/dashboard/harmony/harmony.yaml mode change 100644 => 100755 lovelace/dashboard/harmony/volume_control.yaml mode change 100644 => 100755 lovelace/dashboard/hello_world.yaml mode change 100644 => 100755 lovelace/dashboard/kunibert.yaml mode change 100644 => 100755 lovelace/dashboard/laundry.yaml mode change 100644 => 100755 lovelace/dashboard/lights.yaml mode change 100644 => 100755 lovelace/dashboard/sensors.yaml mode change 100644 => 100755 lovelace/dashboard/temperature.yaml mode change 100644 => 100755 packages/door_sensors/door_sensors.yaml mode change 100644 => 100755 packages/harmony/harmony.yaml mode change 100644 => 100755 packages/harmony/netflix.yaml mode change 100644 => 100755 packages/harmony/turn_on_tv.yaml mode change 100644 => 100755 packages/harmony/volume_control.yaml mode change 100644 => 100755 packages/homeassistant/default_theme.yaml mode change 100644 => 100755 packages/homeassistant/homeassistant.yaml mode change 100644 => 100755 packages/homeassistant/recorder.yaml mode change 100644 => 100755 packages/html5_notifications/html5_notification.yaml mode change 100644 => 100755 packages/laundry/laundry_timer.yaml mode change 100644 => 100755 packages/laundry/timer.yaml mode change 100644 => 100755 packages/light/adaptive.yaml mode change 100644 => 100755 packages/light/all_device_group.yaml mode change 100644 => 100755 packages/light/bedroom_group.yaml mode change 100644 => 100755 packages/light/buttons/bedrooms.yaml mode change 100644 => 100755 packages/light/livingroom_group.yaml mode change 100644 => 100755 packages/light/motion.yaml mode change 100644 => 100755 packages/livingroom/button/button.yaml create mode 100755 packages/livingroom/remote/.~lock.remote.yaml# mode change 100644 => 100755 packages/livingroom/remote/remote.yaml mode change 100644 => 100755 packages/mailbox/mailbox_received.yaml mode change 100644 => 100755 packages/mailbox/mailbox_taken_out.yaml mode change 100644 => 100755 packages/mailbox/switch.yaml mode change 100644 => 100755 packages/minimalist/minimalist_input.yaml mode change 100644 => 100755 packages/nursery/babycrydetection.yaml mode change 100644 => 100755 packages/nursery/nursery.yaml mode change 100644 => 100755 packages/office/button.yaml mode change 100644 => 100755 packages/office/wol.yaml mode change 100644 => 100755 packages/turn_off_everything.txt mode change 100644 => 100755 resources.yaml mode change 100644 => 100755 ui-lovelace.yaml diff --git a/lovelace/dashboard/harmony/harmony.yaml b/lovelace/dashboard/harmony/harmony.yaml old mode 100644 new mode 100755 diff --git a/lovelace/dashboard/harmony/volume_control.yaml b/lovelace/dashboard/harmony/volume_control.yaml old mode 100644 new mode 100755 diff --git a/lovelace/dashboard/hello_world.yaml b/lovelace/dashboard/hello_world.yaml old mode 100644 new mode 100755 index 365e91f..d98b898 --- a/lovelace/dashboard/hello_world.yaml +++ b/lovelace/dashboard/hello_world.yaml @@ -40,7 +40,7 @@ name: Mailbox tap_action: none show_label: true - size: 20% + size: 10% state: - operator: template value: > @@ -48,13 +48,6 @@ icon: mdi:mailbox - operator: default icon: mdi:mailbox-outline - - type: 'custom:button-card' - #color_type: icon - entity: timer.laundry - name: laundry - tap_action: none - show_label: true - size: 20% - type: horizontal-stack cards: diff --git a/lovelace/dashboard/kunibert.yaml b/lovelace/dashboard/kunibert.yaml old mode 100644 new mode 100755 diff --git a/lovelace/dashboard/laundry.yaml b/lovelace/dashboard/laundry.yaml old mode 100644 new mode 100755 diff --git a/lovelace/dashboard/lights.yaml b/lovelace/dashboard/lights.yaml old mode 100644 new mode 100755 index 202e0fb..bba8d96 --- a/lovelace/dashboard/lights.yaml +++ b/lovelace/dashboard/lights.yaml @@ -28,6 +28,15 @@ ulm_card_light_enable_color: true ulm_card_light_force_background_color: true ulm_card_light_name: Sill + - type: "custom:button-card" + template: card_light + entity: light.living_room_tv_bank_switch + variables: + ulm_card_light_enable_color: true + ulm_card_light_force_background_color: true + ulm_card_light_name: TV Bank +- type: horizontal-stack + cards: - type: "custom:button-card" template: card_light entity: light.living_room_lights @@ -56,7 +65,7 @@ - type: "custom:button-card" template: card_light - entity: light.livingroom_switch_tv + entity: switch.livingroom_tv_socket_switch variables: ulm_card_light_icon: mdi:television ulm_card_light_enable_color: true diff --git a/lovelace/dashboard/sensors.yaml b/lovelace/dashboard/sensors.yaml old mode 100644 new mode 100755 index 4a41b42..fd7a25b --- a/lovelace/dashboard/sensors.yaml +++ b/lovelace/dashboard/sensors.yaml @@ -8,14 +8,14 @@ template: card_binary_sensor_alert variables: ulm_card_binary_sensor_alert: true - ulm_show_last_changed: true + ulm_show_last_alert_changed: true ulm_card_binary_sensor_alert_name : "Garden Door" - entity: binary_sensor.livingroom_door_garden_iaszone + entity: binary_sensor.livingroom_door_garden_opening - type: 'custom:button-card' template: card_binary_sensor_alert variables: ulm_card_binary_sensor_alert: true - ulm_show_last_changed: true + ulm_show_last_alert_changed: true ulm_card_binary_sensor_alert_name : "Freezer" entity: binary_sensor.livingroom_freezer_iaszone - type: horizontal-stack @@ -24,14 +24,14 @@ template: card_binary_sensor_alert variables: ulm_card_binary_sensor_alert: true - ulm_show_last_changed: true + ulm_show_last_alert_changed: true ulm_card_binary_sensor_alert_name : "Bathroom Window" entity: binary_sensor.bathroom_window_iaszone - type: 'custom:button-card' template: card_binary_sensor_alert variables: ulm_card_binary_sensor_alert: true - ulm_show_last_changed: true + ulm_show_last_alert_changed: true ulm_card_binary_sensor_alert_name : "Mailbox" entity: binary_sensor.mailbox_door_iaszone @@ -41,14 +41,14 @@ template: card_binary_sensor_alert variables: ulm_card_binary_sensor_alert: true - ulm_show_last_changed: true + ulm_show_last_alert_changed: true ulm_card_binary_sensor_alert_name : "Hallway Motion" entity: binary_sensor.hallway_motion_iaszone - type: 'custom:button-card' template: card_binary_sensor_alert variables: ulm_card_binary_sensor_alert: true - ulm_show_last_changed: true + ulm_show_last_alert_changed: true ulm_card_binary_sensor_alert_name : "Mailbox Motion" entity: binary_sensor.mailbox_motion_iaszone diff --git a/lovelace/dashboard/temperature.yaml b/lovelace/dashboard/temperature.yaml old mode 100644 new mode 100755 diff --git a/packages/door_sensors/door_sensors.yaml b/packages/door_sensors/door_sensors.yaml old mode 100644 new mode 100755 diff --git a/packages/harmony/harmony.yaml b/packages/harmony/harmony.yaml old mode 100644 new mode 100755 index b85013b..17bf63f --- a/packages/harmony/harmony.yaml +++ b/packages/harmony/harmony.yaml @@ -15,7 +15,7 @@ script: seconds: 2 - service: media_player.volume_set data: - volume_level: 0.3 + volume_level: 0.25 target: entity_id: media_player.denon_avr_x1600h - service: remote.send_command diff --git a/packages/harmony/netflix.yaml b/packages/harmony/netflix.yaml old mode 100644 new mode 100755 index abf3a45..a8b6938 --- a/packages/harmony/netflix.yaml +++ b/packages/harmony/netflix.yaml @@ -5,9 +5,9 @@ script: - conditions: - condition: device type: is_off - device_id: 53acbc86deb1bb16ca4c0889a78be5d2 - entity_id: light.livingroom_switch_tv - domain: light + device_id: ff2addb4c1638a2277c0198d9ec18844 + entity_id: switch.livingroom_tv_socket_switch + domain: switch sequence: - service: script.turn_on target: @@ -41,6 +41,6 @@ script: seconds: 2 - service: media_player.volume_set data: - volume_level: 0.5 + volume_level: 0.35 target: entity_id: media_player.denon_avr_x1600h \ No newline at end of file diff --git a/packages/harmony/turn_on_tv.yaml b/packages/harmony/turn_on_tv.yaml old mode 100644 new mode 100755 index d6e1f65..5aca0bd --- a/packages/harmony/turn_on_tv.yaml +++ b/packages/harmony/turn_on_tv.yaml @@ -1,9 +1,9 @@ script: tv_turn_on: sequence: - - service: light.turn_on + - service: switch.turn_on target: - entity_id: light.livingroom_switch_tv + entity_id: switch.livingroom_tv_socket_switch - delay: seconds: 15 - service: remote.send_command diff --git a/packages/harmony/volume_control.yaml b/packages/harmony/volume_control.yaml old mode 100644 new mode 100755 diff --git a/packages/homeassistant/default_theme.yaml b/packages/homeassistant/default_theme.yaml old mode 100644 new mode 100755 diff --git a/packages/homeassistant/homeassistant.yaml b/packages/homeassistant/homeassistant.yaml old mode 100644 new mode 100755 index f4d5796..28f46e1 --- a/packages/homeassistant/homeassistant.yaml +++ b/packages/homeassistant/homeassistant.yaml @@ -23,4 +23,9 @@ http: lovelace: mode: yaml - resources: !include ../../resources.yaml \ No newline at end of file + resources: !include ../../resources.yaml + +zha: + zigpy_config: + ota: + ikea_provider: true \ No newline at end of file diff --git a/packages/homeassistant/recorder.yaml b/packages/homeassistant/recorder.yaml old mode 100644 new mode 100755 diff --git a/packages/html5_notifications/html5_notification.yaml b/packages/html5_notifications/html5_notification.yaml old mode 100644 new mode 100755 diff --git a/packages/laundry/laundry_timer.yaml b/packages/laundry/laundry_timer.yaml old mode 100644 new mode 100755 diff --git a/packages/laundry/timer.yaml b/packages/laundry/timer.yaml old mode 100644 new mode 100755 diff --git a/packages/light/adaptive.yaml b/packages/light/adaptive.yaml old mode 100644 new mode 100755 index 60c192e..bec24d4 --- a/packages/light/adaptive.yaml +++ b/packages/light/adaptive.yaml @@ -7,5 +7,4 @@ adaptive_lighting: - light.office_bulb - light.bedroom_bulb_light - light.bedroom_bulb_toni_light - - light.bedroom_bulb_philipp_light - - light.nursery_bulb \ No newline at end of file + - light.bedroom_bulb_philipp_light \ No newline at end of file diff --git a/packages/light/all_device_group.yaml b/packages/light/all_device_group.yaml old mode 100644 new mode 100755 diff --git a/packages/light/bedroom_group.yaml b/packages/light/bedroom_group.yaml old mode 100644 new mode 100755 diff --git a/packages/light/buttons/bedrooms.yaml b/packages/light/buttons/bedrooms.yaml old mode 100644 new mode 100755 diff --git a/packages/light/livingroom_group.yaml b/packages/light/livingroom_group.yaml old mode 100644 new mode 100755 index e8fe4fd..f7fc796 --- a/packages/light/livingroom_group.yaml +++ b/packages/light/livingroom_group.yaml @@ -7,3 +7,4 @@ light: - light.livingroom_switch_lamp_couch - light.living_room_switch_lamp_sill #- light.livingroom_switch_lamp + - light.living_room_tv_bank_switch diff --git a/packages/light/motion.yaml b/packages/light/motion.yaml old mode 100644 new mode 100755 diff --git a/packages/livingroom/button/button.yaml b/packages/livingroom/button/button.yaml old mode 100644 new mode 100755 diff --git a/packages/livingroom/remote/.~lock.remote.yaml# b/packages/livingroom/remote/.~lock.remote.yaml# new file mode 100755 index 0000000..2490eee --- /dev/null +++ b/packages/livingroom/remote/.~lock.remote.yaml# @@ -0,0 +1 @@ +,philipp,C3PO,10.02.2024 22:06,file:///home/philipp/.config/libreoffice/4; \ No newline at end of file diff --git a/packages/livingroom/remote/remote.yaml b/packages/livingroom/remote/remote.yaml old mode 100644 new mode 100755 diff --git a/packages/mailbox/mailbox_received.yaml b/packages/mailbox/mailbox_received.yaml old mode 100644 new mode 100755 diff --git a/packages/mailbox/mailbox_taken_out.yaml b/packages/mailbox/mailbox_taken_out.yaml old mode 100644 new mode 100755 diff --git a/packages/mailbox/switch.yaml b/packages/mailbox/switch.yaml old mode 100644 new mode 100755 diff --git a/packages/minimalist/minimalist_input.yaml b/packages/minimalist/minimalist_input.yaml old mode 100644 new mode 100755 diff --git a/packages/nursery/babycrydetection.yaml b/packages/nursery/babycrydetection.yaml old mode 100644 new mode 100755 diff --git a/packages/nursery/nursery.yaml b/packages/nursery/nursery.yaml old mode 100644 new mode 100755 index e8ed466..2f1c668 --- a/packages/nursery/nursery.yaml +++ b/packages/nursery/nursery.yaml @@ -1,6 +1,8 @@ automation: # Nursery heat lamp turn on from bedroom Philipp - - alias: nursery_heat_lamp_bedroom_button_philipp_turn_on + - alias: nursery_light_on + description: "nursery_light_on" + mode: single trigger: - device_id: 1baf5adc6850ac0413ee80d5ce75f1b8 domain: zha @@ -8,23 +10,16 @@ automation: type: remote_button_short_press subtype: turn_on action: - - type: turn_on - device_id: f544eb364af0e4c42f36e5479f79e111 - entity_id: switch.nursery - domain: switch - type: turn_on device_id: 8d78194d0cb175221b3b0ffa337a9592 entity_id: light.nursery_bulb domain: light - - delay: - minutes: 15 - - type: turn_off - device_id: f544eb364af0e4c42f36e5479f79e111 - entity_id: switch.nursery - domain: switch + # Nursery heat lamp turn off from bedroom Philipp - - alias: nursery_heat_lamp_bedroom_button_philippturn_off + - alias: nursery_light_off + description: "nursery_light_off" + mode: single trigger: - device_id: 1baf5adc6850ac0413ee80d5ce75f1b8 domain: zha @@ -36,10 +31,6 @@ automation: device_id: 8d78194d0cb175221b3b0ffa337a9592 entity_id: light.nursery_bulb domain: light - - type: turn_off - device_id: f544eb364af0e4c42f36e5479f79e111 - entity_id: switch.nursery - domain: switch ###### Nursery ##### @@ -52,20 +43,10 @@ automation: type: remote_button_short_press subtype: turn_on action: - - type: turn_on - device_id: f544eb364af0e4c42f36e5479f79e111 - entity_id: switch.nursery - domain: switch - type: turn_on device_id: 8d78194d0cb175221b3b0ffa337a9592 entity_id: light.nursery_bulb - domain: light - - delay: - minutes: 15 - - type: turn_off - device_id: f544eb364af0e4c42f36e5479f79e111 - entity_id: switch.nursery - domain: switch + domain: light # Nursery heat lamp + light turn on button door - alias: nursery_heat_lamp_bulb_turn_on_nursery_button_door @@ -79,13 +60,21 @@ automation: - type: turn_on device_id: f544eb364af0e4c42f36e5479f79e111 entity_id: switch.nursery - domain: switch + domain: switch + - type: turn_on + device_id: 8d78194d0cb175221b3b0ffa337a9592 + entity_id: light.nursery_bulb + domain: light - delay: minutes: 15 - type: turn_off device_id: f544eb364af0e4c42f36e5479f79e111 entity_id: switch.nursery domain: switch + - type: turn_off + device_id: 8d78194d0cb175221b3b0ffa337a9592 + entity_id: light.nursery_bulb + domain: light # Nursery heat lamp turn off button door - alias: nursery_heat_lamp_turn_off_nursery_button_door @@ -105,7 +94,6 @@ automation: entity_id: light.nursery_bulb domain: light - - id: '1689371777559' - alias: Baby Notification description: '' trigger: @@ -118,11 +106,11 @@ automation: entity_id: input_boolean.baby_cry_notification state: 'on' action: - - service: notify.mobile_app_pixel_7_pro + - service: notify.mobile_app_pixel_7_pro data: message: Baby schreit - data: - image: /api/camera_proxy/camera.nursery_baby_cam?token={{state_attr('camera.nursery_baby_cam','access_token')}} - url: /dashboard-babycam - clickAction: /dashboard-babycam/0 + data: + image: /api/camera_proxy/camera.nursery_baby_cam?token={{state_attr('camera.nursery_baby_cam','access_token')}} + url: /dashboard-babycam + clickAction: /dashboard-babycam/0 mode: single \ No newline at end of file diff --git a/packages/office/button.yaml b/packages/office/button.yaml old mode 100644 new mode 100755 index a76e44a..51d2653 --- a/packages/office/button.yaml +++ b/packages/office/button.yaml @@ -106,7 +106,7 @@ automation: domain: zha platform: device type: remote_button_long_press - subtype: dim_down + subtype: long_down action: - type: turn_off entity_id: light.office_bulb diff --git a/packages/office/wol.yaml b/packages/office/wol.yaml old mode 100644 new mode 100755 diff --git a/packages/turn_off_everything.txt b/packages/turn_off_everything.txt old mode 100644 new mode 100755 diff --git a/resources.yaml b/resources.yaml old mode 100644 new mode 100755 diff --git a/ui-lovelace.yaml b/ui-lovelace.yaml old mode 100644 new mode 100755