From 8cd7f9ccd1cfa0bf2abf6ae015f04e32edcb1640 Mon Sep 17 00:00:00 2001 From: "CORP\\SIMMARCH" Date: Wed, 1 Mar 2023 18:53:27 +0100 Subject: [PATCH] =?UTF-8?q?Fixed=20check=20of=20occupied=20heating=20setpo?= =?UTF-8?q?int=20value=20using=20correct=20limits,=20if=20any.=20Fixed=20c?= =?UTF-8?q?orrect=20value=20of=20dead=5Fband=20attribute=20that=20must=20b?= =?UTF-8?q?ue=20muliplied=20by=200.1=20=C2=B0C=20as=20indicated=20into=20z?= =?UTF-8?q?cl=20specs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zboss/production/src/zcl/zcl_thermostat_commands.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zboss/production/src/zcl/zcl_thermostat_commands.c b/zboss/production/src/zcl/zcl_thermostat_commands.c index 070e3570dd..a226a5a571 100644 --- a/zboss/production/src/zcl/zcl_thermostat_commands.c +++ b/zboss/production/src/zcl/zcl_thermostat_commands.c @@ -249,9 +249,9 @@ zb_ret_t check_value_thermostat_server(zb_uint16_t attr_id, zb_uint8_t endpoint, /* First check MinHeatSetpointLimit/MaxHeatSetpointLimit, than * AbsMinHeatSetpointLimit/AbsMaxHeatSetpointLimit, than predefined constants. */ zb_zcl_attr_t *attr_desc_min = zb_zcl_get_attr_desc_a(endpoint, - ZB_ZCL_CLUSTER_ID_THERMOSTAT, ZB_ZCL_CLUSTER_SERVER_ROLE, ZB_ZCL_ATTR_THERMOSTAT_ABS_MIN_HEAT_SETPOINT_LIMIT_ID); + ZB_ZCL_CLUSTER_ID_THERMOSTAT, ZB_ZCL_CLUSTER_SERVER_ROLE, ZB_ZCL_ATTR_THERMOSTAT_MIN_HEAT_SETPOINT_LIMIT_ID); zb_zcl_attr_t *attr_desc_max = zb_zcl_get_attr_desc_a(endpoint, - ZB_ZCL_CLUSTER_ID_THERMOSTAT, ZB_ZCL_CLUSTER_SERVER_ROLE, ZB_ZCL_ATTR_THERMOSTAT_ABS_MAX_HEAT_SETPOINT_LIMIT_ID); + ZB_ZCL_CLUSTER_ID_THERMOSTAT, ZB_ZCL_CLUSTER_SERVER_ROLE, ZB_ZCL_ATTR_THERMOSTAT_MAX_HEAT_SETPOINT_LIMIT_ID); if (attr_desc_min && attr_desc_max) { min_val = (zb_int16_t)ZB_ZCL_GET_ATTRIBUTE_VAL_S16(attr_desc_min); @@ -629,11 +629,11 @@ zb_ret_t check_value_thermostat_server(zb_uint16_t attr_id, zb_uint8_t endpoint, ZB_ZCL_CLUSTER_ID_THERMOSTAT, ZB_ZCL_CLUSTER_SERVER_ROLE, ZB_ZCL_ATTR_THERMOSTAT_MIN_SETPOINT_DEAD_BAND_ID); - zb_int8_t dead_band = ZB_ZCL_THERMOSTAT_MIN_SETPOINT_DEAD_BAND_MIN_VALUE; + zb_int8_t dead_band = ZB_ZCL_THERMOSTAT_MIN_SETPOINT_DEAD_BAND_MIN_VALUE * 10; /* 10 = 0.1 °C*/ if ( attr_desc != NULL ) { - dead_band = (zb_int8_t)ZB_ZCL_GET_ATTRIBUTE_VAL_S8(attr_desc); + dead_band = (zb_int8_t)ZB_ZCL_GET_ATTRIBUTE_VAL_S8(attr_desc) * 10; } switch( attr_id )