Updated for some Camera fixes. Moving everything over to frigate. #1461

config/.HA_VERSION

@@ -1 +1 @@
-2024.5.5
+2024.7.0.dev202406190219

config/group/motion.yaml

@@ -4,6 +4,6 @@ motion:
     - binary_sensor.office_motion
     - binary_sensor.entry_alarm_panel
     - binary_sensor.bedroom_alarm_panel
-    - binary_sensor.camera1_motion_sensor
+    - binary_sensor.frontdoorbell_all_occupancy
     - binary_sensor.camera2_motion_sensor
     - binary_sensor.camera3_motion_sensor

config/homekit.yaml

@@ -20,10 +20,12 @@ filter:
     - scene
     - light
   include_entities:
-    - camera.carlo_nvr_camera1
+    - camera.bedroomgate
-    - camera.carlo_nvr_camera2
+    - camera.driveway
-    - camera.carlo_nvr_camera3
+    - camera.filtergate
-    - camera.front_door
+    - camera.frontdoorbell
+    - camera.poolcam
+    - camera.birdseye
     - light.bedroom
     - light.bedroom_lights
     - light.den_lights
@@ -48,8 +50,8 @@ filter:
     - climate.spaceship_hvac_climate_system
     
 entity_config:
-  camera.carlo_nvr_camera1:
+  camera.frontdoorbell:
-    linked_motion_sensor: binary_sensor.camera1_motion_sensor
+    linked_motion_sensor: binary_sensor.frontdoorbell_all_occupancy
     video_codec: copy
     stream_source: !secret camera1_stream
   camera.carlo_nvr_camera2:

config/packages/foscam.yaml

@@ -1,43 +0,0 @@
-#-------------------------------------------
-# @CCOSTAN
-# Original Repo : https://github.com/CCOSTAN/Home-AssistantConfig
-# More Info : https://www.vcloudinfo.com/2019/03/using-foscam-cameras-with-home-assistant-and-synology.html
-#-------------------------------------------
-
-binary_sensor:
-  - platform: rest
-    name: "CAMERA1 Motion Sensor"
-    resource: !secret camera1_url
-    device_class: motion
-    scan_interval: 5
-    value_template: >-
-      {%- if "<motionDetectAlarm>2</motionDetectAlarm>" in value -%}
-        {{ true }}
-      {%- else -%}
-        {{ false }}
-      {%- endif -%}
-  - platform: rest
-    name: "CAMERA2 Motion Sensor"
-    resource: !secret camera2_url
-    device_class: motion
-    scan_interval: 5
-    value_template: >-
-      {%- if "<motionDetectAlarm>2</motionDetectAlarm>" in value -%}
-        {{ true }}
-      {%- else -%}
-        {{ false }}
-      {%- endif -%}
-  - platform: rest
-    name: "CAMERA3 Motion Sensor"
-    resource: !secret camera3_url
-    device_class: motion
-    scan_interval: 5
-    value_template: >-
-      {%- if "<motionDetectAlarm>2</motionDetectAlarm>" in value -%}
-        {{ true }}
-      {%- else -%}
-        {{ false }}
-      {%- endif -%}
-#-------------------------------------------
-# Motion Sensors added to other motion sensors in group yaml
-#-------------------------------------------

config/templates/speech/briefing.yaml

@@ -120,7 +120,9 @@
   {%- endmacro -%}
 
   {%- macro moon() -%}
+        {% if (now().hour == 17) %}
         Current Moon phase: {{ states('sensor.moon') }} [Give a fact and mention today's phase]
+        {% endif %}
   {%- endmacro -%}
 
   {%- macro uv() -%}
@@ -173,7 +175,7 @@
   {% endmacro %}
 
   {%- macro traffic_time() -%} 
-         Current traffic is Spectrum Offices: {{ states.sensor.waze_travel_time.state }} minutes.   
+         Current traffic to Spectrum Offices: {{ states.sensor.waze_travel_time.state }} minutes.   
   {%- endmacro -%}
 
   {# a macro that removes all newline characters, empty spaces, and returns formatted text and replaces underscores with spaces  #}