diff --git a/components/input_numbers/max_outside_temp.yaml b/components/input_numbers/max_outside_temp.yaml deleted file mode 100644 index 583e4e2..0000000 --- a/components/input_numbers/max_outside_temp.yaml +++ /dev/null @@ -1,5 +0,0 @@ -name: Max Outside Temp -min: 70 -max: 90 -step: 1 -mode: box diff --git a/components/packages/automatic_sprinkler_system.yaml b/components/packages/automatic_sprinkler_system.yaml index 90dc492..d915b9a 100644 --- a/components/packages/automatic_sprinkler_system.yaml +++ b/components/packages/automatic_sprinkler_system.yaml @@ -505,17 +505,17 @@ automation: id: automation_sprinkler_check_maximum_temperature_when_temperature_changes trigger: - platform: state - entity_id: sensor.outdoors_mean_temperature + entity_id: sensor.outdoor_temperature condition: - condition: numeric_state - entity_id: sensor.outdoors_mean_temperature + entity_id: sensor.outdoor_temperature above: input_number.sprinkler_maximum_temperature_measured action: service: input_number.set_value target: entity_id: input_number.sprinkler_maximum_temperature_measured data: - value: "{{ states('sensor.outdoors_mean_temperature') | float(default=50) }}" + value: "{{ states('sensor.outdoor_temperature') | float(default=50) }}" - alias: "Sprinkler: Stop Watering If Starts Raining" id: 74ef91ed-6665-4e24-a817-c1a3540d2e3d @@ -686,7 +686,7 @@ script: target: entity_id: input_number.sprinkler_maximum_temperature_measured data: - value: "{{ states('sensor.outdoors_mean_temperature') | float(default=50) }}" + value: "{{ states('sensor.outdoor_temperature') | float(default=50) }}" - service: input_datetime.set_datetime target: diff --git a/components/packages/bayesian_testing.yaml b/components/packages/bayesian_testing.yaml deleted file mode 100644 index 34ff486..0000000 --- a/components/packages/bayesian_testing.yaml +++ /dev/null @@ -1,68 +0,0 @@ -binary_sensor: - - name: 'Bayesian Crunching' - platform: 'bayesian' - prior: 0.25 - probability_threshold: 0.7 - observations: - - entity_id: 'input_boolean.bayesian_test_1' # Motion - prob_given_true: 0.99 - prob_given_false: 0.85 - platform: 'state' - to_state: 'on' - - - entity_id: 'input_boolean.bayesian_test_2' # Person - prob_given_true: 0.99 - prob_given_false: 0.85 - platform: 'state' - to_state: 'on' - - - entity_id: 'input_boolean.bayesian_test_3' # Home Occupied - prob_given_true: 0.99 - prob_given_false: 0.01 - platform: 'state' - to_state: 'on' - - # - entity_id: 'input_boolean.bayesian_test_4' # person occupancy - # prob_given_true: 0.99 - # prob_given_false: 0.97 - # platform: 'state' - # to_state: 'on' - - # - entity_id: 'input_boolean.bayesian_test_5' # dreambox recently active - # prob_given_true: 0.75 - # prob_given_false: 0.5 - # platform: 'state' - # to_state: 'on' - -input_boolean: - bayesian_test_1: - name: Bayesian Test 1 - icon: mdi:numeric-1-circle - - bayesian_test_2: - name: Bayesian Test 2 - icon: mdi:numeric-2-circle - - bayesian_test_3: - name: Bayesian Test 3 - icon: mdi:numeric-3-circle - - bayesian_test_4: - name: Bayesian Test 4 - icon: mdi:numeric-4-circle - - bayesian_test_5: - name: Bayesian Test 5 - icon: mdi:numeric-5-circle - - bayesian_test_6: - name: Bayesian Test 6 - icon: mdi:numeric-6-circle - - bayesian_test_7: - name: Bayesian Test 7 - icon: mdi:numeric-7-circle - - bayesian_test_8: - name: Bayesian Test 8 - icon: mdi:numeric-8-circle \ No newline at end of file diff --git a/components/packages/databases.yaml b/components/packages/databases.yaml index c04e7a7..aec18bc 100644 --- a/components/packages/databases.yaml +++ b/components/packages/databases.yaml @@ -32,9 +32,6 @@ recorder: - input_select.master_bedroom_camera - automation.cycle_cameras - input_select.outdoor_camera_cycle - - automation.cam14_ptz_presets - - automation.cam14_ptz_move - - automation.cycle_back_yard_camera - sensor.nws_alerts_last_updated entity_globs: - sensor.*_text @@ -125,7 +122,6 @@ history: # entities: # - binary_sensor.have_custody # - sensor.mail_image_url - # - automation.cam14_ptz_move # - automation.cycle_back_yard_camera # - input_select.camera14_preset # - input_select.indoor_camera_cycle @@ -193,10 +189,6 @@ logbook: - sensor.time_utc - sensor.hvac_multisensor_delta - sensor.master_bed_person_count - - automation.cam14_ptz_move - - automation.cycle_back_yard_camera - - input_select.camera14_preset - - input_select.indoor_camera_cycle - sensor.lights_on_count entity_globs: diff --git a/components/packages/hvac_stats.yaml b/components/packages/hvac_stats.yaml index 9af549d..2fee764 100644 --- a/components/packages/hvac_stats.yaml +++ b/components/packages/hvac_stats.yaml @@ -117,16 +117,6 @@ sensor: - sensor.mancave_thermostat_humidity - sensor.blue_room_thermostat_humidity - - platform: statistics - unique_id: statistics_outdoors_mean_temperature - name: Outdoors Mean Temperature - entity_id: sensor.outdoor_temperature - state_characteristic: mean - sampling_size: 20 - precision: 1 - max_age: - minutes: 5 - - platform: history_stats name: AC Cooling Time Today entity_id: sensor.hvac_action diff --git a/components/packages/plants.yaml b/components/packages/plants.yaml index 83a1b7a..61aa4d2 100644 --- a/components/packages/plants.yaml +++ b/components/packages/plants.yaml @@ -47,7 +47,7 @@ plant: fineoffset_wh51_00f935: sensors: moisture: sensor.fineoffset_wh51_00f935_moisture - temperature: sensor.outdoors_mean_temperature + temperature: sensor.outdoor_temperature battery: sensor.fineoffset_wh51_00f935_battery brightness: sensor.outdoors_mean_illuminance min_moisture: 15 @@ -60,7 +60,7 @@ plant: fineoffset_wh51_0ce593: sensors: moisture: sensor.fineoffset_wh51_0ce593_moisture - temperature: sensor.outdoors_mean_temperature + temperature: sensor.outdoor_temperature battery: sensor.fineoffset_wh51_0ce593_battery brightness: sensor.outdoors_mean_illuminance min_moisture: 15 @@ -73,7 +73,7 @@ plant: fineoffset_wh51_0d1e11: sensors: moisture: sensor.fineoffset_wh51_0d1e11_moisture - temperature: sensor.outdoors_mean_temperature + temperature: sensor.outdoor_temperature battery: sensor.fineoffset_wh51_0d1e11_battery brightness: sensor.outdoors_mean_illuminance min_moisture: 15 diff --git a/components/packages/rtl_433_devices/outdoor_thermostat.yaml b/components/packages/rtl_433_devices/outdoor_thermostat.yaml index ca5f42e..08f89dd 100644 --- a/components/packages/rtl_433_devices/outdoor_thermostat.yaml +++ b/components/packages/rtl_433_devices/outdoor_thermostat.yaml @@ -3,7 +3,7 @@ mqtt: - name: "Timestamp" device_class: timestamp icon: mdi:clock-in - state_topic: "rtl_433/9b13b3f4-rtl433/devices/LaCrosse-TX141THBv2/0/76/time" + state_topic: "rtl_433/9b13b3f4-rtl433/devices/LaCrosse-TX141THBv2/0/106/time" force_update: true entity_category: diagnostic unique_id: LaCrosse-TX141THBv2-0-UTC @@ -19,7 +19,7 @@ mqtt: value_template: "{{ (float(value) * 99 + 1) | round(0) }}" state_class: measurement entity_category: diagnostic - state_topic: "rtl_433/9b13b3f4-rtl433/devices/LaCrosse-TX141THBv2/0/76/battery_ok" + state_topic: "rtl_433/9b13b3f4-rtl433/devices/LaCrosse-TX141THBv2/0/106/battery_ok" force_update: true unique_id: LaCrosse-TX141THBv2-0-B device: @@ -33,7 +33,7 @@ mqtt: unit_of_measurement: "°C" value_template: "{{ value|float }}" state_class: measurement - state_topic: "rtl_433/9b13b3f4-rtl433/devices/LaCrosse-TX141THBv2/0/76/temperature_C" + state_topic: "rtl_433/9b13b3f4-rtl433/devices/LaCrosse-TX141THBv2/0/106/temperature_C" force_update: true unique_id: LaCrosse-TX141THBv2-0-T device: @@ -47,7 +47,7 @@ mqtt: unit_of_measurement: "%" value_template: "{{ value|float }}" state_class: measurement - state_topic: "rtl_433/9b13b3f4-rtl433/devices/LaCrosse-TX141THBv2/0/76/humidity" + state_topic: "rtl_433/9b13b3f4-rtl433/devices/LaCrosse-TX141THBv2/0/106/humidity" force_update: true unique_id: LaCrosse-TX141THBv2-0-H device: diff --git a/components/packages/sprinklers.yaml b/components/packages/sprinklers.yaml index 91eb877..6a9ed2e 100644 --- a/components/packages/sprinklers.yaml +++ b/components/packages/sprinklers.yaml @@ -7,13 +7,13 @@ switch: value_template: "{{ is_state('binary_sensor.front_yard_station_running', 'on') }}" icon_template: mdi:sprinkler turn_on: - service: opensprinkler.run + action: opensprinkler.run data_template: entity_id: binary_sensor.front_yard_station_running # Run seconds uses the input_number below. run_seconds: "{{ ((states('input_number.front_yard_station_minutes') | float) * 60) | int }}" turn_off: - service: opensprinkler.stop + action: opensprinkler.stop data: entity_id: binary_sensor.front_yard_station_running @@ -23,13 +23,13 @@ switch: value_template: "{{ is_state('binary_sensor.east_side_station_running', 'on') }}" icon_template: mdi:sprinkler turn_on: - service: opensprinkler.run + action: opensprinkler.run data_template: entity_id: binary_sensor.east_side_station_running # Run seconds uses the input_number below. run_seconds: "{{ ((states('input_number.east_side_station_minutes') | float) * 60) | int }}" turn_off: - service: opensprinkler.stop + action: opensprinkler.stop data: entity_id: binary_sensor.east_side_station_running @@ -39,13 +39,13 @@ switch: value_template: "{{ is_state('binary_sensor.back_yard_station_running', 'on') }}" icon_template: mdi:sprinkler turn_on: - service: opensprinkler.run + action: opensprinkler.run data_template: entity_id: binary_sensor.back_yard_station_running # Run seconds uses the input_number below. run_seconds: "{{ ((states('input_number.back_yard_station_minutes') | float) * 60) | int }}" turn_off: - service: opensprinkler.stop + action: opensprinkler.stop data: entity_id: binary_sensor.back_yard_station_running @@ -55,13 +55,13 @@ switch: value_template: "{{ is_state('binary_sensor.west_side_station_running', 'on') }}" icon_template: mdi:sprinkler turn_on: - service: opensprinkler.run + action: opensprinkler.run data_template: entity_id: binary_sensor.west_side_station_running # Run seconds uses the input_number below. run_seconds: "{{ ((states('input_number.west_side_station_minutes') | float) * 60) | int }}" turn_off: - service: opensprinkler.stop + action: opensprinkler.stop data: entity_id: binary_sensor.west_side_station_running @@ -135,36 +135,36 @@ automation: mode: queued trigger: - id: 5_minute_test_program_enabled - platform: state + trigger: state entity_id: input_button.5_minute_test - id: front_yard_fun_program_enabled - platform: state + trigger: state entity_id: input_button.front_yard_fun - id: back_yard_fun_program_enabled - platform: state + trigger: state entity_id: input_button.back_yard_fun - id: evening_program_enabled - platform: state + trigger: state entity_id: input_button.evening_program - id: morning_program_enabled - platform: state + trigger: state entity_id: input_button.morning_program - id: full_run_program_enabled - platform: state + trigger: state entity_id: input_button.full_run_program - id: automatic_run_program_enabled - platform: state + trigger: state entity_id: input_button.automatic_run_program condition: [] action: - - service: opensprinkler.run + - action: opensprinkler.run data: entity_id: "switch.{{ trigger.id }}" @@ -176,12 +176,12 @@ automation: mode: queued trigger: - id: opensprinkler_enabled - platform: state + trigger: state entity_id: input_button.stop_all_sprinklers condition: [] action: - - service: opensprinkler.stop + - action: opensprinkler.stop data: entity_id: "switch.{{ trigger.id }}" diff --git a/components/packages/temperature_management.yaml b/components/packages/temperature_management.yaml index 1c6f37b..d2579d4 100644 --- a/components/packages/temperature_management.yaml +++ b/components/packages/temperature_management.yaml @@ -24,11 +24,11 @@ template: seconds: 15 delay_off: seconds: 15 - availability: "{{ (states('sensor.upstairs_mean_temperature') not in ['unknown', 'unavailable']) and (states('sensor.outdoors_mean_temperature') not in ['unknown', 'unavailable']) }}" - state: "{{ iif(states('sensor.outdoors_mean_temperature') | float(default=0) - states('input_number.warmer_outside_difference_trigger') | float(default=0) > states('sensor.upstairs_mean_temperature') | float(default=0) ) }}" + availability: "{{ (states('sensor.upstairs_mean_temperature') not in ['unknown', 'unavailable']) and (states('sensor.outdoor_temperature') not in ['unknown', 'unavailable']) }}" + state: "{{ iif(states('sensor.outdoor_temperature') | float(default=0) - states('input_number.warmer_outside_difference_trigger') | float(default=0) > states('sensor.upstairs_mean_temperature') | float(default=0) ) }}" attributes: indoors: "{{ states('sensor.upstairs_mean_temperature') | float(default=0) }}" - outdoors: "{{ states('sensor.outdoors_mean_temperature') | float(default=0) }}" + outdoors: "{{ states('sensor.outdoor_temperature') | float(default=0) }}" trigger: "{{ states('input_number.warmer_outside_difference_trigger') | float(default=0) }}" # This is ON when it is cooler outside than it is inside, as defined by input_number.cooler_outside_difference_trigger @@ -40,11 +40,11 @@ template: seconds: 15 delay_off: seconds: 15 - availability: "{{ (states('sensor.upstairs_mean_temperature') not in ['unknown', 'unavailable']) and (states('sensor.outdoors_mean_temperature') not in ['unknown', 'unavailable']) }}" - state: "{{ iif(states('sensor.outdoors_mean_temperature') | float(default=0) + states('input_number.cooler_outside_difference_trigger') | float(default=0) < states('sensor.upstairs_mean_temperature') | float(default=0) ) }}" + availability: "{{ (states('sensor.upstairs_mean_temperature') not in ['unknown', 'unavailable']) and (states('sensor.outdoor_temperature') not in ['unknown', 'unavailable']) }}" + state: "{{ iif(states('sensor.outdoor_temperature') | float(default=0) + states('input_number.cooler_outside_difference_trigger') | float(default=0) < states('sensor.upstairs_mean_temperature') | float(default=0) ) }}" attributes: indoors: "{{ states('sensor.upstairs_mean_temperature') | float(default=0)}}" - outdoors: "{{ states('sensor.outdoors_mean_temperature') | float(default=0)}}" + outdoors: "{{ states('sensor.outdoor_temperature') | float(default=0)}}" trigger: "{{ states('input_number.cooler_outside_difference_trigger') | float(default=0) }}" # This is ON when the temperature outside is hotter than the temp_high configured as part of the climate platform @@ -56,10 +56,10 @@ template: seconds: 15 delay_off: seconds: 15 - availability: "{{ (states('climate.thermostat') not in ['unknown', 'unavailable']) and (states('sensor.outdoors_mean_temperature') not in ['unknown', 'unavailable']) }}" - state: "{{states('sensor.outdoors_mean_temperature') | float(default=0) > states('sensor.hvac_target_temp_high') | float(default=0) - (states('input_number.warmer_outside_difference_trigger') | float(default=0) / 2) }}" + availability: "{{ (states('climate.thermostat') not in ['unknown', 'unavailable']) and (states('sensor.outdoor_temperature') not in ['unknown', 'unavailable']) }}" + state: "{{states('sensor.outdoor_temperature') | float(default=0) > states('sensor.hvac_target_temp_high') | float(default=0) - (states('input_number.warmer_outside_difference_trigger') | float(default=0) / 2) }}" attributes: - outdoor_temp: "{{ states('sensor.outdoors_mean_temperature') | float(default=0)}}" + outdoor_temp: "{{ states('sensor.outdoor_temperature') | float(default=0)}}" target_temp_high: "{{ state_attr('climate.thermostat','target_temp_high') | float(default=0)}}" # This is ON when the thermostat is hotter than the temp_high configured as part of the climate platform @@ -83,10 +83,10 @@ template: seconds: 15 delay_off: seconds: 15 - availability: "{{ (states('climate.thermostat') not in ['unknown', 'unavailable']) and (states('sensor.outdoors_mean_temperature') not in ['unknown', 'unavailable']) }}" - state: "{{states('sensor.outdoors_mean_temperature') | float(default=0) < states('sensor.hvac_target_temp_low') | float(default=0) - (states('input_number.cooler_outside_difference_trigger') | float(default=0) ) }}" + availability: "{{ (states('climate.thermostat') not in ['unknown', 'unavailable']) and (states('sensor.outdoor_temperature') not in ['unknown', 'unavailable']) }}" + state: "{{states('sensor.outdoor_temperature') | float(default=0) < states('sensor.hvac_target_temp_low') | float(default=0) - (states('input_number.cooler_outside_difference_trigger') | float(default=0) ) }}" attributes: - outdoor_temp: "{{ states('sensor.outdoors_mean_temperature') | float(default=0)}}" + outdoor_temp: "{{ states('sensor.outdoor_temperature') | float(default=0)}}" target_temp_low: "{{ state_attr('climate.thermostat','target_temp_low') | float(default=0)}}" # This is ON when the thermostat is hotter than the temp_high configured as part of the climate platform @@ -142,7 +142,7 @@ template: {{'false'}} {% endif %} attributes: - outdoor_temp: "{{ states('sensor.outdoors_mean_temperature') | float(default=0)}}" + outdoor_temp: "{{ states('sensor.outdoor_temperature') | float(default=0)}}" upstairs_mean_temp: "{{ states('sensor.upstairs_mean_temperature') | float(default=0)}}" target_temp_high: "{{ state_attr('climate.thermostat','target_temp_high') | float(default=0)}}" target_temp_low: "{{ state_attr('climate.thermostat','target_temp_low') | float(default=0)}}" @@ -171,7 +171,7 @@ template: {{'false'}} {% endif %} attributes: - outdoor_temp: "{{ states('sensor.outdoors_mean_temperature') | float(default=0)}}" + outdoor_temp: "{{ states('sensor.outdoor_temperature') | float(default=0)}}" upstairs_mean_temp: "{{ states('sensor.upstairs_mean_temperature') | float(default=0)}}" target_temp_high: "{{ state_attr('climate.thermostat','target_temp_high') | float(default=0)}}" target_temp_low: "{{ state_attr('climate.thermostat','target_temp_low') | float(default=0)}}" @@ -193,7 +193,7 @@ template: state_class: measurement unit_of_measurement: p attributes: - outdoor_temp: "{{ states('sensor.outdoors_mean_temperature') | float(default=0)}}" + outdoor_temp: "{{ states('sensor.outdoor_temperature') | float(default=0)}}" target_temp_high: "{{ state_attr('climate.thermostat','target_temp_high') | float(default=0)}}" target_temp_low: "{{ state_attr('climate.thermostat','target_temp_low') | float(default=0)}}" getting_warmer: "{{ states('binary_sensor.getting_warmer_outside') }}" diff --git a/groups.yaml b/groups.yaml index 32957a5..42a3f57 100644 --- a/groups.yaml +++ b/groups.yaml @@ -213,20 +213,12 @@ person_bridget: entities: - device_tracker.bridget_s_fire_wifi -saturn: - name: Saturn - icon: mdi:car-side - entities: - - binary_sensor.green_car_east_side - - binary_sensor.green_car_west_side - #- binary_sensor.frigate_cam04_vehicle_occupancy traverse: name: Traverse icon: mdi:car-estate entities: - binary_sensor.gray_suv_east_side - - binary_sensor.gray_suv_west_side - binary_sensor.east_side_vehicle_occupancy person_tess: diff --git a/lovelace/details/view-hvac.yaml b/lovelace/details/view-hvac.yaml index 8fab271..2e21933 100644 --- a/lovelace/details/view-hvac.yaml +++ b/lovelace/details/view-hvac.yaml @@ -1634,7 +1634,7 @@ cards: action: more-info - type: custom:mini-graph-card - name: Temperature + name: Inside state_map: - value: "on" label: Day @@ -1649,8 +1649,6 @@ cards: name: Front Room - entity: sensor.master_bedroom_multisensor_air_temperature name: Bedroom - - entity: sensor.garage_multisensor_air_temperature - name: Garage - entity: sensor.nursery_multisensor_air_temperature name: Nursery - entity: sensor.kitchen_multisensor_air_temperature @@ -1660,7 +1658,81 @@ cards: - entity: sensor.great_room_multisensor_air_temperature name: Great Room - color: white - entity: sensor.outdoors_mean_temperature + entity: sensor.outdoor_temperature + name: Outside + show_line: false + show_points: false + show_legend: false + - color: black + entity: sensor.sun_elevation + name: Night + show_line: false + show_points: false + show_legend: false + y_axis: secondary + lower_bound: 60 + line_width: 1 + hour24: true + hours_to_show: 24 + points_per_hour: 4 + color_thresholds: + - value: 58 + color: "#260d8f" + - value: 60 + color: "#251ab9" + - value: 62 + color: "#0f28e5" + - value: 64 + color: "#007eff" + - value: 66 + color: "#00aaf9" + - value: 68 + color: "#00cc9e" + - value: 70 + color: "#59E442" + - value: 72 + color: "#59E442" + - value: 74 + color: "#7fd206" + - value: 76 + color: "#97bf00" + - value: 78 + color: "#aaac00" + - value: 80 + color: "#b89700" + - value: 82 + color: "#c18200" + - value: 84 + color: "#c86c00" + - value: 86 + color: "#ca5400" + - value: 88 + color: "#c93905" + - value: 90 + color: "#c4161e" + + - type: custom:mini-graph-card + name: Outside + state_map: + - value: "on" + label: Day + - value: "off" + label: Night + - value: above_horizon + label: Day + - 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 + - color: white + entity: sensor.outdoor_temperature name: Outside show_line: false show_points: false diff --git a/lovelace/phone/blue-room.yaml b/lovelace/phone/blue-room.yaml index 81e5ed5..2f87110 100644 --- a/lovelace/phone/blue-room.yaml +++ b/lovelace/phone/blue-room.yaml @@ -68,7 +68,7 @@ cards: - type: horizontal-stack cards: - type: custom:mini-media-player - entity: media_player.utility_room_clock + entity: media_player.blue_room_clock artwork: cover-fit - type: vertical-stack cards: diff --git a/lovelace/phone/front-room.yaml b/lovelace/phone/front-room.yaml index b7f5ae4..0f044b1 100644 --- a/lovelace/phone/front-room.yaml +++ b/lovelace/phone/front-room.yaml @@ -3,9 +3,10 @@ subview: true title: Front Room path: front-room icon: mdi:television +type: sections badges: [] -cards: - - type: vertical-stack +sections: + - type: grid cards: - type: custom:mushroom-chips-card chips: @@ -24,7 +25,7 @@ cards: detail: 1 entity: sensor.front_room_thermostat_humidity name: Humidity - - type: vertical-stack + - type: grid cards: - type: custom:mushroom-title-card subtitle: Lights @@ -89,17 +90,14 @@ cards: entity: input_select.front_room_color_set name: Color layout: vertical - - type: vertical-stack + - type: grid cards: - type: custom:mushroom-title-card subtitle: Devices - - type: custom:mini-media-player - entity: media_player.front_room_tv - artwork: cover-fit - type: custom:mini-media-player entity: media_player.front_room_hub artwork: cover-fit - - type: vertical-stack + - type: grid cards: - type: custom:mushroom-title-card subtitle: Sensors @@ -127,13 +125,10 @@ cards: name: Window layout: vertical secondary_info: none - - type: vertical-stack + - type: grid cards: - type: custom:mushroom-title-card subtitle: Cameras - !include /config/lovelace/cameras/view-camera-13.yaml - - type: vertical-stack - cards: - - type: custom:mushroom-title-card - subtitle: TV - - !include /config/lovelace/templates/front-room-roku-card.yaml \ No newline at end of file + + - !include /config/lovelace/templates/front-room-remote.yaml \ No newline at end of file diff --git a/lovelace/phone/great-room.yaml b/lovelace/phone/great-room.yaml index 79e6279..c26364f 100644 --- a/lovelace/phone/great-room.yaml +++ b/lovelace/phone/great-room.yaml @@ -4,8 +4,9 @@ title: Great Room path: great-room icon: mdi:microsoft-xbox-controller badges: [] -cards: - - type: vertical-stack +type: sections +sections: + - type: grid cards: - type: custom:mushroom-chips-card chips: @@ -24,7 +25,7 @@ cards: detail: 1 entity: sensor.great_room_multisensor_humidity name: Humidity - - type: vertical-stack + - type: grid cards: - type: custom:mushroom-title-card subtitle: Lights @@ -58,29 +59,16 @@ cards: name: Naturally Lit layout: vertical secondary_info: none - - type: vertical-stack + - type: grid cards: - type: custom:mushroom-title-card subtitle: Devices - - type: horizontal-stack - cards: - - type: custom:mushroom-entity-card - entity: switch.shelly_projector - name: Projector - layout: vertical - hide_icon: false - secondary_info: none - type: horizontal-stack cards: - type: custom:mini-media-player entity: media_player.great_room artwork: cover-fit - - type: horizontal-stack - cards: - - type: custom:mini-media-player - entity: media_player.downstairs_roku - artwork: cover-fit - - type: vertical-stack + - type: grid cards: - type: custom:mushroom-title-card subtitle: Sensors @@ -96,3 +84,5 @@ cards: name: Person layout: vertical secondary_info: none + + - !include /config/lovelace/templates/great-room-remote.yaml diff --git a/lovelace/room_cards/back_yard.yaml b/lovelace/room_cards/back_yard.yaml index dc7b97d..ddcb7d2 100644 --- a/lovelace/room_cards/back_yard.yaml +++ b/lovelace/room_cards/back_yard.yaml @@ -13,16 +13,16 @@ elements: top: 88% text-transform: capitalize - - type: custom:mushroom-template-card - primary: "{{ states('input_select.camera14_preset') }}" - entity: input_select.camera14_preset - tap_action: - action: more-info - style: - font-style: italic - left: 75% - top: 88% - text-transform: capitalize + # - type: custom:mushroom-template-card + # primary: "{{ states('input_select.camera14_preset') }}" + # entity: input_select.camera14_preset + # tap_action: + # action: more-info + # style: + # font-style: italic + # left: 75% + # top: 88% + # text-transform: capitalize - type: state-label entity: sensor.deck_temperature @@ -105,25 +105,25 @@ elements: action: navigate navigation_path: /phone-yaml/plants - - type: "custom:button-card" - color: auto - entity: camera.frigate_cam14 - show_name: false - show_entity_picture: true - style: - left: 75% - top: 65% - styles: - card: - #- border-radius: 50px - - width: 50px - - height: 50px - icon: - - width: 45px - - height: 45px - tap_action: - action: navigate - navigation_path: /ai-yml/ai-cam14 + # - type: "custom:button-card" + # color: auto + # entity: camera.frigate_cam14 + # show_name: false + # show_entity_picture: true + # style: + # left: 75% + # top: 65% + # styles: + # card: + # #- border-radius: 50px + # - width: 50px + # - height: 50px + # icon: + # - width: 45px + # - height: 45px + # tap_action: + # action: navigate + # navigation_path: /ai-yml/ai-cam14 # 12,31,50,69,88 # 14,38,62,86 # 25,50,75 diff --git a/lovelace/room_cards/front_room.yaml b/lovelace/room_cards/front_room.yaml index 679602f..94cbddb 100644 --- a/lovelace/room_cards/front_room.yaml +++ b/lovelace/room_cards/front_room.yaml @@ -85,25 +85,25 @@ elements: hold_action: action: more-info type: "custom:button-card" - - type: "custom:button-card" - color: auto - entity: camera.frigate_cam13 - show_name: false - show_entity_picture: true - style: - left: 38% - top: 65% - styles: - card: - #- border-radius: 50px - - width: 50px - - height: 50px - icon: - - width: 45px - - height: 45px - tap_action: - action: navigate - navigation_path: /ai-yml/ai-cam13 + # - type: "custom:button-card" + # color: auto + # entity: camera.frigate_cam13 + # show_name: false + # show_entity_picture: true + # style: + # left: 38% + # top: 65% + # styles: + # card: + # #- border-radius: 50px + # - width: 50px + # - height: 50px + # icon: + # - width: 45px + # - height: 45px + # tap_action: + # action: navigate + # navigation_path: /ai-yml/ai-cam13 - type: "custom:button-card" color: auto entity: media_player.front_room_tv diff --git a/lovelace/room_cards/great_room.yaml b/lovelace/room_cards/great_room.yaml index 08d6988..2cef969 100644 --- a/lovelace/room_cards/great_room.yaml +++ b/lovelace/room_cards/great_room.yaml @@ -36,7 +36,7 @@ elements: - type: state-icon entity: binary_sensor.great_room_occupied style: - left: 60% + left: 68% top: 9% # - type: state-icon # entity: group.great_room_motion @@ -45,19 +45,9 @@ elements: # top: 9% - type: state-icon entity: binary_sensor.storage_room_door_contact - style: - left: 68% - top: 9% - #top icon spot #2 - - type: state-icon - entity: switch.shelly_projector style: left: 76% top: 9% - tap_action: - action: toggle - hold_action: - action: more-info #top icon spot #3 - type: state-icon entity: switch.great_room_light_cycle diff --git a/lovelace/templates/front-room-roku-card.yaml b/lovelace/templates/front-room-roku-card.yaml deleted file mode 100644 index 826119f..0000000 --- a/lovelace/templates/front-room-roku-card.yaml +++ /dev/null @@ -1,369 +0,0 @@ -type: vertical-stack -cards: - - type: custom:roku-card - entity: media_player.front_room_tv - tv: true - name: Front Room - apps: - - image: /local/netflix-icon.png - app: Netflix - tap_action: - action: call-service - service: media_player.select_source - service_data: - entity_id: media_player.front_room_tv - source: Netflix - - image: /local/youtube-icon.png - app: YouTube - tap_action: - action: call-service - service: media_player.select_source - service_data: - source: YouTube - entity_id: media_player.front_room_tv - # - image: /local/baby-yoda.png - # app: Disney Plus - # tap_action: - # action: call-service - # service: media_player.select_source - # service_data: - # source: Disney Plus - # entity_id: media_player.front_room_tv - - image: /local/primevideo-icon.png - app: Prime Video - tap_action: - action: call-service - service: media_player.select_source - service_data: - source: Prime Video - entity_id: media_player.front_room_tv - - icon: mdi:light-flood-down - tap_action: - action: call-service - service: input_boolean.toggle - service_data: - entity_id: input_boolean.front_room_light_cycle - volume_up: - tap_action: - action: call-service - service: remote.send_command - service_data: - entity_id: remote.front_room_tv - command: volume_up - volume_down: - tap_action: - action: call-service - service: remote.send_command - service_data: - entity_id: remote.front_room_tv - command: volume_down - - - type: vertical-stack - cards: - - type: custom:mushroom-entity-card - entity: input_boolean.lovelace_front_room_roku_keyboard - name: Keyboard - secondary_info: none - primary_info: none - tap_action: - action: toggle - layout: horizontal - - type: conditional - conditions: - - entity: input_boolean.lovelace_front_room_roku_keyboard - state: 'on' - card: - type: vertical-stack - cards: - - type: custom:mushroom-chips-card - alignment: center - chips: - - type: action - icon: mdi:numeric-1-box - tap_action: - action: call-service - service: rest_command.numeric_1_on_roku_1 - data: {} - target: {} - - type: action - icon: mdi:numeric-2-box - tap_action: - action: call-service - service: rest_command.numeric_2_on_roku_1 - data: {} - target: {} - - type: action - icon: mdi:numeric-3-box - tap_action: - action: call-service - service: rest_command.numeric_3_on_roku_1 - data: {} - target: {} - - type: action - icon: mdi:numeric-4-box - tap_action: - action: call-service - service: rest_command.numeric_4_on_roku_1 - data: {} - target: {} - - type: action - icon: mdi:numeric-5-box - tap_action: - action: call-service - service: rest_command.numeric_5_on_roku_1 - data: {} - target: {} - - type: action - icon: mdi:numeric-6-box - tap_action: - action: call-service - service: rest_command.numeric_6_on_roku_1 - data: {} - target: {} - - type: action - icon: mdi:numeric-7-box - tap_action: - action: call-service - service: rest_command.numeric_7_on_roku_1 - data: {} - target: {} - - type: action - icon: mdi:numeric-8-box - tap_action: - action: call-service - service: rest_command.numeric_8_on_roku_1 - data: {} - target: {} - - type: action - icon: mdi:numeric-9-box - tap_action: - action: call-service - service: rest_command.numeric_9_on_roku_1 - data: {} - target: {} - - type: action - icon: mdi:numeric-0-box - tap_action: - action: call-service - service: rest_command.numeric_0_on_roku_1 - data: {} - target: {} - - type: custom:mushroom-chips-card - alignment: center - chips: - - type: action - icon: 'mdi:alpha-q-box' - tap_action: - action: call-service - service: rest_command.lowercase_q_on_roku_1 - hold_action: - action: call-service - service: rest_command.uppercase_q_on_roku_1 - - type: action - icon: 'mdi:alpha-w-box' - tap_action: - action: call-service - service: rest_command.lowercase_w_on_roku_1 - hold_action: - action: call-service - service: rest_command.uppercase_w_on_roku_1 - - type: action - icon: 'mdi:alpha-e-box' - tap_action: - action: call-service - service: rest_command.lowercase_e_on_roku_1 - hold_action: - action: call-service - service: rest_command.uppercase_e_on_roku_1 - - type: action - icon: 'mdi:alpha-r-box' - tap_action: - action: call-service - service: rest_command.lowercase_r_on_roku_1 - hold_action: - action: call-service - service: rest_command.uppercase_r_on_roku_1 - - type: action - icon: 'mdi:alpha-t-box' - tap_action: - action: call-service - service: rest_command.lowercase_t_on_roku_1 - hold_action: - action: call-service - service: rest_command.uppercase_t_on_roku_1 - - type: action - icon: 'mdi:alpha-y-box' - tap_action: - action: call-service - service: rest_command.lowercase_y_on_roku_1 - hold_action: - action: call-service - service: rest_command.uppercase_y_on_roku_1 - - type: action - icon: 'mdi:alpha-u-box' - tap_action: - action: call-service - service: rest_command.lowercase_u_on_roku_1 - hold_action: - action: call-service - service: rest_command.uppercase_u_on_roku_1 - - type: action - icon: 'mdi:alpha-i-box' - tap_action: - action: call-service - service: rest_command.lowercase_i_on_roku_1 - hold_action: - action: call-service - service: rest_command.uppercase_i_on_roku_1 - - type: action - icon: 'mdi:alpha-o-box' - tap_action: - action: call-service - service: rest_command.lowercase_o_on_roku_1 - hold_action: - action: call-service - service: rest_command.uppercase_o_on_roku_1 - - type: action - icon: 'mdi:alpha-p-box' - tap_action: - action: call-service - service: rest_command.lowercase_p_on_roku_1 - hold_action: - action: call-service - service: rest_command.uppercase_p_on_roku_1 - - - type: custom:mushroom-chips-card - alignment: center - chips: - - type: action - icon: 'mdi:alpha-a-box' - tap_action: - action: call-service - service: rest_command.lowercase_a_on_roku_1 - hold_action: - action: call-service - service: rest_command.uppercase_a_on_roku_1 - - type: action - icon: 'mdi:alpha-s-box' - tap_action: - action: call-service - service: rest_command.lowercase_s_on_roku_1 - hold_action: - action: call-service - service: rest_command.uppercase_s_on_roku_1 - - type: action - icon: 'mdi:alpha-d-box' - tap_action: - action: call-service - service: rest_command.lowercase_d_on_roku_1 - hold_action: - action: call-service - service: rest_command.uppercase_d_on_roku_1 - - type: action - icon: 'mdi:alpha-f-box' - tap_action: - action: call-service - service: rest_command.lowercase_f_on_roku_1 - hold_action: - action: call-service - service: rest_command.uppercase_f_on_roku_1 - - type: action - icon: 'mdi:alpha-g-box' - tap_action: - action: call-service - service: rest_command.lowercase_g_on_roku_1 - hold_action: - action: call-service - service: rest_command.uppercase_g_on_roku_1 - - type: action - icon: 'mdi:alpha-h-box' - tap_action: - action: call-service - service: rest_command.lowercase_h_on_roku_1 - hold_action: - action: call-service - service: rest_command.uppercase_h_on_roku_1 - - type: action - icon: 'mdi:alpha-j-box' - tap_action: - action: call-service - service: rest_command.lowercase_j_on_roku_1 - hold_action: - action: call-service - service: rest_command.uppercase_j_on_roku_1 - - type: action - icon: 'mdi:alpha-k-box' - tap_action: - action: call-service - service: rest_command.lowercase_k_on_roku_1 - hold_action: - action: call-service - service: rest_command.uppercase_k_on_roku_1 - - type: action - icon: 'mdi:alpha-l-box' - tap_action: - action: call-service - service: rest_command.lowercase_l_on_roku_1 - hold_action: - action: call-service - service: rest_command.uppercase_l_on_roku_1 - - - type: custom:mushroom-chips-card - alignment: center - chips: - - type: action - icon: 'mdi:alpha-z-box' - tap_action: - action: call-service - service: rest_command.lowercase_z_on_roku_1 - hold_action: - action: call-service - service: rest_command.uppercase_z_on_roku_1 - - type: action - icon: 'mdi:alpha-x-box' - tap_action: - action: call-service - service: rest_command.lowercase_x_on_roku_1 - hold_action: - action: call-service - service: rest_command.uppercase_x_on_roku_1 - - type: action - icon: 'mdi:alpha-c-box' - tap_action: - action: call-service - service: rest_command.lowercase_c_on_roku_1 - hold_action: - action: call-service - service: rest_command.uppercase_c_on_roku_1 - - type: action - icon: 'mdi:alpha-v-box' - tap_action: - action: call-service - service: rest_command.lowercase_v_on_roku_1 - hold_action: - action: call-service - service: rest_command.uppercase_v_on_roku_1 - - type: action - icon: 'mdi:alpha-b-box' - tap_action: - action: call-service - service: rest_command.lowercase_b_on_roku_1 - hold_action: - action: call-service - service: rest_command.uppercase_b_on_roku_1 - - type: action - icon: 'mdi:alpha-n-box' - tap_action: - action: call-service - service: rest_command.lowercase_n_on_roku_1 - hold_action: - action: call-service - service: rest_command.uppercase_n_on_roku_1 - - type: action - icon: 'mdi:alpha-m-box' - tap_action: - action: call-service - service: rest_command.lowercase_m_on_roku_1 - hold_action: - action: call-service - service: rest_command.uppercase_m_on_roku_1 diff --git a/lovelace/templates/great-room-roku-card.yaml b/lovelace/templates/great-room-roku-card.yaml deleted file mode 100644 index 40ac1fd..0000000 --- a/lovelace/templates/great-room-roku-card.yaml +++ /dev/null @@ -1,387 +0,0 @@ -type: vertical-stack -cards: - - type: 'custom:roku-card' - entity: media_player.downstairs_roku - tv: true - name: Great Room - apps: - - image: /local/netflix-icon.png - app: Netflix - hold_action: - action: call-service - service: media_player.select_source - service_data: - entity_id: media_player.downstairs_roku - source: Netflix - - - image: /local/youtube-icon.png - app: YouTube - hold_action: - action: call-service - service: media_player.select_source - service_data: - source: "YouTube" - entity_id: media_player.downstairs_roku - - # - image: /local/baby-yoda.png - # app: Disney Plus - # hold_action: - # action: call-service - # service: media_player.select_source - # service_data: - # source: "Disney Plus" - # entity_id: media_player.downstairs_roku - - - image: /local/primevideo-icon.png - app: Prime Video - hold_action: - action: call-service - service: media_player.select_source - service_data: - source: "Prime Video" - entity_id: media_player.downstairs_roku - - - icon: mdi:light-flood-down - tap_action: - action: call-service - service: input_boolean.toggle - service_data: - entity_id: input_boolean.great_room_light_cycle - - power: - tap_action: - action: call-service - service: switch.toggle - service_data: - entity_id: switch.shelly_projector - - hold_action: - action: call-service - service: switch.toggle - service_data: - entity_id: switch.shelly_projector - - volume_up: - tap_action: - action: call-service - service: remote.send_command - service_data: - entity_id: remote.downstairs_roku - command: volume_up - volume_down: - tap_action: - action: call-service - service: remote.send_command - service_data: - entity_id: remote.downstairs_roku - command: volume_down - - - type: vertical-stack - cards: - - type: custom:mushroom-entity-card - entity: input_boolean.lovelace_great_room_roku_keyboard - name: Keyboard - secondary_info: none - primary_info: none - tap_action: - action: toggle - layout: horizontal - - type: conditional - conditions: - - entity: input_boolean.lovelace_great_room_roku_keyboard - state: 'on' - card: - type: vertical-stack - cards: - - type: custom:mushroom-chips-card - alignment: center - chips: - - type: action - icon: mdi:numeric-1-box - tap_action: - action: call-service - service: rest_command.numeric_1_on_roku_2 - data: {} - target: {} - - type: action - icon: mdi:numeric-2-box - tap_action: - action: call-service - service: rest_command.numeric_2_on_roku_2 - data: {} - target: {} - - type: action - icon: mdi:numeric-3-box - tap_action: - action: call-service - service: rest_command.numeric_3_on_roku_2 - data: {} - target: {} - - type: action - icon: mdi:numeric-4-box - tap_action: - action: call-service - service: rest_command.numeric_4_on_roku_2 - data: {} - target: {} - - type: action - icon: mdi:numeric-5-box - tap_action: - action: call-service - service: rest_command.numeric_5_on_roku_2 - data: {} - target: {} - - type: action - icon: mdi:numeric-6-box - tap_action: - action: call-service - service: rest_command.numeric_6_on_roku_2 - data: {} - target: {} - - type: action - icon: mdi:numeric-7-box - tap_action: - action: call-service - service: rest_command.numeric_7_on_roku_2 - data: {} - target: {} - - type: action - icon: mdi:numeric-8-box - tap_action: - action: call-service - service: rest_command.numeric_8_on_roku_2 - data: {} - target: {} - - type: action - icon: mdi:numeric-9-box - tap_action: - action: call-service - service: rest_command.numeric_9_on_roku_2 - data: {} - target: {} - - type: action - icon: mdi:numeric-0-box - tap_action: - action: call-service - service: rest_command.numeric_0_on_roku_2 - data: {} - target: {} - - type: custom:mushroom-chips-card - alignment: center - chips: - - type: action - icon: 'mdi:alpha-q-box' - tap_action: - action: call-service - service: rest_command.lowercase_q_on_roku_2 - hold_action: - action: call-service - service: rest_command.uppercase_q_on_roku_2 - - type: action - icon: 'mdi:alpha-w-box' - tap_action: - action: call-service - service: rest_command.lowercase_w_on_roku_2 - hold_action: - action: call-service - service: rest_command.uppercase_w_on_roku_2 - - type: action - icon: 'mdi:alpha-e-box' - tap_action: - action: call-service - service: rest_command.lowercase_e_on_roku_2 - hold_action: - action: call-service - service: rest_command.uppercase_e_on_roku_2 - - type: action - icon: 'mdi:alpha-r-box' - tap_action: - action: call-service - service: rest_command.lowercase_r_on_roku_2 - hold_action: - action: call-service - service: rest_command.uppercase_r_on_roku_2 - - type: action - icon: 'mdi:alpha-t-box' - tap_action: - action: call-service - service: rest_command.lowercase_t_on_roku_2 - hold_action: - action: call-service - service: rest_command.uppercase_t_on_roku_2 - - type: action - icon: 'mdi:alpha-y-box' - tap_action: - action: call-service - service: rest_command.lowercase_y_on_roku_2 - hold_action: - action: call-service - service: rest_command.uppercase_y_on_roku_2 - - type: action - icon: 'mdi:alpha-u-box' - tap_action: - action: call-service - service: rest_command.lowercase_u_on_roku_2 - hold_action: - action: call-service - service: rest_command.uppercase_u_on_roku_2 - - type: action - icon: 'mdi:alpha-i-box' - tap_action: - action: call-service - service: rest_command.lowercase_i_on_roku_2 - hold_action: - action: call-service - service: rest_command.uppercase_i_on_roku_2 - - type: action - icon: 'mdi:alpha-o-box' - tap_action: - action: call-service - service: rest_command.lowercase_o_on_roku_2 - hold_action: - action: call-service - service: rest_command.uppercase_o_on_roku_2 - - type: action - icon: 'mdi:alpha-p-box' - tap_action: - action: call-service - service: rest_command.lowercase_p_on_roku_2 - hold_action: - action: call-service - service: rest_command.uppercase_p_on_roku_2 - - - type: custom:mushroom-chips-card - alignment: center - chips: - - type: action - icon: 'mdi:alpha-a-box' - tap_action: - action: call-service - service: rest_command.lowercase_a_on_roku_2 - hold_action: - action: call-service - service: rest_command.uppercase_a_on_roku_2 - - type: action - icon: 'mdi:alpha-s-box' - tap_action: - action: call-service - service: rest_command.lowercase_s_on_roku_2 - hold_action: - action: call-service - service: rest_command.uppercase_s_on_roku_2 - - type: action - icon: 'mdi:alpha-d-box' - tap_action: - action: call-service - service: rest_command.lowercase_d_on_roku_2 - hold_action: - action: call-service - service: rest_command.uppercase_d_on_roku_2 - - type: action - icon: 'mdi:alpha-f-box' - tap_action: - action: call-service - service: rest_command.lowercase_f_on_roku_2 - hold_action: - action: call-service - service: rest_command.uppercase_f_on_roku_2 - - type: action - icon: 'mdi:alpha-g-box' - tap_action: - action: call-service - service: rest_command.lowercase_g_on_roku_2 - hold_action: - action: call-service - service: rest_command.uppercase_g_on_roku_2 - - type: action - icon: 'mdi:alpha-h-box' - tap_action: - action: call-service - service: rest_command.lowercase_h_on_roku_2 - hold_action: - action: call-service - service: rest_command.uppercase_h_on_roku_2 - - type: action - icon: 'mdi:alpha-j-box' - tap_action: - action: call-service - service: rest_command.lowercase_j_on_roku_2 - hold_action: - action: call-service - service: rest_command.uppercase_j_on_roku_2 - - type: action - icon: 'mdi:alpha-k-box' - tap_action: - action: call-service - service: rest_command.lowercase_k_on_roku_2 - hold_action: - action: call-service - service: rest_command.uppercase_k_on_roku_2 - - type: action - icon: 'mdi:alpha-l-box' - tap_action: - action: call-service - service: rest_command.lowercase_l_on_roku_2 - hold_action: - action: call-service - service: rest_command.uppercase_l_on_roku_2 - - - type: custom:mushroom-chips-card - alignment: center - chips: - - type: action - icon: 'mdi:alpha-z-box' - tap_action: - action: call-service - service: rest_command.lowercase_z_on_roku_2 - hold_action: - action: call-service - service: rest_command.uppercase_z_on_roku_2 - - type: action - icon: 'mdi:alpha-x-box' - tap_action: - action: call-service - service: rest_command.lowercase_x_on_roku_2 - hold_action: - action: call-service - service: rest_command.uppercase_x_on_roku_2 - - type: action - icon: 'mdi:alpha-c-box' - tap_action: - action: call-service - service: rest_command.lowercase_c_on_roku_2 - hold_action: - action: call-service - service: rest_command.uppercase_c_on_roku_2 - - type: action - icon: 'mdi:alpha-v-box' - tap_action: - action: call-service - service: rest_command.lowercase_v_on_roku_2 - hold_action: - action: call-service - service: rest_command.uppercase_v_on_roku_2 - - type: action - icon: 'mdi:alpha-b-box' - tap_action: - action: call-service - service: rest_command.lowercase_b_on_roku_2 - hold_action: - action: call-service - service: rest_command.uppercase_b_on_roku_2 - - type: action - icon: 'mdi:alpha-n-box' - tap_action: - action: call-service - service: rest_command.lowercase_n_on_roku_2 - hold_action: - action: call-service - service: rest_command.uppercase_n_on_roku_2 - - type: action - icon: 'mdi:alpha-m-box' - tap_action: - action: call-service - service: rest_command.lowercase_m_on_roku_2 - hold_action: - action: call-service - service: rest_command.uppercase_m_on_roku_2 diff --git a/lovelace/view-ha-floorplan.yaml b/lovelace/view-ha-floorplan.yaml index 05fcd70..4b00c41 100644 --- a/lovelace/view-ha-floorplan.yaml +++ b/lovelace/view-ha-floorplan.yaml @@ -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" @@ -425,7 +425,7 @@ cards: # - sensor.hvac_multisensor_supply # - sensor.hvac_multisensor_return # - sensor.hvac_multisensor_ambient - - sensor.outdoors_mean_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 text_template: '${entity.state ? Math.ceil(entity.state) : "undefined"} F' @@ -685,10 +685,9 @@ cards: class: "light-unavailable" - entities: - # - switch.shelly_projector - binary_sensor.computer_chair_contact_occupied # - switch.computer_area_pi_plug - # - switch.computer_area_lighouse + # - switch.computer_area_lighthouse # - switch.front_room_pi_plug # - switch.shelly1pm_f4cfa2748094 states: diff --git a/www/floorplan/fullsized_floorplan.svg b/www/floorplan/fullsized_floorplan.svg index 58432c7..4a06605 100644 --- a/www/floorplan/fullsized_floorplan.svg +++ b/www/floorplan/fullsized_floorplan.svg @@ -38,9 +38,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="0.080000002" - inkscape:cx="28106.249" - inkscape:cy="11093.75" + inkscape:zoom="0.01" + inkscape:cx="65849.998" + inkscape:cy="16250" 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="-8" + inkscape:window-x="1912" 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" /> - @@ -4987,8 +4981,8 @@