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_timer_fmt_cluster' into 'main'

Browse Source 
time-format and active-calendar-type are not nullable attributes in spec

See merge request app-frameworks/esp-matter!690
This commit is contained in:
Hrishikesh Dhayagude
2024-04-06 20:59:57 +08:00
parent a119520fcc 9d2af7785f
commit 2418e6696f
4 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
@@ -3404,18 +3404,18 @@ attribute_t *create_supported_locales(cluster_t *cluster, uint8_t *value, uint16
namespace time_format_localization {
namespace attribute {
attribute_t *create_hour_format(cluster_t *cluster, nullable<uint8_t> value)
attribute_t *create_hour_format(cluster_t *cluster, uint8_t value)
{
return esp_matter::attribute::create(cluster, TimeFormatLocalization::Attributes::HourFormat::Id,
ATTRIBUTE_FLAG_WRITABLE | ATTRIBUTE_FLAG_NONVOLATILE | ATTRIBUTE_FLAG_NULLABLE,
esp_matter_nullable_enum8(value));
ATTRIBUTE_FLAG_WRITABLE | ATTRIBUTE_FLAG_NONVOLATILE,
esp_matter_enum8(value));
}
attribute_t *create_active_calendar_type(cluster_t *cluster, nullable<uint8_t> value)
attribute_t *create_active_calendar_type(cluster_t *cluster, uint8_t value)
{
return esp_matter::attribute::create(cluster, TimeFormatLocalization::Attributes::ActiveCalendarType::Id,
ATTRIBUTE_FLAG_WRITABLE | ATTRIBUTE_FLAG_NONVOLATILE | ATTRIBUTE_FLAG_NULLABLE,
esp_matter_nullable_enum8(value));
ATTRIBUTE_FLAG_WRITABLE | ATTRIBUTE_FLAG_NONVOLATILE,
esp_matter_enum8(value));
}
attribute_t *create_supported_calendar_types(cluster_t *cluster, uint8_t *value, uint16_t length, uint16_t count)
components/esp_matter/esp_matter_attribute.h
+2 -2
View File
@@ -791,8 +791,8 @@ attribute_t *create_supported_locales(cluster_t *cluster, uint8_t *value, uint16
namespace time_format_localization {
namespace attribute {
attribute_t *create_hour_format(cluster_t *cluster, nullable<uint8_t> value);
attribute_t *create_active_calendar_type(cluster_t *cluster, nullable<uint8_t> value);
attribute_t *create_hour_format(cluster_t *cluster, uint8_t value);
attribute_t *create_active_calendar_type(cluster_t *cluster, uint8_t value);
attribute_t *create_supported_calendar_types(cluster_t *cluster, uint8_t *value, uint16_t length, uint16_t count);
} /* attribute */
} /* time_format_localization */
components/esp_matter/esp_matter_cluster.h
+1 -1
View File
@@ -681,7 +681,7 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags);
namespace time_format_localization {
typedef struct config {
uint16_t cluster_revision;
nullable<uint8_t> hour_format;
uint8_t hour_format;
feature::calendar_format::config_t calendar_format;
config() : cluster_revision(4), hour_format(0) {}
} config_t;
components/esp_matter/esp_matter_feature.h
+1 -1
View File
@@ -1445,7 +1445,7 @@ namespace feature {
namespace calendar_format {
typedef struct config {
nullable<uint8_t> active_calendar_type;
uint8_t active_calendar_type;
config() : active_calendar_type(0) {}
} config_t;