diff --git a/config/automation/Timed_Triggers/sunrise_turn_off.yaml b/config/automation/Timed_Triggers/sunrise_turn_off.yaml index b055691b..d3847a12 100755 --- a/config/automation/Timed_Triggers/sunrise_turn_off.yaml +++ b/config/automation/Timed_Triggers/sunrise_turn_off.yaml @@ -49,7 +49,7 @@ {{ states.sun.sun.state == 'above_horizon' }} - service: homeassistant.turn_off entity_id: - - switch.master_bathroom_accents + - group.master_bathroom_accents - group.exterior_lights - group.outdoor_front_lights diff --git a/config/automation/Timed_Triggers/sunset_turn_on.yaml b/config/automation/Timed_Triggers/sunset_turn_on.yaml index 6a13687d..dd9ca722 100755 --- a/config/automation/Timed_Triggers/sunset_turn_on.yaml +++ b/config/automation/Timed_Triggers/sunset_turn_on.yaml @@ -64,7 +64,7 @@ {{ states.group.family.state == 'home' }} - service: switch.turn_on entity_id: - - switch.master_bathroom_accents + - group.master_bathroom_accents - switch.back_landscaping - switch.front_door_outlet - switch.living_room_outlet diff --git a/config/automation/good_morning.yaml b/config/automation/good_morning.yaml index 33e96e35..9d2a45ff 100755 --- a/config/automation/good_morning.yaml +++ b/config/automation/good_morning.yaml @@ -38,6 +38,6 @@ - light.s1 - light.s4 - service: switch.turn_on - entity_id: switch.kitchen_accents + entity_id: group.kitchen_accents - service: input_boolean.turn_off entity_id: input_boolean.good_morning diff --git a/config/automation/kitchen_lights_and_accents.yaml b/config/automation/kitchen_lights_and_accents.yaml index f8a243bf..af6bcc62 100755 --- a/config/automation/kitchen_lights_and_accents.yaml +++ b/config/automation/kitchen_lights_and_accents.yaml @@ -13,12 +13,12 @@ condition: - condition: state - entity_id: switch.kitchen_accents + entity_id: group.kitchen_Accents state: 'on' action: - service: switch.turn_off - entity_id: switch.kitchen_accents + entity_id: group.kitchen_Accents ############################################################################## @@ -66,4 +66,4 @@ action: - service: switch.turn_on - entity_id: switch.kitchen_accents + entity_id: group.kitchen_Accents diff --git a/config/automation/late_night_helper.yaml b/config/automation/late_night_helper.yaml index ce5c5296..a92cf4ac 100755 --- a/config/automation/late_night_helper.yaml +++ b/config/automation/late_night_helper.yaml @@ -39,7 +39,7 @@ brightness: 10 - service: switch.turn_on entity_id: - - switch.kitchen_accents + - group.kitchen_Accents - delay: '00:05:00' - service: light.turn_off entity_id: diff --git a/config/automation/late_night_outside_helper.yaml b/config/automation/late_night_outside_helper.yaml index b55e9cc7..610c9dfd 100755 --- a/config/automation/late_night_outside_helper.yaml +++ b/config/automation/late_night_outside_helper.yaml @@ -45,7 +45,7 @@ switch.turn_on {% endif %} entity_id: - - switch.master_bathroom_accents + - group.master_bathroom_accents - switch.back_landscaping - switch.front_door_outlet - switch.living_room_outlet diff --git a/config/automation/master_bath_accents.yaml b/config/automation/master_bath_accents.yaml index e0564da0..e137b481 100755 --- a/config/automation/master_bath_accents.yaml +++ b/config/automation/master_bath_accents.yaml @@ -32,10 +32,10 @@ action: - service: switch.turn_on - entity_id: switch.master_bathroom_accents + entity_id: group.master_bathroom_accents - wait_template: >- {{ not is_state('binary_sensor.sleepnumber_carlo_stacey_is_in_bed', 'off') or is_state('device_tracker.stacey', 'not_home')}} - wait_template: >- {{ not is_state('binary_sensor.sleepnumber_carlo_carlo_is_in_bed', 'off') or is_state('device_tracker.carlo', 'not_home') }} - service: switch.turn_off - entity_id: switch.master_bathroom_accents + entity_id: group.master_bathroom_accents diff --git a/config/automation/tv_time_on_and_off.yaml b/config/automation/tv_time_on_and_off.yaml index f44aa484..32f097e9 100755 --- a/config/automation/tv_time_on_and_off.yaml +++ b/config/automation/tv_time_on_and_off.yaml @@ -47,7 +47,7 @@ - group.kitchen_lights - service: switch.turn_on - entity_id: switch.kitchen_accents + entity_id: group.kitchen_Accents - service: scene.turn_on entity_id: scene.tv_time diff --git a/config/configuration.yaml b/config/configuration.yaml index df0dc3cb..ce387659 100755 --- a/config/configuration.yaml +++ b/config/configuration.yaml @@ -50,8 +50,10 @@ cloud: - group.office_lights - group.hallway_lights - group.kitchen_lights + - group.kitchen_accents - group.upstairs_lights - group.outdoor_pool_lights + - group.master_bathroom_accents - group.garage_lights - group.paiges_room - group.justins_room @@ -63,6 +65,7 @@ cloud: - switch - cover - input_boolean + - group # exclude_entities: # exclude_domains: # - light @@ -74,6 +77,11 @@ cloud: display_categories: LIGHT group.upstairs_lights: display_categories: LIGHT + group.kitchen_accents: + display_categories: LIGHT + group.master_bathroom_accents: + display_categories: LIGHT + http: base_url: !secret http_base_url server_port: !secret http_port diff --git a/config/customize/switches.yaml b/config/customize/switches.yaml index c38ca4cb..57b807d3 100755 --- a/config/customize/switches.yaml +++ b/config/customize/switches.yaml @@ -37,21 +37,6 @@ switch.pool_deck: hidden: False homebridge_hidden: False -switch.kitchen_accent_2: - friendly_name: 'Kitchen Accents 2' - - hidden: False - icon: mdi:lightbulb-outline - assumed_state: true - - -switch.kitchen_accents: - friendly_name: 'Kitchen Accents' - - hidden: False - icon: mdi:lightbulb-outline - assumed_state: true - switch.lr_amp: friendly_name: 'Living Room Amp' @@ -67,7 +52,7 @@ switch.living_room_outlet: assumed_state: true -switch.master_bathroom_accents: +group.master_bathroom_accents: friendly_name: 'Master Bathroom Accents' hidden: False diff --git a/config/group/Indoor_Outdoor.yaml b/config/group/Indoor_Outdoor.yaml index 84ec73b9..994f40e8 100755 --- a/config/group/Indoor_Outdoor.yaml +++ b/config/group/Indoor_Outdoor.yaml @@ -1,5 +1,6 @@ Interior_Lights: entities: + - group.master_bathroom_accents - group.bedroom_lights - group.living_room_lights - group.living_room_accents @@ -10,6 +11,7 @@ Interior_Lights: - group.office_lights - group.hallway_lights - group.kitchen_lights + - group.kitchen_accents - group.upstairs_lights - group.outdoor_pool_lights - group.garage_lights diff --git a/config/group/arris_stats.yaml b/config/group/arris_stats.yaml deleted file mode 100755 index c73355b1..00000000 --- a/config/group/arris_stats.yaml +++ /dev/null @@ -1,13 +0,0 @@ -media_players: - entities: - - media_player.livingroomcc - - media_player.living_room_tv - - media_player.living_room_ultra - - media_player.upstairs_living_room - - media_player.bedroom_alarm_panel - - media_player.living_room - - media_player.office - - media_player.kitchen - - media_player.justin_room - - media_player.tap - - media_player.upstairs diff --git a/config/group/switches.yaml b/config/group/switches.yaml index aecc902b..1c061791 100755 --- a/config/group/switches.yaml +++ b/config/group/switches.yaml @@ -3,14 +3,22 @@ Interior Switches: - switch.den_outlet - switch.living_room_outlet - switch.foyer_outlet - - switch.kitchen_accents - - switch.kitchen_accent_2 + - group.kitchen_accents - switch.printer_outlet - switch.front_door_outlet - switch.garage_outlet - switch.lr_amp - - switch.master_bathroom_accents - - switch.master_bathroom_accents_2 + - group.master_bathroom_accents - switch.pool_deck - switch.1412_2_Outlet - switch.1412_3_Outlet + +kitchen_accents: + entities: + - switch.kitchen_accent_1 + - switch.kitchen_accent_2 + +master_bathroom_accents: + entities: + - switch.master_bathroom_accent_1 + - switch.master_bathroom_accent_2 diff --git a/config/switch/rf_outlets.yaml b/config/switch/rf_outlets.yaml index 346eac42..e8d36076 100755 --- a/config/switch/rf_outlets.yaml +++ b/config/switch/rf_outlets.yaml @@ -10,15 +10,15 @@ host: 192.168.10.118 mac: '34:EA:34:CC:CE:25' switches: - kitchen_accents: - friendly_name: "Kitchen Accents" - command_on: 'sjcyAAcSBxMHEgcSBxIUBgcTBxIIEhMGBxITBggSFAYHEhQGBxIHExQGFAYIEwcSFAYTBge8AAAAAAAA' - command_off: 'stgyAAcTBxMHEwcSBxMTBgcTBxMHExMHBxMUBgcTEwcHExMHBxMHExMHEwcTBxMHBxMHEwe9AAAAAAAA' - - kitchen_accents_2: - friendly_name: "Kitchen Accents 2" - command_on: 'sjcyAAcSBxMHEgcSBxIUBgcTBxIIEhMGBxITBggSFAYHEhQGBxIHExQGFAYIEwcSFAYTBge8AAAAAAAA' - command_off: 'stgyAAcTBxMHEwcSBxMTBgcTBxMHExMHBxMUBgcTEwcHExMHBxMHExMHEwcTBxMHBxMHEwe9AAAAAAAA' + # kitchen_accents: + # friendly_name: "Kitchen Accents" + # command_on: 'sjcyAAcSBxMHEgcSBxIUBgcTBxIIEhMGBxITBggSFAYHEhQGBxIHExQGFAYIEwcSFAYTBge8AAAAAAAA' + # command_off: 'stgyAAcTBxMHEwcSBxMTBgcTBxMHExMHBxMUBgcTEwcHExMHBxMHExMHEwcTBxMHBxMHEwe9AAAAAAAA' + # + # kitchen_accents_2: + # friendly_name: "Kitchen Accents 2" + # command_on: 'sjcyAAcSBxMHEgcSBxIUBgcTBxIIEhMGBxITBggSFAYHEhQGBxIHExQGFAYIEwcSFAYTBge8AAAAAAAA' + # command_off: 'stgyAAcTBxMHEwcSBxMTBgcTBxMHExMHBxMUBgcTEwcHExMHBxMHExMHEwcTBxMHBxMHEwe9AAAAAAAA' den_outlet: friendly_name: "Den Outlet" @@ -35,10 +35,10 @@ command_on: 'slYyAAcTEwcHExMHBxMGEwcTEwcHExMHBxMTBwYTEwcHExMHEwcTBwcTBxMHEwcTEwcTBwe+AAAAAAAA' command_off: 'sl4yAAcTEwcGExMHBxMHEwcTFAcHExMHBxMTBwYTEwcHExMHEwcTBwYTBxMTBxMHBhMHEwe+AAAAAAAA' - master_bathroom_accents: - friendly_name: "Master Bathroom Accents" - command_on: 'siAyAAUTEQcFExEIBhMGEwYTBhMGExEHBhMRCAYTEQgGExEHBRMFExEIEQgGEwYTEQcRBwa1AAAAAAAA' - command_off: 'sjsyAAYSEgcGEhIHBhIGEgYTBhMGExIHBhIRBwYSEQcGExIHBhIGEhIHEQcSBxEHBhIGEga0AAAAAAAA' + # master_bathroom_accents: + # friendly_name: "Master Bathroom Accents" + # command_on: 'siAyAAUTEQcFExEIBhMGEwYTBhMGExEHBhMRCAYTEQgGExEHBRMFExEIEQgGEwYTEQcRBwa1AAAAAAAA' + # command_off: 'sjsyAAYSEgcGEhIHBhIGEgYTBhMGExIHBhIRBwYSEQcGExIHBhIGEhIHEQcSBxEHBhIGEga0AAAAAAAA' 1412_2_outlet: friendly_name: "1412_2 Outlet" diff --git a/config/www/custom_ui/floorplan/alarm.yaml b/config/www/custom_ui/floorplan/alarm.yaml index b177b6ed..b4794bc4 100755 --- a/config/www/custom_ui/floorplan/alarm.yaml +++ b/config/www/custom_ui/floorplan/alarm.yaml @@ -84,8 +84,8 @@ rules: - switch.front_landscaping - switch.back_landscaping - switch.printer_outlet - - switch.kitchen_accents - - switch.master_bathroom_accents + - group.kitchen_Accents + - group.master_bathroom_accents - switch.front_door_outlet - switch.foyer_outlet - switch.lr_amp diff --git a/config/www/custom_ui/floorplan/images/branding/solar_readings.png b/config/www/custom_ui/floorplan/images/branding/solar_readings.png index 5ddee90a..2ef65051 100644 Binary files a/config/www/custom_ui/floorplan/images/branding/solar_readings.png and b/config/www/custom_ui/floorplan/images/branding/solar_readings.png differ