Change the VendorID attribute in Basic Information to the vendor_id t…

…ype. (#13110)
project-chip · Jan 6, 2022 · 4112be5 · 4112be5
1 parent a9982ae
commit 4112be5
Show file tree

Hide file tree

Showing 34 changed files with 153 additions and 57 deletions.
diff --git a/.../CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/BasicClientFragment.kt b/.../CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/BasicClientFragment.kt
@@ -179,7 +179,7 @@ class BasicClientFragment : Fragment() {
   }
 
   private suspend fun sendReadVendorIDAttribute() {
-    getBasicClusterForDevice().readVendorIDAttribute(object : ChipClusters.IntegerAttributeCallback {
+    getBasicClusterForDevice().readVendorIDAttribute(object : ChipClusters.BasicCluster.VendorIDAttributeCallback {
       override fun onSuccess(value: Int) {
         Log.i(TAG,"[Read Success] VendorID: $value")
         showMessage("[Read Success] VendorID: $value")

diff --git a/src/app/clusters/basic/basic.cpp b/src/app/clusters/basic/basic.cpp
@@ -209,7 +209,7 @@ void emberAfBasicClusterServerInitCallback(chip::EndpointId endpoint)
     uint16_t vendorId;
     if (ConfigurationMgr().GetVendorId(vendorId) == CHIP_NO_ERROR)
     {
-        status = Attributes::VendorID::Set(endpoint, vendorId);
+        status = Attributes::VendorID::Set(endpoint, static_cast<VendorId>(vendorId));
         VerifyOrdo(EMBER_ZCL_STATUS_SUCCESS == status, ChipLogError(Zcl, "Error setting Vendor Id: 0x%02x", status));
     }
 

diff --git a/src/app/clusters/ota-requestor/OTARequestor.cpp b/src/app/clusters/ota-requestor/OTARequestor.cpp
@@ -374,10 +374,8 @@ CHIP_ERROR OTARequestor::SendQueryImageRequest(OperationalDeviceProxy & devicePr
     constexpr OTADownloadProtocol kProtocolsSupported[] = { OTADownloadProtocol::kBDXSynchronous };
     QueryImage::Type args;
 
-    uint16_t vendorId;
-    VerifyOrReturnError(Basic::Attributes::VendorID::Get(kRootEndpointId, &vendorId) == EMBER_ZCL_STATUS_SUCCESS,
+    VerifyOrReturnError(Basic::Attributes::VendorID::Get(kRootEndpointId, &args.vendorId) == EMBER_ZCL_STATUS_SUCCESS,
                         CHIP_ERROR_READ_FAILED);
-    args.vendorId = static_cast<VendorId>(vendorId);
 
     VerifyOrReturnError(Basic::Attributes::ProductID::Get(kRootEndpointId, &args.productId) == EMBER_ZCL_STATUS_SUCCESS,
                         CHIP_ERROR_READ_FAILED);

diff --git a/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml
@@ -26,7 +26,7 @@ limitations under the License.
 
     <attribute side="server" code="0"  define="INTERACTION_MODEL_VERSION" type="int16u"                                 default="1"                                >InteractionModelVersion</attribute>
     <attribute side="server" code="1"  define="VENDOR_NAME"               type="char_string"               length="32"                                             >VendorName</attribute>
-    <attribute side="server" code="2"  define="VENDOR_ID"                 type="int16u"                                                                            >VendorID</attribute>
+    <attribute side="server" code="2"  define="VENDOR_ID"                 type="vendor_id"                                                                            >VendorID</attribute>
     <attribute side="server" code="3"  define="PRODUCT_NAME"              type="char_string"               length="32"                                             >ProductName</attribute>
     <attribute side="server" code="4"  define="PRODUCT_ID"                type="int16u"                                                                            >ProductID</attribute>
     <attribute side="server" code="5"  define="NODE_LABEL"                type="char_string"               length="32"  default=""  writable="true"                >NodeLabel</attribute>

diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp
@@ -370,9 +370,9 @@ void DeviceController::OnPIDReadResponse(void * context, uint16_t value)
     }
 }
 
-void DeviceController::OnVIDReadResponse(void * context, uint16_t value)
+void DeviceController::OnVIDReadResponse(void * context, VendorId value)
 {
-    ChipLogProgress(Controller, "Received VID for the device. Value %d", value);
+    ChipLogProgress(Controller, "Received VID for the device. Value %d", to_underlying(value));
 
     DeviceController * controller = static_cast<DeviceController *>(context);
 

diff --git a/src/controller/CHIPDeviceController.h b/src/controller/CHIPDeviceController.h
@@ -397,7 +397,7 @@ class DLL_EXPORT DeviceController : public SessionReleaseDelegate,
     Callback::Callback<DefaultFailureCallback> mOpenPairingFailureCallback;
 
     static void OnPIDReadResponse(void * context, uint16_t value);
-    static void OnVIDReadResponse(void * context, uint16_t value);
+    static void OnVIDReadResponse(void * context, VendorId value);
     static void OnVIDPIDReadFailureResponse(void * context, EmberAfStatus status);
 
     CHIP_ERROR OpenCommissioningWindowInternal();

diff --git a/src/controller/java/zap-generated/CHIPClusters-JNI.cpp b/src/controller/java/zap-generated/CHIPClusters-JNI.cpp
diff --git a/src/controller/java/zap-generated/CHIPClustersRead-JNI.cpp b/src/controller/java/zap-generated/CHIPClustersRead-JNI.cpp
diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.h b/src/controller/java/zap-generated/CHIPReadCallbacks.h
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.mm
diff --git a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h
diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp
diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h