espressif/esp-matter
1
0
Fork 0
mirror of https://github.com/espressif/esp-matter.git synced 2026-04-27 19:13:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

See merge request app-frameworks/esp-matter!1348
This commit is contained in:
Shu Chen
2025-12-19 01:51:23 +00:00
parent 6bc6b83bb2 0d89a620f2
commit 46b8f573d9
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_matter/esp_matter_attribute.cpp
+6 -6
View File
@@ -1088,18 +1088,18 @@ attribute_t *create_global_scene_control(cluster_t *cluster, bool value)
esp_matter_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, return esp_matter::attribute::create(cluster, OnOff::Attributes::OnTime::Id,
ATTRIBUTE_FLAG_WRITABLE | ATTRIBUTE_FLAG_NULLABLE, ATTRIBUTE_FLAG_WRITABLE,
esp_matter_nullable_uint16(value)); 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, return esp_matter::attribute::create(cluster, OnOff::Attributes::OffWaitTime::Id,
ATTRIBUTE_FLAG_WRITABLE | ATTRIBUTE_FLAG_NULLABLE, ATTRIBUTE_FLAG_WRITABLE,
esp_matter_nullable_uint16(value)); esp_matter_uint16(value));
} }
attribute_t *create_start_up_on_off(cluster_t *cluster, nullable<uint8_t> value) attribute_t *create_start_up_on_off(cluster_t *cluster, nullable<uint8_t> value)
components/esp_matter/esp_matter_attribute.h
+2 -2
View File
@@ -309,8 +309,8 @@ namespace on_off {
namespace attribute { namespace attribute {
attribute_t *create_on_off(cluster_t *cluster, bool value); attribute_t *create_on_off(cluster_t *cluster, bool value);
attribute_t *create_global_scene_control(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_on_time(cluster_t *cluster, uint16_t 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);
attribute_t *create_start_up_on_off(cluster_t *cluster, nullable<uint8_t> value); attribute_t *create_start_up_on_off(cluster_t *cluster, nullable<uint8_t> value);
} /* attribute */ } /* attribute */
} /* on_off */ } /* on_off */
components/esp_matter/esp_matter_feature.h
+2 -2
View File
@@ -164,8 +164,8 @@ namespace lighting {
typedef struct config { typedef struct config {
bool global_scene_control; bool global_scene_control;
nullable<uint16_t> on_time; uint16_t on_time;
nullable<uint16_t> off_wait_time; uint16_t off_wait_time;
nullable<uint8_t> start_up_on_off; 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() : global_scene_control(1), on_time(0), off_wait_time(0), start_up_on_off(0) {}
} config_t; } config_t;