diff --git a/src/app/zap-templates/zcl/data-model/chip/scene.xml b/src/app/zap-templates/zcl/data-model/chip/scene.xml index 46980424ccb228..3653e5c1db6530 100644 --- a/src/app/zap-templates/zcl/data-model/chip/scene.xml +++ b/src/app/zap-templates/zcl/data-model/chip/scene.xml @@ -49,7 +49,7 @@ limitations under the License. <attribute side="server" code="0x0001" define="CURRENT_SCENE" type="INT8U" min="0x00" max="0xFF" writable="false" default="0x00" optional="false">CurrentScene</attribute> <attribute side="server" code="0x0002" define="CURRENT_GROUP" type="group_id" min="0x0000" max="0xFFF7" writable="false" default="0x0000" optional="false">CurrentGroup</attribute> <attribute side="server" code="0x0003" define="SCENE_VALID" type="BOOLEAN" min="0x00" max="0x01" writable="false" default="0x00" optional="false">SceneValid</attribute> - <attribute side="server" code="0x0004" define="NAME_SUPPORT" type="BITMAP8" min="0x00" max="0x80" writable="false" default="0x00" optional="false">NameSupport</attribute> + <attribute side="server" code="0x0004" define="SCENE_NAME_SUPPORT" type="BITMAP8" min="0x00" max="0x80" writable="false" default="0x00" optional="false">NameSupport</attribute> <attribute side="server" code="0x0005" define="LAST_CONFIGURED_BY" type="node_id" writable="false" isNullable="true" optional="true">LastConfiguredBy</attribute> <command source="client" code="0x00" name="AddScene" response="AddSceneResponse" isFabricScoped="true" optional="false" cli="chip scenes add"> diff --git a/src/app/zap-templates/zcl/data-model/silabs/general.xml b/src/app/zap-templates/zcl/data-model/silabs/general.xml index eaa247454fd88f..85049e7b1a2571 100644 --- a/src/app/zap-templates/zcl/data-model/silabs/general.xml +++ b/src/app/zap-templates/zcl/data-model/silabs/general.xml @@ -98,7 +98,7 @@ limitations under the License. <client init="false" tick="false">true</client> <server init="false" tick="false">true</server> <globalAttribute side="either" code="0xFFFD" value="3"/> - <attribute side="server" code="0x0000" define="NAME_SUPPORT" type="BITMAP8" min="0x00" max="0x80" writable="false" optional="false">name support</attribute> + <attribute side="server" code="0x0000" define="GROUP_NAME_SUPPORT" type="BITMAP8" min="0x00" max="0x80" writable="false" optional="false">name support</attribute> <!-- NAME_SUPPORT --> <command source="client" code="0x00" name="AddGroup" response="AddGroupResponse" isFabricScoped="true" optional="false" cli="zcl groups add"> <description> @@ -192,9 +192,9 @@ limitations under the License. <server tick="false" init="false">true</server> <globalAttribute side="either" code="0xFFFD" value="5"/> <attribute side="server" code="0x0000" define="CURRENT_LEVEL" type="INT8U" isNullable="true" writable="false" default="0x00" optional="false">CurrentLevel</attribute> - <attribute side="server" code="0x0001" define="REMAINING_TIME" type="INT16U" min="0x0000" max="0xFFFF" writable="false" default="0x0000" optional="true">RemainingTime</attribute> - <attribute side="server" code="0x0002" define="MIN_LEVEL" type="INT8U" min="0x00" max="0xFF" writable="false" default="0x00" optional="true">MinLevel</attribute> - <attribute side="server" code="0x0003" define="MAX_LEVEL" type="INT8U" min="0x00" max="0xFF" writable="false" default="0xFE" optional="true">MaxLevel</attribute> + <attribute side="server" code="0x0001" define="LEVEL_CONTROL_REMAINING_TIME" type="INT16U" min="0x0000" max="0xFFFF" writable="false" default="0x0000" optional="true">RemainingTime</attribute> + <attribute side="server" code="0x0002" define="MINIMUM_LEVEL" type="INT8U" min="0x00" max="0xFF" writable="false" default="0x00" optional="true">MinLevel</attribute> + <attribute side="server" code="0x0003" define="MAXIMUM_LEVEL" type="INT8U" min="0x00" max="0xFF" writable="false" default="0xFE" optional="true">MaxLevel</attribute> <attribute side="server" code="0x0004" define="CURRENT_FREQUENCY" type="INT16U" min="0x0000" max="0xFFFF" writable="false" default="0x0000" optional="true">CurrentFrequency</attribute> <attribute side="server" code="0x0005" define="MIN_FREQUENCY" type="INT16U" min="0x0000" max="0xFFFF" writable="false" default="0x0000" optional="true">MinFrequency</attribute> <attribute side="server" code="0x0006" define="MAX_FREQUENCY" type="INT16U" min="0x0000" max="0xFFFF" writable="false" default="0x0000" optional="true">MaxFrequency</attribute> diff --git a/zzz_generated/app-common/app-common/zap-generated/attribute-id.h b/zzz_generated/app-common/app-common/zap-generated/attribute-id.h index 8872d8decf56dd..7a0ec247317e58 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attribute-id.h +++ b/zzz_generated/app-common/app-common/zap-generated/attribute-id.h @@ -209,7 +209,7 @@ // Server attributes #define ZCL_HOUR_FORMAT_ATTRIBUTE_ID (0x0000) -#define ZCL_CALENDAR_TYPE_ATTRIBUTE_ID (0x0001) +#define ZCL_ACTIVE_CALENDAR_TYPE_ATTRIBUTE_ID (0x0001) #define ZCL_SUPPORTED_CALENDAR_TYPES_ATTRIBUTE_ID (0x0002) // Attribute ids for cluster: Unit Localization @@ -269,9 +269,9 @@ // Server attributes #define ZCL_BREADCRUMB_ATTRIBUTE_ID (0x0000) -#define ZCL_BASICCOMMISSIONINGINFO_ATTRIBUTE_ID (0x0001) -#define ZCL_REGULATORYCONFIG_ATTRIBUTE_ID (0x0002) -#define ZCL_LOCATIONCAPABILITY_ATTRIBUTE_ID (0x0003) +#define ZCL_BASIC_COMMISSIONING_INFO_ATTRIBUTE_ID (0x0001) +#define ZCL_REGULATORY_CONFIG_ATTRIBUTE_ID (0x0002) +#define ZCL_LOCATION_CAPABILITY_ATTRIBUTE_ID (0x0003) #define ZCL_SUPPORTS_CONCURRENT_CONNECTION_ATTRIBUTE_ID (0x0004) // Attribute ids for cluster: Network Commissioning @@ -301,7 +301,7 @@ // Server attributes #define ZCL_NETWORK_INTERFACES_ATTRIBUTE_ID (0x0000) #define ZCL_REBOOT_COUNT_ATTRIBUTE_ID (0x0001) -#define ZCL_UPTIME_ATTRIBUTE_ID (0x0002) +#define ZCL_UP_TIME_ATTRIBUTE_ID (0x0002) #define ZCL_TOTAL_OPERATIONAL_HOURS_ATTRIBUTE_ID (0x0003) #define ZCL_BOOT_REASONS_ATTRIBUTE_ID (0x0004) #define ZCL_ACTIVE_HARDWARE_FAULTS_ATTRIBUTE_ID (0x0005) @@ -486,7 +486,7 @@ #define ZCL_FABRICS_ATTRIBUTE_ID (0x0001) #define ZCL_SUPPORTED_FABRICS_ATTRIBUTE_ID (0x0002) #define ZCL_COMMISSIONED_FABRICS_ATTRIBUTE_ID (0x0003) -#define ZCL_TRUSTED_ROOTS_ATTRIBUTE_ID (0x0004) +#define ZCL_TRUSTED_ROOT_CERTIFICATES_ATTRIBUTE_ID (0x0004) #define ZCL_CURRENT_FABRIC_INDEX_ATTRIBUTE_ID (0x0005) // Attribute ids for cluster: Group Key Management