From 9db4448fa41e6c1659f33b11c9eb0b083851b57e Mon Sep 17 00:00:00 2001 From: darthsandmann Date: Tue, 2 Aug 2022 14:03:44 +0200 Subject: [PATCH] Updates --- lovelace/climate/setup.yaml | 2 + lovelace/lights/adaptive.yaml | 31 +++++ lovelace/lights/lightbulbs.yaml | 22 +--- lovelace/lights/scenes.yaml | 23 +--- lovelace/overview/batteries.yaml | 20 ++- lovelace/overview/climate.yaml | 49 +++---- lovelace/overview/energy.yaml | 6 +- lovelace/overview/feed.yaml | 26 ++++ lovelace/overview/lights.yaml | 24 ++-- lovelace/overview/multimedia.yaml | 15 +++ lovelace/overview/nas.yaml | 6 +- lovelace/overview/vacuum.yaml | 20 +++ lovelace/overview/welcome.yaml | 20 ++- packages/climate/climate_automation.yaml | 121 ++++++++++++++++++ .../climate/climate_automation.yaml.disabled | 99 -------------- packages/homeassistant/homeassistant.yaml | 6 + packages/homeassistant/lovelace.yaml | 30 ----- packages/homekit.yaml | 4 +- packages/light/adaptive.yaml | 18 +++ ...circadian.yaml => circadian.yaml.disabled} | 0 packages/light/lightscenes.yaml | 16 +-- packages/light/lightstore.yaml | 4 +- packages/light/yeelight.yaml | 12 +- packages/pirate_weather.yaml | 3 +- resources.yaml | 36 ++++++ ui-lovelace-testing.yaml | 14 ++ ui-lovelace.yaml | 54 ++++++-- 27 files changed, 436 insertions(+), 245 deletions(-) create mode 100644 lovelace/lights/adaptive.yaml create mode 100644 lovelace/overview/feed.yaml create mode 100644 lovelace/overview/multimedia.yaml create mode 100644 lovelace/overview/vacuum.yaml create mode 100644 packages/climate/climate_automation.yaml delete mode 100644 packages/climate/climate_automation.yaml.disabled delete mode 100644 packages/homeassistant/lovelace.yaml create mode 100644 packages/light/adaptive.yaml rename packages/light/{circadian.yaml => circadian.yaml.disabled} (100%) create mode 100644 resources.yaml create mode 100644 ui-lovelace-testing.yaml diff --git a/lovelace/climate/setup.yaml b/lovelace/climate/setup.yaml index 8e6d9b5..451b614 100644 --- a/lovelace/climate/setup.yaml +++ b/lovelace/climate/setup.yaml @@ -3,6 +3,8 @@ - type: 'custom:button-card' template: card_title name: Day/Night + - type: custom:button-card + template: custom_card_httpedo13_sun - type: "horizontal-stack" cards: - type: "custom:button-card" diff --git a/lovelace/lights/adaptive.yaml b/lovelace/lights/adaptive.yaml new file mode 100644 index 0000000..f634b94 --- /dev/null +++ b/lovelace/lights/adaptive.yaml @@ -0,0 +1,31 @@ +- type: 'custom:button-card' + template: card_title + name: Adaptive + +- type: "horizontal-stack" + cards: + - type: 'custom:button-card' + template: card_input_boolean + entity: switch.adaptive_lighting_default + variables: + ulm_card_input_boolean_name: Adaptive + + - type: 'custom:button-card' + template: card_input_boolean + entity: switch.adaptive_lighting_sleep_mode_default + variables: + ulm_card_input_boolean_name: Sleep + +- type: "horizontal-stack" + cards: + - type: 'custom:button-card' + template: card_input_boolean + entity: switch.adaptive_lighting_adapt_brightness_default + variables: + ulm_card_input_boolean_name: Brightness + + - type: 'custom:button-card' + template: card_input_boolean + entity: switch.adaptive_lighting_adapt_color_default + variables: + ulm_card_input_boolean_name: Color \ No newline at end of file diff --git a/lovelace/lights/lightbulbs.yaml b/lovelace/lights/lightbulbs.yaml index 40cd401..d52f5be 100644 --- a/lovelace/lights/lightbulbs.yaml +++ b/lovelace/lights/lightbulbs.yaml @@ -7,26 +7,10 @@ - type: 'custom:button-card' template: card_light_slider_collapse variables: - ulm_card_light_slider_collapse_name: Ceiling 1 + ulm_card_light_slider_collapse_name: Ceiling ulm_card_light_enable_collapse: false - ulm_card_light_name: Ceiling 1 - entity: light.ceiling1 - - type: 'custom:button-card' - template: card_light_slider_collapse - variables: - ulm_card_light_slider_collapse_name: Ceiling 2 - ulm_card_light_enable_collapse: false - ulm_card_light_name: Ceiling 2 - entity: light.ceiling2 -- type: "horizontal-stack" - cards: - - type: 'custom:button-card' - template: card_light_slider_collapse - variables: - ulm_card_light_slider_collapse_name: Ceiling 3 - ulm_card_light_enable_collapse: false - ulm_card_light_name: Ceiling 3 - entity: light.ceiling3 + ulm_card_light_name: Ceiling + entity: light.ceiling - type: 'custom:button-card' template: card_light_slider_collapse variables: diff --git a/lovelace/lights/scenes.yaml b/lovelace/lights/scenes.yaml index 820ba6a..e499229 100644 --- a/lovelace/lights/scenes.yaml +++ b/lovelace/lights/scenes.yaml @@ -7,10 +7,10 @@ - card_scenes variables: entity_1: - entity_id: scene.light_flux + entity_id: scene.light_adaptive icon: "mdi:YOUR_ICON" icon_color: "yellow" - name: Flux + name: Adaptive bg_color: "yellow" entity_2: entity_id: scene.light_blue @@ -25,25 +25,14 @@ name: Night bg_color: "purple" entity_4: - entity_id: scene.light_alloff + entity_id: script.light_store_restore icon: "mdi:YOUR_ICON" icon_color: "green" - name: All Off + name: All On bg_color: "green" entity_5: - entity_id: scene.light_alloff + entity_id: script.light_store_off icon: "mdi:YOUR_ICON" icon_color: "red" name: All Off - bg_color: "red" - - -- type: 'custom:button-card' - template: card_title - name: Switches - -- type: 'custom:button-card' - template: card_input_boolean - entity: switch.circadian_lighting_circadian_lighting - variables: - ulm_card_input_boolean_name: Circadian Lighting \ No newline at end of file + bg_color: "red" \ No newline at end of file diff --git a/lovelace/overview/batteries.yaml b/lovelace/overview/batteries.yaml index 1b403d6..9f921a0 100644 --- a/lovelace/overview/batteries.yaml +++ b/lovelace/overview/batteries.yaml @@ -1,6 +1,6 @@ -- type: 'custom:button-card' - template: card_title - name: Batteries +#- type: 'custom:button-card' +# template: card_title +# name: Batteries - type: "horizontal-stack" @@ -21,4 +21,16 @@ 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 \ No newline at end of file + 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 diff --git a/lovelace/overview/climate.yaml b/lovelace/overview/climate.yaml index f5418f9..7e0a473 100644 --- a/lovelace/overview/climate.yaml +++ b/lovelace/overview/climate.yaml @@ -1,28 +1,29 @@ -- type: 'custom:button-card' - template: card_title - name: Climate +#- type: 'custom:button-card' +# template: card_title +# name: Climate -- type: 'custom:button-card' - template: card_generic - entity: sensor.climate_temp_recommendation +#- type: custom:simple-weather-card +# entity: weather.pirateweather -- type: custom:simple-weather-card - entity: weather.pirateweather - - -- type: 'custom:button-card' - template: card_graph - entity: sensor.temperature_kai_temperature - variables: - ulm_card_graph_color: "var(--google-blue)" - ulm_card_graph_name: Temperature - ulm_card_graph_entity: sensor.temperature_kai_temperature - ulm_card_graph_color2: "var(--google-green)" - ulm_card_graph_entity2: sensor.temperature_outside_pirateweather - ulm_card_graph_type: fill - ulm_card_graph_hours: 6 +- type: custom:apexcharts-card + graph_span: 6h + header: + show: false + series: + - entity: sensor.temperature_kai_temperature + type: line + name: Inside + group_by: + func: avg + duration: 30min + - entity: sensor.temperature_outside_pirateweather + type: column + name: Outside + group_by: + func: avg + duration: 30min - type: "horizontal-stack" @@ -37,4 +38,8 @@ template: card_generic entity: sensor.temperature_kai_pressure variables: - ulm_card_generic_name: Pressure \ No newline at end of file + ulm_card_generic_name: Pressure + + +- type: custom:weather-card + entity: weather.pirateweather \ No newline at end of file diff --git a/lovelace/overview/energy.yaml b/lovelace/overview/energy.yaml index 8629107..90d0b29 100644 --- a/lovelace/overview/energy.yaml +++ b/lovelace/overview/energy.yaml @@ -1,6 +1,6 @@ -- type: 'custom:button-card' - template: card_title - name: Energy +#- type: 'custom:button-card' +# template: card_title +# name: Energy - type: 'custom:button-card' diff --git a/lovelace/overview/feed.yaml b/lovelace/overview/feed.yaml new file mode 100644 index 0000000..7fcea53 --- /dev/null +++ b/lovelace/overview/feed.yaml @@ -0,0 +1,26 @@ +- type: 'custom:home-feed-card' + title: Feed + card_id: main_feed + show_empty: false + more_info_on_tap: true + state_color: true + compact_mode: true + entities: + - entity: sensor.climate_temp_recommendation + name: Recommendation + content_template: '{{state}}' + - entity: binary_sensor.warning_duisburg_stadt_1 + exclude_states: + - "Safe" + - entity: binary_sensor.warning_duisburg_stadt_2 + exclude_states: + - "Safe" + - entity: binary_sensor.warning_duisburg_stadt_3 + exclude_states: + - "Safe" + - entity: binary_sensor.warning_duisburg_stadt_4 + exclude_states: + - "Safe" + - entity: binary_sensor.warning_duisburg_stadt_5 + exclude_states: + - "Safe" \ No newline at end of file diff --git a/lovelace/overview/lights.yaml b/lovelace/overview/lights.yaml index 3a2d196..098d43a 100644 --- a/lovelace/overview/lights.yaml +++ b/lovelace/overview/lights.yaml @@ -1,6 +1,6 @@ -- type: 'custom:button-card' - template: card_title - name: Lights +#- type: 'custom:button-card' +# template: card_title +# name: Lights - type: "horizontal-stack" @@ -24,8 +24,16 @@ entity: light.all_direct -- type: 'custom:button-card' - template: card_input_boolean - entity: switch.circadian_lighting_circadian_lighting - variables: - ulm_card_input_boolean_name: Circadian Lighting \ No newline at end of file +- type: "horizontal-stack" + cards: + - type: 'custom:button-card' + template: card_input_boolean + entity: switch.adaptive_lighting_default + variables: + ulm_card_input_boolean_name: Adaptive + + - type: 'custom:button-card' + template: card_input_boolean + entity: switch.adaptive_lighting_sleep_mode_default + variables: + ulm_card_input_boolean_name: Sleep diff --git a/lovelace/overview/multimedia.yaml b/lovelace/overview/multimedia.yaml new file mode 100644 index 0000000..07ddc12 --- /dev/null +++ b/lovelace/overview/multimedia.yaml @@ -0,0 +1,15 @@ +#- type: 'custom:button-card' +# template: card_title +# name: Multimedia + + +- type: "custom:button-card" + template: card_media_player + entity: media_player.denon_avr_x1100w + name: Denon + variables: + ulm_card_media_player_more_info: true + ulm_card_media_player_collapsible: true + ulm_card_media_player_enable_volume_slider: true + ulm_card_media_player_enable_controls: true + ulm_card_media_player_enable_art: false \ No newline at end of file diff --git a/lovelace/overview/nas.yaml b/lovelace/overview/nas.yaml index 87e3295..7dc2ea8 100644 --- a/lovelace/overview/nas.yaml +++ b/lovelace/overview/nas.yaml @@ -1,6 +1,6 @@ -- type: 'custom:button-card' - template: card_title - name: NAS +#- type: 'custom:button-card' +# template: card_title +# name: NAS - type: "horizontal-stack" diff --git a/lovelace/overview/vacuum.yaml b/lovelace/overview/vacuum.yaml new file mode 100644 index 0000000..f431064 --- /dev/null +++ b/lovelace/overview/vacuum.yaml @@ -0,0 +1,20 @@ +#- type: 'custom:button-card' +# template: card_title +# name: Vacuum + + +- type: 'custom:valetudo-map-card' + vacuum: valetudo_rockrobo + title: + show_status: false + show_battery_level: false + show_start_button: false + show_pause_button: false + show_stop_button: false + show_home_button: false + show_locate_button: false + + +- type: "custom:button-card" + template: "card_vacuum" + entity: vacuum.valetudo_rockrobo \ No newline at end of file diff --git a/lovelace/overview/welcome.yaml b/lovelace/overview/welcome.yaml index 917caaf..13ddb83 100644 --- a/lovelace/overview/welcome.yaml +++ b/lovelace/overview/welcome.yaml @@ -1,6 +1,8 @@ -- type: 'custom:button-card' - template: card_title - name: Home Assistant +#- type: 'custom:button-card' +# template: card_title +# name: Home Assistant + + - type: "custom:button-card" template: "card_welcome_scenes" triggers_update: input_boolean.welcome_collapse @@ -9,10 +11,10 @@ ulm_card_welcome_scenes_collapse: input_boolean.welcome_collapse ulm_weather: weather.pirateweather entity_1: - entity_id: scene.light_flux + entity_id: scene.light_adaptive icon: "mdi:theme-light-dark" icon_color: "yellow" - name: "Flux" + name: "Adaptive" bg_color: "yellow" entity_2: entity_id: scene.light_blue @@ -33,12 +35,8 @@ name: "All On" bg_color: "green" entity_5: - entity_id: "scene.light_alloff" + entity_id: "script.light_store_off" icon: "mdi:lightbulb-group-off-outline" icon_color: "red" name: "All Off" - bg_color: "red" - - -- type: custom:button-card - template: custom_card_httpedo13_sun \ No newline at end of file + bg_color: "red" \ No newline at end of file diff --git a/packages/climate/climate_automation.yaml b/packages/climate/climate_automation.yaml new file mode 100644 index 0000000..3be685e --- /dev/null +++ b/packages/climate/climate_automation.yaml @@ -0,0 +1,121 @@ +automation: + ## -----------------------------------------------------------------------------------------------## + ## Notification on state change + ## -----------------------------------------------------------------------------------------------## + - alias: "climate_recommendation_close" + trigger: + - platform: state + entity_id: sensor.climate_temp_recommendation + to: 'close window' + action: + - service: notify.notify + data: + message: "Close the window." + - alias: "climate_recommendation_open" + trigger: + - platform: state + entity_id: sensor.climate_temp_recommendation + to: 'open window' + action: + - service: notify.notify + data: + message: "Open the window." + + ## -----------------------------------------------------------------------------------------------## + ## Trigger alle 15min um Abfrage und Temperaturanpassung durchzuführen + ## -----------------------------------------------------------------------------------------------## + # - alias: climate_set_auto + # initial_state: on + # trigger: + # - platform: time_pattern + # minutes: '/5' + # - platform: state + # entity_id: sensor.climate_temp + # condition: + # - condition: template + # value_template: '{{ states.climate.kai.state != "unavailable" }}' + # action: + # - service: script.turn_on + # entity_id: script.climate_set + # - delay: '00:20' + # - service: script.turn_on + # entity_id: script.climate_set + # - service: input_number.set_value + # data_template: + # entity_id: input_number.climate_temp_last + # value: '{{ states("sensor.aqara_temperature_kai_temperature")|float }}' + # - alias: climate_set_manual + # initial_state: on + # trigger: + # - platform: state + # entity_id: input_number.climate_temp + # condition: + # - condition: template + # value_template: '{{ states.climate.kai.state != "unavailable" }}' + # action: + # - service: input_boolean.turn_off + # entity_id: input_boolean.climate_auto + # - service: script.turn_on + # entity_id: script.climate_set + # - delay: '00:20' + # - service: script.turn_on + # entity_id: script.climate_set + # - alias: climate_set_power_off + # initial_state: on + # trigger: + # - platform: state + # entity_id: input_boolean.climate_power + # to: "off" + # action: + # - service: climate.turn_off + # entity_id: climate.kai + # - delay: '00:20' + # - service: climate.turn_off + # entity_id: climate.kai + # - alias: climate_set_power_on + # initial_state: on + # trigger: + # - platform: state + # entity_id: input_boolean.climate_power + # to: "on" + # action: + # - service: climate.turn_on + # entity_id: climate.kai + # - delay: '00:20' + # - service: climate.turn_on + # entity_id: climate.kai + ## -----------------------------------------------------------------------------------------------## + ## Trigger alle 5min, wenn Wochentag -> aktiviere Weekday-Boolean + ## -----------------------------------------------------------------------------------------------## + - alias: climate_weekday + initial_state: on + trigger: + platform: time_pattern + minutes: '/5' + condition: + - condition: time + weekday: + - mon + - tue + - wed + - thu + - fri + action: + service: input_boolean.turn_on + entity_id: input_boolean.climate_weekday + ## -----------------------------------------------------------------------------------------------## + ## Trigger alle 5min, wenn Wochenende -> deaktiviere Weekday-Boolean + ## -----------------------------------------------------------------------------------------------## + - alias: climate_weekend + initial_state: on + trigger: + platform: time_pattern + minutes: '/5' + condition: + - condition: time + weekday: + - sat + - sun + action: + service: input_boolean.turn_off + entity_id: input_boolean.climate_weekday \ No newline at end of file diff --git a/packages/climate/climate_automation.yaml.disabled b/packages/climate/climate_automation.yaml.disabled deleted file mode 100644 index e4f43fa..0000000 --- a/packages/climate/climate_automation.yaml.disabled +++ /dev/null @@ -1,99 +0,0 @@ -automation: - ## -----------------------------------------------------------------------------------------------## - ## Trigger alle 15min um Abfrage und Temperaturanpassung durchzuführen - ## -----------------------------------------------------------------------------------------------## - - alias: climate_set_auto - initial_state: on - trigger: - - platform: time_pattern - minutes: '/5' - - platform: state - entity_id: sensor.climate_temp - condition: - - condition: template - value_template: '{{ states.climate.kai.state != "unavailable" }}' - action: - - service: script.turn_on - entity_id: script.climate_set - - delay: '00:20' - - service: script.turn_on - entity_id: script.climate_set - - service: input_number.set_value - data_template: - entity_id: input_number.climate_temp_last - value: '{{ states("sensor.aqara_temperature_kai_temperature")|float }}' - - alias: climate_set_manual - initial_state: on - trigger: - - platform: state - entity_id: input_number.climate_temp - condition: - - condition: template - value_template: '{{ states.climate.kai.state != "unavailable" }}' - action: - - service: input_boolean.turn_off - entity_id: input_boolean.climate_auto - - service: script.turn_on - entity_id: script.climate_set - - delay: '00:20' - - service: script.turn_on - entity_id: script.climate_set - - alias: climate_set_power_off - initial_state: on - trigger: - - platform: state - entity_id: input_boolean.climate_power - to: "off" - action: - - service: climate.turn_off - entity_id: climate.kai - - delay: '00:20' - - service: climate.turn_off - entity_id: climate.kai - - alias: climate_set_power_on - initial_state: on - trigger: - - platform: state - entity_id: input_boolean.climate_power - to: "on" - action: - - service: climate.turn_on - entity_id: climate.kai - - delay: '00:20' - - service: climate.turn_on - entity_id: climate.kai - ## -----------------------------------------------------------------------------------------------## - ## Trigger alle 5min, wenn Wochentag -> aktiviere Weekday-Boolean - ## -----------------------------------------------------------------------------------------------## - - alias: climate_weekday - initial_state: on - trigger: - platform: time_pattern - minutes: '/5' - condition: - - condition: time - weekday: - - mon - - tue - - wed - - thu - - fri - - sun - action: - service: input_boolean.turn_on - entity_id: input_boolean.climate_weekday - ## -----------------------------------------------------------------------------------------------## - ## Trigger alle 5min, wenn Wochenende -> deaktiviere Weekday-Boolean - ## -----------------------------------------------------------------------------------------------## - - alias: climate_weekend - initial_state: on - trigger: - platform: time_pattern - minutes: '/5' - condition: - - condition: time - weekday: - - sat - action: - service: input_boolean.turn_off - entity_id: input_boolean.climate_weekday \ No newline at end of file diff --git a/packages/homeassistant/homeassistant.yaml b/packages/homeassistant/homeassistant.yaml index 0bedb08..a36ac90 100644 --- a/packages/homeassistant/homeassistant.yaml +++ b/packages/homeassistant/homeassistant.yaml @@ -14,6 +14,11 @@ homeassistant: - 10.10.10.0/24 +lovelace: + mode: yaml + resources: !include ../../resources.yaml + + http: use_x_forwarded_for: true trusted_proxies: @@ -34,6 +39,7 @@ history: map: mobile_app: person: +python_script: ssdp: system_health: timer: diff --git a/packages/homeassistant/lovelace.yaml b/packages/homeassistant/lovelace.yaml deleted file mode 100644 index e849465..0000000 --- a/packages/homeassistant/lovelace.yaml +++ /dev/null @@ -1,30 +0,0 @@ -lovelace: - mode: yaml - - resources: - - url: /hacsfiles/button-card/button-card.js - type: module - - url: /hacsfiles/light-entity-card/light-entity-card.js - type: module - - url: /hacsfiles/lovelace-auto-entities/auto-entities.js - type: module - - url: /hacsfiles/lovelace-card-mod/card-mod.js - type: module - - url: /hacsfiles/mini-graph-card/mini-graph-card-bundle.js - type: module - - url: /hacsfiles/mini-media-player/mini-media-player-bundle.js - type: module - - url: /hacsfiles/my-cards/my-slider.js - type: module - #- url: /hacsfiles/my-cards/my-slider-v2.js - # type: module - - url: /hacsfiles/my-cards/my-button.js - type: module - - url: /hacsfiles/simple-weather-card/simple-weather-card-bundle.js - type: module - - url: /hacsfiles/home-assistant-sun-card/home-assistant-sun-card.js - type: module - - url: /hacsfiles/lovelace-layout-card/layout-card.js - type: module - - url: /hacsfiles/lovelace-state-switch/state-switch.js - type: module \ No newline at end of file diff --git a/packages/homekit.yaml b/packages/homekit.yaml index 45d0978..731c16b 100644 --- a/packages/homekit.yaml +++ b/packages/homekit.yaml @@ -48,8 +48,8 @@ homekit: name: Lights Off scene.light_blue: name: Lights Blue - scene.light_flux: - name: Lights Flux + scene.light_adaptive: + name: Lights Adaptive scene.light_night: name: Lights Night switch.circadian_lighting_circadian_lighting: diff --git a/packages/light/adaptive.yaml b/packages/light/adaptive.yaml new file mode 100644 index 0000000..36e02e8 --- /dev/null +++ b/packages/light/adaptive.yaml @@ -0,0 +1,18 @@ +adaptive_lighting: +- name: "default" + lights: + - light.stripe + - light.direct + prefer_rgb_color: false + transition: 45 + initial_transition: 1 + interval: 90 + min_brightness: 1 + max_brightness: 80 + min_color_temp: 2700 + max_color_temp: 6500 + sleep_brightness: 1 + sleep_color_temp: 1000 + take_over_control: true + detect_non_ha_changes: false + only_once: false \ No newline at end of file diff --git a/packages/light/circadian.yaml b/packages/light/circadian.yaml.disabled similarity index 100% rename from packages/light/circadian.yaml rename to packages/light/circadian.yaml.disabled diff --git a/packages/light/lightscenes.yaml b/packages/light/lightscenes.yaml index 4e59de2..8920883 100644 --- a/packages/light/lightscenes.yaml +++ b/packages/light/lightscenes.yaml @@ -1,15 +1,14 @@ scene: - - name: light_alloff - entities: - light.all_lights: false - - name: light_flux + - name: light_adaptive entities: light.all_direct: false light.all_indirect: true - switch.circadian_lighting_circadian_lighting: on + switch.adaptive_lighting_default: on + switch.adaptive_lighting_sleep_mode_default: off - name: light_blue entities: - switch.circadian_lighting_circadian_lighting: off + switch.adaptive_lighting_default: off + switch.adaptive_lighting_sleep_mode_default: off light.all_direct: false light.all_indirect: rgb_color: [0, 0, 255] @@ -17,9 +16,10 @@ scene: brightness: 20 - name: light_night entities: - switch.circadian_lighting_circadian_lighting: off + switch.adaptive_lighting_default: on light.all_direct: false light.all_indirect: rgb_color: [255, 139, 21] state: true - brightness: 1 \ No newline at end of file + brightness: 1 + switch.adaptive_lighting_sleep_mode_default: on \ No newline at end of file diff --git a/packages/light/lightstore.yaml b/packages/light/lightstore.yaml index 8f7a7dc..b93bdff 100644 --- a/packages/light/lightstore.yaml +++ b/packages/light/lightstore.yaml @@ -10,9 +10,9 @@ script: store_name: flash_store entity_id: - light.bed - - light.closet + - light.ceiling - light.desk - - light.direct + - light.bed_ceiling - light.tv light_store_off: sequence: diff --git a/packages/light/yeelight.yaml b/packages/light/yeelight.yaml index 02b7c01..9643372 100644 --- a/packages/light/yeelight.yaml +++ b/packages/light/yeelight.yaml @@ -19,28 +19,28 @@ yeelight: 10.10.10.82: name: ceiling1 save_on_change: False - transition: 2500 + transition: 1500 10.10.10.83: name: ceiling2 save_on_change: False - transition: 2500 + transition: 1500 10.10.10.80: name: ceiling3 save_on_change: False - transition: 2500 + transition: 1500 10.10.10.81: name: bed_ceiling save_on_change: False - transition: 2500 + transition: 1500 10.10.10.84: name: bed save_on_change: False - transition: 2500 + transition: 1500 model: strip1 10.10.10.85: name: desk save_on_change: False - transition: 2500 + transition: 1500 model: strip1 diff --git a/packages/pirate_weather.yaml b/packages/pirate_weather.yaml index 44cea2c..582f1a2 100644 --- a/packages/pirate_weather.yaml +++ b/packages/pirate_weather.yaml @@ -20,4 +20,5 @@ sensor: sensors: temperature_outside_pirateweather: value_template: '{{ states.weather.pirateweather.attributes.temperature }}' - friendly_name: 'Outside Temperature' \ No newline at end of file + friendly_name: 'Outside Temperature' + unit_of_measurement: '°C' \ No newline at end of file diff --git a/resources.yaml b/resources.yaml new file mode 100644 index 0000000..71dd7c5 --- /dev/null +++ b/resources.yaml @@ -0,0 +1,36 @@ +- url: /hacsfiles/button-card/button-card.js + type: module +- url: /hacsfiles/light-entity-card/light-entity-card.js + type: module +- url: /hacsfiles/lovelace-auto-entities/auto-entities.js + type: module +- url: /hacsfiles/lovelace-card-mod/card-mod.js + type: module +- url: /hacsfiles/mini-graph-card/mini-graph-card-bundle.js + type: module +- url: /hacsfiles/mini-media-player/mini-media-player-bundle.js + type: module +- url: /hacsfiles/my-cards/my-slider.js + type: module +- url: /hacsfiles/my-cards/my-button.js + type: module +- url: /hacsfiles/simple-weather-card/simple-weather-card-bundle.js + type: module +- url: /hacsfiles/home-assistant-sun-card/home-assistant-sun-card.js + type: module +- url: /hacsfiles/lovelace-layout-card/layout-card.js + type: module +- url: /hacsfiles/lovelace-state-switch/state-switch.js + type: module +- url: /hacsfiles/lovelace-valetudo-map-card/valetudo-map-card.js + type: module +- url: /hacsfiles/apexcharts-card/apexcharts-card.js + type: module +- url: /hacsfiles/lovelace-home-feed-card/lovelace-home-feed-card.js + type: module +- url: /hacsfiles/hass-swipe-navigation/swipe-navigation.js + type: module +- url: /hacsfiles/weather-card/weather-card.js + type: module +- url: /hacsfiles/lovelace-mushroom/mushroom.js + type: module \ No newline at end of file diff --git a/ui-lovelace-testing.yaml b/ui-lovelace-testing.yaml new file mode 100644 index 0000000..68e13bd --- /dev/null +++ b/ui-lovelace-testing.yaml @@ -0,0 +1,14 @@ +--- +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 54b5dfd..a7e1bdf 100644 --- a/ui-lovelace.yaml +++ b/ui-lovelace.yaml @@ -4,31 +4,62 @@ button_card_templates: !include_dir_merge_named "custom_components/ui_lovelace_m title: "Overview" theme: "minimalist-desktop" -background: "var(--background-image)" +background: "var(--background-image)" + + +swipe_nav: + wrap: true + animate: swipe + prevent_default: true + swipe_amount: 30 views: - - title: "Overview" + - type: custom:vertical-layout + title: "Overview" path: 0 cards: - - type: "vertical-stack" + ## Column 1 + - type: custom:vertical-layout + type: "vertical-stack" cards: !include lovelace/overview/welcome.yaml - - type: "vertical-stack" + - type: custom:vertical-layout + type: "vertical-stack" cards: !include lovelace/overview/lights.yaml - - type: "vertical-stack" + - type: custom:vertical-layout + type: "vertical-stack" + cards: + !include lovelace/overview/feed.yaml + - type: custom:layout-break + ## Column 2 + - type: custom:vertical-layout + type: "vertical-stack" cards: !include lovelace/overview/climate.yaml - - type: "vertical-stack" + - type: custom:vertical-layout + type: "vertical-stack" cards: !include lovelace/overview/batteries.yaml - - type: "vertical-stack" - cards: - !include lovelace/overview/energy.yaml - - type: "vertical-stack" + - type: custom:vertical-layout + type: "vertical-stack" cards: !include lovelace/overview/nas.yaml + - type: custom:layout-break + ## Column 3 + - type: custom:vertical-layout + type: "vertical-stack" + cards: + !include lovelace/overview/energy.yaml + - type: custom:vertical-layout + type: "vertical-stack" + cards: + !include lovelace/overview/multimedia.yaml + - type: custom:vertical-layout + type: "vertical-stack" + cards: + !include lovelace/overview/vacuum.yaml - title: "Lights" @@ -37,6 +68,9 @@ views: - type: "vertical-stack" cards: !include lovelace/lights/scenes.yaml + - type: "vertical-stack" + cards: + !include lovelace/lights/adaptive.yaml - type: "vertical-stack" cards: !include lovelace/lights/lightgroups.yaml