From a2c057da756b44a11b56a25a305a35fa4c5c8b3f Mon Sep 17 00:00:00 2001 From: Yufeng Wang Date: Tue, 3 Sep 2024 11:30:05 -0700 Subject: [PATCH] Update the FS XML definations to algin with spec update --- .../device_manager/DeviceManager.cpp | 4 +-- .../fabric-bridge-app.matter | 14 ++++---- .../linux/CommissionerControl.cpp | 4 +-- .../commissioner-control-server.cpp | 8 ++--- .../chip/bridged-device-basic-information.xml | 2 +- .../chip/commissioner-control-cluster.xml | 16 ++++----- .../data_model/controller-clusters.matter | 14 ++++---- .../chip/devicecontroller/ChipClusters.java | 36 +++++++++---------- .../devicecontroller/ChipEventStructs.java | 36 +++++++++---------- .../devicecontroller/ClusterIDMapping.java | 4 +-- .../devicecontroller/ClusterInfoMapping.java | 24 ++++++------- ...lClusterCommissioningRequestResultEvent.kt | 20 +++++------ .../clusters/CommissionerControlCluster.kt | 16 ++++----- ...lClusterCommissioningRequestResultEvent.kt | 20 +++++------ .../CHIPEventTLVValueDecoder.cpp | 26 +++++++------- .../python/chip/clusters/CHIPClusters.py | 8 ++--- .../python/chip/clusters/Objects.py | 24 ++++++------- .../zap-generated/MTRCommandPayloadsObjc.h | 8 ++--- .../zap-generated/MTRCommandPayloadsObjc.mm | 28 +++++++-------- .../zap-generated/MTREventTLVValueDecoder.mm | 8 ++--- .../CHIP/zap-generated/MTRStructsObjc.h | 4 +-- .../CHIP/zap-generated/MTRStructsObjc.mm | 10 +++--- .../zap-generated/cluster-objects.cpp | 36 +++++++++---------- .../zap-generated/cluster-objects.h | 36 +++++++++---------- .../zap-generated/cluster/Commands.h | 8 ++--- .../cluster/logging/DataModelLogger.cpp | 8 ++--- .../zap-generated/cluster/Commands.h | 16 ++++----- 27 files changed, 219 insertions(+), 219 deletions(-) diff --git a/examples/fabric-admin/device_manager/DeviceManager.cpp b/examples/fabric-admin/device_manager/DeviceManager.cpp index 54c4bd8d45debf..d8de362255dd81 100644 --- a/examples/fabric-admin/device_manager/DeviceManager.cpp +++ b/examples/fabric-admin/device_manager/DeviceManager.cpp @@ -282,7 +282,7 @@ void DeviceManager::HandleCommissioningRequestResult(TLV::TLVReader & data) return; } - if (value.requestId != mRequestId) + if (value.requestID != mRequestId) { ChipLogError(NotSpecified, "The RequestId does not match the RequestId provided to RequestCommissioningApproval"); return; @@ -296,7 +296,7 @@ void DeviceManager::HandleCommissioningRequestResult(TLV::TLVReader & data) // The server is ready to begin commissioning the requested device, request the Commissioner Control Server to begin // commissioning a previously approved request. - SendCommissionNodeRequest(value.requestId, kResponseTimeoutSeconds); + SendCommissionNodeRequest(value.requestID, kResponseTimeoutSeconds); } void DeviceManager::HandleAttributePartsListUpdate(chip::TLV::TLVReader & data) diff --git a/examples/fabric-bridge-app/fabric-bridge-common/fabric-bridge-app.matter b/examples/fabric-bridge-app/fabric-bridge-common/fabric-bridge-app.matter index 22f5ae6ccda3be..e43a4658f69f41 100644 --- a/examples/fabric-bridge-app/fabric-bridge-common/fabric-bridge-app.matter +++ b/examples/fabric-bridge-app/fabric-bridge-common/fabric-bridge-app.matter @@ -1706,9 +1706,9 @@ provisional cluster CommissionerControl = 1873 { } fabric_sensitive info event access(read: manage) CommissioningRequestResult = 0 { - int64u requestId = 0; - node_id clientNodeId = 1; - enum8 statusCode = 2; + int64u requestID = 0; + node_id clientNodeID = 1; + status statusCode = 2; fabric_idx fabricIndex = 254; } @@ -1721,14 +1721,14 @@ provisional cluster CommissionerControl = 1873 { readonly attribute int16u clusterRevision = 65533; request struct RequestCommissioningApprovalRequest { - int64u requestId = 0; - vendor_id vendorId = 1; - int16u productId = 2; + int64u requestID = 0; + vendor_id vendorID = 1; + int16u productID = 2; optional char_string<64> label = 3; } request struct CommissionNodeRequest { - int64u requestId = 0; + int64u requestID = 0; int16u responseTimeoutSeconds = 1; } diff --git a/examples/fabric-bridge-app/linux/CommissionerControl.cpp b/examples/fabric-bridge-app/linux/CommissionerControl.cpp index 96984d50696474..e9dded102bcac1 100644 --- a/examples/fabric-bridge-app/linux/CommissionerControl.cpp +++ b/examples/fabric-bridge-app/linux/CommissionerControl.cpp @@ -79,8 +79,8 @@ CHIP_ERROR CommissionerControlDelegate::HandleCommissioningApprovalRequest(const VerifyOrReturnError(mNextStep == Step::kIdle, CHIP_ERROR_INCORRECT_STATE); CommissionerControl::Events::CommissioningRequestResult::Type result; - result.requestId = request.requestId; - result.clientNodeId = request.clientNodeId; + result.requestID = request.requestId; + result.clientNodeID = request.clientNodeId; result.fabricIndex = request.fabricIndex; result.statusCode = static_cast(Protocols::InteractionModel::Status::Success); diff --git a/src/app/clusters/commissioner-control-server/commissioner-control-server.cpp b/src/app/clusters/commissioner-control-server/commissioner-control-server.cpp index 80d65b2c4d16fc..d6282f287a1181 100644 --- a/src/app/clusters/commissioner-control-server/commissioner-control-server.cpp +++ b/src/app/clusters/commissioner-control-server/commissioner-control-server.cpp @@ -170,9 +170,9 @@ bool emberAfCommissionerControlClusterRequestCommissioningApprovalCallback( } auto fabricIndex = commandObj->GetAccessingFabricIndex(); - auto requestId = commandData.requestId; - auto vendorId = commandData.vendorId; - auto productId = commandData.productId; + auto requestId = commandData.requestID; + auto vendorId = commandData.vendorID; + auto productId = commandData.productID; // The label assigned from commandData need to be stored in CommissionerControl::Delegate which ensure that the backing buffer // of it has a valid lifespan during fabric sync setup process. @@ -232,7 +232,7 @@ bool emberAfCommissionerControlClusterCommissionNodeCallback( return true; } - auto requestId = commandData.requestId; + auto requestId = commandData.requestID; auto commissioningWindowParams = std::make_unique(); diff --git a/src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information.xml b/src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information.xml index ef2629c3574701..bc1d61e64309b5 100644 --- a/src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information.xml +++ b/src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information.xml @@ -111,7 +111,7 @@ limitations under the License. The Leave event SHOULD be emitted by a Node prior to permanently leaving the Fabric. - + This event SHALL be generated when there is a change in the Reachable attribute. diff --git a/src/app/zap-templates/zcl/data-model/chip/commissioner-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/commissioner-control-cluster.xml index af9a734d6e7176..abfd85dde2cd93 100644 --- a/src/app/zap-templates/zcl/data-model/chip/commissioner-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/commissioner-control-cluster.xml @@ -39,21 +39,21 @@ limitations under the License. This command is sent by a client to request approval for a future CommissionNode call. - - - + + + This command is sent by a client to request that the server begins commissioning a previously approved request. - + - + When received within the timeout specified by CommissionNode, the client SHALL open a commissioning window on to the node which the client called RequestCommissioningApproval to have commissioned. @@ -64,9 +64,9 @@ limitations under the License. This event SHALL be sent by the server following a RequestCommissioningApproval command which the server responded to with SUCCESS. - - - + + + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 42086a2caa93c5..73dbd8f6bd6c2c 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -9426,9 +9426,9 @@ provisional cluster CommissionerControl = 1873 { } fabric_sensitive info event access(read: manage) CommissioningRequestResult = 0 { - int64u requestId = 0; - node_id clientNodeId = 1; - enum8 statusCode = 2; + int64u requestID = 0; + node_id clientNodeID = 1; + status statusCode = 2; fabric_idx fabricIndex = 254; } @@ -9441,14 +9441,14 @@ provisional cluster CommissionerControl = 1873 { readonly attribute int16u clusterRevision = 65533; request struct RequestCommissioningApprovalRequest { - int64u requestId = 0; - vendor_id vendorId = 1; - int16u productId = 2; + int64u requestID = 0; + vendor_id vendorID = 1; + int16u productID = 2; optional char_string<64> label = 3; } request struct CommissionNodeRequest { - int64u requestId = 0; + int64u requestID = 0; int16u responseTimeoutSeconds = 1; } diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java index fd792a14bb2e4f..16ab5d931b9455 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java @@ -61055,25 +61055,25 @@ public long initWithDevice(long devicePtr, int endpointId) { return 0L; } - public void requestCommissioningApproval(DefaultClusterCallback callback, Long requestId, Integer vendorId, Integer productId, Optional label) { - requestCommissioningApproval(callback, requestId, vendorId, productId, label, 0); + public void requestCommissioningApproval(DefaultClusterCallback callback, Long requestID, Integer vendorID, Integer productID, Optional label) { + requestCommissioningApproval(callback, requestID, vendorID, productID, label, 0); } - public void requestCommissioningApproval(DefaultClusterCallback callback, Long requestId, Integer vendorId, Integer productId, Optional label, int timedInvokeTimeoutMs) { + public void requestCommissioningApproval(DefaultClusterCallback callback, Long requestID, Integer vendorID, Integer productID, Optional label, int timedInvokeTimeoutMs) { final long commandId = 0L; ArrayList elements = new ArrayList<>(); - final long requestIdFieldID = 0L; - BaseTLVType requestIdtlvValue = new UIntType(requestId); - elements.add(new StructElement(requestIdFieldID, requestIdtlvValue)); + final long requestIDFieldID = 0L; + BaseTLVType requestIDtlvValue = new UIntType(requestID); + elements.add(new StructElement(requestIDFieldID, requestIDtlvValue)); - final long vendorIdFieldID = 1L; - BaseTLVType vendorIdtlvValue = new UIntType(vendorId); - elements.add(new StructElement(vendorIdFieldID, vendorIdtlvValue)); + final long vendorIDFieldID = 1L; + BaseTLVType vendorIDtlvValue = new UIntType(vendorID); + elements.add(new StructElement(vendorIDFieldID, vendorIDtlvValue)); - final long productIdFieldID = 2L; - BaseTLVType productIdtlvValue = new UIntType(productId); - elements.add(new StructElement(productIdFieldID, productIdtlvValue)); + final long productIDFieldID = 2L; + BaseTLVType productIDtlvValue = new UIntType(productID); + elements.add(new StructElement(productIDFieldID, productIDtlvValue)); final long labelFieldID = 3L; BaseTLVType labeltlvValue = label.map((nonOptionallabel) -> new StringType(nonOptionallabel)).orElse(new EmptyType()); @@ -61087,17 +61087,17 @@ public void onResponse(StructType invokeStructValue) { }}, commandId, commandArgs, timedInvokeTimeoutMs); } - public void commissionNode(ReverseOpenCommissioningWindowCallback callback, Long requestId, Integer responseTimeoutSeconds) { - commissionNode(callback, requestId, responseTimeoutSeconds, 0); + public void commissionNode(ReverseOpenCommissioningWindowCallback callback, Long requestID, Integer responseTimeoutSeconds) { + commissionNode(callback, requestID, responseTimeoutSeconds, 0); } - public void commissionNode(ReverseOpenCommissioningWindowCallback callback, Long requestId, Integer responseTimeoutSeconds, int timedInvokeTimeoutMs) { + public void commissionNode(ReverseOpenCommissioningWindowCallback callback, Long requestID, Integer responseTimeoutSeconds, int timedInvokeTimeoutMs) { final long commandId = 1L; ArrayList elements = new ArrayList<>(); - final long requestIdFieldID = 0L; - BaseTLVType requestIdtlvValue = new UIntType(requestId); - elements.add(new StructElement(requestIdFieldID, requestIdtlvValue)); + final long requestIDFieldID = 0L; + BaseTLVType requestIDtlvValue = new UIntType(requestID); + elements.add(new StructElement(requestIDFieldID, requestIDtlvValue)); final long responseTimeoutSecondsFieldID = 1L; BaseTLVType responseTimeoutSecondstlvValue = new UIntType(responseTimeoutSeconds); diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipEventStructs.java b/src/controller/java/generated/java/chip/devicecontroller/ChipEventStructs.java index 916493fc2b60c3..fdf02ea06589a9 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ChipEventStructs.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ChipEventStructs.java @@ -6234,8 +6234,8 @@ public String toString() { } } public static class CommissionerControlClusterCommissioningRequestResultEvent { - public Long requestId; - public Long clientNodeId; + public Long requestID; + public Long clientNodeID; public Integer statusCode; public Integer fabricIndex; private static final long REQUEST_ID_ID = 0L; @@ -6244,21 +6244,21 @@ public static class CommissionerControlClusterCommissioningRequestResultEvent { private static final long FABRIC_INDEX_ID = 254L; public CommissionerControlClusterCommissioningRequestResultEvent( - Long requestId, - Long clientNodeId, + Long requestID, + Long clientNodeID, Integer statusCode, Integer fabricIndex ) { - this.requestId = requestId; - this.clientNodeId = clientNodeId; + this.requestID = requestID; + this.clientNodeID = clientNodeID; this.statusCode = statusCode; this.fabricIndex = fabricIndex; } public StructType encodeTlv() { ArrayList values = new ArrayList<>(); - values.add(new StructElement(REQUEST_ID_ID, new UIntType(requestId))); - values.add(new StructElement(CLIENT_NODE_ID_ID, new UIntType(clientNodeId))); + values.add(new StructElement(REQUEST_ID_ID, new UIntType(requestID))); + values.add(new StructElement(CLIENT_NODE_ID_ID, new UIntType(clientNodeID))); values.add(new StructElement(STATUS_CODE_ID, new UIntType(statusCode))); values.add(new StructElement(FABRIC_INDEX_ID, new UIntType(fabricIndex))); @@ -6269,20 +6269,20 @@ public static CommissionerControlClusterCommissioningRequestResultEvent decodeTl if (tlvValue == null || tlvValue.type() != TLVType.Struct) { return null; } - Long requestId = null; - Long clientNodeId = null; + Long requestID = null; + Long clientNodeID = null; Integer statusCode = null; Integer fabricIndex = null; for (StructElement element: ((StructType)tlvValue).value()) { if (element.contextTagNum() == REQUEST_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); - requestId = castingValue.value(Long.class); + requestID = castingValue.value(Long.class); } } else if (element.contextTagNum() == CLIENT_NODE_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); - clientNodeId = castingValue.value(Long.class); + clientNodeID = castingValue.value(Long.class); } } else if (element.contextTagNum() == STATUS_CODE_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { @@ -6297,8 +6297,8 @@ public static CommissionerControlClusterCommissioningRequestResultEvent decodeTl } } return new CommissionerControlClusterCommissioningRequestResultEvent( - requestId, - clientNodeId, + requestID, + clientNodeID, statusCode, fabricIndex ); @@ -6308,11 +6308,11 @@ public static CommissionerControlClusterCommissioningRequestResultEvent decodeTl public String toString() { StringBuilder output = new StringBuilder(); output.append("CommissionerControlClusterCommissioningRequestResultEvent {\n"); - output.append("\trequestId: "); - output.append(requestId); + output.append("\trequestID: "); + output.append(requestID); output.append("\n"); - output.append("\tclientNodeId: "); - output.append(clientNodeId); + output.append("\tclientNodeID: "); + output.append(clientNodeID); output.append("\n"); output.append("\tstatusCode: "); output.append(statusCode); diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java index b48f4029b62237..c4fc1c7407e8f8 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java @@ -17407,7 +17407,7 @@ public static Command value(long id) throws NoSuchFieldError { } throw new NoSuchFieldError(); } - }public enum RequestCommissioningApprovalCommandField {RequestId(0),VendorId(1),ProductId(2),Label(3),; + }public enum RequestCommissioningApprovalCommandField {RequestID(0),VendorID(1),ProductID(2),Label(3),; private final int id; RequestCommissioningApprovalCommandField(int id) { this.id = id; @@ -17424,7 +17424,7 @@ public static RequestCommissioningApprovalCommandField value(int id) throws NoSu } throw new NoSuchFieldError(); } - }public enum CommissionNodeCommandField {RequestId(0),ResponseTimeoutSeconds(1),; + }public enum CommissionNodeCommandField {RequestID(0),ResponseTimeoutSeconds(1),; private final int id; CommissionNodeCommandField(int id) { this.id = id; diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java index 55659d8463581d..2195c3418b1876 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java @@ -29009,14 +29009,14 @@ public Map> getCommandMap() { Map commissionerControlrequestCommissioningApprovalCommandParams = new LinkedHashMap(); - CommandParameterInfo commissionerControlrequestCommissioningApprovalrequestIdCommandParameterInfo = new CommandParameterInfo("requestId", Long.class, Long.class); - commissionerControlrequestCommissioningApprovalCommandParams.put("requestId",commissionerControlrequestCommissioningApprovalrequestIdCommandParameterInfo); + CommandParameterInfo commissionerControlrequestCommissioningApprovalrequestIDCommandParameterInfo = new CommandParameterInfo("requestID", Long.class, Long.class); + commissionerControlrequestCommissioningApprovalCommandParams.put("requestID",commissionerControlrequestCommissioningApprovalrequestIDCommandParameterInfo); - CommandParameterInfo commissionerControlrequestCommissioningApprovalvendorIdCommandParameterInfo = new CommandParameterInfo("vendorId", Integer.class, Integer.class); - commissionerControlrequestCommissioningApprovalCommandParams.put("vendorId",commissionerControlrequestCommissioningApprovalvendorIdCommandParameterInfo); + CommandParameterInfo commissionerControlrequestCommissioningApprovalvendorIDCommandParameterInfo = new CommandParameterInfo("vendorID", Integer.class, Integer.class); + commissionerControlrequestCommissioningApprovalCommandParams.put("vendorID",commissionerControlrequestCommissioningApprovalvendorIDCommandParameterInfo); - CommandParameterInfo commissionerControlrequestCommissioningApprovalproductIdCommandParameterInfo = new CommandParameterInfo("productId", Integer.class, Integer.class); - commissionerControlrequestCommissioningApprovalCommandParams.put("productId",commissionerControlrequestCommissioningApprovalproductIdCommandParameterInfo); + CommandParameterInfo commissionerControlrequestCommissioningApprovalproductIDCommandParameterInfo = new CommandParameterInfo("productID", Integer.class, Integer.class); + commissionerControlrequestCommissioningApprovalCommandParams.put("productID",commissionerControlrequestCommissioningApprovalproductIDCommandParameterInfo); CommandParameterInfo commissionerControlrequestCommissioningApprovallabelCommandParameterInfo = new CommandParameterInfo("label", Optional.class, String.class); commissionerControlrequestCommissioningApprovalCommandParams.put("label",commissionerControlrequestCommissioningApprovallabelCommandParameterInfo); @@ -29025,11 +29025,11 @@ public Map> getCommandMap() { ((ChipClusters.CommissionerControlCluster) cluster) .requestCommissioningApproval((DefaultClusterCallback) callback , (Long) - commandArguments.get("requestId") + commandArguments.get("requestID") , (Integer) - commandArguments.get("vendorId") + commandArguments.get("vendorID") , (Integer) - commandArguments.get("productId") + commandArguments.get("productID") , (Optional) commandArguments.get("label") ); @@ -29041,8 +29041,8 @@ public Map> getCommandMap() { Map commissionerControlcommissionNodeCommandParams = new LinkedHashMap(); - CommandParameterInfo commissionerControlcommissionNoderequestIdCommandParameterInfo = new CommandParameterInfo("requestId", Long.class, Long.class); - commissionerControlcommissionNodeCommandParams.put("requestId",commissionerControlcommissionNoderequestIdCommandParameterInfo); + CommandParameterInfo commissionerControlcommissionNoderequestIDCommandParameterInfo = new CommandParameterInfo("requestID", Long.class, Long.class); + commissionerControlcommissionNodeCommandParams.put("requestID",commissionerControlcommissionNoderequestIDCommandParameterInfo); CommandParameterInfo commissionerControlcommissionNoderesponseTimeoutSecondsCommandParameterInfo = new CommandParameterInfo("responseTimeoutSeconds", Integer.class, Integer.class); commissionerControlcommissionNodeCommandParams.put("responseTimeoutSeconds",commissionerControlcommissionNoderesponseTimeoutSecondsCommandParameterInfo); @@ -29051,7 +29051,7 @@ public Map> getCommandMap() { ((ChipClusters.CommissionerControlCluster) cluster) .commissionNode((ChipClusters.CommissionerControlCluster.ReverseOpenCommissioningWindowCallback) callback , (Long) - commandArguments.get("requestId") + commandArguments.get("requestID") , (Integer) commandArguments.get("responseTimeoutSeconds") diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/CommissionerControlClusterCommissioningRequestResultEvent.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/CommissionerControlClusterCommissioningRequestResultEvent.kt index 2a7a8d3c5b8ffb..ce05d28a261e91 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/CommissionerControlClusterCommissioningRequestResultEvent.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/CommissionerControlClusterCommissioningRequestResultEvent.kt @@ -23,15 +23,15 @@ import matter.tlv.TlvReader import matter.tlv.TlvWriter class CommissionerControlClusterCommissioningRequestResultEvent( - val requestId: ULong, - val clientNodeId: ULong, + val requestID: ULong, + val clientNodeID: ULong, val statusCode: UInt, val fabricIndex: UInt, ) { override fun toString(): String = buildString { append("CommissionerControlClusterCommissioningRequestResultEvent {\n") - append("\trequestId : $requestId\n") - append("\tclientNodeId : $clientNodeId\n") + append("\trequestID : $requestID\n") + append("\tclientNodeID : $clientNodeID\n") append("\tstatusCode : $statusCode\n") append("\tfabricIndex : $fabricIndex\n") append("}\n") @@ -40,8 +40,8 @@ class CommissionerControlClusterCommissioningRequestResultEvent( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_REQUEST_ID), requestId) - put(ContextSpecificTag(TAG_CLIENT_NODE_ID), clientNodeId) + put(ContextSpecificTag(TAG_REQUEST_ID), requestID) + put(ContextSpecificTag(TAG_CLIENT_NODE_ID), clientNodeID) put(ContextSpecificTag(TAG_STATUS_CODE), statusCode) put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex) endStructure() @@ -59,16 +59,16 @@ class CommissionerControlClusterCommissioningRequestResultEvent( tlvReader: TlvReader, ): CommissionerControlClusterCommissioningRequestResultEvent { tlvReader.enterStructure(tlvTag) - val requestId = tlvReader.getULong(ContextSpecificTag(TAG_REQUEST_ID)) - val clientNodeId = tlvReader.getULong(ContextSpecificTag(TAG_CLIENT_NODE_ID)) + val requestID = tlvReader.getULong(ContextSpecificTag(TAG_REQUEST_ID)) + val clientNodeID = tlvReader.getULong(ContextSpecificTag(TAG_CLIENT_NODE_ID)) val statusCode = tlvReader.getUInt(ContextSpecificTag(TAG_STATUS_CODE)) val fabricIndex = tlvReader.getUInt(ContextSpecificTag(TAG_FABRIC_INDEX)) tlvReader.exitContainer() return CommissionerControlClusterCommissioningRequestResultEvent( - requestId, - clientNodeId, + requestID, + clientNodeID, statusCode, fabricIndex, ) diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/CommissionerControlCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/CommissionerControlCluster.kt index 3e9d07f3f04354..f7b592b6bc2c72 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/clusters/CommissionerControlCluster.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/CommissionerControlCluster.kt @@ -92,9 +92,9 @@ class CommissionerControlCluster( } suspend fun requestCommissioningApproval( - requestId: ULong, - vendorId: UShort, - productId: UShort, + requestID: ULong, + vendorID: UShort, + productID: UShort, label: String?, timedInvokeTimeout: Duration? = null, ) { @@ -104,13 +104,13 @@ class CommissionerControlCluster( tlvWriter.startStructure(AnonymousTag) val TAG_REQUEST_ID_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_REQUEST_ID_REQ), requestId) + tlvWriter.put(ContextSpecificTag(TAG_REQUEST_ID_REQ), requestID) val TAG_VENDOR_ID_REQ: Int = 1 - tlvWriter.put(ContextSpecificTag(TAG_VENDOR_ID_REQ), vendorId) + tlvWriter.put(ContextSpecificTag(TAG_VENDOR_ID_REQ), vendorID) val TAG_PRODUCT_ID_REQ: Int = 2 - tlvWriter.put(ContextSpecificTag(TAG_PRODUCT_ID_REQ), productId) + tlvWriter.put(ContextSpecificTag(TAG_PRODUCT_ID_REQ), productID) val TAG_LABEL_REQ: Int = 3 label?.let { tlvWriter.put(ContextSpecificTag(TAG_LABEL_REQ), label) } @@ -128,7 +128,7 @@ class CommissionerControlCluster( } suspend fun commissionNode( - requestId: ULong, + requestID: ULong, responseTimeoutSeconds: UShort, timedInvokeTimeout: Duration? = null, ): ReverseOpenCommissioningWindow { @@ -138,7 +138,7 @@ class CommissionerControlCluster( tlvWriter.startStructure(AnonymousTag) val TAG_REQUEST_ID_REQ: Int = 0 - tlvWriter.put(ContextSpecificTag(TAG_REQUEST_ID_REQ), requestId) + tlvWriter.put(ContextSpecificTag(TAG_REQUEST_ID_REQ), requestID) val TAG_RESPONSE_TIMEOUT_SECONDS_REQ: Int = 1 tlvWriter.put(ContextSpecificTag(TAG_RESPONSE_TIMEOUT_SECONDS_REQ), responseTimeoutSeconds) diff --git a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/CommissionerControlClusterCommissioningRequestResultEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/CommissionerControlClusterCommissioningRequestResultEvent.kt index c8947776269773..4cc7a31fdbe97c 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/CommissionerControlClusterCommissioningRequestResultEvent.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/CommissionerControlClusterCommissioningRequestResultEvent.kt @@ -23,15 +23,15 @@ import matter.tlv.TlvReader import matter.tlv.TlvWriter class CommissionerControlClusterCommissioningRequestResultEvent( - val requestId: ULong, - val clientNodeId: ULong, + val requestID: ULong, + val clientNodeID: ULong, val statusCode: UByte, val fabricIndex: UByte, ) { override fun toString(): String = buildString { append("CommissionerControlClusterCommissioningRequestResultEvent {\n") - append("\trequestId : $requestId\n") - append("\tclientNodeId : $clientNodeId\n") + append("\trequestID : $requestID\n") + append("\tclientNodeID : $clientNodeID\n") append("\tstatusCode : $statusCode\n") append("\tfabricIndex : $fabricIndex\n") append("}\n") @@ -40,8 +40,8 @@ class CommissionerControlClusterCommissioningRequestResultEvent( fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { tlvWriter.apply { startStructure(tlvTag) - put(ContextSpecificTag(TAG_REQUEST_ID), requestId) - put(ContextSpecificTag(TAG_CLIENT_NODE_ID), clientNodeId) + put(ContextSpecificTag(TAG_REQUEST_ID), requestID) + put(ContextSpecificTag(TAG_CLIENT_NODE_ID), clientNodeID) put(ContextSpecificTag(TAG_STATUS_CODE), statusCode) put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex) endStructure() @@ -59,16 +59,16 @@ class CommissionerControlClusterCommissioningRequestResultEvent( tlvReader: TlvReader, ): CommissionerControlClusterCommissioningRequestResultEvent { tlvReader.enterStructure(tlvTag) - val requestId = tlvReader.getULong(ContextSpecificTag(TAG_REQUEST_ID)) - val clientNodeId = tlvReader.getULong(ContextSpecificTag(TAG_CLIENT_NODE_ID)) + val requestID = tlvReader.getULong(ContextSpecificTag(TAG_REQUEST_ID)) + val clientNodeID = tlvReader.getULong(ContextSpecificTag(TAG_CLIENT_NODE_ID)) val statusCode = tlvReader.getUByte(ContextSpecificTag(TAG_STATUS_CODE)) val fabricIndex = tlvReader.getUByte(ContextSpecificTag(TAG_FABRIC_INDEX)) tlvReader.exitContainer() return CommissionerControlClusterCommissioningRequestResultEvent( - requestId, - clientNodeId, + requestID, + clientNodeID, statusCode, fabricIndex, ) diff --git a/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp index e695cd1dc794a2..cf2d1449df90a3 100644 --- a/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp @@ -8335,20 +8335,20 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader & { return nullptr; } - jobject value_requestId; - std::string value_requestIdClassName = "java/lang/Long"; - std::string value_requestIdCtorSignature = "(J)V"; - jlong jnivalue_requestId = static_cast(cppValue.requestId); + jobject value_requestID; + std::string value_requestIDClassName = "java/lang/Long"; + std::string value_requestIDCtorSignature = "(J)V"; + jlong jnivalue_requestID = static_cast(cppValue.requestID); chip::JniReferences::GetInstance().CreateBoxedObject( - value_requestIdClassName.c_str(), value_requestIdCtorSignature.c_str(), jnivalue_requestId, value_requestId); + value_requestIDClassName.c_str(), value_requestIDCtorSignature.c_str(), jnivalue_requestID, value_requestID); - jobject value_clientNodeId; - std::string value_clientNodeIdClassName = "java/lang/Long"; - std::string value_clientNodeIdCtorSignature = "(J)V"; - jlong jnivalue_clientNodeId = static_cast(cppValue.clientNodeId); - chip::JniReferences::GetInstance().CreateBoxedObject(value_clientNodeIdClassName.c_str(), - value_clientNodeIdCtorSignature.c_str(), - jnivalue_clientNodeId, value_clientNodeId); + jobject value_clientNodeID; + std::string value_clientNodeIDClassName = "java/lang/Long"; + std::string value_clientNodeIDCtorSignature = "(J)V"; + jlong jnivalue_clientNodeID = static_cast(cppValue.clientNodeID); + chip::JniReferences::GetInstance().CreateBoxedObject(value_clientNodeIDClassName.c_str(), + value_clientNodeIDCtorSignature.c_str(), + jnivalue_clientNodeID, value_clientNodeID); jobject value_statusCode; std::string value_statusCodeClassName = "java/lang/Integer"; @@ -8388,7 +8388,7 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader & } jobject value = env->NewObject(commissioningRequestResultStructClass, commissioningRequestResultStructCtor, - value_requestId, value_clientNodeId, value_statusCode, value_fabricIndex); + value_requestID, value_clientNodeID, value_statusCode, value_fabricIndex); return value; } diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py index 356d3b43569ea2..5950cededa5499 100644 --- a/src/controller/python/chip/clusters/CHIPClusters.py +++ b/src/controller/python/chip/clusters/CHIPClusters.py @@ -13377,9 +13377,9 @@ class ChipClusters: "commandId": 0x00000000, "commandName": "RequestCommissioningApproval", "args": { - "requestId": "int", - "vendorId": "int", - "productId": "int", + "requestID": "int", + "vendorID": "int", + "productID": "int", "label": "str", }, }, @@ -13387,7 +13387,7 @@ class ChipClusters: "commandId": 0x00000001, "commandName": "CommissionNode", "args": { - "requestId": "int", + "requestID": "int", "responseTimeoutSeconds": "int", }, }, diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index a5988bbf54e71a..91078911685e0d 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -47453,15 +47453,15 @@ class RequestCommissioningApproval(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor(Label="requestId", Tag=0, Type=uint), - ClusterObjectFieldDescriptor(Label="vendorId", Tag=1, Type=uint), - ClusterObjectFieldDescriptor(Label="productId", Tag=2, Type=uint), + ClusterObjectFieldDescriptor(Label="requestID", Tag=0, Type=uint), + ClusterObjectFieldDescriptor(Label="vendorID", Tag=1, Type=uint), + ClusterObjectFieldDescriptor(Label="productID", Tag=2, Type=uint), ClusterObjectFieldDescriptor(Label="label", Tag=3, Type=typing.Optional[str]), ]) - requestId: 'uint' = 0 - vendorId: 'uint' = 0 - productId: 'uint' = 0 + requestID: 'uint' = 0 + vendorID: 'uint' = 0 + productID: 'uint' = 0 label: 'typing.Optional[str]' = None @dataclass @@ -47475,11 +47475,11 @@ class CommissionNode(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor(Label="requestId", Tag=0, Type=uint), + ClusterObjectFieldDescriptor(Label="requestID", Tag=0, Type=uint), ClusterObjectFieldDescriptor(Label="responseTimeoutSeconds", Tag=1, Type=uint), ]) - requestId: 'uint' = 0 + requestID: 'uint' = 0 responseTimeoutSeconds: 'uint' = 0 @dataclass @@ -47634,14 +47634,14 @@ def event_id(cls) -> int: def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor(Label="requestId", Tag=0, Type=uint), - ClusterObjectFieldDescriptor(Label="clientNodeId", Tag=1, Type=uint), + ClusterObjectFieldDescriptor(Label="requestID", Tag=0, Type=uint), + ClusterObjectFieldDescriptor(Label="clientNodeID", Tag=1, Type=uint), ClusterObjectFieldDescriptor(Label="statusCode", Tag=2, Type=uint), ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=254, Type=uint), ]) - requestId: 'uint' = 0 - clientNodeId: 'uint' = 0 + requestID: 'uint' = 0 + clientNodeID: 'uint' = 0 statusCode: 'uint' = 0 fabricIndex: 'uint' = 0 diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h index 044b0116ff4778..05bcb8213b6df9 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h @@ -10894,11 +10894,11 @@ MTR_PROVISIONALLY_AVAILABLE MTR_PROVISIONALLY_AVAILABLE @interface MTRCommissionerControlClusterRequestCommissioningApprovalParams : NSObject -@property (nonatomic, copy) NSNumber * _Nonnull requestId MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull requestID MTR_PROVISIONALLY_AVAILABLE; -@property (nonatomic, copy) NSNumber * _Nonnull vendorId MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull vendorID MTR_PROVISIONALLY_AVAILABLE; -@property (nonatomic, copy) NSNumber * _Nonnull productId MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull productID MTR_PROVISIONALLY_AVAILABLE; @property (nonatomic, copy) NSString * _Nullable label MTR_PROVISIONALLY_AVAILABLE; /** @@ -10930,7 +10930,7 @@ MTR_PROVISIONALLY_AVAILABLE MTR_PROVISIONALLY_AVAILABLE @interface MTRCommissionerControlClusterCommissionNodeParams : NSObject -@property (nonatomic, copy) NSNumber * _Nonnull requestId MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull requestID MTR_PROVISIONALLY_AVAILABLE; @property (nonatomic, copy) NSNumber * _Nonnull responseTimeoutSeconds MTR_PROVISIONALLY_AVAILABLE; /** diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm index d24ce54fc84028..87aacfd377eb82 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm @@ -31480,11 +31480,11 @@ - (instancetype)init { if (self = [super init]) { - _requestId = @(0); + _requestID = @(0); - _vendorId = @(0); + _vendorID = @(0); - _productId = @(0); + _productID = @(0); _label = nil; _timedInvokeTimeoutMs = nil; @@ -31497,9 +31497,9 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; { auto other = [[MTRCommissionerControlClusterRequestCommissioningApprovalParams alloc] init]; - other.requestId = self.requestId; - other.vendorId = self.vendorId; - other.productId = self.productId; + other.requestID = self.requestID; + other.vendorID = self.vendorID; + other.productID = self.productID; other.label = self.label; other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; other.serverSideProcessingTimeout = self.serverSideProcessingTimeout; @@ -31509,7 +31509,7 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; - (NSString *)description { - NSString * descriptionString = [NSString stringWithFormat:@"<%@: requestId:%@; vendorId:%@; productId:%@; label:%@; >", NSStringFromClass([self class]), _requestId, _vendorId, _productId, _label]; + NSString * descriptionString = [NSString stringWithFormat:@"<%@: requestID:%@; vendorID:%@; productID:%@; label:%@; >", NSStringFromClass([self class]), _requestID, _vendorID, _productID, _label]; return descriptionString; } @@ -31522,13 +31522,13 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader chip::app::Clusters::CommissionerControl::Commands::RequestCommissioningApproval::Type encodableStruct; ListFreer listFreer; { - encodableStruct.requestId = self.requestId.unsignedLongLongValue; + encodableStruct.requestID = self.requestID.unsignedLongLongValue; } { - encodableStruct.vendorId = static_cast>(self.vendorId.unsignedShortValue); + encodableStruct.vendorID = static_cast>(self.vendorID.unsignedShortValue); } { - encodableStruct.productId = self.productId.unsignedShortValue; + encodableStruct.productID = self.productID.unsignedShortValue; } { if (self.label != nil) { @@ -31580,7 +31580,7 @@ - (instancetype)init { if (self = [super init]) { - _requestId = @(0); + _requestID = @(0); _responseTimeoutSeconds = @(0); _timedInvokeTimeoutMs = nil; @@ -31593,7 +31593,7 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; { auto other = [[MTRCommissionerControlClusterCommissionNodeParams alloc] init]; - other.requestId = self.requestId; + other.requestID = self.requestID; other.responseTimeoutSeconds = self.responseTimeoutSeconds; other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; other.serverSideProcessingTimeout = self.serverSideProcessingTimeout; @@ -31603,7 +31603,7 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; - (NSString *)description { - NSString * descriptionString = [NSString stringWithFormat:@"<%@: requestId:%@; responseTimeoutSeconds:%@; >", NSStringFromClass([self class]), _requestId, _responseTimeoutSeconds]; + NSString * descriptionString = [NSString stringWithFormat:@"<%@: requestID:%@; responseTimeoutSeconds:%@; >", NSStringFromClass([self class]), _requestID, _responseTimeoutSeconds]; return descriptionString; } @@ -31616,7 +31616,7 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader chip::app::Clusters::CommissionerControl::Commands::CommissionNode::Type encodableStruct; ListFreer listFreer; { - encodableStruct.requestId = self.requestId.unsignedLongLongValue; + encodableStruct.requestID = self.requestID.unsignedLongLongValue; } { encodableStruct.responseTimeoutSeconds = self.responseTimeoutSeconds.unsignedShortValue; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm index 99f43ea97f0360..d1154cbc031653 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm @@ -4623,13 +4623,13 @@ static id _Nullable DecodeEventPayloadForCommissionerControlCluster(EventId aEve do { NSNumber * _Nonnull memberValue; - memberValue = [NSNumber numberWithUnsignedLongLong:cppValue.requestId]; - value.requestId = memberValue; + memberValue = [NSNumber numberWithUnsignedLongLong:cppValue.requestID]; + value.requestID = memberValue; } while (0); do { NSNumber * _Nonnull memberValue; - memberValue = [NSNumber numberWithUnsignedLongLong:cppValue.clientNodeId]; - value.clientNodeId = memberValue; + memberValue = [NSNumber numberWithUnsignedLongLong:cppValue.clientNodeID]; + value.clientNodeID = memberValue; } while (0); do { NSNumber * _Nonnull memberValue; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h index 93632e8935cbc6..63ae44407df542 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h @@ -2150,8 +2150,8 @@ MTR_PROVISIONALLY_AVAILABLE MTR_PROVISIONALLY_AVAILABLE @interface MTRCommissionerControlClusterCommissioningRequestResultEvent : NSObject -@property (nonatomic, copy) NSNumber * _Nonnull requestId MTR_PROVISIONALLY_AVAILABLE; -@property (nonatomic, copy) NSNumber * _Nonnull clientNodeId MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull requestID MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull clientNodeID MTR_PROVISIONALLY_AVAILABLE; @property (nonatomic, copy) NSNumber * _Nonnull statusCode MTR_PROVISIONALLY_AVAILABLE; @property (nonatomic, copy) NSNumber * _Nonnull fabricIndex MTR_PROVISIONALLY_AVAILABLE; @end diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm index 917332e40cff8f..75bc4923610cd2 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm @@ -8914,9 +8914,9 @@ - (instancetype)init { if (self = [super init]) { - _requestId = @(0); + _requestID = @(0); - _clientNodeId = @(0); + _clientNodeID = @(0); _statusCode = @(0); @@ -8929,8 +8929,8 @@ - (id)copyWithZone:(NSZone * _Nullable)zone { auto other = [[MTRCommissionerControlClusterCommissioningRequestResultEvent alloc] init]; - other.requestId = self.requestId; - other.clientNodeId = self.clientNodeId; + other.requestID = self.requestID; + other.clientNodeID = self.clientNodeID; other.statusCode = self.statusCode; other.fabricIndex = self.fabricIndex; @@ -8939,7 +8939,7 @@ - (id)copyWithZone:(NSZone * _Nullable)zone - (NSString *)description { - NSString * descriptionString = [NSString stringWithFormat:@"<%@: requestId:%@; clientNodeId:%@; statusCode:%@; fabricIndex:%@; >", NSStringFromClass([self class]), _requestId, _clientNodeId, _statusCode, _fabricIndex]; + NSString * descriptionString = [NSString stringWithFormat:@"<%@: requestID:%@; clientNodeID:%@; statusCode:%@; fabricIndex:%@; >", NSStringFromClass([self class]), _requestID, _clientNodeID, _statusCode, _fabricIndex]; return descriptionString; } diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp index 4be7782087f3d6..2f9d68f1d33a40 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp @@ -28922,9 +28922,9 @@ namespace RequestCommissioningApproval { CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const { DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; - encoder.Encode(to_underlying(Fields::kRequestId), requestId); - encoder.Encode(to_underlying(Fields::kVendorId), vendorId); - encoder.Encode(to_underlying(Fields::kProductId), productId); + encoder.Encode(to_underlying(Fields::kRequestID), requestID); + encoder.Encode(to_underlying(Fields::kVendorID), vendorID); + encoder.Encode(to_underlying(Fields::kProductID), productID); encoder.Encode(to_underlying(Fields::kLabel), label); return encoder.Finalize(); } @@ -28943,17 +28943,17 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) CHIP_ERROR err = CHIP_NO_ERROR; const uint8_t __context_tag = std::get(__element); - if (__context_tag == to_underlying(Fields::kRequestId)) + if (__context_tag == to_underlying(Fields::kRequestID)) { - err = DataModel::Decode(reader, requestId); + err = DataModel::Decode(reader, requestID); } - else if (__context_tag == to_underlying(Fields::kVendorId)) + else if (__context_tag == to_underlying(Fields::kVendorID)) { - err = DataModel::Decode(reader, vendorId); + err = DataModel::Decode(reader, vendorID); } - else if (__context_tag == to_underlying(Fields::kProductId)) + else if (__context_tag == to_underlying(Fields::kProductID)) { - err = DataModel::Decode(reader, productId); + err = DataModel::Decode(reader, productID); } else if (__context_tag == to_underlying(Fields::kLabel)) { @@ -28971,7 +28971,7 @@ namespace CommissionNode { CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const { DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; - encoder.Encode(to_underlying(Fields::kRequestId), requestId); + encoder.Encode(to_underlying(Fields::kRequestID), requestID); encoder.Encode(to_underlying(Fields::kResponseTimeoutSeconds), responseTimeoutSeconds); return encoder.Finalize(); } @@ -28990,9 +28990,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) CHIP_ERROR err = CHIP_NO_ERROR; const uint8_t __context_tag = std::get(__element); - if (__context_tag == to_underlying(Fields::kRequestId)) + if (__context_tag == to_underlying(Fields::kRequestID)) { - err = DataModel::Decode(reader, requestId); + err = DataModel::Decode(reader, requestID); } else if (__context_tag == to_underlying(Fields::kResponseTimeoutSeconds)) { @@ -29093,8 +29093,8 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const { TLV::TLVType outer; ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kRequestId), requestId)); - ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kClientNodeId), clientNodeId)); + ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kRequestID), requestID)); + ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kClientNodeID), clientNodeID)); ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kStatusCode), statusCode)); ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kFabricIndex), fabricIndex)); return aWriter.EndContainer(outer); @@ -29114,13 +29114,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) CHIP_ERROR err = CHIP_NO_ERROR; const uint8_t __context_tag = std::get(__element); - if (__context_tag == to_underlying(Fields::kRequestId)) + if (__context_tag == to_underlying(Fields::kRequestID)) { - err = DataModel::Decode(reader, requestId); + err = DataModel::Decode(reader, requestID); } - else if (__context_tag == to_underlying(Fields::kClientNodeId)) + else if (__context_tag == to_underlying(Fields::kClientNodeID)) { - err = DataModel::Decode(reader, clientNodeId); + err = DataModel::Decode(reader, clientNodeID); } else if (__context_tag == to_underlying(Fields::kStatusCode)) { diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h index 78022f3ac6ce11..d7d6cfddd0eb99 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h @@ -41973,9 +41973,9 @@ namespace Commands { namespace RequestCommissioningApproval { enum class Fields : uint8_t { - kRequestId = 0, - kVendorId = 1, - kProductId = 2, + kRequestID = 0, + kVendorID = 1, + kProductID = 2, kLabel = 3, }; @@ -41986,9 +41986,9 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::RequestCommissioningApproval::Id; } static constexpr ClusterId GetClusterId() { return Clusters::CommissionerControl::Id; } - uint64_t requestId = static_cast(0); - chip::VendorId vendorId = static_cast(0); - uint16_t productId = static_cast(0); + uint64_t requestID = static_cast(0); + chip::VendorId vendorID = static_cast(0); + uint16_t productID = static_cast(0); Optional label; CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; @@ -42004,9 +42004,9 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::RequestCommissioningApproval::Id; } static constexpr ClusterId GetClusterId() { return Clusters::CommissionerControl::Id; } - uint64_t requestId = static_cast(0); - chip::VendorId vendorId = static_cast(0); - uint16_t productId = static_cast(0); + uint64_t requestID = static_cast(0); + chip::VendorId vendorID = static_cast(0); + uint16_t productID = static_cast(0); Optional label; CHIP_ERROR Decode(TLV::TLVReader & reader); }; @@ -42014,7 +42014,7 @@ struct DecodableType namespace CommissionNode { enum class Fields : uint8_t { - kRequestId = 0, + kRequestID = 0, kResponseTimeoutSeconds = 1, }; @@ -42025,7 +42025,7 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::CommissionNode::Id; } static constexpr ClusterId GetClusterId() { return Clusters::CommissionerControl::Id; } - uint64_t requestId = static_cast(0); + uint64_t requestID = static_cast(0); uint16_t responseTimeoutSeconds = static_cast(0); CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; @@ -42041,7 +42041,7 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::CommissionNode::Id; } static constexpr ClusterId GetClusterId() { return Clusters::CommissionerControl::Id; } - uint64_t requestId = static_cast(0); + uint64_t requestID = static_cast(0); uint16_t responseTimeoutSeconds = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; @@ -42168,8 +42168,8 @@ static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info; enum class Fields : uint8_t { - kRequestId = 0, - kClientNodeId = 1, + kRequestID = 0, + kClientNodeID = 1, kStatusCode = 2, kFabricIndex = 254, }; @@ -42182,8 +42182,8 @@ struct Type static constexpr ClusterId GetClusterId() { return Clusters::CommissionerControl::Id; } static constexpr bool kIsFabricScoped = true; - uint64_t requestId = static_cast(0); - chip::NodeId clientNodeId = static_cast(0); + uint64_t requestID = static_cast(0); + chip::NodeId clientNodeID = static_cast(0); uint8_t statusCode = static_cast(0); chip::FabricIndex fabricIndex = static_cast(0); @@ -42199,8 +42199,8 @@ struct DecodableType static constexpr EventId GetEventId() { return Events::CommissioningRequestResult::Id; } static constexpr ClusterId GetClusterId() { return Clusters::CommissionerControl::Id; } - uint64_t requestId = static_cast(0); - chip::NodeId clientNodeId = static_cast(0); + uint64_t requestID = static_cast(0); + chip::NodeId clientNodeID = static_cast(0); uint8_t statusCode = static_cast(0); chip::FabricIndex fabricIndex = static_cast(0); diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index f50b5721bce5d5..f809eb9b481828 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -13843,9 +13843,9 @@ class CommissionerControlRequestCommissioningApproval : public ClusterCommand CommissionerControlRequestCommissioningApproval(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("request-commissioning-approval", credsIssuerConfig) { - AddArgument("RequestId", 0, UINT64_MAX, &mRequest.requestId); - AddArgument("VendorId", 0, UINT16_MAX, &mRequest.vendorId); - AddArgument("ProductId", 0, UINT16_MAX, &mRequest.productId); + AddArgument("RequestID", 0, UINT64_MAX, &mRequest.requestID); + AddArgument("VendorID", 0, UINT16_MAX, &mRequest.vendorID); + AddArgument("ProductID", 0, UINT16_MAX, &mRequest.productID); AddArgument("Label", &mRequest.label); ClusterCommand::AddArguments(); } @@ -13884,7 +13884,7 @@ class CommissionerControlCommissionNode : public ClusterCommand CommissionerControlCommissionNode(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("commission-node", credsIssuerConfig) { - AddArgument("RequestId", 0, UINT64_MAX, &mRequest.requestId); + AddArgument("RequestID", 0, UINT64_MAX, &mRequest.requestID); AddArgument("ResponseTimeoutSeconds", 0, UINT16_MAX, &mRequest.responseTimeoutSeconds); ClusterCommand::AddArguments(); } diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp index 0efe192f7b59aa..c0ea83bc0cc43e 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -7912,18 +7912,18 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, { DataModelLogger::LogString(label, indent, "{"); { - CHIP_ERROR err = DataModelLogger::LogValue("RequestId", indent + 1, value.requestId); + CHIP_ERROR err = DataModelLogger::LogValue("RequestID", indent + 1, value.requestID); if (err != CHIP_NO_ERROR) { - DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'RequestId'"); + DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'RequestID'"); return err; } } { - CHIP_ERROR err = DataModelLogger::LogValue("ClientNodeId", indent + 1, value.clientNodeId); + CHIP_ERROR err = DataModelLogger::LogValue("ClientNodeID", indent + 1, value.clientNodeID); if (err != CHIP_NO_ERROR) { - DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'ClientNodeId'"); + DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'ClientNodeID'"); return err; } } diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h index a77ea1f918b90b..a47147a19533b9 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -164673,13 +164673,13 @@ class CommissionerControlRequestCommissioningApproval : public ClusterCommand { : ClusterCommand("request-commissioning-approval") { #if MTR_ENABLE_PROVISIONAL - AddArgument("RequestId", 0, UINT64_MAX, &mRequest.requestId); + AddArgument("RequestID", 0, UINT64_MAX, &mRequest.requestID); #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL - AddArgument("VendorId", 0, UINT16_MAX, &mRequest.vendorId); + AddArgument("VendorID", 0, UINT16_MAX, &mRequest.vendorID); #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL - AddArgument("ProductId", 0, UINT16_MAX, &mRequest.productId); + AddArgument("ProductID", 0, UINT16_MAX, &mRequest.productID); #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL AddArgument("Label", &mRequest.label); @@ -164699,13 +164699,13 @@ class CommissionerControlRequestCommissioningApproval : public ClusterCommand { __auto_type * params = [[MTRCommissionerControlClusterRequestCommissioningApprovalParams alloc] init]; params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; #if MTR_ENABLE_PROVISIONAL - params.requestId = [NSNumber numberWithUnsignedLongLong:mRequest.requestId]; + params.requestID = [NSNumber numberWithUnsignedLongLong:mRequest.requestID]; #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL - params.vendorId = [NSNumber numberWithUnsignedShort:chip::to_underlying(mRequest.vendorId)]; + params.vendorID = [NSNumber numberWithUnsignedShort:chip::to_underlying(mRequest.vendorID)]; #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL - params.productId = [NSNumber numberWithUnsignedShort:mRequest.productId]; + params.productID = [NSNumber numberWithUnsignedShort:mRequest.productID]; #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL if (mRequest.label.HasValue()) { @@ -164748,7 +164748,7 @@ class CommissionerControlCommissionNode : public ClusterCommand { : ClusterCommand("commission-node") { #if MTR_ENABLE_PROVISIONAL - AddArgument("RequestId", 0, UINT64_MAX, &mRequest.requestId); + AddArgument("RequestID", 0, UINT64_MAX, &mRequest.requestID); #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL AddArgument("ResponseTimeoutSeconds", 0, UINT16_MAX, &mRequest.responseTimeoutSeconds); @@ -164768,7 +164768,7 @@ class CommissionerControlCommissionNode : public ClusterCommand { __auto_type * params = [[MTRCommissionerControlClusterCommissionNodeParams alloc] init]; params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; #if MTR_ENABLE_PROVISIONAL - params.requestId = [NSNumber numberWithUnsignedLongLong:mRequest.requestId]; + params.requestID = [NSNumber numberWithUnsignedLongLong:mRequest.requestID]; #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL params.responseTimeoutSeconds = [NSNumber numberWithUnsignedShort:mRequest.responseTimeoutSeconds];