Merge branch 'fix-attribute-types-1-3' into 'release/v1.3'

[v1.3] components/esp-matter: fix types for on_time and off_wait_time

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

Author: chshu

.gitlab-ci.yml

@@ -208,7 +208,7 @@ build_image:
     - *add_gitlab_ssh_key
     - *get_build_caches
     - *setup_idf
-    - pip install 'idf-component-manager~=1.4.0'
+    - pip install 'idf-component-manager~=2.2'
     - cd ${ESP_MATTER_PATH}
     - mkdir -p ${REPOS_PATH}
     - *update_build_caches

components/esp_matter/esp_matter_attribute.cpp

@@ -1129,18 +1129,18 @@ attribute_t *create_global_scene_control(cluster_t *cluster, bool value)
                                          esp_matter_bool(value));
 }
 
-attribute_t *create_on_time(cluster_t *cluster, nullable<uint16_t> value)
+attribute_t *create_on_time(cluster_t *cluster, uint16_t value)
 {
     return esp_matter::attribute::create(cluster, OnOff::Attributes::OnTime::Id,
-                                         ATTRIBUTE_FLAG_WRITABLE | ATTRIBUTE_FLAG_NULLABLE,
-                                         esp_matter_nullable_uint16(value));
+                                         ATTRIBUTE_FLAG_WRITABLE,
+                                         esp_matter_uint16(value));
 }
 
-attribute_t *create_off_wait_time(cluster_t *cluster, nullable<uint16_t> value)
+attribute_t *create_off_wait_time(cluster_t *cluster, uint16_t value)
 {
     return esp_matter::attribute::create(cluster, OnOff::Attributes::OffWaitTime::Id,
-                                         ATTRIBUTE_FLAG_WRITABLE | ATTRIBUTE_FLAG_NULLABLE,
-                                         esp_matter_nullable_uint16(value));
+                                         ATTRIBUTE_FLAG_WRITABLE,
+                                         esp_matter_uint16(value));
 }
 
 attribute_t *create_start_up_on_off(cluster_t *cluster, nullable<uint8_t> value)

components/esp_matter/esp_matter_attribute.h

@@ -320,8 +320,8 @@ namespace on_off {
 namespace attribute {
 attribute_t *create_on_off(cluster_t *cluster, bool value);
 attribute_t *create_global_scene_control(cluster_t *cluster, bool value);
-attribute_t *create_on_time(cluster_t *cluster, nullable<uint16_t> value);
-attribute_t *create_off_wait_time(cluster_t *cluster, nullable<uint16_t> value);
+attribute_t *create_on_time(cluster_t *cluster, uint16_t value);
+attribute_t *create_off_wait_time(cluster_t *cluster, uint16_t value);
 attribute_t *create_start_up_on_off(cluster_t *cluster, nullable<uint8_t> value);
 } /* attribute */
 } /* on_off */

components/esp_matter/esp_matter_feature.h

@@ -185,8 +185,8 @@ namespace lighting {
 
 typedef struct config {
     bool global_scene_control;
-    nullable<uint16_t> on_time;
-    nullable<uint16_t> off_wait_time;
+    uint16_t on_time;
+    uint16_t off_wait_time;
     nullable<uint8_t> start_up_on_off;
     config() : global_scene_control(1), on_time(0), off_wait_time(0), start_up_on_off(0) {}
 } config_t;

examples/light/main/idf_component.yml

@@ -7,4 +7,4 @@ dependencies:
   esp_bsp_generic:
     version: "^1.1.0"
   espressif/esp_lvgl_port:
-    version: "2.6.0"
+    version: "2.7.0"