Fix additional merge issues

This commit is contained in:
2025-07-29 20:00:15 -04:00
parent 60bab6bc60
commit eb2f68aeb6

View File

@@ -8239,8 +8239,6 @@ views:
max_columns: 4
cards: []
background: {}
visible:
- user: c3909d27048140729f002aaef0391775
- title: Weather
path: weather
type: sections
@@ -9291,232 +9289,6 @@ views:
icon: mdi:weather-cloudy
cards: []
subview: true
- title: Testing
path: testing
icon: mdi:test-tube
type: sections
sections:
- type: grid
cards:
- type: heading
heading: Presence
- type: entities
entities:
- entity: sensor.people_at_home
- entity: binary_sensor.tony_presence
- entity: binary_sensor.tina_presence
- entity: binary_sensor.kallen_presence
- entity: sensor.tony_location
- entity: sensor.tina_location
- entity: sensor.kallen_location
- entity: input_boolean.kallen_at_school
- entity: binary_sensor.tony_home
- entity: binary_sensor.tina_home
- entity: binary_sensor.kallen_home
- entity: binary_sensor.nerds_home
- entity: binary_sensor.parents_home
- entity: binary_sensor.family_home
- entity: group.family
- entity: group.adults
- entity: device_tracker.tony_s_iphone
- entity: device_tracker.tony_s_iphone_app
- entity: device_tracker.tinas_iphone
- entity: device_tracker.tinas_iphone_app
- entity: device_tracker.kallen_iphone
- entity: device_tracker.kallen_iphone_app
- entity: binary_sensor.people_present
- entity: sensor.last_outdoor_presence_trigger
show_header_toggle: false
state_color: true
- type: grid
cards:
- type: heading
heading: Misc
- type: entities
state_color: true
entities:
- entity: input_boolean.tony_awake
- entity: input_boolean.tina_awake
- entity: input_boolean.kallen_awake
- entity: input_boolean.emma_awake
- entity: sensor.services_down
- entity: sensor.room_presence
- entity: sensor.last_alexa_name
- entity: sensor.last_alexa_serial
- entity: sensor.last_alexa_entity_id
- entity: sensor.tony_current_age
- entity: sensor.tina_current_age
- entity: sensor.kallen_current_age
- entity: sensor.emma_current_age
- entity: sensor.birthdays_today
- entity: sensor.total_age_years
- entity: binary_sensor.people_sleeping
- entity: sensor.people_sleeping_total
- entity: sensor.second_floor_plugs_current
- entity: sensor.first_floor_plugs_current
- entity: sensor.basement_plugs_current
show_header_toggle: false
- type: entities
entities:
- entity: sensor.bedrooms_max_temp
visibility:
- condition: numeric_state
entity: sensor.bedrooms_max_temp
above: 50
- condition: user
users:
- f387a983651a4321a7411ff8cf36f949
- 879b4c04e32841b3ad1d2763a11b4e70
- c3909d27048140729f002aaef0391775
- type: custom:twitch-followed-live-streams-card
global_credentials_user_name: ironnerd24
global_credentials_access_token: byewyefnhuigdv2t6bu4172tqggpy9
global_credentials_client_id: 5p6hri1olv96he0umxchi8vuh7el39
streams_limit_count: 8
streams_image_show: true
streams_show_viewers: true
streams_show_title: false
streams_vip:
- fuzhpuzy
- manasen
- misami_desu
- kobegriffin23
- type: grid
cards:
- type: heading
heading: Sports
- type: entities
entities:
- entity: switch.watching_sports
- entity: select.active_sporting_event
- entity: select.sports_room
name: Active Room
- entity: number.team_score
- entity: number.opponent_score
show_header_toggle: false
state_color: true
- type: custom:auto-entities
card:
type: entities
show_header_toggle: false
state_color: true
filter:
include:
- label: sports
domain: binary_sensor
sort:
method: entity_id
reverse: false
numeric: true
ignore_case: false
- type: grid
cards:
- type: heading
heading: Card Templating
- type: custom:card-templater
card:
type: entities
show_header_toggle: false
columns: 2
title: Card Templater
entities:
- entity: person.tony_stork
name_template: >-
{{ "Stupid" if
is_state('input_boolean.early_night_mode','on') else "Not
Stupid" }}
- type: custom:config-template-card
variables:
BOOL_STATE: states['input_boolean.toggle_testing'].state
LIGHT_STATE: states['light.living_room_lights'].state
entities:
- light.living_room_lights
- input_boolean.toggle_testing
card:
type: entities
title: '${BOOL_STATE === ''on'' ? ''Testing'' : ''Fucked Up''}'
entities:
- entity: light.living_room_lights
name: '${BOOL_STATE === ''on'' ? ''Lights'' : ''Other Lights''}'
- entity: input_boolean.toggle_testing
show_header_toggle: false
state_color: true
- type: grid
cards:
- type: heading
heading: Diagnostics Feed
- type: custom:home-feed-card
card_id: diag_feed
show_empty: false
id_filter: ^diag_feed_.*
more_info_on_tap: true
state_color: true
entities:
- entity: automation.family_has_arrived
- entity: automation.family_has_left
- entity: automation.presence_disconnect_protection
- entity: automation.icloud3_restart
- entity: automation.basement_led_strip_reset
- entity: binary_sensor.lightning_warning
- entity: binary_sensor.raining
name: Raining
- entity: sensor.total_rain_sensors
- type: grid
cards:
- type: heading
heading: Alarm Clock Testing
- type: entities
entities:
- entity: input_boolean.master_bedroom_alarm_clock
- entity: input_datetime.master_bedroom_alarm_clock
- entity: input_boolean.kallen_alarm_clock
- entity: input_datetime.kallen_alarm_clock
- entity: input_boolean.emma_alarm_clock
- entity: input_datetime.emma_alarm_clock
show_header_toggle: false
state_color: true
- type: grid
cards:
- type: heading
heading: Testing Entities
- type: entities
entities:
- entity: input_datetime.time_testing
- entity: input_datetime.date_testing
- entity: input_datetime.datetime_testing
- entity: input_text.text_testing
- entity: input_text.password_testing
- entity: input_select.select_testing
- entity: input_boolean.toggle_testing
- entity: input_number.number_box_test
- entity: input_number.number_slider_test
- entity: switch.power_tester
- entity: sensor.power_tester_power
- entity: sensor.power_tester_current
- entity: sensor.power_tester_voltage
show_header_toggle: false
state_color: true
- type: grid
cards:
- type: heading
heading: Time of Day Sensors
- type: entities
entities:
- entity: binary_sensor.day
- entity: binary_sensor.after_midnight
- entity: binary_sensor.early_morning
- entity: binary_sensor.morning
- entity: binary_sensor.late_morning
- entity: binary_sensor.midday
- entity: binary_sensor.evening
- entity: binary_sensor.night
- entity: binary_sensor.overnight
- entity: binary_sensor.quiet_time
show_header_toggle: false
state_color: true
max_columns: 4
cards: []
background: {}
- type: sections
max_columns: 4
title: Weather Test