From e46c7eadab72592971065e9c7c98dcea575dec1c Mon Sep 17 00:00:00 2001 From: darthsandmann Date: Tue, 9 Aug 2022 11:21:13 +0200 Subject: [PATCH] Cleanup --- lovelace/lights/scenes.yaml | 28 +++++++++---------- lovelace/overview/batteries.yaml | 14 +--------- packages/button/button_logic.yaml | 10 ++++--- packages/button/button_press.yaml | 10 +++++++ packages/climate/climate_sensors.yaml | 12 +++----- packages/{ => climate}/weather.yaml | 0 packages/homeassistant/default_theme.yaml | 1 - packages/{ => homeassistant}/homekit.yaml | 0 .../{ => homeassistant}/notifications.yaml | 0 packages/{ => homeassistant}/time_date.yaml | 0 packages/light/circadian.yaml.disabled | 16 ----------- packages/light/lightstore.yaml | 13 ++++++++- packages/light/night.yaml | 2 ++ packages/light/yeelight.yaml | 13 ++------- packages/minimalist/custom_entities.yaml | 10 +------ packages/nas/wol.yaml | 2 -- ui-lovelace-testing.yaml | 14 ---------- ui-lovelace.yaml | 14 ++++++++-- 18 files changed, 65 insertions(+), 94 deletions(-) rename packages/{ => climate}/weather.yaml (100%) rename packages/{ => homeassistant}/homekit.yaml (100%) rename packages/{ => homeassistant}/notifications.yaml (100%) rename packages/{ => homeassistant}/time_date.yaml (100%) delete mode 100644 packages/light/circadian.yaml.disabled delete mode 100644 ui-lovelace-testing.yaml diff --git a/lovelace/lights/scenes.yaml b/lovelace/lights/scenes.yaml index e499229..254d31b 100644 --- a/lovelace/lights/scenes.yaml +++ b/lovelace/lights/scenes.yaml @@ -8,31 +8,31 @@ variables: entity_1: entity_id: scene.light_adaptive - icon: "mdi:YOUR_ICON" + icon: "mdi:theme-light-dark" icon_color: "yellow" - name: Adaptive + name: "Adaptive" bg_color: "yellow" entity_2: - entity_id: scene.light_blue - icon: "mdi:YOUR_ICON" + entity_id: scene.light_bright + icon: "mdi:television-play" icon_color: "blue" - name: Blue + name: "Bright" bg_color: "blue" entity_3: - entity_id: scene.light_night - icon: "mdi:YOUR_ICON" + entity_id: "scene.light_night" + icon: "mdi:weather-night" icon_color: "purple" - name: Night + name: "Night" bg_color: "purple" entity_4: - entity_id: script.light_store_restore - icon: "mdi:YOUR_ICON" + entity_id: "script.light_store_restore" + icon: "mdi:lightbulb-group" icon_color: "green" - name: All On + name: "All On" bg_color: "green" entity_5: - entity_id: script.light_store_off - icon: "mdi:YOUR_ICON" + entity_id: "script.light_store_off" + icon: "mdi:lightbulb-group-off-outline" icon_color: "red" - name: All Off + name: "All Off" bg_color: "red" \ No newline at end of file diff --git a/lovelace/overview/batteries.yaml b/lovelace/overview/batteries.yaml index 9f921a0..2fdf456 100644 --- a/lovelace/overview/batteries.yaml +++ b/lovelace/overview/batteries.yaml @@ -21,16 +21,4 @@ ulm_card_battery_charger_type_entity_id: sensor.ipad_battery_level ulm_card_battery_battery_level_danger: 30 ulm_card_battery_battery_level_warning: 80 - ulm_card_battery_name: iPad - - -# - type: "horizontal-stack" -# cards: -# - type: 'custom:button-card' -# template: card_battery -# entity: sensor.kais_apple_watch_battery_state -# variables: -# ulm_card_battery_charger_type_entity_id: sensor.kais_apple_watch_battery_state -# ulm_card_battery_battery_level_danger: 30 -# ulm_card_battery_battery_level_warning: 80 -# ulm_card_battery_name: Watch \ No newline at end of file + ulm_card_battery_name: iPad \ No newline at end of file diff --git a/packages/button/button_logic.yaml b/packages/button/button_logic.yaml index 66d1f73..f39c464 100644 --- a/packages/button/button_logic.yaml +++ b/packages/button/button_logic.yaml @@ -1,8 +1,7 @@ script: - #----------------------------------------------------------------------------------# - # L/R #----------------------------------------------------------------------------------# # Left + #----------------------------------------------------------------------------------# pos_left_incr: alias: pos_left_incr sequence: @@ -39,7 +38,9 @@ script: target: entity_id: timer.pos_timer mode: single + #----------------------------------------------------------------------------------# # Right + #----------------------------------------------------------------------------------# pos_right_incr: alias: pos_right_incr sequence: @@ -77,10 +78,9 @@ script: entity_id: timer.pos_timer mode: single - #----------------------------------------------------------------------------------# - # Up/Down #----------------------------------------------------------------------------------# # Up + #----------------------------------------------------------------------------------# pos_up: alias: pos_up sequence: @@ -169,7 +169,9 @@ script: target: entity_id: scene.light_bright mode: single + #----------------------------------------------------------------------------------# # Down + #----------------------------------------------------------------------------------# pos_down: alias: pos_down sequence: diff --git a/packages/button/button_press.yaml b/packages/button/button_press.yaml index 622266f..b0895c0 100644 --- a/packages/button/button_press.yaml +++ b/packages/button/button_press.yaml @@ -5,12 +5,14 @@ automation: # Button Left: Pos Left - alias: button_pos_left trigger: + # Bed - platform: device domain: mqtt device_id: 4f9d195bf907da59e1461a5d2404f606 type: action subtype: arrow_left_click discovery_id: 0x0c4314fffee0bb44 action_arrow_left_click + # Door - platform: device domain: mqtt device_id: 5e67efdee83ccceaac84046dfc6c735e @@ -24,12 +26,14 @@ automation: # Button Left: Pos Right - alias: button_pos_right trigger: + # Bed - platform: device domain: mqtt device_id: 4f9d195bf907da59e1461a5d2404f606 type: action subtype: arrow_right_click discovery_id: 0x0c4314fffee0bb44 action_arrow_right_click + # Door - platform: device domain: mqtt device_id: 5e67efdee83ccceaac84046dfc6c735e @@ -47,18 +51,21 @@ automation: # Up - alias: button_up trigger: + # Desk - platform: device domain: mqtt device_id: 121e4230e41feb19254fa92ed5335760 type: action subtype: "on" discovery_id: 0x2c1165fffebebf6d action_on + # Bed - platform: device domain: mqtt device_id: 4f9d195bf907da59e1461a5d2404f606 type: action subtype: "on" discovery_id: 0x0c4314fffee0bb44 action_on + # Door - platform: device domain: mqtt device_id: 5e67efdee83ccceaac84046dfc6c735e @@ -71,18 +78,21 @@ automation: # Down - alias: button_down trigger: + # Desk - platform: device domain: mqtt device_id: 121e4230e41feb19254fa92ed5335760 type: action subtype: "off" discovery_id: 0x2c1165fffebebf6d action_off + # Bed - platform: device domain: mqtt device_id: 4f9d195bf907da59e1461a5d2404f606 type: action subtype: "off" discovery_id: 0x0c4314fffee0bb44 action_off + # Door - platform: device domain: mqtt device_id: 5e67efdee83ccceaac84046dfc6c735e diff --git a/packages/climate/climate_sensors.yaml b/packages/climate/climate_sensors.yaml index f12b0e6..c93d4bc 100644 --- a/packages/climate/climate_sensors.yaml +++ b/packages/climate/climate_sensors.yaml @@ -1,9 +1,6 @@ -## -------------------------------------------------------------------------------------------------## -## Sensoren -## -------------------------------------------------------------------------------------------------## sensor: ## -----------------------------------------------------------------------------------------------## - ## Berechnung der Temperaturveränderung + ## Calculation of temperature change ## -----------------------------------------------------------------------------------------------## - platform: template sensors: @@ -16,7 +13,7 @@ sensor: {% if now == ("0.0"|float) %} {% set change = ("0.0"|float) %} {% endif %} {{ change | round(2) }} ## -----------------------------------------------------------------------------------------------## - ## Berechnung der aktuellen Zieltemperatur bzgl Morgen/Nacht, Automatik/Manuell + ## Calculation of the target temperature ## -----------------------------------------------------------------------------------------------## - platform: template sensors: @@ -71,7 +68,7 @@ sensor: ## -----------------------------------------------------------------------------------------------## - ## Unterer + Oberer Schwellwert + ## target min and max temperature ## -----------------------------------------------------------------------------------------------## - platform: template sensors: @@ -113,9 +110,8 @@ sensor: {% endif %} - ## -----------------------------------------------------------------------------------------------## - ## Differenz zu Ziel + ## difference to target ## -----------------------------------------------------------------------------------------------## - platform: template sensors: diff --git a/packages/weather.yaml b/packages/climate/weather.yaml similarity index 100% rename from packages/weather.yaml rename to packages/climate/weather.yaml diff --git a/packages/homeassistant/default_theme.yaml b/packages/homeassistant/default_theme.yaml index 844433e..a49d2d4 100644 --- a/packages/homeassistant/default_theme.yaml +++ b/packages/homeassistant/default_theme.yaml @@ -5,7 +5,6 @@ automation: trigger: - event: start platform: homeassistant - condition: [] action: - data: name: minimalist-desktop diff --git a/packages/homekit.yaml b/packages/homeassistant/homekit.yaml similarity index 100% rename from packages/homekit.yaml rename to packages/homeassistant/homekit.yaml diff --git a/packages/notifications.yaml b/packages/homeassistant/notifications.yaml similarity index 100% rename from packages/notifications.yaml rename to packages/homeassistant/notifications.yaml diff --git a/packages/time_date.yaml b/packages/homeassistant/time_date.yaml similarity index 100% rename from packages/time_date.yaml rename to packages/homeassistant/time_date.yaml diff --git a/packages/light/circadian.yaml.disabled b/packages/light/circadian.yaml.disabled deleted file mode 100644 index 2a1af2f..0000000 --- a/packages/light/circadian.yaml.disabled +++ /dev/null @@ -1,16 +0,0 @@ -## -------------------------------------------------------------------------------------------------## -## Circadian Lighting / Flux -## -------------------------------------------------------------------------------------------------## -circadian_lighting: - min_colortemp: 2700 - max_colortemp: 6500 - interval: 450 - transition: 8 - - -switch: - - platform: circadian_lighting - lights_ct: - - light.stripe - - light.direct - max_brightness: 80 \ No newline at end of file diff --git a/packages/light/lightstore.yaml b/packages/light/lightstore.yaml index 31a0f61..1cc0305 100644 --- a/packages/light/lightstore.yaml +++ b/packages/light/lightstore.yaml @@ -3,6 +3,9 @@ ## https://github.com/pnbruckner/homeassistant-config/blob/master/python_scripts/light_store.py ## -------------------------------------------------------------------------------------------------## script: + #----------------------------------------------------------------------------------# + # All Lights + #----------------------------------------------------------------------------------# light_store_save: sequence: - service: python_script.light_store @@ -26,7 +29,9 @@ script: store_name: flash_store operation: restore - + #----------------------------------------------------------------------------------# + # Ceiling only + #----------------------------------------------------------------------------------# light_ceiling_save: sequence: - service: python_script.light_store @@ -41,6 +46,9 @@ script: store_name: ceiling_store operation: restore + #----------------------------------------------------------------------------------# + # Ceiling Bed only + #----------------------------------------------------------------------------------# light_ceiling_bed_save: sequence: - service: python_script.light_store @@ -55,6 +63,9 @@ script: store_name: ceiling_store operation: restore + #----------------------------------------------------------------------------------# + # Indirect only + #----------------------------------------------------------------------------------# light_indirect_save: sequence: - service: python_script.light_store diff --git a/packages/light/night.yaml b/packages/light/night.yaml index 31fc05d..144d65e 100644 --- a/packages/light/night.yaml +++ b/packages/light/night.yaml @@ -3,6 +3,7 @@ input_boolean: name: Lights needed initial: false + automation: - alias: lights_needed mode: single @@ -11,6 +12,7 @@ automation: minutes: "10" action: - if: + # Resets at midnight -> OR instead of AND - condition: or conditions: - condition: sun diff --git a/packages/light/yeelight.yaml b/packages/light/yeelight.yaml index 3cca5ff..4a491da 100644 --- a/packages/light/yeelight.yaml +++ b/packages/light/yeelight.yaml @@ -1,8 +1,3 @@ -## -------------------------------------------------------------------------------------------------## -## Yeelight -## -------------------------------------------------------------------------------------------------## - - ## -------------------------------------------------------------------------------------------------## ## Discovery disable ## -------------------------------------------------------------------------------------------------## @@ -12,7 +7,7 @@ discovery: ## -------------------------------------------------------------------------------------------------## -## Lampen-Konfig +## Lights ## -------------------------------------------------------------------------------------------------## yeelight: devices: @@ -45,7 +40,7 @@ yeelight: ## -------------------------------------------------------------------------------------------------## -## Lampengruppen +## Light Groups ## -------------------------------------------------------------------------------------------------## light: - platform: group @@ -78,6 +73,4 @@ light: name: all_lights entities: - light.all_direct - - light.all_indirect - - + - light.all_indirect \ No newline at end of file diff --git a/packages/minimalist/custom_entities.yaml b/packages/minimalist/custom_entities.yaml index c273303..75b321b 100644 --- a/packages/minimalist/custom_entities.yaml +++ b/packages/minimalist/custom_entities.yaml @@ -1,11 +1,3 @@ input_boolean: welcome_collapse: - name: welcome_collapse - - -input_select: - minimalist_ui_switch: - name: Select popup/view - options: - - light.all_indirect - - light.all_direct \ No newline at end of file + name: welcome_collapse \ No newline at end of file diff --git a/packages/nas/wol.yaml b/packages/nas/wol.yaml index b4c0609..b6a8a09 100644 --- a/packages/nas/wol.yaml +++ b/packages/nas/wol.yaml @@ -3,13 +3,11 @@ ## -------------------------------------------------------------------------------------------------## wake_on_lan: - switch: - platform: wake_on_lan mac: 54:04:A6:BF:1E:43 name: Server host: ip.wnsrt.de -#switch: - platform: template switches: server_template: diff --git a/ui-lovelace-testing.yaml b/ui-lovelace-testing.yaml deleted file mode 100644 index 68e13bd..0000000 --- a/ui-lovelace-testing.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -button_card_templates: !include_dir_merge_named "custom_components/ui_lovelace_minimalist/__ui_minimalist__/ulm_templates/" - - -title: "Testing" -theme: "minimalist-desktop" -background: "var(--background-image)" - - -swipe_nav: - wrap: true - animate: swipe - prevent_default: true - swipe_amount: 30 \ No newline at end of file diff --git a/ui-lovelace.yaml b/ui-lovelace.yaml index 8dd6795..f16a2a0 100644 --- a/ui-lovelace.yaml +++ b/ui-lovelace.yaml @@ -15,6 +15,9 @@ swipe_nav: views: + #----------------------------------------------------------------------------------# + # Dashboard + #----------------------------------------------------------------------------------# - type: custom:vertical-layout title: "Overview" path: 0 @@ -61,6 +64,9 @@ views: cards: !include lovelace/overview/vacuum.yaml + #----------------------------------------------------------------------------------# + # Lights + #----------------------------------------------------------------------------------# - type: custom:vertical-layout title: "Lights" path: 1 @@ -93,7 +99,9 @@ views: cards: !include lovelace/lights/lightmenu.yaml - + #----------------------------------------------------------------------------------# + # pfSense + #----------------------------------------------------------------------------------# - type: custom:vertical-layout title: "pfSense" path: 2 @@ -122,7 +130,9 @@ views: cards: !include lovelace/pfsense/traffic.yaml - + #----------------------------------------------------------------------------------# + # Climate + #----------------------------------------------------------------------------------# - type: custom:vertical-layout title: "Climate" path: 3