diff --git a/automations/people/Clint/Clint_home.yaml b/automations/people/Clint/Clint_home.yaml index d4d20a7..d510d2f 100644 --- a/automations/people/Clint/Clint_home.yaml +++ b/automations/people/Clint/Clint_home.yaml @@ -21,6 +21,12 @@ trigger: from: 'off' to: 'on' + - platform: state + id: car_home + entity_id: + - device_tracker.chevrolet_traverse_location + to: 'home' + - platform: homeassistant event: start diff --git a/automations/people/Clint/Clint_wakeup.yaml b/automations/people/Clint/Clint_wakeup.yaml index aa2ba8c..afe31d3 100644 --- a/automations/people/Clint/Clint_wakeup.yaml +++ b/automations/people/Clint/Clint_wakeup.yaml @@ -22,7 +22,7 @@ condition: entity_id: binary_sensor.morning state: 'on' - condition: state - entity_id: binary_sensor.work_day + entity_id: binary_sensor.is_workday state: 'on' action: diff --git a/automations/people/Clint/set_clint_next_alarm.yaml b/automations/people/Clint/set_clint_next_alarm.yaml index 152513b..dee1104 100644 --- a/automations/people/Clint/set_clint_next_alarm.yaml +++ b/automations/people/Clint/set_clint_next_alarm.yaml @@ -4,11 +4,11 @@ id: automation_set_clint_next_alarm trigger: - platform: state - entity_id: binary_sensor.work_day + entity_id: binary_sensor.is_workday to: 'off' - platform: state - entity_id: binary_sensor.work_day + entity_id: binary_sensor.is_workday to: 'on' - platform: time @@ -21,18 +21,18 @@ action: - choose: - conditions: - condition: state - entity_id: binary_sensor.work_day + entity_id: binary_sensor.is_workday state: 'off' sequence: - service: input_datetime.set_datetime target: entity_id: input_datetime.clint_next_alarm data: - time: "09:00:00" + time: "07:00:00" - conditions: - condition: state - entity_id: binary_sensor.work_day + entity_id: binary_sensor.is_workday state: 'on' sequence: - service: input_datetime.set_datetime diff --git a/automations/people/Clint/wake_clint.yaml b/automations/people/Clint/wake_clint.yaml index fb08a1c..13e1a21 100644 --- a/automations/people/Clint/wake_clint.yaml +++ b/automations/people/Clint/wake_clint.yaml @@ -8,7 +8,7 @@ trigger: at: input_datetime.clint_next_alarm # condition: # - condition: state -# entity_id: binary_sensor.work_day +# entity_id: binary_sensor.is_workday # state: 'on' action: - service: input_boolean.turn_off diff --git a/automations/rooms/nursery/nursery_awake_button.yaml b/automations/rooms/nursery/nursery_awake_button.yaml index 1b2fe91..b6ebbbf 100644 --- a/automations/rooms/nursery/nursery_awake_button.yaml +++ b/automations/rooms/nursery/nursery_awake_button.yaml @@ -24,7 +24,6 @@ action: target: entity_id: - switch.black_bed_force_occupancy - - switch.white_bed_force_occupancy - service: input_boolean.turn_off data: {} diff --git a/automations/things/car/car_home.yaml b/automations/things/car/car_home.yaml index fbd93f8..217d6f6 100644 --- a/automations/things/car/car_home.yaml +++ b/automations/things/car/car_home.yaml @@ -8,6 +8,10 @@ trigger: - binary_sensor.gray_suv_west_side to: 'on' + - platform: state + entity_id: device_tracker.chevrolet_traverse_location + to: 'home' + - platform: homeassistant event: start condition: @@ -28,6 +32,9 @@ condition: - condition: state entity_id: binary_sensor.west_side_vehicle_occupancy state: 'on' + - condition: state + entity_id: device_tracker.chevrolet_traverse_location + state: 'home' action: - service: input_boolean.turn_on entity_id: input_boolean.car_home \ No newline at end of file diff --git a/automations/things/dishwasher_done.yaml b/automations/things/dishwasher_done.yaml index 954d342..bebd3b8 100644 --- a/automations/things/dishwasher_done.yaml +++ b/automations/things/dishwasher_done.yaml @@ -61,7 +61,7 @@ action: - choose: - conditions: - - "{{states('sensor.dreambox_audio_audio_sessions') | int(default=0) > 0 or is_state('binary_sensor.dreambox_recently_active','on') }}" + - "{{is_state('binary_sensor.dreambox_recently_active','on') }}" sequence: - service: notify.dreambox @@ -70,7 +70,7 @@ action: - choose: - conditions: - - "{{states('sensor.dreamsurface_audio_audio_sessions') | int(default=0) > 0 or is_state('binary_sensor.dreamsurface_recently_active','on') }}" + - "{{is_state('binary_sensor.dreamsurface_recently_active','on') }}" sequence: - service: notify.dreamsurface @@ -87,6 +87,10 @@ action: - service: notify.mobile_app_pixel_7 data: message: The dishwasher is done + data: + tag: "dishwasher-complete" + notification_icon: mdi:dishwasher-alert + channel: Appliance - delay: minutes: 30 diff --git a/automations/things/doorbell.yaml b/automations/things/doorbell.yaml deleted file mode 100644 index 6d98377..0000000 --- a/automations/things/doorbell.yaml +++ /dev/null @@ -1,86 +0,0 @@ -alias: Doorbell -id: automation_doorbell -description: "Someone pushed the doorbell" -trigger: - - id: button_pressed - platform: webhook - webhook_id: "synology_doorbell_actionrule" - local_only: true - - # - id: button_pressed - # platform: event - # event_type: "amcrest" - # event_data: - # camera: "Front Porch" - # event: "AlarmLocal" - - - id: button_pressed - trigger: event - event_type: amcrest - event_data: - event: "CallNoAnswered" - payload: - action: "Start" - - - id: door_opened - platform: state - entity_id: - - binary_sensor.front_door_contact - - binary_sensor.outer_garage_door - - binary_sensor.outer_garage_door_contact - from: "off" - to: "on" - - - id: door_closed - platform: state - entity_id: - - binary_sensor.front_door_contact - - binary_sensor.outer_garage_door - - binary_sensor.outer_garage_door_contact - from: "on" - to: "off" - -action: - - choose: - - conditions: - - condition: trigger - id: button_pressed - - sequence: - - service: notify.mobile_app_pixel_7 - data: - message: Someone is at the door - data: - image_url: "https://frigate.clintweaver.com/api/frigate_cam19/latest.jpg" - - - service: input_boolean.turn_on - data: {} - target: - entity_id: input_boolean.doorbell - - - service: notify.dreamsurface - data: - title: Ding Dong - message: "Someone is at the door" - data: - image: "https://frigate.clintweaver.com/api/frigate_cam19/latest.jpg" - - - service: notify.dreambox - data: - title: Ding Dong - message: "Someone is at the door" - data: - image: "https://frigate.clintweaver.com/api/frigate_cam19/latest.jpg" - - - conditions: - - condition: trigger - id: door_opened - - condition: state - entity_id: input_boolean.doorbell - state: "on" - - sequence: - - service: input_boolean.turn_off - data: {} - target: - entity_id: input_boolean.doorbell diff --git a/automations/things/tumble_dryer_done.yaml b/automations/things/tumble_dryer_done.yaml index 511c0d7..8d1af37 100644 --- a/automations/things/tumble_dryer_done.yaml +++ b/automations/things/tumble_dryer_done.yaml @@ -70,7 +70,7 @@ action: - choose: - conditions: - - "{{states('sensor.dreambox_audio_audio_sessions') | int(default=0) > 0 or is_state('binary_sensor.dreambox_recently_active','on') }}" + - "{{ is_state('binary_sensor.dreambox_recently_active','on') }}" sequence: - service: notify.dreambox @@ -79,7 +79,7 @@ action: - choose: - conditions: - - "{{states('sensor.dreamsurface_audio_audio_sessions') | int(default=0) > 0 or is_state('binary_sensor.dreamsurface_recently_active','on') }}" + - "{{ is_state('binary_sensor.dreamsurface_recently_active','on') }}" sequence: - service: notify.dreamsurface @@ -96,6 +96,10 @@ action: - service: notify.mobile_app_pixel_7 data: message: The dryer is done + data: + tag: "dryer-complete" + notification_icon: mdi:tumble-dryer-alert + channel: Appliance - delay: minutes: 15 diff --git a/automations/things/washing_machine_done.yaml b/automations/things/washing_machine_done.yaml index 1a355cc..9cef890 100644 --- a/automations/things/washing_machine_done.yaml +++ b/automations/things/washing_machine_done.yaml @@ -70,7 +70,7 @@ action: - choose: - conditions: - - "{{states('sensor.dreambox_audio_audio_sessions') | int(default=0) > 0 or is_state('binary_sensor.dreambox_recently_active','on') }}" + - "{{is_state('binary_sensor.dreambox_recently_active','on') }}" sequence: - service: notify.dreambox @@ -79,7 +79,7 @@ action: - choose: - conditions: - - "{{states('sensor.dreamsurface_audio_audio_sessions') | int(default=0) > 0 or is_state('binary_sensor.dreamsurface_recently_active','on') }}" + - "{{is_state('binary_sensor.dreamsurface_recently_active','on') }}" sequence: - service: notify.dreamsurface @@ -96,6 +96,10 @@ action: - service: notify.mobile_app_pixel_7 data: message: The washing machine is done + data: + tag: "washing-machine-complete" + notification_icon: mdi:washing-machine-alert + channel: Appliance - delay: minutes: 15 diff --git a/components/binary_sensors/template.yaml b/components/binary_sensors/template.yaml index 81461d0..fe0a6a6 100644 --- a/components/binary_sensors/template.yaml +++ b/components/binary_sensors/template.yaml @@ -170,7 +170,7 @@ sensors: work_hours: unique_id: templatebinarysensor.work_hours friendly_name: Work Hours - value_template: "{{ is_state('binary_sensor.work_day', 'on') and is_state('binary_sensor.business_hours', 'on') }}" + value_template: "{{ is_state('binary_sensor.is_workday', 'on') and is_state('binary_sensor.business_hours', 'on') }}" icon_template: mdi:briefcase # washing_machine: diff --git a/components/input_numbers/white_bed/white_bed_loadcell_load.yaml b/components/input_numbers/white_bed/white_bed_loadcell_load.yaml deleted file mode 100644 index 30bdc8b..0000000 --- a/components/input_numbers/white_bed/white_bed_loadcell_load.yaml +++ /dev/null @@ -1,5 +0,0 @@ -name: White Bed LoadCell Load -icon: mdi:weight -min: -8388000 -max: 8388000 -mode: box \ No newline at end of file diff --git a/components/input_numbers/white_bed/white_bed_loadcell_weight.yaml b/components/input_numbers/white_bed/white_bed_loadcell_weight.yaml deleted file mode 100644 index 488a3b3..0000000 --- a/components/input_numbers/white_bed/white_bed_loadcell_weight.yaml +++ /dev/null @@ -1,5 +0,0 @@ -name: White Bed LoadCell Weight -icon: mdi:weight-pound -min: 0 -max: 300 -mode: box \ No newline at end of file diff --git a/components/input_numbers/white_bed/white_bed_loadcell_zero.yaml b/components/input_numbers/white_bed/white_bed_loadcell_zero.yaml deleted file mode 100644 index b0c8449..0000000 --- a/components/input_numbers/white_bed/white_bed_loadcell_zero.yaml +++ /dev/null @@ -1,5 +0,0 @@ -name: White Bed LoadCell Zero -icon: mdi:weight -min: -8388000 -max: 8388000 -mode: box \ No newline at end of file diff --git a/components/input_numbers/white_bed/white_bed_occupied.yaml b/components/input_numbers/white_bed/white_bed_occupied.yaml deleted file mode 100644 index f47494b..0000000 --- a/components/input_numbers/white_bed/white_bed_occupied.yaml +++ /dev/null @@ -1,5 +0,0 @@ -name: White Bed Occupied -icon: mdi:weight -min: 0 -max: 300 -mode: box \ No newline at end of file diff --git a/components/packages/hass_agent/dreambox.yaml b/components/packages/hass_agent/dreambox.yaml deleted file mode 100644 index c5ff935..0000000 --- a/components/packages/hass_agent/dreambox.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# notify: -# name: DreamBox -# platform: hass_agent_notifier -# resource: !secret dreambox_hassagent - -# # media_player: -# # - name: DreamBox -# # platform: hass_agent_mediaplayer -# # host: !secret dreambox_ip -# # port: 5115 - -template: - - trigger: - - platform: homeassistant - event: start - - - platform: state - entity_id: sensor.dreambox_lastactive - - binary_sensor: - - name: DreamBox Recently Active - unique_id: templatebinarysensor.dreambox_recently_active - icon: mdi:desktop-tower-monitor - #availability: "{{ states('sensor.dreambox_lastactive') not in ['unknown', 'unavailable'] }}" - state: " {{ iif( states('sensor.dreambox_lastactive') == 'unknown' or is_state('sensor.dreambox_lastactive', 'unavailable'), false, as_timestamp(now()) - as_timestamp(states('sensor.dreambox_lastactive'),0) < 180 or is_state('sensor.dreambox_usernotification','Busy'))}}" diff --git a/components/packages/hass_agent/dreamsurface.yaml b/components/packages/hass_agent/dreamsurface.yaml deleted file mode 100644 index db9738e..0000000 --- a/components/packages/hass_agent/dreamsurface.yaml +++ /dev/null @@ -1,37 +0,0 @@ -# notify: -# name: DreamSurface -# platform: hass_agent_notifier -# resource: !secret dreamsurface_hassagent - -# mqtt: -# light: -# - name: "DreamSurface: Screen Brightness" -# unique_id: "dreamsurface_screen_brightness" -# object_id: "dreamsurface_monitor_brightness" -# command_topic: "homeassistant/light/DREAMSURFACE/DREAMSURFACE_screen_brightness/action" -# brightness_command_topic: "homeassistant/light/HASSAGENT/dreamsurface_monitor_brightness/action" -# brightness_command_template: "%PROGRAMFILES(X86)%\\Monitorian\\Monitorian.exe /set {{ value }}" -# brightness_scale: 100 -# on_command_type: "brightness" -# icon: mdi:monitor-shimmer - -# # media_player: -# # - name: Dreamsurface -# # platform: hass_agent_mediaplayer -# # host: !secret dreamsurface_ip -# # port: 5115 - -template: - - trigger: - - platform: homeassistant - event: start - - - platform: state - entity_id: sensor.dreamsurface_lastactive - - binary_sensor: - - name: DreamSurface Recently Active - unique_id: templatebinarysensor.dreamsurface_recently_active - icon: mdi:tablet - #availability: "{{ states('sensor.dreamsurface_lastactive') not in ['unknown', 'unavailable'] }}" - state: " {{ iif( states('sensor.dreamsurface_lastactive') == 'unknown' or is_state('sensor.dreamsurface_lastactive', 'unavailable'), false, as_timestamp(now()) - as_timestamp(states('sensor.dreamsurface_lastactive'),0) < 180 or is_state('sensor.dreamsurface_usernotification','Busy'))}}" diff --git a/components/packages/hass_agent/notify_hass_agent_group.yaml b/components/packages/hass_agent/notify_hass_agent_group.yaml deleted file mode 100644 index a79f610..0000000 --- a/components/packages/hass_agent/notify_hass_agent_group.yaml +++ /dev/null @@ -1,6 +0,0 @@ -notify: - - platform: group - name: "Dream Computers" - services: - - service: dreambox - - service: dreamsurface diff --git a/components/proximity/clint_agh.yaml b/components/proximity/clint_work.yaml similarity index 72% rename from components/proximity/clint_agh.yaml rename to components/proximity/clint_work.yaml index 618aed3..08e339f 100644 --- a/components/proximity/clint_agh.yaml +++ b/components/proximity/clint_work.yaml @@ -1,5 +1,5 @@ -clint_agh: - zone: agh +clint_work: + zone: work devices: - device_tracker.pixel_7 unit_of_measurement: mi diff --git a/esphome/front-yard-plant-monitor.yaml b/esphome/archive/front-yard-plant-monitor.yaml similarity index 100% rename from esphome/front-yard-plant-monitor.yaml rename to esphome/archive/front-yard-plant-monitor.yaml diff --git a/esphome/furnace-room-multisensor.yaml b/esphome/archive/furnace-room-multisensor.yaml similarity index 100% rename from esphome/furnace-room-multisensor.yaml rename to esphome/archive/furnace-room-multisensor.yaml diff --git a/esphome/archive/white-bed.yaml b/esphome/archive/white-bed.yaml new file mode 100644 index 0000000..6bb3319 --- /dev/null +++ b/esphome/archive/white-bed.yaml @@ -0,0 +1,27 @@ +substitutions: + devicename: white-bed + entity_name: white_bed + friendly_name: White Bed + platform: ESP32 + board: nodemcu-32s + static_ip: !secret white-bed-ip + dout_pin: !secret white-bed-dout + clk_pin: !secret white-bed-clk + loadcell_zero: !secret white-bed-zero + loadcell_load: !secret white-bed-load + loadcell_weight: !secret white-bed-weight + +# Enable logging +# logger: +# level: DEBUG +# logs: +# sensor: INFO +# hx711: DEBUG + +packages: + wifi: !include common/wifi.yaml + device_base: !include common/device_base.yaml + # hx711: !include common/hx711_single_verbose.yaml + +esp32: + board: nodemcu-32s diff --git a/esphome/bed-presence/bluetooth-proxy.yaml b/esphome/bed-presence/bluetooth-proxy.yaml index 5d388aa..4a9be5e 100644 --- a/esphome/bed-presence/bluetooth-proxy.yaml +++ b/esphome/bed-presence/bluetooth-proxy.yaml @@ -1,9 +1,9 @@ -api: - on_client_connected: - - esp32_ble_tracker.start_scan: - continuous: true - on_client_disconnected: - - esp32_ble_tracker.stop_scan: +# api: +# on_client_connected: +# - esp32_ble_tracker.start_scan: +# continuous: true +# on_client_disconnected: +# - esp32_ble_tracker.stop_scan: bluetooth_proxy: active: true diff --git a/esphome/white-bed.yaml b/esphome/white-bed.yaml index 9839853..9a0c1b0 100644 --- a/esphome/white-bed.yaml +++ b/esphome/white-bed.yaml @@ -5,23 +5,74 @@ substitutions: platform: ESP32 board: nodemcu-32s static_ip: !secret white-bed-ip - dout_pin: !secret white-bed-dout - clk_pin: !secret white-bed-clk - loadcell_zero: !secret white-bed-zero - loadcell_load: !secret white-bed-load - loadcell_weight: !secret white-bed-weight + center_sensor_gpio: GPIO34 -# Enable logging -logger: - level: DEBUG - logs: - sensor: INFO - hx711: DEBUG - -packages: - wifi: !include common/wifi.yaml - device_base: !include common/device_base.yaml - hx711: !include common/hx711_single_verbose.yaml esp32: board: nodemcu-32s + framework: + type: esp-idf + +esphome: + name: ${devicename} +# platform: ${platform} +# board: ${board} + +# Enable logging +logger: + +# Sync time with Home Assistant. +time: + - platform: homeassistant + id: homeassistant_time + +# Enable Home Assistant API +api: + reboot_timeout: 15min + +ota: + - platform: esphome + + +packages: + #wifi: !include common/wifi.yaml + wifi: !include common/wifi_no_power_save.yaml + ble: !include bed-presence/bluetooth-proxy.yaml + + diagnostics: !include + file: bed-presence/diagnostics.yaml + vars: + boot_gpio: GPIO9 + uptime_id: bed_presence_uptime + restart_id: btn_restart + status_id: bed_presence_status + + bed_sensor: !include + file: bed-presence/sensor.yaml + vars: + sensor_name: Center + sensor_id: center_occupied + sensor_gpio: ${center_sensor_gpio} + +switch: + - platform: template + name: Full Range + id: full_range + optimistic: true + restore_mode: RESTORE_DEFAULT_OFF + entity_category: config + icon: mdi:arrow-expand + +select: + - platform: template + name: "Response Speed" + id: response_speed + icon: mdi:speedometer + optimistic: true + restore_value: true + options: + - "Fast" + - "Normal" + - "Slow" + initial_option: "Normal" + entity_category: config \ No newline at end of file diff --git a/lovelace/cameras/view-camera-14.yaml b/lovelace/cameras/view-camera-14.yaml index f2bcaae..fe626e6 100644 --- a/lovelace/cameras/view-camera-14.yaml +++ b/lovelace/cameras/view-camera-14.yaml @@ -73,11 +73,6 @@ card: style: left: 8% top: 95% - - type: state-icon - entity: sensor.back_yard_animal_count - style: - left: 50% - top: 95% - type: state-icon entity: input_boolean.back_yard_occupied tap_action: @@ -101,13 +96,3 @@ card: style: top: 45% left: 45% - - type: conditional - conditions: - - entity: binary_sensor.back_yard_animal_occupancy - state: "on" - elements: - - type: state-icon - entity: binary_sensor.back_yard_animal_occupancy - style: - top: 45% - left: 55% diff --git a/lovelace/details/view-batteries.yaml b/lovelace/details/view-batteries.yaml index e4d343e..d927c3e 100644 --- a/lovelace/details/view-batteries.yaml +++ b/lovelace/details/view-batteries.yaml @@ -5,6 +5,7 @@ visible: - user: 24a4bd075e7f41a497dd0390a1dd4a9f - user: cad46dedf86f454ebbd7f697a58730f2 cards: + - type: custom:battery-state-card - type: entities title: Smart Devices entities: diff --git a/lovelace/frigate/view-ai-cam14.yaml b/lovelace/frigate/view-ai-cam14.yaml index 1bb9b12..0f9a659 100644 --- a/lovelace/frigate/view-ai-cam14.yaml +++ b/lovelace/frigate/view-ai-cam14.yaml @@ -16,7 +16,6 @@ cards: - type: glance title: Back Yard entities: [] - - !include /config/lovelace/templates/back-yard-camera-presets-grid.yaml - type: glance show_state: true columns: 5 diff --git a/lovelace/phone/nursery.yaml b/lovelace/phone/nursery.yaml index 6de1b08..b5f2d1e 100644 --- a/lovelace/phone/nursery.yaml +++ b/lovelace/phone/nursery.yaml @@ -331,29 +331,29 @@ cards: target: entity_id: button.black_bed_manual_tare layout: vertical - - type: custom:mushroom-template-card - entity: binary_sensor.white_bed_occupied - icon: mdi:bed - icon_color: >- - {% if(is_state('binary_sensor.white_bed_occupied','on')) %} - yellow - {% elif(is_state('binary_sensor.white_bed_hx711_error','on')) %} - red - {% endif %} - primary: White Bed - double_tap_action: - action: call-service - service: homeassistant.toggle - service_data: {} - target: - entity_id: switch.white_bed_force_occupancy - hold_action: - action: call-service - service: button.press - service_data: {} - target: - entity_id: button.white_bed_manual_tare - layout: vertical + # - type: custom:mushroom-template-card + # entity: binary_sensor.white_bed_occupied + # icon: mdi:bed + # icon_color: >- + # {% if(is_state('binary_sensor.white_bed_occupied','on')) %} + # yellow + # {% elif(is_state('binary_sensor.white_bed_hx711_error','on')) %} + # red + # {% endif %} + # primary: White Bed + # double_tap_action: + # action: call-service + # service: homeassistant.toggle + # service_data: {} + # target: + # entity_id: switch.white_bed_force_occupancy + # hold_action: + # action: call-service + # service: button.press + # service_data: {} + # target: + # entity_id: button.white_bed_manual_tare + # layout: vertical - type: horizontal-stack cards: - type: custom:mushroom-entity-card diff --git a/lovelace/templates/back-yard-camera-presets-grid.yaml b/lovelace/templates/back-yard-camera-presets-grid.yaml deleted file mode 100644 index 2f15a7b..0000000 --- a/lovelace/templates/back-yard-camera-presets-grid.yaml +++ /dev/null @@ -1,90 +0,0 @@ -square: false -columns: 2 -type: grid -cards: - # - Deck - # - Sandbox - # - Grove - # - Grass - # - Yard - # - Stairs - # - BesideStairs - - show_name: true - show_icon: false - show_state: true - type: button - entity: input_select.camera14_preset - name: Presets - icon_height: 25px - - show_name: true - show_icon: true - type: button - icon_height: 25px - tap_action: - action: toggle - entity: switch.deck_power_plug - name: Power - - show_name: true - show_icon: true - type: button - tap_action: - action: toggle - entity: input_button.cam14_ptz_preset_1 - name: Deck - icon_height: 25px - - show_name: true - show_icon: true - type: button - icon_height: 25px - tap_action: - action: toggle - entity: input_button.cam14_ptz_preset_2 - name: Sandbox - - show_name: true - show_icon: true - type: button - icon_height: 25px - tap_action: - action: toggle - entity: input_button.cam14_ptz_preset_4 - name: Grove - - show_name: true - show_icon: true - type: button - icon_height: 25px - tap_action: - action: toggle - entity: input_button.cam14_ptz_preset_7 - name: Grass - - show_name: true - show_icon: true - type: button - icon_height: 25px - tap_action: - action: toggle - entity: input_button.cam14_ptz_preset_3 - name: Yard - - show_name: true - show_icon: true - type: button - icon_height: 25px - tap_action: - action: toggle - entity: input_button.cam14_ptz_preset_5 - name: Stairs - - show_name: true - show_icon: true - type: button - icon_height: 25px - tap_action: - action: toggle - entity: input_button.cam14_ptz_preset_6 - name: BesideStairs - - show_name: true - show_icon: true - type: button - icon_height: 25px - tap_action: - action: toggle - entity: input_boolean.cycle_cam14 - name: Cycle \ No newline at end of file diff --git a/lovelace/templates/back-yard-camera-presets.yaml b/lovelace/templates/back-yard-camera-presets.yaml deleted file mode 100644 index 0dbe3fb..0000000 --- a/lovelace/templates/back-yard-camera-presets.yaml +++ /dev/null @@ -1,66 +0,0 @@ -type: vertical-stack -cards: - - show_name: true - show_icon: true - type: button - icon_height: 25px - tap_action: - action: toggle - entity: input_button.cam14_ptz_preset_1 - name: Deck - - show_name: true - show_icon: true - type: button - icon_height: 25px - tap_action: - action: toggle - entity: input_button.cam14_ptz_preset_2 - name: Sandbox - - show_name: true - show_icon: true - type: button - icon_height: 25px - tap_action: - action: toggle - entity: input_button.cam14_ptz_preset_3 - name: Yard - - show_name: true - show_icon: true - type: button - icon_height: 25px - tap_action: - action: toggle - entity: input_button.cam14_ptz_preset_4 - name: Grove - - show_name: true - show_icon: true - type: button - icon_height: 25px - tap_action: - action: toggle - entity: input_button.cam14_ptz_preset_5 - name: Stairs - - show_name: true - show_icon: true - type: button - icon_height: 25px - tap_action: - action: toggle - entity: input_button.cam14_ptz_preset_6 - name: BesideStairs - - show_name: true - show_icon: true - type: button - icon_height: 25px - tap_action: - action: toggle - entity: input_button.cam14_ptz_preset_5 - name: Grass - - show_name: true - show_icon: true - type: button - icon_height: 25px - tap_action: - action: toggle - entity: input_boolean.cycle_cam14 - name: Cycle diff --git a/lovelace/view-ai-overview.yaml b/lovelace/view-ai-overview.yaml deleted file mode 100644 index 31573a4..0000000 --- a/lovelace/view-ai-overview.yaml +++ /dev/null @@ -1,105 +0,0 @@ -title: AI Overview -path: ai-overview -icon: mdi:eye -#type: sidebar -panel: true -visible: - - user: 24a4bd075e7f41a497dd0390a1dd4a9f - - user: cad46dedf86f454ebbd7f697a58730f2 - -cards: - - type: horizontal-stack - cards: - - type: vertical-stack - cards: - - type: grid - square: false - columns: 4 - cards: - - show_name: true - show_icon: true - type: button - tap_action: - action: call-service - service: input_select.select_previous - service_data: {} - target: - entity_id: input_select.indoor_camera_cycle - entity: '' - icon: mdi:arrow-left - icon_height: 25px - - show_name: false - show_icon: false - type: button - tap_action: - action: more-info - entity: input_select.indoor_camera_cycle - show_state: true - - show_name: false - show_icon: true - type: button - tap_action: - action: toggle - entity: input_boolean.indoor_camera_lock - show_state: true - icon_height: 25px - - show_name: true - show_icon: true - type: button - tap_action: - action: call-service - service: input_select.select_next - service_data: {} - target: - entity_id: input_select.indoor_camera_cycle - entity: '' - icon: mdi:arrow-right - icon_height: 25px - - !include /config/lovelace/templates/indoor-camera-cycler.yaml - - - type: vertical-stack - cards: - - type: grid - square: false - columns: 4 - cards: - - show_name: true - show_icon: true - type: button - tap_action: - action: call-service - service: input_select.select_previous - service_data: {} - target: - entity_id: input_select.outdoor_camera_cycle - entity: '' - icon: mdi:arrow-left - icon_height: 25px - - show_name: false - show_icon: false - type: button - tap_action: - action: more-info - entity: input_select.outdoor_camera_cycle - show_state: true - - show_name: false - show_icon: true - type: button - tap_action: - action: toggle - entity: input_boolean.outdoor_camera_lock - show_state: true - icon_height: 25px - - show_name: true - show_icon: true - type: button - tap_action: - action: call-service - service: input_select.select_next - service_data: {} - target: - entity_id: input_select.outdoor_camera_cycle - entity: '' - icon: mdi:arrow-right - icon_height: 25px - - !include /config/lovelace/templates/outdoor-camera-cycler.yaml diff --git a/lovelace/view-ha-floorplan.yaml b/lovelace/view-ha-floorplan.yaml index c48d5a0..ee9defb 100644 --- a/lovelace/view-ha-floorplan.yaml +++ b/lovelace/view-ha-floorplan.yaml @@ -11,7 +11,7 @@ cards: config: image: /local/floorplan/fullsized_floorplan.svg stylesheet: /local/floorplan/floorplan.css - #log_level: debug + # log_level: debug console_log_level: debug defaults: hover_action: hover-info @@ -116,7 +116,7 @@ cards: class: water-dry - entities: - - binary_sensor.gray_suv_east_side + #- binary_sensor.gray_suv_east_side - binary_sensor.gray_suv_west_side states: - state: "on" @@ -124,6 +124,14 @@ cards: - state: "off" class: "hidden-entity" + - entities: + - device_tracker.chevrolet_traverse_location + states: + - state: "home" + class: "suv-home" + - state_not: "home" + class: "hidden_entity" + # - entities: # - input_select.camera14_preset # states: diff --git a/lovelace/view-overview.yaml b/lovelace/view-overview.yaml index 4947911..623cb86 100644 --- a/lovelace/view-overview.yaml +++ b/lovelace/view-overview.yaml @@ -1194,15 +1194,15 @@ cards: name: Frigate state_filter: - "error" - - entity: binary_sensor.front_yard_plant_monitor_status - state_filter: - - "off" + # - entity: binary_sensor.front_yard_plant_monitor_status + # state_filter: + # - "off" - entity: binary_sensor.pm_status state_filter: - "off" - - entity: binary_sensor.furnace_room_multisensor_status - state_filter: - - "off" + # - entity: binary_sensor.furnace_room_multisensor_status + # state_filter: + # - "off" - entity: binary_sensor.nursery_tagreader_status state_filter: - "off" diff --git a/lovelace/view-surveillance-card.yaml b/lovelace/view-surveillance-card.yaml index 830728b..cd13268 100644 --- a/lovelace/view-surveillance-card.yaml +++ b/lovelace/view-surveillance-card.yaml @@ -21,8 +21,8 @@ cards: motion_entity: binary_sensor.frigate_cam08_person_occupancy - entity: camera.frigate_cam12 motion_entity: binary_sensor.frigate_cam12_person_occupancy - - entity: camera.frigate_cam13 - motion_entity: binary_sensor.frigate_cam13_person_occupancy + # - entity: camera.frigate_cam13 + # motion_entity: binary_sensor.frigate_cam13_person_occupancy - entity: camera.frigate_cam01 motion_entity: binary_sensor.frigate_cam01_person_occupancy - entity: camera.frigate_cam03 @@ -39,7 +39,7 @@ cards: # motion_entity: binary_sensor.frigate_cam10_person_occupancy - entity: camera.frigate_cam04 motion_entity: binary_sensor.frigate_cam04_person_occupancy - - entity: camera.frigate_cam14 - motion_entity: binary_sensor.frigate_cam14_person_occupancy + # - entity: camera.frigate_cam14 + # motion_entity: binary_sensor.frigate_cam14_person_occupancy - entity: camera.frigate_cam19 motion_entity: binary_sensor.frigate_cam19_person_occupancy diff --git a/ui-cameras.yaml b/ui-cameras.yaml index 412c592..16a2c13 100644 --- a/ui-cameras.yaml +++ b/ui-cameras.yaml @@ -6,7 +6,6 @@ views: - !include lovelace/view-surveillance.yaml - !include lovelace/view-cameras.yaml - !include lovelace/view-camera-overview.yaml - - !include lovelace/view-ai-overview.yaml - !include lovelace/frigate/view-ai-cam08.yaml - !include lovelace/frigate/view-ai-cam12.yaml - !include lovelace/frigate/view-ai-cam13.yaml diff --git a/www/floorplan/fullsized_floorplan.svg b/www/floorplan/fullsized_floorplan.svg index d8eaeec..ac6a0f2 100644 --- a/www/floorplan/fullsized_floorplan.svg +++ b/www/floorplan/fullsized_floorplan.svg @@ -38,18 +38,18 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="0.014142136" - inkscape:cx="64417.426" - inkscape:cy="22945.614" + inkscape:zoom="0.080000002" + inkscape:cx="30968.749" + inkscape:cy="10593.75" inkscape:document-units="px" - inkscape:current-layer="thermal-comfort-group-template-5-01" + inkscape:current-layer="layer1" showgrid="true" units="in" inkscape:pagecheckerboard="false" showborder="true" inkscape:window-width="1920" inkscape:window-height="1009" - inkscape:window-x="1912" + inkscape:window-x="-8" inkscape:window-y="-8" inkscape:window-maximized="1" showguides="true" @@ -1429,12 +1429,12 @@ inkscape:label="binary_sensor.front_door_contact" /> + inkscape:label="binary_sensor.inner_garage_door" /> + inkscape:label="binary_sensor.furnace_room_door" /> + inkscape:label="binary_sensor.outer_garage_door" /> - inkscape:label="light.front_porch_overhead" />