feat(zigbee): Add humidity support for Thermostat

Author: P-R-O-C-H-Y

libraries/Zigbee/examples/Zigbee_Thermostat/Zigbee_Thermostat.ino

@@ -90,7 +90,7 @@ void setup() {
 #endif
 
   // Set callback function for receiving sensor configuration
-  zbThermostat.onConfigReceive(receiveSensorConfig);
+  zbThermostat.onTempConfigReceive(receiveSensorConfig);
 
   //Optional: set Zigbee device name and model
   zbThermostat.setManufacturerAndModel("Espressif", "ZigbeeThermostat");
@@ -138,10 +138,10 @@ void setup() {
         "Device on endpoint %d, IEEE Address: %02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X\r\n", device->endpoint, device->ieee_addr[7], device->ieee_addr[6],
         device->ieee_addr[5], device->ieee_addr[4], device->ieee_addr[3], device->ieee_addr[2], device->ieee_addr[1], device->ieee_addr[0]
       );
-      zbThermostat.getSensorSettings(device->endpoint, device->ieee_addr);
+      zbThermostat.getTemperatureSettings(device->endpoint, device->ieee_addr);
     } else {
       Serial.printf("Device on endpoint %d, short address: 0x%x\r\n", device->endpoint, device->short_addr);
-      zbThermostat.getSensorSettings(device->endpoint, device->short_addr);
+      zbThermostat.getTemperatureSettings(device->endpoint, device->short_addr);
     }
   }
 }

libraries/Zigbee/keywords.txt

@@ -142,11 +142,17 @@ onLightColorChangeWithSource	KEYWORD2
 
 # ZigbeeThermostat
 onTempRecieve	KEYWORD2
-onConfigRecieve	KEYWORD2
 onTempReceiveWithSource	KEYWORD2
+onTempConfigReceive	KEYWORD2
 getTemperature	KEYWORD2
-getSensorSettings	KEYWORD2
+getTemperatureSettings	KEYWORD2
 setTemperatureReporting	KEYWORD2
+onHumidityReceive	KEYWORD2
+onHumidityReceiveWithSource	KEYWORD2
+onHumidityConfigReceive	KEYWORD2
+getHumidity	KEYWORD2
+getHumiditySettings	KEYWORD2
+setHumidityReporting	KEYWORD2
 
 # Common Zigbee Sensor
 setMinMaxValue	KEYWORD2

libraries/Zigbee/src/ep/ZigbeeTempSensor.cpp

@@ -127,10 +127,10 @@ bool ZigbeeTempSensor::reportTemperature() {
 }
 
 void ZigbeeTempSensor::addHumiditySensor(float min, float max, float tolerance) {
-  int16_t zb_min = zb_float_to_s16(min);
-  int16_t zb_max = zb_float_to_s16(max);
+  uint16_t zb_min = (uint16_t)(min * 100);
+  uint16_t zb_max = (uint16_t)(max * 100);
   uint16_t zb_tolerance = (uint16_t)(tolerance * 100);
-  int16_t default_hum = ESP_ZB_ZCL_REL_HUMIDITY_MEASUREMENT_MEASURED_VALUE_DEFAULT;
+  uint16_t default_hum = ESP_ZB_ZCL_REL_HUMIDITY_MEASUREMENT_MEASURED_VALUE_DEFAULT;
   esp_zb_attribute_list_t *humidity_cluster = esp_zb_zcl_attr_list_create(ESP_ZB_ZCL_CLUSTER_ID_REL_HUMIDITY_MEASUREMENT);
   esp_zb_humidity_meas_cluster_add_attr(humidity_cluster, ESP_ZB_ZCL_ATTR_REL_HUMIDITY_MEASUREMENT_VALUE_ID, &default_hum);
   esp_zb_humidity_meas_cluster_add_attr(humidity_cluster, ESP_ZB_ZCL_ATTR_REL_HUMIDITY_MEASUREMENT_MIN_VALUE_ID, &zb_min);
@@ -142,7 +142,7 @@ void ZigbeeTempSensor::addHumiditySensor(float min, float max, float tolerance)
 
 bool ZigbeeTempSensor::setHumidity(float humidity) {
   esp_zb_zcl_status_t ret = ESP_ZB_ZCL_STATUS_SUCCESS;
-  int16_t zb_humidity = zb_float_to_s16(humidity);
+  uint16_t zb_humidity = (uint16_t)(humidity * 100);
   log_v("Updating humidity sensor value...");
   /* Update humidity sensor measured value */
   log_d("Setting humidity to %d", zb_humidity);