Updates

lovelace/climate/recommendation.yaml

@@ -23,17 +23,23 @@
       variables:
         ulm_card_generic_swap_name: difference
 
-- type: 'custom:button-card'
+- type: custom:apexcharts-card
-  template: card_graph
+  graph_span: 6h
-  entity: sensor.temperature_kai_temperature
+  header:
-  variables:
+    show: false
-    ulm_card_graph_color: "var(--google-blue)"
+  series:
-    ulm_card_graph_name: Temperature
+    - entity: sensor.temperature_kai_temperature
-    ulm_card_graph_entity: sensor.temperature_kai_temperature
+      type: line
-    ulm_card_graph_color2: "var(--google-green)"
+      name: Inside
-    ulm_card_graph_entity2: sensor.climate_temp
+      group_by:
-    ulm_card_graph_type: fill
+        func: avg
-    ulm_card_graph_hours: 6
+        duration: 30min
+    - entity: sensor.temperature_outside_pirateweather
+      type: column
+      name: Outside
+      group_by:
+        func: avg
+        duration: 30min
 
 - type: "horizontal-stack"
   cards:

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

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

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

lovelace/overview/energy.yaml

@@ -3,29 +3,32 @@
 #  name: Energy
 
 
-- type: 'custom:button-card'
+- type: custom:apexcharts-card
-  template: card_graph
+  graph_span: 12h
-  entity: sensor.schreibtisch_current_consumption
+  header:
-  variables:
+    show: false
-    ulm_card_graph_color: "var(--google-green)"
+  series:
-    ulm_card_graph_name: Desk
+    - entity: sensor.desk_current_consumption
-    ulm_card_graph_entity: sensor.schreibtisch_current_consumption
+      name: Consumption
-    ulm_card_graph_type: fill
+      curve: smooth
-    ulm_card_graph_hours: 12
+      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"

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
 

lovelace/pfsense/traffic.yaml

@@ -3,62 +3,90 @@
   name: Traffic
 
 
-- type: 'custom:button-card'
+- type: custom:apexcharts-card
-  template: card_graph
+  graph_span: 2h
-  entity: sensor.pfsense_interface_wan_inbytes_kilobytes_per_second
+  apex_config:
-  variables:
+    chart:
-    ulm_card_graph_color: "var(--google-blue)"
+      height: 250px
-    ulm_card_graph_name: WAN Incoming
+  series:
-    ulm_card_graph_entity: sensor.pfsense_interface_wan_inbytes_kilobytes_per_second
+    - entity: sensor.pfsense_interface_wan_inbytes_kilobytes_per_second
-    ulm_card_graph_color2: "var(--google-green)"
+      stroke_width: 2
-    ulm_card_graph_entity2: sensor.pfsense_interface_wan_outbytes_kilobytes_per_second
+      type: area
-    ulm_card_graph_type: fill
+      transform: return x / 1024;
-    ulm_card_graph_hours: 1
+      unit: Mb/s
-- type: "horizontal-stack"
+      name: WAN In
-  cards:
+    - entity: sensor.pfsense_interface_wan_outbytes_kilobytes_per_second
-    - type: 'custom:button-card'
+      invert: true
-      template: card_graph
+      stroke_width: 2
-      entity: sensor.pfsense_interface_mullvad1_inbytes_kilobytes_per_second
+      type: area
-      variables:
+      transform: return x / 1024;
-        ulm_card_graph_color: "var(--google-blue)"
+      unit: Mb/s
-        ulm_card_graph_name: Mullvad1 Incoming
+      name: WAN Out
-        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
+- type: custom:apexcharts-card
-        ulm_card_graph_type: fill
+  graph_span: 2h
-        ulm_card_graph_hours: 1
+  apex_config:
-    - type: 'custom:button-card'
+    chart:
-      template: card_graph
+      height: 250px
-      entity: sensor.pfsense_interface_mullvad2_inbytes_kilobytes_per_second
+  series:
-      variables:
+    - entity:  sensor.pfsense_interface_mullvad1_inbytes_kilobytes_per_second
-        ulm_card_graph_color: "var(--google-blue)"
+      stroke_width: 2
-        ulm_card_graph_name: Mullvad2 Incoming
+      type: area
-        ulm_card_graph_entity: sensor.pfsense_interface_mullvad2_inbytes_kilobytes_per_second
+      transform: return x / 1024;
-        ulm_card_graph_color2: "var(--google-green)"
+      unit: Mb/s
-        ulm_card_graph_entity2: sensor.pfsense_interface_mullvad2_outbytes_kilobytes_per_second
+      name: Mullvad1 In
-        ulm_card_graph_type: fill
+    - entity: sensor.pfsense_interface_mullvad1_outbytes_kilobytes_per_second
-        ulm_card_graph_hours: 1
+      invert: true
-- type: "horizontal-stack"
+      stroke_width: 2
-  cards:
+      type: area
-    - type: 'custom:button-card'
+      transform: return x / 1024;
-      template: card_graph
+      unit: Mb/s
-      entity: sensor.pfsense_interface_lan_inbytes_kilobytes_per_second
+      name: Mullvad1 Out
-      variables:
+    - entity:  sensor.pfsense_interface_mullvad2_inbytes_kilobytes_per_second
-        ulm_card_graph_color: "var(--google-blue)"
+      stroke_width: 2
-        ulm_card_graph_name: LAN Incoming
+      type: area
-        ulm_card_graph_entity: sensor.pfsense_interface_lan_inbytes_kilobytes_per_second
+      transform: return x / 1024;
-        ulm_card_graph_color2: "var(--google-green)"
+      unit: Mb/s
-        ulm_card_graph_entity2: sensor.pfsense_interface_lan_outbytes_kilobytes_per_second
+      name: Mullvad2 In
-        ulm_card_graph_type: fill
+    - entity: sensor.pfsense_interface_mullvad2_outbytes_kilobytes_per_second
-        ulm_card_graph_hours: 1
+      invert: true
-    - type: 'custom:button-card'
+      stroke_width: 2
-      template: card_graph
+      type: area
-      entity: sensor.pfsense_interface_backend_inbytes_kilobytes_per_second
+      transform: return x / 1024;
-      variables:
+      unit: Mb/s
-        ulm_card_graph_color: "var(--google-blue)"
+      name: Mullvad2 Out
-        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)"
+- type: custom:apexcharts-card
-        ulm_card_graph_entity2: sensor.pfsense_interface_backend_outbytes_kilobytes_per_second
+  graph_span: 2h
-        ulm_card_graph_type: fill
+  apex_config:
-        ulm_card_graph_hours: 1
+    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

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
+      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

ui-lovelace.yaml

@@ -61,53 +61,76 @@ views:
         cards:
           !include lovelace/overview/vacuum.yaml
 
-
+  - type: custom:vertical-layout
-  - title: "Lights"
+    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"
+      - type: custom:vertical-layout
-        cards:
+        type: "vertical-stack"
-          !include lovelace/pfsense/traffic.yaml
-      - 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