Apply Upstream code (2021-03-15)

[platform/upstream/connectedhomeip.git] / examples / all-clusters-app / all-clusters-common / gen / attribute-id.h

diff --git a/examples/all-clusters-app/all-clusters-common/gen/attribute-id.h b/examples/all-clusters-app/all-clusters-common/gen/attribute-id.h
index 3ab0310..8c8757f 100644 (file)
--- a/examples/all-clusters-app/all-clusters-common/gen/attribute-id.h
+++ b/examples/all-clusters-app/all-clusters-common/gen/attribute-id.h
@@ -26,30 +26,6 @@
 #define ZCL_REPORTING_STATUS_CLIENT_ATTRIBUTE_ID (0xFFFE)
 #define ZCL_REPORTING_STATUS_SERVER_ATTRIBUTE_ID (0xFFFE)
 
-// Attribute ids for cluster: Basic
-
-// Client attributes
-
-// Server attributes
-#define ZCL_VERSION_ATTRIBUTE_ID (0x0000)
-#define ZCL_APPLICATION_VERSION_ATTRIBUTE_ID (0x0001)
-#define ZCL_STACK_VERSION_ATTRIBUTE_ID (0x0002)
-#define ZCL_HW_VERSION_ATTRIBUTE_ID (0x0003)
-#define ZCL_MANUFACTURER_NAME_ATTRIBUTE_ID (0x0004)
-#define ZCL_MODEL_IDENTIFIER_ATTRIBUTE_ID (0x0005)
-#define ZCL_DATE_CODE_ATTRIBUTE_ID (0x0006)
-#define ZCL_POWER_SOURCE_ATTRIBUTE_ID (0x0007)
-#define ZCL_GENERIC_DEVICE_CLASS_ATTRIBUTE_ID (0x0008)
-#define ZCL_GENERIC_DEVICE_TYPE_ATTRIBUTE_ID (0x0009)
-#define ZCL_PRODUCT_CODE_ATTRIBUTE_ID (0x000A)
-#define ZCL_PRODUCT_URL_ATTRIBUTE_ID (0x000B)
-#define ZCL_LOCATION_DESCRIPTION_ATTRIBUTE_ID (0x0010)
-#define ZCL_PHYSICAL_ENVIRONMENT_ATTRIBUTE_ID (0x0011)
-#define ZCL_DEVICE_ENABLED_ATTRIBUTE_ID (0x0012)
-#define ZCL_ALARM_MASK_ATTRIBUTE_ID (0x0013)
-#define ZCL_DISABLE_LOCAL_CONFIG_ATTRIBUTE_ID (0x0014)
-#define ZCL_SW_BUILD_ID_ATTRIBUTE_ID (0x4000)
-
 // Attribute ids for cluster: Power Configuration
 
 // Client attributes
@@ -384,6 +360,29 @@
 #define ZCL_KEEPALIVE_BASE_ATTRIBUTE_ID (0x0000)
 #define ZCL_KEEPALIVE_JITTER_ATTRIBUTE_ID (0x0001)
 
+// Attribute ids for cluster: Basic
+
+// Client attributes
+
+// Server attributes
+#define ZCL_INTERACTION_MODEL_VERSION_ATTRIBUTE_ID (0x0000)
+#define ZCL_VENDOR_NAME_ATTRIBUTE_ID (0x0001)
+#define ZCL_VENDOR_ID_ATTRIBUTE_ID (0x0002)
+#define ZCL_PRODUCT_NAME_ATTRIBUTE_ID (0x0003)
+#define ZCL_PRODUCT_ID_ATTRIBUTE_ID (0x0004)
+#define ZCL_USER_LABEL_ATTRIBUTE_ID (0x0005)
+#define ZCL_LOCATION_ATTRIBUTE_ID (0x0006)
+#define ZCL_HARDWARE_VERSION_ATTRIBUTE_ID (0x0007)
+#define ZCL_HARDWARE_VERSION_STRING_ATTRIBUTE_ID (0x0008)
+#define ZCL_SOFTWARE_VERSION_ATTRIBUTE_ID (0x0009)
+#define ZCL_SOFTWARE_VERSION_STRING_ATTRIBUTE_ID (0x000A)
+#define ZCL_MANUFACTURING_DATE_ATTRIBUTE_ID (0x000B)
+#define ZCL_PART_NUMBER_ATTRIBUTE_ID (0x000C)
+#define ZCL_PRODUCT_URL_ATTRIBUTE_ID (0x000D)
+#define ZCL_PRODUCT_LABEL_ATTRIBUTE_ID (0x000E)
+#define ZCL_SERIAL_NUMBER_ATTRIBUTE_ID (0x000F)
+#define ZCL_LOCAL_CONFIG_DISABLED_ATTRIBUTE_ID (0x0010)
+
 // Attribute ids for cluster: General Commissioning
 
 // Client attributes
@@ -1104,10 +1103,10 @@
 // Client attributes
 
 // Server attributes
-#define ZCL_VENDOR_NAME_ATTRIBUTE_ID (0x0000)
-#define ZCL_VENDOR_ID_ATTRIBUTE_ID (0x0001)
+#define ZCL_APPLICATION_VENDOR_NAME_ATTRIBUTE_ID (0x0000)
+#define ZCL_APPLICATION_VENDOR_ID_ATTRIBUTE_ID (0x0001)
 #define ZCL_APPLICATION_NAME_ATTRIBUTE_ID (0x0002)
-#define ZCL_PRODUCT_ID_ATTRIBUTE_ID (0x0003)
+#define ZCL_APPLICATION_PRODUCT_ID_ATTRIBUTE_ID (0x0003)
 #define ZCL_APPLICATION_ID_ATTRIBUTE_ID (0x0005)
 #define ZCL_CATALOG_VENDOR_ID_ATTRIBUTE_ID (0x0006)
 #define ZCL_APPLICATION_STATUS_ATTRIBUTE_ID (0x0007)
@@ -3839,7 +3838,7 @@
 #define ZCL_PRICE_TRAILING_DIGIT_ATTRIBUTE_ID (0x0021)
 #define ZCL_PRICE_ATTRIBUTE_ID (0x0022)
 #define ZCL_GOOD_ID_ATTRIBUTE_ID (0x0030)
-#define ZCL_SERIAL_NUMBER_ATTRIBUTE_ID (0x0031)
+#define ZCL_PAYMENT_SERIAL_NUMBER_ATTRIBUTE_ID (0x0031)
 #define ZCL_PAYMENT_TIMESTAMP_ATTRIBUTE_ID (0x0032)
 #define ZCL_TRANS_ID_ATTRIBUTE_ID (0x0033)
 #define ZCL_TRANS_STATUS_ATTRIBUTE_ID (0x0034)