From 9d2af7785f972f4aa6fef2d95293c0418b2764c6 Mon Sep 17 00:00:00 2001 From: Shubham Patil Date: Thu, 4 Apr 2024 18:02:30 +0530 Subject: [PATCH] time-format and active-calendar-type are not nullable attributes --- components/esp_matter/esp_matter_attribute.cpp | 12 ++++++------ components/esp_matter/esp_matter_attribute.h | 4 ++-- components/esp_matter/esp_matter_cluster.h | 2 +- components/esp_matter/esp_matter_feature.h | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/components/esp_matter/esp_matter_attribute.cpp b/components/esp_matter/esp_matter_attribute.cpp index 8316ba489..d1cd7e342 100644 --- a/components/esp_matter/esp_matter_attribute.cpp +++ b/components/esp_matter/esp_matter_attribute.cpp @@ -3351,18 +3351,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 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 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) diff --git a/components/esp_matter/esp_matter_attribute.h b/components/esp_matter/esp_matter_attribute.h index dff42b3eb..bbadfd99b 100644 --- a/components/esp_matter/esp_matter_attribute.h +++ b/components/esp_matter/esp_matter_attribute.h @@ -778,8 +778,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 value); -attribute_t *create_active_calendar_type(cluster_t *cluster, nullable 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 */ diff --git a/components/esp_matter/esp_matter_cluster.h b/components/esp_matter/esp_matter_cluster.h index d0910db70..a64fd7bf1 100644 --- a/components/esp_matter/esp_matter_cluster.h +++ b/components/esp_matter/esp_matter_cluster.h @@ -638,7 +638,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 hour_format; + uint8_t hour_format; feature::calendar_format::config_t calendar_format; config() : cluster_revision(4), hour_format(0) {} } config_t; diff --git a/components/esp_matter/esp_matter_feature.h b/components/esp_matter/esp_matter_feature.h index 2e640fb88..e330266c7 100644 --- a/components/esp_matter/esp_matter_feature.h +++ b/components/esp_matter/esp_matter_feature.h @@ -1405,7 +1405,7 @@ namespace feature { namespace calendar_format { typedef struct config { - nullable active_calendar_type; + uint8_t active_calendar_type; config() : active_calendar_type(0) {} } config_t;