From ec4cbc1e7c49dcb2d2474e072a9a60318c7002be Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Thu, 28 Sep 2023 22:08:35 +0200 Subject: [PATCH] some bugfixes --- hal-core/resources/web/event_overview.tmpl | 3 ++- .../src/se/hal/plugin/zigbee/device/ZigbeeColorConfig.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hal-core/resources/web/event_overview.tmpl b/hal-core/resources/web/event_overview.tmpl index 1a5d27df..fe600e7a 100644 --- a/hal-core/resources/web/event_overview.tmpl +++ b/hal-core/resources/web/event_overview.tmpl @@ -53,13 +53,14 @@ // Update Cells - if (row.dataset.deviceId != deviceData.id || row.cells[3].innerHTML != deviceData.data?.timestamp) { + if (row.dataset.deviceId != deviceData.id || row.dataset.timestamp != deviceData.data?.timestamp) { // Only update if data has changed row.dataset.deviceId = deviceData.id; row.cells[0].innerHTML = deviceData.name; row.cells[1].innerHTML = deviceData.config?.typeConfig; row.cells[2].innerHTML = deviceData.data?.valueStr; + row.dataset.timestamp = deviceData.data?.timestamp; row.cells[3].innerHTML = deviceData.data?.timestamp; $(row.cells[3]).relTimestamp(); diff --git a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/device/ZigbeeColorConfig.java b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/device/ZigbeeColorConfig.java index 71b63aa6..2dca6601 100644 --- a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/device/ZigbeeColorConfig.java +++ b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/device/ZigbeeColorConfig.java @@ -70,7 +70,7 @@ public class ZigbeeColorConfig extends ZigbeeHalEventDeviceConfig implements Hal return null; float[] cieXYZ = ((ColorEventData) data).getCieXYZ(); - return new MoveToColorCommand((int) cieXYZ[0], (int) cieXYZ[1], 1); + return new MoveToColorCommand((int) (cieXYZ[0] * 65536), (int) (cieXYZ[2] * 65536), 1); } // --------------------------