diff --git a/config/.HA_VERSION b/config/.HA_VERSION index 6541cf13..719a11a4 100755 --- a/config/.HA_VERSION +++ b/config/.HA_VERSION @@ -1 +1 @@ -0.98.5 \ No newline at end of file +0.99.3 \ No newline at end of file diff --git a/config/automation/System/watchdog_light.yaml b/config/automation/System/watchdog_light.yaml index e7a5d6d9..38276a7f 100755 --- a/config/automation/System/watchdog_light.yaml +++ b/config/automation/System/watchdog_light.yaml @@ -9,14 +9,12 @@ - light.hallway - group.hallway_lights - group.foyer_lights - - switch.printer_outlet to: 'on' for: '00:20:00' - platform: state entity_id: - group.upstairs - - switch.garage_outlet to: 'on' for: '02:00:00' diff --git a/config/automation/Timed_Triggers/sunset_turn_on.yaml b/config/automation/Timed_Triggers/sunset_turn_on.yaml index 6625cdf6..0c438978 100755 --- a/config/automation/Timed_Triggers/sunset_turn_on.yaml +++ b/config/automation/Timed_Triggers/sunset_turn_on.yaml @@ -65,9 +65,6 @@ - group.master_bathroom_accents - switch.back_landscaping - switch.front_door_outlet - - switch.living_room_outlet - - switch.den_outlet - - switch.foyer_outlet - service: light.turn_on entity_id: - group.living_room_accents diff --git a/config/automation/late_night_outside_helper.yaml b/config/automation/late_night_outside_helper.yaml index 610c9dfd..a39554d0 100755 --- a/config/automation/late_night_outside_helper.yaml +++ b/config/automation/late_night_outside_helper.yaml @@ -48,9 +48,6 @@ - group.master_bathroom_accents - switch.back_landscaping - switch.front_door_outlet - - switch.living_room_outlet - - switch.den_outlet - - switch.foyer_outlet - wait_template: >- {{ states.group.garage_doors.state == 'closed' }} - service: script.monthly_color_scene diff --git a/config/customize/switches.yaml b/config/customize/switches.yaml index 42813609..1efb3192 100755 --- a/config/customize/switches.yaml +++ b/config/customize/switches.yaml @@ -1,27 +1,6 @@ ################################### ## Switches Section ################################### -switch.den_outlet: - friendly_name: 'Den Outlet' - - hidden: False - icon: mdi:power-plug - assumed_state: true - - -switch.foyer_outlet: - friendly_name: 'Foyer Outlet' - - hidden: False - icon: mdi:power-plug - assumed_state: true - -switch.garage_outlet: - friendly_name: 'Garage Outlet' - - hidden: False - icon: mdi:power-plug - assumed_state: true switch.pool_deck: @@ -37,27 +16,6 @@ switch.lr_amp: hidden: False icon: mdi:music-circle -switch.living_room_outlet: - friendly_name: 'Living Room Outlet' - - hidden: False - icon: mdi:power-plug - assumed_state: true - - -switch.outlet_304_2: - friendly_name: 'Outlet 304 2' - - hidden: False - icon: mdi:power-plug - assumed_state: true - -switch.printer_outlet: - friendly_name: 'Printer Outlet' - - hidden: False - icon: mdi:printer - assumed_state: true switch.pihole_temp_disable: friendly_name: 'Pihole Temp Disable' diff --git a/config/group/lights.yaml b/config/group/lights.yaml index 9774d864..868de881 100755 --- a/config/group/lights.yaml +++ b/config/group/lights.yaml @@ -82,7 +82,6 @@ Garage lights: control: hidden entities: - light.garage_attic - - switch.garage_outlet Hallway Lights: entities: diff --git a/config/group/switches.yaml b/config/group/switches.yaml index 688403e3..68d57a14 100755 --- a/config/group/switches.yaml +++ b/config/group/switches.yaml @@ -1,19 +1,12 @@ Interior Switches: entities: - - switch.den_outlet - - switch.living_room_outlet - - switch.foyer_outlet - switch.kitchen_accent_1 - switch.kitchen_accent_2 - - switch.printer_outlet - switch.front_door_outlet - - switch.garage_outlet - switch.lr_amp - switch.master_bathroom_accent_1 - switch.master_bathroom_accent_2 - switch.pool_deck - - switch.1412_2_Outlet - - switch.1412_3_Outlet Kitchen Accents: entities: diff --git a/config/switch/rf_outlets.yaml b/config/switch/rf_outlets.disabled similarity index 65% rename from config/switch/rf_outlets.yaml rename to config/switch/rf_outlets.disabled index e8d36076..849190c4 100755 --- a/config/switch/rf_outlets.yaml +++ b/config/switch/rf_outlets.disabled @@ -6,10 +6,10 @@ ###################################################################### # Thanks to @ZOMBU2 for providing me with the right firmware - http://cn-fwversions.ibroadlink.com/firmware/download/10026/20028.bin -- platform: broadlink - host: 192.168.10.118 - mac: '34:EA:34:CC:CE:25' - switches: +# - platform: broadlink +# host: 192.168.10.118 +# mac: '34:EA:34:CC:CE:25' +# switches: # kitchen_accents: # friendly_name: "Kitchen Accents" # command_on: 'sjcyAAcSBxMHEgcSBxIUBgcTBxIIEhMGBxITBggSFAYHEhQGBxIHExQGFAYIEwcSFAYTBge8AAAAAAAA' @@ -19,51 +19,51 @@ # friendly_name: "Kitchen Accents 2" # command_on: 'sjcyAAcSBxMHEgcSBxIUBgcTBxIIEhMGBxITBggSFAYHEhQGBxIHExQGFAYIEwcSFAYTBge8AAAAAAAA' # command_off: 'stgyAAcTBxMHEwcSBxMTBgcTBxMHExMHBxMUBgcTEwcHExMHBxMHExMHEwcTBxMHBxMHEwe9AAAAAAAA' - - den_outlet: - friendly_name: "Den Outlet" - command_on: 'sjgyAAgSEwYHEhQGBxIIEgcSFAYHEhMGBxIUBgcSFAYUBhMGBxMHEggSBxIHEgcSFAYUBge+AAAAAAAA' - command_off: 'slUyAAcSFAYHEhQGBxMHEgcTFAYHEhQGBxIUBgcSFAYTBhMHBxIHEwcSBxMTBhMHBxMHEwe+AAAAAAAA' - - foyer_outlet: - friendly_name: "Foyer Outlet" - command_on: 'sh8yAAcSBxMHEwcTBxIUBgcTBxMHExMGEwcTBwcTFAYHExMHBxMHEwcSBxMHEgcSEwcTBge9AAAAAAAA' - command_off: 'skIyAAcTBxIHEgcSBxMTBgcTBxIHExQGEwYUBgcTEwcHExQGBxMHEgcTBxITBxMGBxMHEge8AAAAAAAA' - - living_room_outlet: - friendly_name: "Living Room Outlet" - command_on: 'slYyAAcTEwcHExMHBxMGEwcTEwcHExMHBxMTBwYTEwcHExMHEwcTBwcTBxMHEwcTEwcTBwe+AAAAAAAA' - command_off: 'sl4yAAcTEwcGExMHBxMHEwcTFAcHExMHBxMTBwYTEwcHExMHEwcTBwYTBxMTBxMHBhMHEwe+AAAAAAAA' + # + # den_outlet: + # friendly_name: "Den Outlet" + # command_on: 'sjgyAAgSEwYHEhQGBxIIEgcSFAYHEhMGBxIUBgcSFAYUBhMGBxMHEggSBxIHEgcSFAYUBge+AAAAAAAA' + # command_off: 'slUyAAcSFAYHEhQGBxMHEgcTFAYHEhQGBxIUBgcSFAYTBhMHBxIHEwcSBxMTBhMHBxMHEwe+AAAAAAAA' + # + # foyer_outlet: + # friendly_name: "Foyer Outlet" + # command_on: 'sh8yAAcSBxMHEwcTBxIUBgcTBxMHExMGEwcTBwcTFAYHExMHBxMHEwcSBxMHEgcSEwcTBge9AAAAAAAA' + # command_off: 'skIyAAcTBxIHEgcSBxMTBgcTBxIHExQGEwYUBgcTEwcHExQGBxMHEgcTBxITBxMGBxMHEge8AAAAAAAA' + # + # living_room_outlet: + # friendly_name: "Living Room Outlet" + # command_on: 'slYyAAcTEwcHExMHBxMGEwcTEwcHExMHBxMTBwYTEwcHExMHEwcTBwcTBxMHEwcTEwcTBwe+AAAAAAAA' + # command_off: 'sl4yAAcTEwcGExMHBxMHEwcTFAcHExMHBxMTBwYTEwcHExMHEwcTBwYTBxMTBxMHBhMHEwe+AAAAAAAA' # master_bathroom_accents: # friendly_name: "Master Bathroom Accents" # command_on: 'siAyAAUTEQcFExEIBhMGEwYTBhMGExEHBhMRCAYTEQgGExEHBRMFExEIEQgGEwYTEQcRBwa1AAAAAAAA' # command_off: 'sjsyAAYSEgcGEhIHBhIGEgYTBhMGExIHBhIRBwYSEQcGExIHBhIGEhIHEQcSBxEHBhIGEga0AAAAAAAA' - 1412_2_outlet: - friendly_name: "1412_2 Outlet" - command_on: 'sjYyAAYSEgcGEhEHBhIGEgYSBhMGEhIHBhISBwYSEgcGEhIHEgcSBwYSBhIGEwYSEgcRBwa0AAAAAAAA' - command_off: 'siwyAAYSEQcGExEHBhIGEwYTBhMGExEHBhMRBwYTEQcGExEHEQcRBwYSBhMSBxEHBhIGEwa1AAAAAAAA' - - 1412_3_outlet: - friendly_name: "1412_3 Outlet" - command_on: 'siUyAAYSEgcGEhIHBhIGEgYSBhIGEhIHBhISBwYSEgYSBxIHBhIGEgYSBhIGEgYSEgcSBwa0AAAAAAAA' - command_off: 'smMyAAcSEgcGExIHBhIHEgcSBhIGEhIHBhISBgcSEgcSBxIHBxIGEgcSBhISBxIHBhIGEge0AAAAAAAA' - - printer_outlet: - friendly_name: "Printer Outlet" - command_on: 'shkyAAcSBxIHEwcSBxITBgcSBxMHExMGBxITBgcTEwcTBxMGBxMHEgcTBxMHEgcSEwYTBge7AAAAAAAA' - command_off: 'slEyAAcTBxMHEwcSBxMTBwcTBxMHExMGBxMTBwcTEwcTBxMHBxMHEwcTBxMTBxMHBxMHEge7AAAAAAAA' + # 1412_2_outlet: + # friendly_name: "1412_2 Outlet" + # command_on: 'sjYyAAYSEgcGEhEHBhIGEgYSBhMGEhIHBhISBwYSEgcGEhIHEgcSBwYSBhIGEwYSEgcRBwa0AAAAAAAA' + # command_off: 'siwyAAYSEQcGExEHBhIGEwYTBhMGExEHBhMRBwYTEQcGExEHEQcRBwYSBhMSBxEHBhIGEwa1AAAAAAAA' + # + # 1412_3_outlet: + # friendly_name: "1412_3 Outlet" + # command_on: 'siUyAAYSEgcGEhIHBhIGEgYSBhIGEhIHBhISBwYSEgYSBxIHBhIGEgYSBhIGEgYSEgcSBwa0AAAAAAAA' + # command_off: 'smMyAAcSEgcGExIHBhIHEgcSBhIGEhIHBhISBgcSEgcSBxIHBxIGEgcSBhISBxIHBhIGEge0AAAAAAAA' + # + # printer_outlet: + # friendly_name: "Printer Outlet" + # command_on: 'shkyAAcSBxIHEwcSBxITBgcSBxMHExMGBxITBgcTEwcTBxMGBxMHEgcTBxMHEgcSEwYTBge7AAAAAAAA' + # command_off: 'slEyAAcTBxMHEwcSBxMTBwcTBxMHExMGBxMTBwcTEwcTBxMHBxMHEwcTBxMTBxMHBxMHEge7AAAAAAAA' # front_door_outlet: # friendly_name: "Front Door Outlet" # command_on: 'skYyAAcTBxMHEgcSBxMTBgcSBxIHExMHBxMTBxMHEwYHEhMGBxIHEgcTBxIHEgcSEwYTBge7AAAAAAAA' # command_off: 'sjwyAAcTBxIHEwcTBxMTBwcTBxIHExMGBxMTBhMGEwYHEhMGBxMHEwcTBxMTBxMGBxMGEwe7AAAAAAAA' - garage_outlet: - friendly_name: "Garage Outlet" - command_on: 'sioyAAYTEwcHExMHBxMHEwcTEwcHExMHBxMTBxMHEwcHExMHBxMGEwcTBxMHEwYTEwcTBwe/AAAAAAAA' - command_off: 'smQyAAcTEwcHExMHBxMGEwcTEwcHExMHBxMTBxMHEwcHExMHBhMGEwcTBhMTBxMHBxMGEwe/AAAAAAAA' + # garage_outlet: + # friendly_name: "Garage Outlet" + # command_on: 'sioyAAYTEwcHExMHBxMHEwcTEwcHExMHBxMTBxMHEwcHExMHBxMGEwcTBxMHEwYTEwcTBwe/AAAAAAAA' + # command_off: 'smQyAAcTEwcHExMHBxMGEwcTEwcHExMHBxMTBxMHEwcHExMHBhMGEwcTBhMTBxMHBxMGEwe/AAAAAAAA' # - platform: rpi_rf # gpio: 17 diff --git a/config/www/custom_ui/floorplan/alarm.yaml b/config/www/custom_ui/floorplan/alarm.yaml index a55952c0..acba35c4 100755 --- a/config/www/custom_ui/floorplan/alarm.yaml +++ b/config/www/custom_ui/floorplan/alarm.yaml @@ -83,13 +83,9 @@ rules: entities: - switch.front_landscaping - switch.back_landscaping - - switch.printer_outlet - group.kitchen_accents - group.master_bathroom_accents - - switch.front_door_outlet - - switch.foyer_outlet - switch.lr_amp - - switch.garage_outlet states: - state: 'on' class: 'switch-on' diff --git a/config/www/custom_ui/floorplan/images/branding/att_speedtest.png b/config/www/custom_ui/floorplan/images/branding/att_speedtest.png index e69de29b..b9c77050 100644 Binary files a/config/www/custom_ui/floorplan/images/branding/att_speedtest.png and b/config/www/custom_ui/floorplan/images/branding/att_speedtest.png differ 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 e69de29b..f512da89 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