From 8b28f09bab9b793a14916c38c24b9a0def4496ae Mon Sep 17 00:00:00 2001
From: Home Assistant Version Control <havc@local>
Date: Sun, 6 Sep 2026 04:58:01 +0000
Subject: [PATCH] configuration.yaml, zigbee2mqtt/state.json

---
 configuration.yaml     | 27 ++++++++++++++++++++++++++-
 zigbee2mqtt/state.json | 16 ++++++++--------
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/configuration.yaml b/configuration.yaml
index f68e6c7b..64b26ed0 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -319,6 +319,31 @@ rest:
           {{ value_json.allPrintJobs | length }}
         json_attributes:
           - "allPrintJobs"
+  # OctoPrint DisplayLayerProgress - layer/height progress from https://ender5pro.duckdns.org
+  - resource: "https://ender5pro.duckdns.org/plugin/DisplayLayerProgress/values"
+    method: GET
+    headers:
+      X-Api-Key: !secret octoprint_api_key
+    scan_interval: 30
+    sensor:
+      - name: "OctoPrint Layer Progress"
+        unique_id: octoprint_layer_progress
+        icon: mdi:layers
+        value_template: "{{ value_json.layer.current | int(0) }}"
+        json_attributes_path: "$.layer"
+        json_attributes:
+          - "current"
+          - "total"
+      - name: "OctoPrint Height Progress"
+        unique_id: octoprint_height_progress
+        unit_of_measurement: "mm"
+        device_class: distance
+        icon: mdi:axis-z-arrow
+        value_template: "{{ value_json.height.current | float(0) | round(1) }}"
+        json_attributes_path: "$.height"
+        json_attributes:
+          - "current"
+          - "total"
   - resource: "https://ender5pro.duckdns.org/api/job"
     method: GET
     headers:
@@ -417,4 +442,4 @@ emulated_hue:
 nest_snapshot:
 
 # G-code proxy for the 3D toolpath viewer card (www/gcode_viewer_card.js)
-octoprint_gcode_proxy:
\ No newline at end of file
+octoprint_gcode_proxy:
diff --git a/zigbee2mqtt/state.json b/zigbee2mqtt/state.json
index ef310614..082065dd 100644
--- a/zigbee2mqtt/state.json
+++ b/zigbee2mqtt/state.json
@@ -27,7 +27,7 @@
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
-        "power": 2.1,
+        "power": 2,
         "current": 0.1,
         "energy": 38.65,
         "power_factor": 0.2,
@@ -74,13 +74,13 @@
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
-        "voltage": 119.7,
+        "voltage": 120.2,
         "state": "ON",
         "ac_frequency": 60,
         "energy": 153.39,
-        "power": 95.6,
-        "current": 0.86,
-        "power_factor": 0.95,
+        "power": 0.8,
+        "current": 0.05,
+        "power_factor": 0.36,
         "update": {
             "state": "idle",
             "installed_version": 268513381,
@@ -96,12 +96,12 @@
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
         "voltage": 120.2,
-        "energy": 74.07,
+        "energy": 74.08,
         "state": "ON",
-        "power": 48,
+        "power": 52.2,
         "current": 0.49,
         "ac_frequency": 60,
-        "power_factor": 0.83,
+        "power_factor": 0.8,
         "update": {
             "state": "idle",
             "installed_version": 268513381,