From 78259b2dc4e657a4c0de2a4b49f264debcf492a6 Mon Sep 17 00:00:00 2001 From: darthsandmann Date: Tue, 2 Aug 2022 18:57:48 +0200 Subject: [PATCH] Updates --- lovelace/climate/recommendation.yaml | 28 +++-- lovelace/lights/lightbulbs.yaml | 4 +- lovelace/lights/lightgroups.yaml | 4 +- lovelace/lights/lightstripes.yaml | 4 +- lovelace/overview/energy.yaml | 25 +++-- lovelace/overview/lights.yaml | 4 +- lovelace/pfsense/traffic.yaml | 146 ++++++++++++++++----------- packages/light/lightscenes.yaml | 8 +- ui-lovelace.yaml | 59 +++++++---- 9 files changed, 174 insertions(+), 108 deletions(-) diff --git a/lovelace/climate/recommendation.yaml b/lovelace/climate/recommendation.yaml index 6eecafc..64be368 100644 --- a/lovelace/climate/recommendation.yaml +++ b/lovelace/climate/recommendation.yaml @@ -23,17 +23,23 @@ variables: ulm_card_generic_swap_name: difference -- 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.climate_temp - 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" cards: diff --git a/lovelace/lights/lightbulbs.yaml b/lovelace/lights/lightbulbs.yaml index d52f5be..1f993e5 100644 --- a/lovelace/lights/lightbulbs.yaml +++ b/lovelace/lights/lightbulbs.yaml @@ -8,13 +8,13 @@ template: card_light_slider_collapse variables: ulm_card_light_slider_collapse_name: Ceiling - ulm_card_light_enable_collapse: false + ulm_card_light_enable_collapse: true ulm_card_light_name: Ceiling entity: light.ceiling - type: 'custom:button-card' template: card_light_slider_collapse variables: ulm_card_light_slider_collapse_name: Bed - ulm_card_light_enable_collapse: false + ulm_card_light_enable_collapse: true ulm_card_light_name: Bed entity: light.bed_ceiling \ No newline at end of file diff --git a/lovelace/lights/lightgroups.yaml b/lovelace/lights/lightgroups.yaml index 707f8f7..ad90f84 100644 --- a/lovelace/lights/lightgroups.yaml +++ b/lovelace/lights/lightgroups.yaml @@ -8,7 +8,7 @@ template: card_light_slider_collapse variables: ulm_card_light_slider_collapse_name: Indirect - ulm_card_light_enable_collapse: false + ulm_card_light_enable_collapse: true ulm_card_light_name: Indirect ulm_input_select_option: light indirect ulm_input_select: input_select.minimalist_ui_switch @@ -18,6 +18,6 @@ template: card_light_slider_collapse variables: ulm_card_light_slider_collapse_name: Direct - ulm_card_light_enable_collapse: false + ulm_card_light_enable_collapse: true ulm_card_light_name: Direct entity: light.all_direct \ No newline at end of file diff --git a/lovelace/lights/lightstripes.yaml b/lovelace/lights/lightstripes.yaml index 71ec789..646d459 100644 --- a/lovelace/lights/lightstripes.yaml +++ b/lovelace/lights/lightstripes.yaml @@ -8,7 +8,7 @@ template: card_light_slider_collapse variables: ulm_card_light_slider_collapse_name: Bed - ulm_card_light_enable_collapse: false + ulm_card_light_enable_collapse: true ulm_card_light_name: Bed entity: light.bed @@ -16,6 +16,6 @@ template: card_light_slider_collapse variables: ulm_card_light_slider_collapse_name: Desk - ulm_card_light_enable_collapse: false + ulm_card_light_enable_collapse: true ulm_card_light_name: Desk entity: light.desk \ No newline at end of file diff --git a/lovelace/overview/energy.yaml b/lovelace/overview/energy.yaml index 90d0b29..948781b 100644 --- a/lovelace/overview/energy.yaml +++ b/lovelace/overview/energy.yaml @@ -3,29 +3,32 @@ # name: Energy -- type: 'custom:button-card' - template: card_graph - entity: sensor.schreibtisch_current_consumption - variables: - ulm_card_graph_color: "var(--google-green)" - ulm_card_graph_name: Desk - ulm_card_graph_entity: sensor.schreibtisch_current_consumption - ulm_card_graph_type: fill - ulm_card_graph_hours: 12 +- type: custom:apexcharts-card + graph_span: 12h + header: + show: false + series: + - entity: sensor.desk_current_consumption + name: Consumption + curve: smooth + type: line + group_by: + duration: 10min + func: avg - type: "horizontal-stack" cards: - type: 'custom:button-card' template: card_generic - entity: sensor.schreibtisch_today_s_consumption + entity: sensor.desk_today_s_consumption variables: ulm_card_generic_name: Today ulm_card_generic_icon: "mdi:home-lightning-bolt" - type: 'custom:button-card' template: card_generic - entity: sensor.schreibtisch_total_consumption + entity: sensor.desk_total_consumption variables: ulm_card_generic_name: Total ulm_card_generic_icon: "mdi:home-lightning-bolt" \ No newline at end of file diff --git a/lovelace/overview/lights.yaml b/lovelace/overview/lights.yaml index 098d43a..cdbcc69 100644 --- a/lovelace/overview/lights.yaml +++ b/lovelace/overview/lights.yaml @@ -9,7 +9,7 @@ template: card_light_slider_collapse variables: ulm_card_light_slider_collapse_name: Indirect - ulm_card_light_enable_collapse: false + ulm_card_light_enable_collapse: true ulm_card_light_name: Indirect ulm_input_select_option: light indirect ulm_input_select: input_select.minimalist_ui_switch @@ -19,7 +19,7 @@ template: card_light_slider_collapse variables: ulm_card_light_slider_collapse_name: Direct - ulm_card_light_enable_collapse: false + ulm_card_light_enable_collapse: true ulm_card_light_name: Direct entity: light.all_direct diff --git a/lovelace/pfsense/traffic.yaml b/lovelace/pfsense/traffic.yaml index d0c2a1e..9c653a2 100644 --- a/lovelace/pfsense/traffic.yaml +++ b/lovelace/pfsense/traffic.yaml @@ -3,62 +3,90 @@ name: Traffic -- type: 'custom:button-card' - template: card_graph - entity: sensor.pfsense_interface_wan_inbytes_kilobytes_per_second - variables: - ulm_card_graph_color: "var(--google-blue)" - ulm_card_graph_name: WAN Incoming - ulm_card_graph_entity: sensor.pfsense_interface_wan_inbytes_kilobytes_per_second - ulm_card_graph_color2: "var(--google-green)" - ulm_card_graph_entity2: sensor.pfsense_interface_wan_outbytes_kilobytes_per_second - ulm_card_graph_type: fill - ulm_card_graph_hours: 1 -- type: "horizontal-stack" - cards: - - type: 'custom:button-card' - template: card_graph - entity: sensor.pfsense_interface_mullvad1_inbytes_kilobytes_per_second - variables: - ulm_card_graph_color: "var(--google-blue)" - ulm_card_graph_name: Mullvad1 Incoming - ulm_card_graph_entity: sensor.pfsense_interface_mullvad1_inbytes_kilobytes_per_second - ulm_card_graph_color2: "var(--google-green)" - ulm_card_graph_entity2: sensor.pfsense_interface_mullvad1_outbytes_kilobytes_per_second - ulm_card_graph_type: fill - ulm_card_graph_hours: 1 - - type: 'custom:button-card' - template: card_graph - entity: sensor.pfsense_interface_mullvad2_inbytes_kilobytes_per_second - variables: - ulm_card_graph_color: "var(--google-blue)" - ulm_card_graph_name: Mullvad2 Incoming - ulm_card_graph_entity: sensor.pfsense_interface_mullvad2_inbytes_kilobytes_per_second - ulm_card_graph_color2: "var(--google-green)" - ulm_card_graph_entity2: sensor.pfsense_interface_mullvad2_outbytes_kilobytes_per_second - ulm_card_graph_type: fill - ulm_card_graph_hours: 1 -- type: "horizontal-stack" - cards: - - type: 'custom:button-card' - template: card_graph - entity: sensor.pfsense_interface_lan_inbytes_kilobytes_per_second - variables: - ulm_card_graph_color: "var(--google-blue)" - ulm_card_graph_name: LAN Incoming - ulm_card_graph_entity: sensor.pfsense_interface_lan_inbytes_kilobytes_per_second - ulm_card_graph_color2: "var(--google-green)" - ulm_card_graph_entity2: sensor.pfsense_interface_lan_outbytes_kilobytes_per_second - ulm_card_graph_type: fill - ulm_card_graph_hours: 1 - - type: 'custom:button-card' - template: card_graph - entity: sensor.pfsense_interface_backend_inbytes_kilobytes_per_second - variables: - ulm_card_graph_color: "var(--google-blue)" - ulm_card_graph_name: Backend Incoming - ulm_card_graph_entity: sensor.pfsense_interface_backend_inbytes_kilobytes_per_second - ulm_card_graph_color2: "var(--google-green)" - ulm_card_graph_entity2: sensor.pfsense_interface_backend_outbytes_kilobytes_per_second - ulm_card_graph_type: fill - ulm_card_graph_hours: 1 \ No newline at end of file +- type: custom:apexcharts-card + graph_span: 2h + apex_config: + chart: + height: 250px + series: + - entity: sensor.pfsense_interface_wan_inbytes_kilobytes_per_second + stroke_width: 2 + type: area + transform: return x / 1024; + unit: Mb/s + name: WAN In + - entity: sensor.pfsense_interface_wan_outbytes_kilobytes_per_second + invert: true + stroke_width: 2 + type: area + transform: return x / 1024; + unit: Mb/s + name: WAN Out + + +- type: custom:apexcharts-card + graph_span: 2h + apex_config: + chart: + height: 250px + series: + - entity: sensor.pfsense_interface_mullvad1_inbytes_kilobytes_per_second + stroke_width: 2 + type: area + transform: return x / 1024; + unit: Mb/s + name: Mullvad1 In + - entity: sensor.pfsense_interface_mullvad1_outbytes_kilobytes_per_second + invert: true + stroke_width: 2 + type: area + transform: return x / 1024; + unit: Mb/s + name: Mullvad1 Out + - entity: sensor.pfsense_interface_mullvad2_inbytes_kilobytes_per_second + stroke_width: 2 + type: area + transform: return x / 1024; + unit: Mb/s + name: Mullvad2 In + - entity: sensor.pfsense_interface_mullvad2_outbytes_kilobytes_per_second + invert: true + stroke_width: 2 + type: area + transform: return x / 1024; + unit: Mb/s + name: Mullvad2 Out + + +- type: custom:apexcharts-card + graph_span: 2h + apex_config: + chart: + height: 250px + series: + - entity: sensor.pfsense_interface_lan_inbytes_kilobytes_per_second + stroke_width: 2 + type: area + transform: return x / 1024; + unit: Mb/s + name: LAN In + - entity: sensor.pfsense_interface_lan_outbytes_kilobytes_per_second + invert: true + stroke_width: 2 + type: area + transform: return x / 1024; + unit: Mb/s + name: LAN Out + - entity: sensor.pfsense_interface_backend_inbytes_kilobytes_per_second + stroke_width: 2 + type: area + transform: return x / 1024; + unit: Mb/s + name: Backend In + - entity: sensor.pfsense_interface_backend_outbytes_kilobytes_per_second + invert: true + stroke_width: 2 + type: area + transform: return x / 1024; + unit: Mb/s + name: Backend In \ No newline at end of file diff --git a/packages/light/lightscenes.yaml b/packages/light/lightscenes.yaml index 8920883..e58d968 100644 --- a/packages/light/lightscenes.yaml +++ b/packages/light/lightscenes.yaml @@ -22,4 +22,10 @@ scene: rgb_color: [255, 139, 21] state: true brightness: 1 - switch.adaptive_lighting_sleep_mode_default: on \ No newline at end of file + switch.adaptive_lighting_sleep_mode_default: on + - name: light_all_on + entities: + script.light_store_restore: on + - name: light_all_off + entities: + script.light_store_off: on \ No newline at end of file diff --git a/ui-lovelace.yaml b/ui-lovelace.yaml index a7e1bdf..d36a653 100644 --- a/ui-lovelace.yaml +++ b/ui-lovelace.yaml @@ -61,53 +61,76 @@ views: cards: !include lovelace/overview/vacuum.yaml - - - title: "Lights" + - type: custom:vertical-layout + title: "Lights" path: 1 cards: - - type: "vertical-stack" + ## Column 1 + - type: custom:vertical-layout + type: "vertical-stack" cards: !include lovelace/lights/scenes.yaml - - type: "vertical-stack" + - type: custom:vertical-layout + type: "vertical-stack" cards: !include lovelace/lights/adaptive.yaml - - type: "vertical-stack" + - type: custom:layout-break + ## Column 2 + - type: custom:vertical-layout + type: "vertical-stack" cards: !include lovelace/lights/lightgroups.yaml - - type: "vertical-stack" + - type: custom:vertical-layout + type: "vertical-stack" cards: !include lovelace/lights/lightbulbs.yaml - - type: "vertical-stack" + - type: custom:vertical-layout + type: "vertical-stack" cards: !include lovelace/lights/lightstripes.yaml - - title: "pfSense" + - type: custom:vertical-layout + title: "pfSense" path: 2 cards: - - type: "vertical-stack" + ## Column 1 + - type: custom:vertical-layout + type: "vertical-stack" cards: !include lovelace/pfsense/notifications.yaml - - type: "vertical-stack" + - type: custom:vertical-layout + type: "vertical-stack" cards: !include lovelace/pfsense/load.yaml - - type: "vertical-stack" + - type: custom:vertical-layout + type: "vertical-stack" cards: !include lovelace/pfsense/gateways.yaml - - type: "vertical-stack" - cards: - !include lovelace/pfsense/traffic.yaml - - type: "vertical-stack" + - type: custom:vertical-layout + type: "vertical-stack" cards: !include lovelace/pfsense/rules.yaml + - type: custom:layout-break + ## Column 2 + - type: custom:vertical-layout + type: "vertical-stack" + cards: + !include lovelace/pfsense/traffic.yaml - - title: "Climate" + - type: custom:vertical-layout + title: "Climate" path: 3 cards: - - type: "vertical-stack" + ## Column 1 + - type: custom:vertical-layout + type: "vertical-stack" cards: !include lovelace/climate/setup.yaml - - type: "vertical-stack" + - type: custom:layout-break + ## Column 2 + - type: custom:vertical-layout + type: "vertical-stack" cards: !include lovelace/climate/recommendation.yaml \ No newline at end of file