diff --git a/automations/people/Clint/wake_clint.yaml b/automations/people/Clint/wake_clint.yaml index 13e1a21..7c91ad4 100644 --- a/automations/people/Clint/wake_clint.yaml +++ b/automations/people/Clint/wake_clint.yaml @@ -4,27 +4,25 @@ id: automation_wake_clint initial_state: on #description: trigger: - platform: time - at: input_datetime.clint_next_alarm -# condition: -# - condition: state -# entity_id: binary_sensor.is_workday -# state: 'on' + trigger: time + at: + entity_id: input_datetime.clint_next_alarm + offset: "-300" action: - service: input_boolean.turn_off data: entity_id: input_boolean.master_bedroom_asleep + - delay: + hours: 0 + minutes: 5 + seconds: 0 + milliseconds: 0 + - service: media_player.volume_set data: entity_id: media_player.master_bedroom_clock - volume_level: 0.95 - - - delay: - hours: 0 - minutes: 0 - seconds: 5 - milliseconds: 0 + volume_level: 0.50 - choose: - conditions: diff --git a/automations/rooms/great_room/great_room_light_cycle.yaml b/automations/rooms/great_room/great_room_light_cycle.yaml index bc0fb26..a6a51d0 100644 --- a/automations/rooms/great_room/great_room_light_cycle.yaml +++ b/automations/rooms/great_room/great_room_light_cycle.yaml @@ -15,18 +15,6 @@ trigger: from: 'on' to: 'off' - # - id: projector_off - # platform: state - # entity_id: switch.shelly_projector - # from: 'on' - # to: 'off' - - # - id: projector_on - # platform: state - # entity_id: switch.shelly_projector - # from: 'off' - # to: 'on' - - id: setting_change platform: state entity_id: @@ -40,8 +28,8 @@ action: - choose: - conditions: - condition: state - entity_id: switch.shelly_projector - state: 'on' + entity_id: media_player.downstairs_roku + state: 'playing' sequence: - service: light.turn_off target: @@ -61,8 +49,8 @@ action: entity_id: input_boolean.great_room_cycle_same state: 'on' - condition: state - entity_id: switch.shelly_projector - state: 'off' + entity_id: media_player.downstairs_roku + state: 'idle' sequence: - service: light.turn_on target: @@ -109,8 +97,8 @@ action: entity_id: input_boolean.great_room_cycle_same state: 'on' - condition: state - entity_id: switch.shelly_projector - state: 'on' + entity_id: media_player.downstairs_roku + state: 'playing' sequence: - service: light.turn_on target: @@ -280,8 +268,8 @@ action: - choose: # If the projector is off, go ahead and reference all the lights - conditions: - condition: state - entity_id: switch.shelly_projector - state: 'off' + entity_id: media_player.downstairs_roku + state: 'idle' sequence: - service: light.turn_on data_template: diff --git a/automations/rooms/master_bedroom/master_bedroom_awake.yaml b/automations/rooms/master_bedroom/master_bedroom_awake.yaml index f8b34ec..2c9250a 100644 --- a/automations/rooms/master_bedroom/master_bedroom_awake.yaml +++ b/automations/rooms/master_bedroom/master_bedroom_awake.yaml @@ -18,7 +18,7 @@ condition: entity_id: input_boolean.kristy_home state: 'on' - - alias: "Before 10:00PM and after 4:00AM" + - alias: "Before 9:00PM and after 4:00AM" condition: time before: '21:00:00' after: '04:00:00' diff --git a/automations/rooms/master_bedroom/master_bedroom_white_noise_off.yaml b/automations/rooms/master_bedroom/master_bedroom_white_noise_off.yaml index 255bc1c..5bedfa7 100644 --- a/automations/rooms/master_bedroom/master_bedroom_white_noise_off.yaml +++ b/automations/rooms/master_bedroom/master_bedroom_white_noise_off.yaml @@ -7,8 +7,8 @@ trigger: to: "off" action: - - action: media_player.media_stop + - action: media_player.turn_off data: {} target: - device_id: d534ab473e271021b537397cbc6fe700 + entity_id: media_player.ma_master_bedroom_clock diff --git a/automations/rooms/master_bedroom/master_bedroom_white_noise_on.yaml b/automations/rooms/master_bedroom/master_bedroom_white_noise_on.yaml index adef8fe..c43b014 100644 --- a/automations/rooms/master_bedroom/master_bedroom_white_noise_on.yaml +++ b/automations/rooms/master_bedroom/master_bedroom_white_noise_on.yaml @@ -15,7 +15,7 @@ action: data: volume_level: 0.25 target: - device_id: d534ab473e271021b537397cbc6fe700 + entity_id: media_player.ma_master_bedroom_clock #- service: script.goodnight_kids_youtube_music @@ -25,13 +25,13 @@ action: data: shuffle: false target: - device_id: d534ab473e271021b537397cbc6fe700 + entity_id: media_player.ma_master_bedroom_clock - action: media_player.repeat_set metadata: {} data: - repeat: "off" + repeat: "all" target: - device_id: d534ab473e271021b537397cbc6fe700 + entity_id: media_player.ma_master_bedroom_clock - action: music_assistant.play_media metadata: {} data: @@ -39,12 +39,5 @@ action: media_type: track enqueue: replace target: - device_id: d534ab473e271021b537397cbc6fe700 - - action: music_assistant.play_media - target: - device_id: d534ab473e271021b537397cbc6fe700 - data: - media_id: library://track/101 - media_type: track - enqueue: add + entity_id: media_player.ma_master_bedroom_clock diff --git a/automations/rooms/nursery/nursery_white_noise_on.yaml b/automations/rooms/nursery/nursery_white_noise_on.yaml index fe44521..21a501a 100644 --- a/automations/rooms/nursery/nursery_white_noise_on.yaml +++ b/automations/rooms/nursery/nursery_white_noise_on.yaml @@ -17,21 +17,33 @@ action: target: entity_id: media_player.ma_nursery_hub - #- service: input_select.select_option - # data: - # entity_id: input_select.nursery_mode - # option: 'Off' + - action: media_player.volume_set + data: + volume_level: 0.25 + target: + entity_id: media_player.ma_nursery_hub - # The kids can turn on their own sounds. Just stop the music - # - service: media_player.volume_set - # data: - # volume_level: 0.6 - # target: - # entity_id: media_player.nursery_hub - # - service: media_player.play_media - # target: - # entity_id: media_player.nursery_hub - # data: - # media_content_id: media-source://media_source/local/sounds/relaxing/thunderstorm/thunderstorm.mp3 - # media_content_type: audio/mpeg + #- service: script.goodnight_kids_youtube_music + + - action: media_player.shuffle_set + metadata: {} + data: + shuffle: false + target: + entity_id: media_player.ma_nursery_hub + - action: media_player.repeat_set + metadata: {} + data: + repeat: "all" + target: + entity_id: media_player.ma_nursery_hub + - action: music_assistant.play_media + metadata: {} + data: + media_id: library://track/101 + media_type: track + enqueue: replace + target: + entity_id: media_player.ma_nursery_hub + diff --git a/components/packages/ambientsounds.yaml b/components/packages/ambientsounds.yaml index 5477729..30c310b 100644 --- a/components/packages/ambientsounds.yaml +++ b/components/packages/ambientsounds.yaml @@ -119,37 +119,37 @@ script: {% elif is_state("input_select.google_home", "Everywhere") %} media_player.all_speakers {% endif %} media_content_id: > - {% if is_state("input_select.ambient_sound", "Babbling Brook") %} media-source://media_source/local/sounds/relaxing/babbling_brook.mp3 - {% elif is_state("input_select.ambient_sound", "Female Baby Shusher") %} media-source://media_source/local/sounds/relaxing/baby_shusher_hol.mp3 - {% elif is_state("input_select.ambient_sound", "Male Baby Shusher") %} media-source://media_source/local/sounds/relaxing/baby_shusher_jmp.mp3 - {% elif is_state("input_select.ambient_sound", "Country Night") %} media-source://media_source/local/sounds/relaxing/country_night.mp3 - {% elif is_state("input_select.ambient_sound", "Fireplace") %} media-source://media_source/local/sounds/relaxing/fireplace.mp3 - {% elif is_state("input_select.ambient_sound", "Forest") %} media-source://media_source/local/sounds/relaxing/forest.mp3 - {% elif is_state("input_select.ambient_sound", "Female Lullaby") %} media-source://media_source/local/sounds/relaxing/luh_lullaby_hol.mp3 - {% elif is_state("input_select.ambient_sound", "Male Lullaby") %} media-source://media_source/local/sounds/relaxing/luh_lullaby_jmp.mp3 - {% elif is_state("input_select.ambient_sound", "Ocean") %} media-source://media_source/local/sounds/relaxing/ocean.mp3 - {% elif is_state("input_select.ambient_sound", "Oscillating Fan") %} media-source://media_source/local/sounds/relaxing/oscillating_fan.mp3 - {% elif is_state("input_select.ambient_sound", "Pink Noise") %} media-source://media_source/local/sounds/relaxing/pink_noise.mp3 - {% elif is_state("input_select.ambient_sound", "Rain") %} media-source://media_source/local/sounds/relaxing/rain.mp3 - {% elif is_state("input_select.ambient_sound", "River") %} media-source://media_source/local/sounds/relaxing/river.mp3 - {% elif is_state("input_select.ambient_sound", "Female Rock-a-bye Baby") %} media-source://media_source/local/sounds/relaxing/rock_a_bye_baby_hol.mp3 - {% elif is_state("input_select.ambient_sound", "Male Rock-a-bye Baby") %} media-source://media_source/local/sounds/relaxing/rock_a_bye_baby_jmp.mp3 - {% elif is_state("input_select.ambient_sound", "Thunderstorm") %} media-source://media_source/local/sounds/relaxing/thunderstorm.mp3 - {% elif is_state("input_select.ambient_sound", "Female Twinkle Twinkle") %} media-source://media_source/local/sounds/relaxing/twinkle_twinkle_hol.mp3 - {% elif is_state("input_select.ambient_sound", "Male Twinkle Twinkle") %} media-source://media_source/local/sounds/relaxing/twinkle_twinkle_jmp.mp3 - {% elif is_state("input_select.ambient_sound", "White Noise") %} media-source://media_source/local/sounds/relaxing/white_noise.mp3 + {% if is_state("input_select.ambient_sound", "Babbling Brook") %} media-source://media_source/relaxing/babbling_brook.mp3 + {% elif is_state("input_select.ambient_sound", "Female Baby Shusher") %} media-source://media_source/relaxing/baby_shusher_hol.mp3 + {% elif is_state("input_select.ambient_sound", "Male Baby Shusher") %} media-source://media_source/relaxing/baby_shusher_jmp.mp3 + {% elif is_state("input_select.ambient_sound", "Country Night") %} media-source://media_source/relaxing/country_night.mp3 + {% elif is_state("input_select.ambient_sound", "Fireplace") %} media-source://media_source/relaxing/fireplace.mp3 + {% elif is_state("input_select.ambient_sound", "Forest") %} media-source://media_source/relaxing/forest.mp3 + {% elif is_state("input_select.ambient_sound", "Female Lullaby") %} media-source://media_source/relaxing/luh_lullaby_hol.mp3 + {% elif is_state("input_select.ambient_sound", "Male Lullaby") %} media-source://media_source/relaxing/luh_lullaby_jmp.mp3 + {% elif is_state("input_select.ambient_sound", "Ocean") %} media-source://media_source/relaxing/ocean.mp3 + {% elif is_state("input_select.ambient_sound", "Oscillating Fan") %} media-source://media_source/relaxing/oscillating_fan.mp3 + {% elif is_state("input_select.ambient_sound", "Pink Noise") %} media-source://media_source/relaxing/pink_noise.mp3 + {% elif is_state("input_select.ambient_sound", "Rain") %} media-source://media_source/relaxing/rain.mp3 + {% elif is_state("input_select.ambient_sound", "River") %} media-source://media_source/relaxing/river.mp3 + {% elif is_state("input_select.ambient_sound", "Female Rock-a-bye Baby") %} media-source://media_source/relaxing/rock_a_bye_baby_hol.mp3 + {% elif is_state("input_select.ambient_sound", "Male Rock-a-bye Baby") %} media-source://media_source/relaxing/rock_a_bye_baby_jmp.mp3 + {% elif is_state("input_select.ambient_sound", "Thunderstorm") %} media-source://media_source/relaxing/thunderstorm.mp3 + {% elif is_state("input_select.ambient_sound", "Female Twinkle Twinkle") %} media-source://media_source/relaxing/twinkle_twinkle_hol.mp3 + {% elif is_state("input_select.ambient_sound", "Male Twinkle Twinkle") %} media-source://media_source/relaxing/twinkle_twinkle_jmp.mp3 + {% elif is_state("input_select.ambient_sound", "White Noise") %} media-source://media_source/relaxing/white_noise.mp3 {% elif is_state("input_select.ambient_sound", "Random White Noise") %} - {% set noises = ['media-source://media_source/local/sounds/relaxing/babbling_brook.mp3', - 'media-source://media_source/local/sounds/relaxing/country_night.mp3', - 'media-source://media_source/local/sounds/relaxing/oscillating_fan.mp3', - 'media-source://media_source/local/sounds/relaxing/rain.mp3', - 'media-source://media_source/local/sounds/relaxing/river.mp3', - 'media-source://media_source/local/sounds/relaxing/thunderstorm.mp3'] %} + {% set noises = ['media-source://media_source/relaxing/babbling_brook.mp3', + 'media-source://media_source/relaxing/country_night.mp3', + 'media-source://media_source/relaxing/oscillating_fan.mp3', + 'media-source://media_source/relaxing/rain.mp3', + 'media-source://media_source/relaxing/river.mp3', + 'media-source://media_source/relaxing/thunderstorm.mp3'] %} {{ noises|random }} {% elif is_state("input_select.ambient_sound", "Random Kids Noise") %} - {% set noises = ['media-source://media_source/local/sounds/relaxing/baby_shusher_hol.mp3', - 'media-source://media_source/local/sounds/relaxing/luh_lullaby_hol.mp3', - 'media-source://media_source/local/sounds/relaxing/twinkle_twinkle_hol.mp3'] %} + {% set noises = ['media-source://media_source/relaxing/baby_shusher_hol.mp3', + 'media-source://media_source/relaxing/luh_lullaby_hol.mp3', + 'media-source://media_source/relaxing/twinkle_twinkle_hol.mp3'] %} {{ noises|random }} {% endif %} media_content_type: "audio/mp4" diff --git a/components/packages/databases.yaml b/components/packages/databases.yaml index aec18bc..582d984 100644 --- a/components/packages/databases.yaml +++ b/components/packages/databases.yaml @@ -32,6 +32,7 @@ recorder: - input_select.master_bedroom_camera - automation.cycle_cameras - input_select.outdoor_camera_cycle + - input_select.indoor_camera_cycle - sensor.nws_alerts_last_updated entity_globs: - sensor.*_text diff --git a/components/packages/rtl_433_devices/back_yard_thermostat.yaml b/components/packages/rtl_433_devices/back_yard_thermostat.yaml new file mode 100644 index 0000000..6413999 --- /dev/null +++ b/components/packages/rtl_433_devices/back_yard_thermostat.yaml @@ -0,0 +1,57 @@ +mqtt: + sensor: + - name: "Timestamp" + device_class: timestamp + icon: mdi:clock-in + state_topic: "rtl_433/9b13b3f4-rtl433/devices/Acurite-Tower/A/6162/time" + force_update: true + entity_category: diagnostic + unique_id: AcuriteTower-6162-A-UTC + device: + identifiers: AcuriteTower-6162-A + name: Acurite 592TXR A + model: Acurite 592TXR + manufacturer: rtl_433 + + - name: "Battery" + device_class: battery + unit_of_measurement: "%" + value_template: "{{ (float(value) * 99 + 1) | round(0) }}" + state_class: measurement + entity_category: diagnostic + state_topic: "rtl_433/9b13b3f4-rtl433/devices/Acurite-Tower/A/6162/battery_ok" + force_update: true + unique_id: AcuriteTower-6162-A-B + device: + identifiers: AcuriteTower-6162-A + name: Acurite 592TXR A + model: Acurite 592TXRv2 + manufacturer: rtl_433 + + - name: "Temperature" + device_class: temperature + unit_of_measurement: "°C" + value_template: "{{ value|float }}" + state_class: measurement + state_topic: "rtl_433/9b13b3f4-rtl433/devices/Acurite-Tower/A/6162/temperature_C" + force_update: true + unique_id: AcuriteTower-6162-A-T + device: + identifiers: AcuriteTower-6162-A + name: Acurite 592TXR A + model: Acurite 592TXR + manufacturer: rtl_433 + + - name: "Humidity" + device_class: humidity + unit_of_measurement: "%" + value_template: "{{ value|float }}" + state_class: measurement + state_topic: "rtl_433/9b13b3f4-rtl433/devices/Acurite-Tower/A/6162/humidity" + force_update: true + unique_id: AcuriteTower-6162-A-H + device: + identifiers: AcuriteTower-6162-A + name: Acurite 592TXR A + model: Acurite 592TXR + manufacturer: rtl_433 \ No newline at end of file diff --git a/lovelace/details/view-hvac.yaml b/lovelace/details/view-hvac.yaml index 2e21933..295d12a 100644 --- a/lovelace/details/view-hvac.yaml +++ b/lovelace/details/view-hvac.yaml @@ -28,10 +28,10 @@ cards: - type: horizontal-stack cards: - type: custom:mushroom-entity-card - entity: sensor.lacrosse_tx141thbv2_0_temperature + entity: sensor.outdoor_temperature name: Temperature - type: custom:mushroom-entity-card - entity: sensor.lacrosse_tx141thbv2_0_humidity + entity: sensor.outdoor_humidity name: Humidity - type: horizontal-stack cards: @@ -1723,14 +1723,10 @@ cards: - value: below_horizon label: Night entities: - - entity: sensor.front_porch_temperature - name: Front Porch - entity: sensor.lacrosse_tx141thbv2_0_temperature - name: Under Front Room - - entity: sensor.deck_temperature - name: Deck - - entity: sensor.nexus_th_1_temperature - name: Under Deck + name: Front Yard + - entity: sensor.acurite_592txr_a_temperature + name: Back Yard - color: white entity: sensor.outdoor_temperature name: Outside diff --git a/lovelace/view-ha-floorplan.yaml b/lovelace/view-ha-floorplan.yaml index 4b00c41..66b58af 100644 --- a/lovelace/view-ha-floorplan.yaml +++ b/lovelace/view-ha-floorplan.yaml @@ -425,6 +425,7 @@ cards: # - sensor.hvac_multisensor_supply # - sensor.hvac_multisensor_return # - sensor.hvac_multisensor_ambient + - sensor.acurite_592txr_a_temperature - sensor.outdoor_temperature # text_template: '${entity.state ? entity.state : "unknown"} F' # An example of rounding up a number, i.e. a temperature of 90.1 becomes 91 @@ -523,6 +524,8 @@ cards: - entities: - sensor.lacrosse_tx141thbv2_0_humidity - sensor.garage_multisensor_humidity + - sensor.acurite_592txr_a_humidity + - sensor.outdoor_humidity text_template: '${entity.state ? Math.ceil(entity.state) : "unknown"} %' class_template: ' var humid = parseFloat(entity.state.replace("%", "")); diff --git a/www/floorplan/fullsized_floorplan.svg b/www/floorplan/fullsized_floorplan.svg index 4a06605..9d3b66f 100644 --- a/www/floorplan/fullsized_floorplan.svg +++ b/www/floorplan/fullsized_floorplan.svg @@ -39,8 +39,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.01" - inkscape:cx="65849.998" - inkscape:cy="16250" + inkscape:cx="52050" + inkscape:cy="21950" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -49,7 +49,7 @@ 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" @@ -3864,7 +3864,7 @@ d="m 720.0222,-17679.003 a 4.5,4.5 0 0 1 4.99225,3.941 4.5,4.5 0 0 1 -3.93422,4.997 4.5,4.5 0 0 1 -5.00204,-3.928 4.5,4.5 0 0 1 3.92178,-5.007" inkscape:label="light.storage_room" sodipodi:arc-type="arc" /> - inkscape:label="light.front_porch_overhead" /> + --------- ---------- --------- +--------- +--------- +--------- +--------- + transform="matrix(0.52345088,0,0,0.52345088,582.41401,-8497.9465)">