#1367 - removed all IFTTT references. Updated notifications to have actionable items and snooze. also using the shutoff value switch to trigger and execute. And some other misc updates.

config/.HA_VERSION

@@ -1 +1 @@
-2024.11.0
+2024.12.1

config/automation/Timed_Triggers/sunset_turn_on.yaml

@@ -48,7 +48,7 @@
        - switch.front_door_outlet
        - switch.foyer_outlet
        - switch.den_outlet
-       - switch.front_office_window
+       - switch.front_office_lamp
        - switch.living_room_outlet
        - switch.living_room_tv_outlet
     - service: light.turn_on

config/automation/late_night_helper.yaml

@@ -23,8 +23,8 @@
   action:
     - service: light.turn_on
       entity_id:
-        - light.living_room_slider
+        - light.slider
-        - light.foyer_door
+        - light.foyer
         - light.fridge
         - light.M1_front_right
         - light.S1
@@ -37,14 +37,15 @@
     - service: switch.turn_on
       entity_id:
         - group.kitchen_Accents
+        - switch.front_office_lamp
     - delay: '00:05:00'
     - service: light.turn_off
       entity_id:
         - light.S1
         - light.S4
-        - light.foyer_door
+        - light.foyer
         - light.fridge
-        - light.living_room_slider
+        - light.slider
         - light.M1_front_right
 
 

config/group/switches.yaml

@@ -18,11 +18,9 @@ Interior Switches:
     - switch.foyer_outlet
     - switch.den_outlet
     - switch.living_room_outlet
-    # - switch.living_room_outlet_2
     - switch.living_room_tv_outlet
     - switch.office_lamp_switch_socket
-    - switch.front_office_window
+    - switch.front_office_lamp
-    - switch.front_office_window_led
 
 Kitchen Accents:
   entities:

config/homekit.yaml

@@ -28,7 +28,8 @@ filter:
     - camera.filtergate
     - camera.frontdoorbell
     - camera.poolcam
-    - camera.birdseye
+    - camera.frontlawn
+    - camera.garagecam
     - light.bedroom
     - light.bedroom_lights
     - light.den_lights
@@ -56,20 +57,28 @@ entity_config:
   camera.frontdoorbell:
     linked_motion_sensor: binary_sensor.frontdoorbell_all_occupancy
     video_codec: copy
-    stream_source: !secret camera1_stream
+    stream_source: rtsp://192.168.10.14:8554/frontdoorbell?mp4
-  camera.carlo_nvr_camera2:
-    linked_motion_sensor: binary_sensor.camera2_motion_sensor
-    video_codec: copy
-    stream_source: !secret camera2_stream
-  camera.carlo_nvr_camera3:
-    linked_motion_sensor: binary_sensor.camera3_motion_sensor
-    video_codec: copy
-    stream_source: !secret camera3_stream
   camera.poolcam:
     linked_motion_sensor: binary_sensor.poolcam_motion_sensor
     video_codec: copy
-    stream_source: !secret camera4_stream
+    stream_source: rtsp://192.168.10.14:8554/poolcam?mp4
-  camera.birdseye:
+  camera.frontlawn:
-    linked_motion_sensor: binary_sensor.birdseye_motion_sensor
+    linked_motion_sensor: binary_sensor.frontlawn_motion_sensor
+    video_codec: copy
+    stream_source: rtsp://192.168.10.14:8554/frontlawn?mp4
+  camera.garagecam:
+    linked_motion_sensor: binary_sensor.garagecam_motion_sensor
+    video_codec: copy
+    stream_source: rtsp://192.168.10.14:8554/garagecam?mp4
+  camera.bedroomgate:
+    linked_motion_sensor: binary_sensor.bedroomgate_motion_sensor
+    video_codec: copy
+    stream_source: rtsp://192.168.10.14:8554/bedroomgate?mp4
+  camera.driveway:
+    linked_motion_sensor: binary_sensor.driveway_motion_sensor
+    video_codec: copy
+    stream_source: rtsp://192.168.10.14:8554/driveway?mp4
+  camera.filtergate:
+    linked_motion_sensor: binary_sensor.filtergate_motion_sensor
     video_codec: copy
-    stream_source: !secret camera5_stream
+    stream_source: rtsp://192.168.10.14:8554/filtergate?mp4

config/packages/phynplus.yaml

@@ -10,27 +10,26 @@
 ######################################################################
 
 automation:
-  ###################################
-  ##  From IFTTT - Notifications
-  ###################################
   - alias: 'Phyn ShutOff Notification'
     id: 78bbd270-ee1e-4b3d-80fd-44ce7c66dab5
     mode: single
 
     trigger:
-      - platform: event
+      - platform: state
-        #Sent from IFTTT Webhooks : {"action":"IFTTT_Phyn", "alert_type":" {{AlertType}}", "where":"{{SuggestedFixtures}}"}
+        entity_id: switch.phyn_shutoff_valve
-        event_type: ifttt_webhook_received
+        to: 'off'
-        event_data:
-          action: IFTTT_Phyn
 
     action:
-      - service: script.notify_engine
+      - service: script.notify_engine_two_button
         data:
           title: 'Phyn Leak Detection'
-          value1: 'Phyn is sensing {{ trigger.event.data.alert_type }} and turned off the water.  Please verify {{ trigger.event.data.where }}.'
+          value1: 'Phyn is sensing a leak and turned off the water.  Please verify.'
           who: 'parents'
           group: 'Phyn'
+          action1: 'PHYN_WATER_ON'
+          action2: 'SNOOZE_PHYN_NOTIFICATION'
+          icon1: 'sfsymbols:arrow.up.circle'
+          icon2: 'sfsymbols:clock'
           level: 'critical'
 
   - alias: Turn Phyn Water On
@@ -41,13 +40,13 @@ automation:
       event_data:
         action: PHYN_WATER_ON
     action:
-      - service: ifttt.trigger
+      - service: homeassistant.turn_on
-        data: {"event":"phyn_water_on"}
+        entity_id: switch.phyn_shutoff_valve
 
       - service: script.notify_engine
         data:
           title: 'Phyn Leak Detection'
-          value1: 'Request Recieved. Attempting to Turn the Water back on.'
+          value1: 'Request Received. Attempting to Turn the Water back on.'
           who: 'parents'
           group: 'Phyn'
           level: 'time-sensitive'
@@ -57,3 +56,24 @@ automation:
           value1: >
             I have been asked to Turn the House Water back on.  Please verify there are no leaks in the house.
           call_no_announcement: 1
+
+  - alias: Snooze Phyn Notification
+    id: 2f295bb8-8925-4b22-PHYN-9fe079b295a8
+    trigger:
+      platform: event
+      event_type: mobile_app_notification_action
+      event_data:
+        action: SNOOZE_PHYN_NOTIFICATION
+    action:
+      - delay: '00:30:00'
+      - service: script.notify_engine_two_button
+        data:
+          title: 'Phyn Leak Detection'
+          value1: 'Phyn is sensing a leak and turned off the water.  Please verify.'
+          who: 'parents'
+          group: 'Phyn'
+          action1: 'PHYN_WATER_ON'
+          action2: 'SNOOZE_PHYN_NOTIFICATION'
+          icon1: 'sfsymbols:arrow.up.circle'
+          icon2: 'sfsymbols:clock'
+          level: 'critical'