Merge branch 'compliance' into 'main'

components/esp_matter: Update revisions, new device types of v1.4.2

See merge request app-frameworks/esp-matter!1235

Author: dhrishi

components/esp_matter/data_model/esp_matter_attribute.cpp

@@ -76,6 +76,13 @@ attribute_t *create_tag_list(cluster_t *cluster, uint8_t *value, uint16_t length
                                          esp_matter_array(value, length, count));
 }
 
+#if CHIP_CONFIG_USE_ENDPOINT_UNIQUE_ID
+attribute_t *create_endpoint_unique_id(cluster_t *cluster, uint8_t *value, uint16_t length)
+{
+    return esp_matter::attribute::create(cluster, Descriptor::Attributes::EndpointUniqueID::Id, ATTRIBUTE_FLAG_MANAGED_INTERNALLY,
+                                         esp_matter_char_str(value, length));
+}
+#endif
 } /* attribute */
 } /* descriptor */
 

components/esp_matter/data_model/esp_matter_attribute.h

@@ -39,6 +39,7 @@ attribute_t *create_server_list(cluster_t *cluster, uint8_t *value, uint16_t len
 attribute_t *create_client_list(cluster_t *cluster, uint8_t *value, uint16_t length, uint16_t count);
 attribute_t *create_parts_list(cluster_t *cluster, uint8_t *value, uint16_t length, uint16_t count);
 attribute_t *create_tag_list(cluster_t *cluster, uint8_t *value, uint16_t length, uint16_t count);
+attribute_t *create_endpoint_unique_id(cluster_t *cluster, uint8_t *value, uint16_t length);
 } /* attribute */
 } /* descriptor */
 

components/esp_matter/data_model/esp_matter_endpoint.cpp

@@ -2006,6 +2006,37 @@ esp_err_t add(endpoint_t *endpoint, config_t *config)
 }
 } /* heat_pump */
 
+namespace thermostat_controller {
+uint32_t get_device_type_id()
+{
+    return ESP_MATTER_THERMOSTAT_CONTROLLER_DEVICE_TYPE_ID;
+}
+
+uint8_t get_device_type_version()
+{
+    return ESP_MATTER_THERMOSTAT_CONTROLLER_DEVICE_TYPE_VERSION;
+}
+
+endpoint_t *create(node_t *node, config_t *config, uint8_t flags, void *priv_data)
+{
+    endpoint_t * endpoint = common::create<config_t>(node, config, flags, priv_data, add);
+    VerifyOrReturnError(endpoint != nullptr, NULL);
+
+    cluster_t *binding_cluster = binding::create(endpoint, &(config->binding), CLUSTER_FLAG_SERVER);
+    VerifyOrReturnValue(binding_cluster != nullptr, NULL, ESP_LOGE(TAG, "Failed to create binding cluster"));
+
+    return endpoint;
+}
+
+esp_err_t add(endpoint_t *endpoint, config_t *config)
+{
+    esp_err_t err = add_device_type(endpoint, get_device_type_id(), get_device_type_version());
+    VerifyOrReturnError(err == ESP_OK, err);
+    cluster::thermostat::create(endpoint, NULL, CLUSTER_FLAG_CLIENT);
+
+    return ESP_OK;
+}
+} /* thermostat_controller */
 } /* endpoint */
 
 namespace node {

components/esp_matter/data_model/esp_matter_endpoint.h

@@ -112,7 +112,7 @@
 #define ESP_MATTER_MODE_SELECT_DEVICE_TYPE_ID 0x0027
 #define ESP_MATTER_MODE_SELECT_DEVICE_TYPE_VERSION 1
 #define ESP_MATTER_ROBOTIC_VACUUM_CLEANER_DEVICE_TYPE_ID 0x0074
-#define ESP_MATTER_ROBOTIC_VACUUM_CLEANER_DEVICE_TYPE_VERSION 3
+#define ESP_MATTER_ROBOTIC_VACUUM_CLEANER_DEVICE_TYPE_VERSION 4
 #define ESP_MATTER_WATER_LEAK_DETECTOR_DEVICE_TYPE_ID 0x0043
 #define ESP_MATTER_WATER_LEAK_DETECTOR_DEVICE_TYPE_VERSION 1
 #define ESP_MATTER_RAIN_SENSOR_DEVICE_TYPE_ID 0x0044
@@ -148,6 +148,8 @@
 #define ESP_MATTER_THREAD_BORDER_ROUTER_DEVICE_TYPE_VERSION 2
 #define ESP_MATTER_HEAT_PUMP_DEVICE_TYPE_ID 0x0309
 #define ESP_MATTER_HEAT_PUMP_DEVICE_TYPE_VERSION 1
+#define ESP_MATTER_THERMOSTAT_CONTROLLER_DEVICE_TYPE_ID 0x030A
+#define ESP_MATTER_THERMOSTAT_CONTROLLER_DEVICE_TYPE_VERSION 1
 
 namespace esp_matter {
 
@@ -1020,6 +1022,16 @@ endpoint_t *create(node_t *node, config_t *config, uint8_t flags, void *priv_dat
 esp_err_t add(endpoint_t *endpoint, config_t *config);
 } /** heat_pump **/
 
+namespace thermostat_controller {
+using config_t = app_client_config;
+
+uint32_t get_device_type_id();
+uint8_t get_device_type_version();
+endpoint_t *create(node_t *node, config_t *config, uint8_t flags, void *priv_data);
+esp_err_t add(endpoint_t *endpoint, config_t *config);
+} /** thermostat_controller **/
+
+
 } /* endpoint */
 
 namespace node {

components/esp_matter/private/esp_matter_cluster_revisions.h

@@ -144,7 +144,7 @@ constexpr uint16_t cluster_revision = 7;
 } // namespace color_control
 
 namespace fan_control {
-constexpr uint16_t cluster_revision = 4;
+constexpr uint16_t cluster_revision = 5;
 } // namespace fan_control
 
 namespace thermostat {
@@ -236,7 +236,7 @@ constexpr uint16_t cluster_revision = 1;
 } // namespace smoke_co_alarm
 
 namespace door_lock {
-constexpr uint16_t cluster_revision = 8;
+constexpr uint16_t cluster_revision = 9;
 } // namespace door_lock
 
 namespace window_covering {
@@ -312,7 +312,7 @@ constexpr uint16_t cluster_revision = 3;
 } // namespace rvc_run_mode
 
 namespace rvc_clean_mode {
-constexpr uint16_t cluster_revision = 3;
+constexpr uint16_t cluster_revision = 4;
 } // namespace rvc_clean_mode
 
 namespace water_heater_mode {
@@ -328,7 +328,7 @@ constexpr uint16_t cluster_revision = 1;
 } // namespace microwave_oven_control
 
 namespace rvc_operational_state {
-constexpr uint16_t cluster_revision = 2;
+constexpr uint16_t cluster_revision = 3;
 } // namespace rvc_operational_state
 
 namespace keypad_input {
@@ -340,7 +340,7 @@ constexpr uint16_t cluster_revision = 1;
 } // namespace power_topology
 
 namespace electrical_power_measurement {
-constexpr uint16_t cluster_revision = 1;
+constexpr uint16_t cluster_revision = 3;
 } // namespace electrical_power_measurement
 
 namespace electrical_energy_measurement {
@@ -384,7 +384,7 @@ constexpr uint16_t cluster_revision = 1;
 } // namespace thread_network_directory
 
 namespace service_area {
-constexpr uint16_t cluster_revision = 1;
+constexpr uint16_t cluster_revision = 2;
 } // namespace service_area
 
 namespace water_heater_management {

examples/all_device_types_app/main/device_types.h

@@ -59,6 +59,7 @@ enum device_type_enum {
     ESP_MATTER_SOLAR_POWER,
     ESP_MATTER_BATTERY_STORAGE,
     ESP_MATTER_HEAT_PUMP,
+    ESP_MATTER_THERMOSTAT_CONTROLLER,
     ESP_MATTER_DEVICE_TYPE_MAX
 };
 
@@ -124,5 +125,6 @@ const device_type_name device_type_list[ESP_MATTER_DEVICE_TYPE_MAX] = {
     {"solar_power", ESP_MATTER_SOLAR_POWER},
     {"battery_storage", ESP_MATTER_BATTERY_STORAGE},
     {"heat_pump", ESP_MATTER_HEAT_PUMP},
+    {"thermostat_controller", ESP_MATTER_THERMOSTAT_CONTROLLER},
 };
 } /* namespace esp_matter */

examples/all_device_types_app/main/esp_matter_console_helpers.cpp

@@ -587,6 +587,11 @@ int create(uint8_t device_type_index)
             endpoint = esp_matter::endpoint::heat_pump::create(node, &heat_pump_config, ENDPOINT_FLAG_NONE, NULL);
             break;
         }
+        case ESP_MATTER_THERMOSTAT_CONTROLLER: {
+            esp_matter::endpoint::thermostat_controller::config_t thermostat_controller_config;
+            endpoint = esp_matter::endpoint::thermostat_controller::create(node, &thermostat_controller_config, ENDPOINT_FLAG_NONE, NULL);
+            break;
+        }
         default: {
             ESP_LOGE(TAG, "Please input a valid device type");
             break;