fix(zigbee): Spelling correction

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

libraries/Zigbee/examples/Zigbee_Thermostat/Zigbee_Thermostat.ino

@@ -35,7 +35,7 @@
 
 /* Zigbee thermostat configuration */
 #define THERMOSTAT_ENDPOINT_NUMBER 1
-#define USE_RECIEVE_TEMP_WITH_SOURCE 1
+#define USE_RECEIVE_TEMP_WITH_SOURCE 1
 uint8_t button = BOOT_PIN;
 
 ZigbeeThermostat zbThermostat = ZigbeeThermostat(THERMOSTAT_ENDPOINT_NUMBER);
@@ -49,13 +49,13 @@ float sensor_tolerance;
 struct tm timeinfo = {};  // Time structure for Time cluster
 
 /****************** Temperature sensor handling *******************/
-#if USE_RECIEVE_TEMP_WITH_SOURCE == 0
-void recieveSensorTemp(float temperature) {
+#if USE_RECEIVE_TEMP_WITH_SOURCE == 0
+void receiveSensorTemp(float temperature) {
   Serial.printf("Temperature sensor value: %.2f°C\n", temperature);
   sensor_temp = temperature;
 }
 #else
-void recieveSensorTempWithSource(float temperature, uint8_t src_endpoint, esp_zb_zcl_addr_t src_address) {
+void receiveSensorTempWithSource(float temperature, uint8_t src_endpoint, esp_zb_zcl_addr_t src_address) {
   if (src_address.addr_type == ESP_ZB_ZCL_ADDR_TYPE_SHORT) {
     Serial.printf("Temperature sensor value: %.2f°C from endpoint %d, address 0x%04x\n", temperature, src_endpoint, src_address.u.short_addr);
   } else {
@@ -65,7 +65,7 @@ void recieveSensorTempWithSource(float temperature, uint8_t src_endpoint, esp_zb
 }
 #endif
 
-void recieveSensorConfig(float min_temp, float max_temp, float tolerance) {
+void receiveSensorConfig(float min_temp, float max_temp, float tolerance) {
   Serial.printf("Temperature sensor config: min %.2f°C, max %.2f°C, tolerance %.2f°C\n", min_temp, max_temp, tolerance);
   sensor_min_temp = min_temp;
   sensor_max_temp = max_temp;
@@ -78,15 +78,15 @@ void setup() {
   // Init button switch
   pinMode(button, INPUT_PULLUP);
 
-  // Set callback function for recieving temperature from sensor - Use only one option
-  #if USE_RECIEVE_TEMP_WITH_SOURCE == 0
-    zbThermostat.onTempRecieve(recieveSensorTemp); // If you bound only one sensor or you don't need to know the source of the temperature
+  // Set callback function for receiving temperature from sensor - Use only one option
+  #if USE_RECEIVE_TEMP_WITH_SOURCE == 0
+    zbThermostat.onTempReceive(receiveSensorTemp); // If you bound only one sensor or you don't need to know the source of the temperature
   #else
-    zbThermostat.onTempRecieveWithSource(recieveSensorTempWithSource);
+    zbThermostat.onTempReceiveWithSource(receiveSensorTempWithSource);
   #endif
 
-  // Set callback function for recieving sensor configuration
-  zbThermostat.onConfigRecieve(recieveSensorConfig);
+  // Set callback function for receiving sensor configuration
+  zbThermostat.onConfigReceive(receiveSensorConfig);
 
   //Optional: set Zigbee device name and model
   zbThermostat.setManufacturerAndModel("Espressif", "ZigbeeThermostat");

libraries/Zigbee/keywords.txt

@@ -107,6 +107,7 @@ setLightColor	KEYWORD2
 # ZigbeeThermostat
 onTempRecieve	KEYWORD2
 onConfigRecieve	KEYWORD2
+onTempReceiveWithSource	KEYWORD2
 getTemperature	KEYWORD2
 getSensorSettings	KEYWORD2
 setTemperatureReporting	KEYWORD2
@@ -191,4 +192,4 @@ ZIGBEE_DEFAULT_COORDINATOR_CONFIG	LITERAL1
 ZIGBEE_DEFAULT_RADIO_CONFIG	LITERAL1
 ZIGBEE_DEFAULT_UART_RCP_RADIO_CONFIG	LITERAL1
 ZIGBEE_DEFAULT_HOST_CONFIG	LITERAL1
-ZB_ARRAY_LENTH	LITERAL1
+ZB_ARRAY_LENGHT	LITERAL1

libraries/Zigbee/src/ZigbeeEP.cpp

@@ -183,7 +183,7 @@ char *ZigbeeEP::readManufacturer(uint8_t endpoint, uint16_t short_addr, esp_zb_i
   uint16_t attributes[] = {
     ESP_ZB_ZCL_ATTR_BASIC_MANUFACTURER_NAME_ID,
   };
-  read_req.attr_number = ZB_ARRAY_LENTH(attributes);
+  read_req.attr_number = ZB_ARRAY_LENGHT(attributes);
   read_req.attr_field = attributes;
 
   if (_read_manufacturer != NULL) {
@@ -221,7 +221,7 @@ char *ZigbeeEP::readModel(uint8_t endpoint, uint16_t short_addr, esp_zb_ieee_add
   uint16_t attributes[] = {
     ESP_ZB_ZCL_ATTR_BASIC_MODEL_IDENTIFIER_ID,
   };
-  read_req.attr_number = ZB_ARRAY_LENTH(attributes);
+  read_req.attr_number = ZB_ARRAY_LENGHT(attributes);
   read_req.attr_field = attributes;
 
   if (_read_model != NULL) {
@@ -386,7 +386,7 @@ tm ZigbeeEP::getTime(uint8_t endpoint, int32_t short_addr, esp_zb_ieee_addr_t ie
   }
 
   uint16_t attributes[] = {ESP_ZB_ZCL_ATTR_TIME_TIME_ID};
-  read_req.attr_number = ZB_ARRAY_LENTH(attributes);
+  read_req.attr_number = ZB_ARRAY_LENGHT(attributes);
   read_req.attr_field = attributes;
 
   read_req.clusterID = ESP_ZB_ZCL_CLUSTER_ID_TIME;
@@ -438,7 +438,7 @@ int32_t ZigbeeEP::getTimezone(uint8_t endpoint, int32_t short_addr, esp_zb_ieee_
   }
 
   uint16_t attributes[] = {ESP_ZB_ZCL_ATTR_TIME_TIME_ZONE_ID};
-  read_req.attr_number = ZB_ARRAY_LENTH(attributes);
+  read_req.attr_number = ZB_ARRAY_LENGHT(attributes);
   read_req.attr_field = attributes;
 
   read_req.clusterID = ESP_ZB_ZCL_CLUSTER_ID_TIME;

libraries/Zigbee/src/ZigbeeEP.h

@@ -12,7 +12,7 @@
 #define ZB_CMD_TIMEOUT             10000     // 10 seconds
 #define OTA_UPGRADE_QUERY_INTERVAL (1 * 60)  // 1 hour = 60 minutes
 
-#define ZB_ARRAY_LENTH(arr) (sizeof(arr) / sizeof(arr[0]))
+#define ZB_ARRAY_LENGHT(arr) (sizeof(arr) / sizeof(arr[0]))
 
 #define RGB_TO_XYZ(r, g, b, X, Y, Z)                               \
   {                                                                \

libraries/Zigbee/src/ep/ZigbeeThermostat.cpp

@@ -120,11 +120,11 @@ void ZigbeeThermostat::zbAttributeRead(uint16_t cluster_id, const esp_zb_zcl_att
   if (cluster_id == ESP_ZB_ZCL_CLUSTER_ID_TEMP_MEASUREMENT) {
     if (attribute->id == ESP_ZB_ZCL_ATTR_TEMP_MEASUREMENT_VALUE_ID && attribute->data.type == ESP_ZB_ZCL_ATTR_TYPE_S16) {
       int16_t value = attribute->data.value ? *(int16_t *)attribute->data.value : 0;
-      if (_on_temp_recieve) {
-        _on_temp_recieve(zb_s16_to_temperature(value));
+      if (_on_temp_receive) {
+        _on_temp_receive(zb_s16_to_temperature(value));
       }
-      if (_on_temp_recieve_with_source) {
-        _on_temp_recieve_with_source(zb_s16_to_temperature(value), src_endpoint, src_address);
+      if (_on_temp_receive_with_source) {
+        _on_temp_receive_with_source(zb_s16_to_temperature(value), src_endpoint, src_address);
       }
     }
     if (attribute->id == ESP_ZB_ZCL_ATTR_TEMP_MEASUREMENT_MIN_VALUE_ID && attribute->data.type == ESP_ZB_ZCL_ATTR_TYPE_S16) {
@@ -161,7 +161,7 @@ void ZigbeeThermostat::getTemperature() {
   read_req.clusterID = ESP_ZB_ZCL_CLUSTER_ID_TEMP_MEASUREMENT;
 
   uint16_t attributes[] = {ESP_ZB_ZCL_ATTR_TEMP_MEASUREMENT_VALUE_ID};
-  read_req.attr_number = ZB_ARRAY_LENTH(attributes);
+  read_req.attr_number = ZB_ARRAY_LENGHT(attributes);
   read_req.attr_field = attributes;
 
   log_i("Sending 'read temperature' command");
@@ -179,7 +179,7 @@ void ZigbeeThermostat::getTemperature(uint16_t group_addr) {
   read_req.clusterID = ESP_ZB_ZCL_CLUSTER_ID_TEMP_MEASUREMENT;
 
   uint16_t attributes[] = {ESP_ZB_ZCL_ATTR_TEMP_MEASUREMENT_VALUE_ID};
-  read_req.attr_number = ZB_ARRAY_LENTH(attributes);
+  read_req.attr_number = ZB_ARRAY_LENGHT(attributes);
   read_req.attr_field = attributes;
 
   log_i("Sending 'read temperature' command to group address 0x%x", group_addr);
@@ -198,7 +198,7 @@ void ZigbeeThermostat::getTemperature(uint8_t endpoint, uint16_t short_addr) {
   read_req.clusterID = ESP_ZB_ZCL_CLUSTER_ID_TEMP_MEASUREMENT;
 
   uint16_t attributes[] = {ESP_ZB_ZCL_ATTR_TEMP_MEASUREMENT_VALUE_ID};
-  read_req.attr_number = ZB_ARRAY_LENTH(attributes);
+  read_req.attr_number = ZB_ARRAY_LENGHT(attributes);
   read_req.attr_field = attributes;
 
   log_i("Sending 'read temperature' command to endpoint %d, address 0x%x", endpoint, short_addr);
@@ -217,7 +217,7 @@ void ZigbeeThermostat::getTemperature(uint8_t endpoint, esp_zb_ieee_addr_t ieee_
   memcpy(read_req.zcl_basic_cmd.dst_addr_u.addr_long, ieee_addr, sizeof(esp_zb_ieee_addr_t));
 
   uint16_t attributes[] = {ESP_ZB_ZCL_ATTR_TEMP_MEASUREMENT_VALUE_ID};
-  read_req.attr_number = ZB_ARRAY_LENTH(attributes);
+  read_req.attr_number = ZB_ARRAY_LENGHT(attributes);
   read_req.attr_field = attributes;
 
   log_i(
@@ -239,7 +239,7 @@ void ZigbeeThermostat::getSensorSettings() {
   uint16_t attributes[] = {
     ESP_ZB_ZCL_ATTR_TEMP_MEASUREMENT_MIN_VALUE_ID, ESP_ZB_ZCL_ATTR_TEMP_MEASUREMENT_MAX_VALUE_ID, ESP_ZB_ZCL_ATTR_TEMP_MEASUREMENT_TOLERANCE_ID
   };
-  read_req.attr_number = ZB_ARRAY_LENTH(attributes);
+  read_req.attr_number = ZB_ARRAY_LENGHT(attributes);
   read_req.attr_field = attributes;
 
   log_i("Sending 'read sensor settings' command");
@@ -253,7 +253,7 @@ void ZigbeeThermostat::getSensorSettings() {
     return;
   } else {
     //Call the callback function when all attributes are read
-    _on_config_recieve(_min_temp, _max_temp, _tolerance);
+    _on_config_receive(_min_temp, _max_temp, _tolerance);
   }
 }
 
@@ -268,7 +268,7 @@ void ZigbeeThermostat::getSensorSettings(uint16_t group_addr) {
   uint16_t attributes[] = {
     ESP_ZB_ZCL_ATTR_TEMP_MEASUREMENT_MIN_VALUE_ID, ESP_ZB_ZCL_ATTR_TEMP_MEASUREMENT_MAX_VALUE_ID, ESP_ZB_ZCL_ATTR_TEMP_MEASUREMENT_TOLERANCE_ID
   };
-  read_req.attr_number = ZB_ARRAY_LENTH(attributes);
+  read_req.attr_number = ZB_ARRAY_LENGHT(attributes);
   read_req.attr_field = attributes;
 
   log_i("Sending 'read sensor settings' command to group address 0x%x", group_addr);
@@ -282,7 +282,7 @@ void ZigbeeThermostat::getSensorSettings(uint16_t group_addr) {
     return;
   } else {
     //Call the callback function when all attributes are read
-    _on_config_recieve(_min_temp, _max_temp, _tolerance);
+    _on_config_receive(_min_temp, _max_temp, _tolerance);
   }
 }
 
@@ -298,7 +298,7 @@ void ZigbeeThermostat::getSensorSettings(uint8_t endpoint, uint16_t short_addr)
   uint16_t attributes[] = {
     ESP_ZB_ZCL_ATTR_TEMP_MEASUREMENT_MIN_VALUE_ID, ESP_ZB_ZCL_ATTR_TEMP_MEASUREMENT_MAX_VALUE_ID, ESP_ZB_ZCL_ATTR_TEMP_MEASUREMENT_TOLERANCE_ID
   };
-  read_req.attr_number = ZB_ARRAY_LENTH(attributes);
+  read_req.attr_number = ZB_ARRAY_LENGHT(attributes);
   read_req.attr_field = attributes;
 
   log_i("Sending 'read sensor settings' command to endpoint %d, address 0x%x", endpoint, short_addr);
@@ -312,7 +312,7 @@ void ZigbeeThermostat::getSensorSettings(uint8_t endpoint, uint16_t short_addr)
     return;
   } else {
     //Call the callback function when all attributes are read
-    _on_config_recieve(_min_temp, _max_temp, _tolerance);
+    _on_config_receive(_min_temp, _max_temp, _tolerance);
   }
 }
 
@@ -328,7 +328,7 @@ void ZigbeeThermostat::getSensorSettings(uint8_t endpoint, esp_zb_ieee_addr_t ie
   uint16_t attributes[] = {
     ESP_ZB_ZCL_ATTR_TEMP_MEASUREMENT_MIN_VALUE_ID, ESP_ZB_ZCL_ATTR_TEMP_MEASUREMENT_MAX_VALUE_ID, ESP_ZB_ZCL_ATTR_TEMP_MEASUREMENT_TOLERANCE_ID
   };
-  read_req.attr_number = ZB_ARRAY_LENTH(attributes);
+  read_req.attr_number = ZB_ARRAY_LENGHT(attributes);
   read_req.attr_field = attributes;
 
   log_i(
@@ -345,7 +345,7 @@ void ZigbeeThermostat::getSensorSettings(uint8_t endpoint, esp_zb_ieee_addr_t ie
     return;
   } else {
     //Call the callback function when all attributes are read
-    _on_config_recieve(_min_temp, _max_temp, _tolerance);
+    _on_config_receive(_min_temp, _max_temp, _tolerance);
   }
 }
 
@@ -367,7 +367,7 @@ void ZigbeeThermostat::setTemperatureReporting(uint16_t min_interval, uint16_t m
       .reportable_change = (void*)&report_change,
     },
   };
-  report_cmd.record_number = ZB_ARRAY_LENTH(records);
+  report_cmd.record_number = ZB_ARRAY_LENGHT(records);
   report_cmd.record_field = records;
 
   log_i("Sending 'configure reporting' command");
@@ -395,7 +395,7 @@ void ZigbeeThermostat::setTemperatureReporting(uint16_t group_addr, uint16_t min
       .reportable_change = (void*)&report_change,
     },
   };
-  report_cmd.record_number = ZB_ARRAY_LENTH(records);
+  report_cmd.record_number = ZB_ARRAY_LENGHT(records);
   report_cmd.record_field = records;
 
   log_i("Sending 'configure reporting' command to group address 0x%x", group_addr);
@@ -424,7 +424,7 @@ void ZigbeeThermostat::setTemperatureReporting(uint8_t endpoint, uint16_t short_
       .reportable_change = (void*)&report_change,
     },
   };
-  report_cmd.record_number = ZB_ARRAY_LENTH(records);
+  report_cmd.record_number = ZB_ARRAY_LENGHT(records);
   report_cmd.record_field = records;
 
   log_i("Sending 'configure reporting' command to endpoint %d, address 0x%x", endpoint, short_addr);
@@ -453,7 +453,7 @@ void ZigbeeThermostat::setTemperatureReporting(uint8_t endpoint, esp_zb_ieee_add
       .reportable_change = (void*)&report_change,
     },
   };
-  report_cmd.record_number = ZB_ARRAY_LENTH(records);
+  report_cmd.record_number = ZB_ARRAY_LENGHT(records);
   report_cmd.record_field = records;
 
   log_i(

libraries/Zigbee/src/ep/ZigbeeThermostat.h

@@ -34,14 +34,14 @@ class ZigbeeThermostat : public ZigbeeEP {
   ZigbeeThermostat(uint8_t endpoint);
   ~ZigbeeThermostat() {}
 
-  void onTempRecieve(void (*callback)(float)) {
-    _on_temp_recieve = callback;
+  void onTempReceive(void (*callback)(float)) {
+    _on_temp_receive = callback;
   }
-  void onTempRecieveWithSource(void (*callback)(float, uint8_t, esp_zb_zcl_addr_t)) {
-    _on_temp_recieve_with_source = callback;
+  void onTempReceiveWithSource(void (*callback)(float, uint8_t, esp_zb_zcl_addr_t)) {
+    _on_temp_receive_with_source = callback;
   }
-  void onConfigRecieve(void (*callback)(float, float, float)) {
-    _on_config_recieve = callback;
+  void onConfigReceive(void (*callback)(float, float, float)) {
+    _on_config_receive = callback;
   }
 
   void getTemperature();
@@ -64,9 +64,9 @@ class ZigbeeThermostat : public ZigbeeEP {
   static ZigbeeThermostat *_instance;
   zb_device_params_t *_device;
 
-  void (*_on_temp_recieve)(float);
-  void (*_on_temp_recieve_with_source)(float, uint8_t, esp_zb_zcl_addr_t);
-  void (*_on_config_recieve)(float, float, float);
+  void (*_on_temp_receive)(float);
+  void (*_on_temp_receive_with_source)(float, uint8_t, esp_zb_zcl_addr_t);
+  void (*_on_config_receive)(float, float, float);
   float _min_temp;
   float _max_temp;
   float _tolerance;