From 1fbd53d7c7a2f17ee8436662cc5a14e4437aac8f Mon Sep 17 00:00:00 2001
From: Home Assistant Version Control <havc@local>
Date: Sat, 8 Aug 2026 03:01:52 +0000
Subject: [PATCH] configuration.yaml, zigbee2mqtt/state.json

---
 configuration.yaml     | 15 +++++++++++++++
 zigbee2mqtt/state.json | 36 ++++++++++++++++++------------------
 2 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/configuration.yaml b/configuration.yaml
index 3cfb744..697742f 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -224,6 +224,21 @@ template:
           {% set lengths = state_attr('sensor.octoprint_filament_used_total', 'filamentLength') %}
           {{ lengths[-1] | float | round(2) if lengths else 0 }}
 
+  # OCTOPRINT Z: Holds the last non-zero Z value (raw currentZ reports 0 when idle)
+  - triggers:
+      - trigger: state
+        entity_id: sensor.octoprint_current_z
+    sensor:
+      - name: "OctoPrint Z Position"
+        unique_id: octoprint_z_position_held
+        unit_of_measurement: "mm"
+        device_class: distance
+        state_class: measurement
+        icon: mdi:axis-z-arrow
+        state: >-
+          {% set z = states('sensor.octoprint_current_z') | float(0) %}
+          {{ z if z > 0 else this.state }}
+
 # Legacy and Integration Sensor Section
 sensor:
   - platform: torque
diff --git a/zigbee2mqtt/state.json b/zigbee2mqtt/state.json
index 9a24029..7a8c49d 100644
--- a/zigbee2mqtt/state.json
+++ b/zigbee2mqtt/state.json
@@ -4,10 +4,10 @@
         "state": "ON",
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
-        "voltage": 117.8,
+        "voltage": 118.5,
         "countdown_to_turn_on": 0,
         "ac_frequency": 60,
-        "power_factor": 0.15,
+        "power_factor": 0.12,
         "update": {
             "state": "idle",
             "installed_version": 268513381,
@@ -29,7 +29,7 @@
         "countdown_to_turn_on": 0,
         "power": 232.8,
         "current": 2.05,
-        "energy": 27.21,
+        "energy": 27.23,
         "power_factor": 0.98,
         "update": {
             "state": "idle",
@@ -45,10 +45,10 @@
         "state": "ON",
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
-        "voltage": 117.4,
+        "voltage": 117.5,
         "countdown_to_turn_on": 0,
         "energy": 50.69,
-        "power_factor": 0.21,
+        "power_factor": 0.2,
         "ac_frequency": 60,
         "update": {
             "state": "idle",
@@ -74,12 +74,12 @@
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
-        "voltage": 116.4,
+        "voltage": 116.9,
         "state": "ON",
         "ac_frequency": 60,
         "energy": 103.34,
-        "power": 93.9,
-        "current": 0.85,
+        "power": 97.2,
+        "current": 0.9,
         "power_factor": 0.95,
         "update": {
             "state": "idle",
@@ -95,13 +95,13 @@
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
-        "voltage": 116.1,
-        "energy": 44.44,
+        "voltage": 116.8,
+        "energy": 44.45,
         "state": "ON",
-        "power": 63.5,
-        "current": 0.7,
+        "power": 68.3,
+        "current": 0.75,
         "ac_frequency": 60,
-        "power_factor": 0.76,
+        "power_factor": 0.74,
         "update": {
             "state": "idle",
             "installed_version": 268513381,
@@ -114,7 +114,7 @@
     },
     "0xffffb40e060895b3": {
         "state": "ON",
-        "voltage": 117.8,
+        "voltage": 118,
         "ac_frequency": 60,
         "energy": 6.4,
         "current": 0.01,
@@ -136,7 +136,7 @@
     "0xffffb40e0608864e": {
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
-        "voltage": 118.3,
+        "voltage": 119.1,
         "energy": 17.35,
         "countdown_to_turn_on": 0,
         "state": "ON",
@@ -172,7 +172,7 @@
     "0xffffb40e060893d8": {
         "state": "ON",
         "led_brightness": 100,
-        "voltage": 118.7,
+        "voltage": 119,
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
         "energy": 3.04,
@@ -187,8 +187,8 @@
             "latest_source": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/ThirdReality/SmartPlug_Zigbee_PROD_OTA_V101_1.01.01.ota",
             "latest_release_notes": null
         },
-        "power_factor": 0.13,
-        "power": 0.2
+        "power_factor": 0.08,
+        "power": 0.4
     },
     "0xa4c1380d0679ffff": {
         "battery": 100,