From 44156e91f9e3a2bdc02998fe61db7307c113bd2b Mon Sep 17 00:00:00 2001 From: CeeWeasel Date: Sat, 4 May 2024 11:22:33 -0400 Subject: [PATCH] Fuck absolutely everything!!! --- .../packages/{ => appliances}/keurig.yaml | 8 ++-- lovelace/view-ha-floorplan.yaml | 20 +++++----- lovelace/view-overview.yaml | 18 ++++++++- www/floorplan/fullsized_floorplan.svg | 40 +++++++++---------- 4 files changed, 51 insertions(+), 35 deletions(-) rename components/packages/{ => appliances}/keurig.yaml (82%) diff --git a/components/packages/keurig.yaml b/components/packages/appliances/keurig.yaml similarity index 82% rename from components/packages/keurig.yaml rename to components/packages/appliances/keurig.yaml index 898725f..a515976 100644 --- a/components/packages/keurig.yaml +++ b/components/packages/appliances/keurig.yaml @@ -40,20 +40,20 @@ binary_sensor: keurig_on: friendly_name: 'Keurig On' - value_template: "{{ states('sensor.pm_kitchen_2_w') | float(default=0) < states('input_number.keurig_on') | float(default=0) }}" + value_template: "{{ states('sensor.shelly_keurig_w') | float(default=0) < states('input_number.keurig_on') | float(default=0) }}" keurig_warming_water: friendly_name: 'Keurig Warming Water' - value_template: "{{ states('sensor.pm_kitchen_2_w') | float(default=0) > states('input_number.keurig_warming_water') | float(default=0) }}" + value_template: "{{ states('sensor.shelly_keurig_w') | float(default=0) > states('input_number.keurig_warming_water') | float(default=0) }}" delay_off: "00:00:20" keurig_brewing: friendly_name: 'Keurig Brewing' - value_template: "{{ states('sensor.pm_kitchen_2_w') | float(default=0) > states('input_number.keurig_brewing') | float(default=0) }}" + value_template: "{{ states('sensor.shelly_keurig_w') | float(default=0) > states('input_number.keurig_brewing') | float(default=0) }}" keurig_pouring: friendly_name: 'Keurig Pouring' - value_template: "{{ states('sensor.pm_kitchen_2_w') | float(default=0) > states('input_number.keurig_pouring') | float(default=0) }}" + value_template: "{{ states('sensor.shelly_keurig_w') | float(default=0) > states('input_number.keurig_pouring') | float(default=0) }}" keurig: #This still needs to watch the Shelly sensor, rather than the circuit, so devices plugged into other outlets don't interfere with this sensor. unique_id: templatebinarysensor.keurig diff --git a/lovelace/view-ha-floorplan.yaml b/lovelace/view-ha-floorplan.yaml index 0befe5e..b2185ae 100644 --- a/lovelace/view-ha-floorplan.yaml +++ b/lovelace/view-ha-floorplan.yaml @@ -643,22 +643,22 @@ cards: - binary_sensor.front_porch_motion - binary_sensor.deck_motion - binary_sensor.entryway_motion - - binary_sensor.frigate_cam01_motion + - binary_sensor.frigate_cam01_person_occupancy #- binary_sensor.frigate_cam02_person_occupancy - - binary_sensor.frigate_cam03_motion - - binary_sensor.frigate_cam04_motion + - binary_sensor.frigate_cam03_person_occupancy + - binary_sensor.frigate_cam04_person_occupancy #- binary_sensor.frigate_cam05_person_occupancy - - binary_sensor.frigate_cam06_motion - - binary_sensor.frigate_cam07_motion - - binary_sensor.frigate_cam08_motion + - binary_sensor.frigate_cam06_person_occupancy + - binary_sensor.frigate_cam07_person_occupancy + - binary_sensor.frigate_cam08_person_occupancy #- binary_sensor.frigate_cam09_person_occupancy #- binary_sensor.frigate_cam10_person_occupancy #- binary_sensor.frigate_cam11_person_occupancy - - binary_sensor.frigate_cam12_motion - - binary_sensor.frigate_cam13_motion + - binary_sensor.frigate_cam12_person_occupancy + - binary_sensor.frigate_cam13_person_occupancy #- binary_sensor.frigate_cam14_motion - - binary_sensor.frigate_cam14_all_occupancy - - binary_sensor.frigate_cam18_motion + - binary_sensor.frigate_cam14_person_occupancy + - binary_sensor.frigate_cam18_person_occupancy #- binary_sensor.frigate_cam19_motion - binary_sensor.frigate_cam19_person_occupancy - binary_sensor.bar_motion diff --git a/lovelace/view-overview.yaml b/lovelace/view-overview.yaml index 3e35540..a2f18dc 100644 --- a/lovelace/view-overview.yaml +++ b/lovelace/view-overview.yaml @@ -1369,6 +1369,10 @@ cards: name: Comp. Desk - entity: camera.frigate_cam04 name: Garage + - entity: camera.frigate_cam06 + name: MBR Left + - entity: camera.frigate_cam07 + name: MBR Right - entity: camera.frigate_cam08 name: Nursery - entity: camera.frigate_cam12 @@ -1377,6 +1381,8 @@ cards: name: Front Room - entity: camera.frigate_cam14 name: Back Yard + - entity: camera.frigate_cam18 + name: Front Yard - entity: camera.frigate_cam19 name: Front Porch @@ -1404,7 +1410,7 @@ cards: icon: mdi:cctv state_filter: - "not_home" - - entity: device_tracker.amcrest_technologies_35_5d_c3 + - entity: device_tracker.amcrest_technologies_22_da_66 name: Garage icon: mdi:cctv state_filter: @@ -1434,6 +1440,16 @@ cards: icon: mdi:cctv state_filter: - "not_home" + # - entity: device_tracker.amcrest_technologies_36_22_3a + # name: Back Yard + # icon: mdi:cctv + # state_filter: + # - "not_home" + - entity: device_tracker.amcrest_technologies_35_5d_c3 + name: Front Yard + icon: mdi:cctv + state_filter: + - "not_home" - entity: device_tracker.amcrest_technologies_38_66_bc name: Front Porch icon: mdi:cctv diff --git a/www/floorplan/fullsized_floorplan.svg b/www/floorplan/fullsized_floorplan.svg index 1907cd6..1f5c214 100644 --- a/www/floorplan/fullsized_floorplan.svg +++ b/www/floorplan/fullsized_floorplan.svg @@ -3023,7 +3023,7 @@ @@ -3560,7 +3560,7 @@ d="m -13182.25,11895.266 a 9.9992313,10 0 0 1 -10,-9.982 l 9.999,-0.02 z" /> @@ -5698,7 +5698,7 @@ d="m 17637.001,945.99921 a 9.9992313,10 0 0 1 -10,-9.98175 l 9.999,-0.0183 z" />