diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter index fde1b2f6831735..9dc395e4720836 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter @@ -2467,7 +2467,7 @@ server cluster OperationalCredentials = 62 { struct FabricDescriptor { OCTET_STRING<65> rootPublicKey = 1; - INT16U vendorId = 2; + VENDOR_ID vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; @@ -2499,7 +2499,7 @@ server cluster OperationalCredentials = 62 { optional OCTET_STRING ICACValue = 1; OCTET_STRING IPKValue = 2; NODE_ID caseAdminNode = 3; - INT16U adminVendorId = 4; + VENDOR_ID adminVendorId = 4; } request struct UpdateNOCRequest { diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter index 8683e55092e9d2..1b61aad7fd83f5 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -725,7 +725,7 @@ server cluster OperationalCredentials = 62 { struct FabricDescriptor { OCTET_STRING<65> rootPublicKey = 1; - INT16U vendorId = 2; + VENDOR_ID vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; @@ -757,7 +757,7 @@ server cluster OperationalCredentials = 62 { optional OCTET_STRING ICACValue = 1; OCTET_STRING IPKValue = 2; NODE_ID caseAdminNode = 3; - INT16U adminVendorId = 4; + VENDOR_ID adminVendorId = 4; } request struct UpdateNOCRequest { diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter index 3edd000dae4d64..0845f9fe1e83bb 100644 --- a/examples/light-switch-app/light-switch-common/light-switch-app.matter +++ b/examples/light-switch-app/light-switch-common/light-switch-app.matter @@ -1159,7 +1159,7 @@ server cluster OperationalCredentials = 62 { struct FabricDescriptor { OCTET_STRING<65> rootPublicKey = 1; - INT16U vendorId = 2; + VENDOR_ID vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; @@ -1191,7 +1191,7 @@ server cluster OperationalCredentials = 62 { optional OCTET_STRING ICACValue = 1; OCTET_STRING IPKValue = 2; NODE_ID caseAdminNode = 3; - INT16U adminVendorId = 4; + VENDOR_ID adminVendorId = 4; } request struct UpdateNOCRequest { diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index bacf6ad4bbe27e..59d00e338aa382 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -1251,7 +1251,7 @@ server cluster OperationalCredentials = 62 { struct FabricDescriptor { OCTET_STRING<65> rootPublicKey = 1; - INT16U vendorId = 2; + VENDOR_ID vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; @@ -1283,7 +1283,7 @@ server cluster OperationalCredentials = 62 { optional OCTET_STRING ICACValue = 1; OCTET_STRING IPKValue = 2; NODE_ID caseAdminNode = 3; - INT16U adminVendorId = 4; + VENDOR_ID adminVendorId = 4; } request struct UpdateNOCRequest { diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index 3ee8e81a8d0876..d851d8b5faad19 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -1359,7 +1359,7 @@ server cluster OperationalCredentials = 62 { struct FabricDescriptor { OCTET_STRING<65> rootPublicKey = 1; - INT16U vendorId = 2; + VENDOR_ID vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; @@ -1391,7 +1391,7 @@ server cluster OperationalCredentials = 62 { optional OCTET_STRING ICACValue = 1; OCTET_STRING IPKValue = 2; NODE_ID caseAdminNode = 3; - INT16U adminVendorId = 4; + VENDOR_ID adminVendorId = 4; } request struct UpdateNOCRequest { diff --git a/examples/log-source-app/log-source-common/log-source-app.matter b/examples/log-source-app/log-source-common/log-source-app.matter index 48f5042cd68cea..79649e4e6ee02e 100644 --- a/examples/log-source-app/log-source-common/log-source-app.matter +++ b/examples/log-source-app/log-source-common/log-source-app.matter @@ -316,7 +316,7 @@ server cluster OperationalCredentials = 62 { struct FabricDescriptor { OCTET_STRING<65> rootPublicKey = 1; - INT16U vendorId = 2; + VENDOR_ID vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; @@ -346,7 +346,7 @@ server cluster OperationalCredentials = 62 { optional OCTET_STRING ICACValue = 1; OCTET_STRING IPKValue = 2; NODE_ID caseAdminNode = 3; - INT16U adminVendorId = 4; + VENDOR_ID adminVendorId = 4; } request struct UpdateFabricLabelRequest { diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter index 33eceb0495ebbf..1d391c6fbf7537 100644 --- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter +++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter @@ -469,7 +469,7 @@ server cluster OperationalCredentials = 62 { struct FabricDescriptor { OCTET_STRING<65> rootPublicKey = 1; - INT16U vendorId = 2; + VENDOR_ID vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; @@ -501,7 +501,7 @@ server cluster OperationalCredentials = 62 { optional OCTET_STRING ICACValue = 1; OCTET_STRING IPKValue = 2; NODE_ID caseAdminNode = 3; - INT16U adminVendorId = 4; + VENDOR_ID adminVendorId = 4; } request struct UpdateFabricLabelRequest { diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter index 215ec1118eb787..2a6682bce72345 100644 --- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter +++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter @@ -508,7 +508,7 @@ server cluster OperationalCredentials = 62 { struct FabricDescriptor { OCTET_STRING<65> rootPublicKey = 1; - INT16U vendorId = 2; + VENDOR_ID vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; @@ -540,7 +540,7 @@ server cluster OperationalCredentials = 62 { optional OCTET_STRING ICACValue = 1; OCTET_STRING IPKValue = 2; NODE_ID caseAdminNode = 3; - INT16U adminVendorId = 4; + VENDOR_ID adminVendorId = 4; } request struct UpdateNOCRequest { diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 7d0b29e4791a77..f895391d069eab 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -1517,7 +1517,7 @@ client cluster OperationalCredentials = 62 { struct FabricDescriptor { OCTET_STRING<65> rootPublicKey = 1; - INT16U vendorId = 2; + VENDOR_ID vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; @@ -1548,7 +1548,7 @@ client cluster OperationalCredentials = 62 { optional OCTET_STRING ICACValue = 1; OCTET_STRING IPKValue = 2; NODE_ID caseAdminNode = 3; - INT16U adminVendorId = 4; + VENDOR_ID adminVendorId = 4; } request struct UpdateNOCRequest { @@ -1599,7 +1599,7 @@ server cluster OperationalCredentials = 62 { struct FabricDescriptor { OCTET_STRING<65> rootPublicKey = 1; - INT16U vendorId = 2; + VENDOR_ID vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; @@ -1630,7 +1630,7 @@ server cluster OperationalCredentials = 62 { optional OCTET_STRING ICACValue = 1; OCTET_STRING IPKValue = 2; NODE_ID caseAdminNode = 3; - INT16U adminVendorId = 4; + VENDOR_ID adminVendorId = 4; } request struct UpdateNOCRequest { diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 7d0b29e4791a77..f895391d069eab 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -1517,7 +1517,7 @@ client cluster OperationalCredentials = 62 { struct FabricDescriptor { OCTET_STRING<65> rootPublicKey = 1; - INT16U vendorId = 2; + VENDOR_ID vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; @@ -1548,7 +1548,7 @@ client cluster OperationalCredentials = 62 { optional OCTET_STRING ICACValue = 1; OCTET_STRING IPKValue = 2; NODE_ID caseAdminNode = 3; - INT16U adminVendorId = 4; + VENDOR_ID adminVendorId = 4; } request struct UpdateNOCRequest { @@ -1599,7 +1599,7 @@ server cluster OperationalCredentials = 62 { struct FabricDescriptor { OCTET_STRING<65> rootPublicKey = 1; - INT16U vendorId = 2; + VENDOR_ID vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; @@ -1630,7 +1630,7 @@ server cluster OperationalCredentials = 62 { optional OCTET_STRING ICACValue = 1; OCTET_STRING IPKValue = 2; NODE_ID caseAdminNode = 3; - INT16U adminVendorId = 4; + VENDOR_ID adminVendorId = 4; } request struct UpdateNOCRequest { diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index 81f484284ad556..a69a782d7db41f 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -985,7 +985,7 @@ server cluster OperationalCredentials = 62 { struct FabricDescriptor { OCTET_STRING<65> rootPublicKey = 1; - INT16U vendorId = 2; + VENDOR_ID vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; @@ -1018,7 +1018,7 @@ server cluster OperationalCredentials = 62 { optional OCTET_STRING ICACValue = 1; OCTET_STRING IPKValue = 2; NODE_ID caseAdminNode = 3; - INT16U adminVendorId = 4; + VENDOR_ID adminVendorId = 4; } request struct UpdateNOCRequest { diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter index 6b5bdb9f387078..c1907971fae34c 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter @@ -871,7 +871,7 @@ server cluster OperationalCredentials = 62 { struct FabricDescriptor { OCTET_STRING<65> rootPublicKey = 1; - INT16U vendorId = 2; + VENDOR_ID vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; @@ -904,7 +904,7 @@ server cluster OperationalCredentials = 62 { optional OCTET_STRING ICACValue = 1; OCTET_STRING IPKValue = 2; NODE_ID caseAdminNode = 3; - INT16U adminVendorId = 4; + VENDOR_ID adminVendorId = 4; } request struct UpdateNOCRequest { diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter index 807bdebd20b5ac..433064b8e59bca 100644 --- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter +++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter @@ -529,7 +529,7 @@ server cluster OperationalCredentials = 62 { struct FabricDescriptor { OCTET_STRING<65> rootPublicKey = 1; - INT16U vendorId = 2; + VENDOR_ID vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; @@ -561,7 +561,7 @@ server cluster OperationalCredentials = 62 { optional OCTET_STRING ICACValue = 1; OCTET_STRING IPKValue = 2; NODE_ID caseAdminNode = 3; - INT16U adminVendorId = 4; + VENDOR_ID adminVendorId = 4; } request struct UpdateNOCRequest { diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index 03c0315042e872..548a65ec4b78cc 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -770,7 +770,7 @@ server cluster OperationalCredentials = 62 { struct FabricDescriptor { OCTET_STRING<65> rootPublicKey = 1; - INT16U vendorId = 2; + VENDOR_ID vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; @@ -802,7 +802,7 @@ server cluster OperationalCredentials = 62 { optional OCTET_STRING ICACValue = 1; OCTET_STRING IPKValue = 2; NODE_ID caseAdminNode = 3; - INT16U adminVendorId = 4; + VENDOR_ID adminVendorId = 4; } request struct UpdateNOCRequest { diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index 5726bb6048fb65..18e120e4f80856 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -1485,7 +1485,7 @@ client cluster OperationalCredentials = 62 { struct FabricDescriptor { OCTET_STRING<65> rootPublicKey = 1; - INT16U vendorId = 2; + VENDOR_ID vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; @@ -1517,7 +1517,7 @@ client cluster OperationalCredentials = 62 { optional OCTET_STRING ICACValue = 1; OCTET_STRING IPKValue = 2; NODE_ID caseAdminNode = 3; - INT16U adminVendorId = 4; + VENDOR_ID adminVendorId = 4; } request struct UpdateFabricLabelRequest { @@ -1583,7 +1583,7 @@ server cluster OperationalCredentials = 62 { struct FabricDescriptor { OCTET_STRING<65> rootPublicKey = 1; - INT16U vendorId = 2; + VENDOR_ID vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; @@ -1615,7 +1615,7 @@ server cluster OperationalCredentials = 62 { optional OCTET_STRING ICACValue = 1; OCTET_STRING IPKValue = 2; NODE_ID caseAdminNode = 3; - INT16U adminVendorId = 4; + VENDOR_ID adminVendorId = 4; } request struct UpdateNOCRequest { diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter index 6ab9bf6936b853..23f21976f19ed8 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter @@ -1545,7 +1545,7 @@ server cluster OperationalCredentials = 62 { struct FabricDescriptor { OCTET_STRING<65> rootPublicKey = 1; - INT16U vendorId = 2; + VENDOR_ID vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; @@ -1577,7 +1577,7 @@ server cluster OperationalCredentials = 62 { optional OCTET_STRING ICACValue = 1; OCTET_STRING IPKValue = 2; NODE_ID caseAdminNode = 3; - INT16U adminVendorId = 4; + VENDOR_ID adminVendorId = 4; } request struct UpdateNOCRequest { diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index 17f8a11a61dd4d..cd35eca723f452 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -830,7 +830,7 @@ server cluster OperationalCredentials = 62 { struct FabricDescriptor { OCTET_STRING<65> rootPublicKey = 1; - INT16U vendorId = 2; + VENDOR_ID vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; @@ -865,7 +865,7 @@ server cluster OperationalCredentials = 62 { optional OCTET_STRING ICACValue = 1; OCTET_STRING IPKValue = 2; NODE_ID caseAdminNode = 3; - INT16U adminVendorId = 4; + VENDOR_ID adminVendorId = 4; } request struct UpdateNOCRequest { diff --git a/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp b/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp index 0461c1fe72a428..7c02d23d3730af 100644 --- a/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp +++ b/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp @@ -165,7 +165,7 @@ CHIP_ERROR OperationalCredentialsAttrAccess::ReadFabricsList(EndpointId endpoint fabricDescriptor.fabricIndex = fabricInfo.GetFabricIndex(); fabricDescriptor.nodeId = fabricInfo.GetPeerId().GetNodeId(); - fabricDescriptor.vendorId = fabricInfo.GetVendorId(); + fabricDescriptor.vendorId = static_cast(fabricInfo.GetVendorId()); fabricDescriptor.fabricId = fabricInfo.GetFabricId(); fabricDescriptor.label = fabricInfo.GetFabricLabel(); diff --git a/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml index e4dcb1e46433d3..e4c212e330fab1 100644 --- a/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml @@ -20,7 +20,7 @@ limitations under the License. - + @@ -107,7 +107,7 @@ limitations under the License. - + diff --git a/src/controller/CHIPDeviceController.h b/src/controller/CHIPDeviceController.h index fa25e0997a5a5f..266fa84e7224f8 100644 --- a/src/controller/CHIPDeviceController.h +++ b/src/controller/CHIPDeviceController.h @@ -108,7 +108,7 @@ struct ControllerInitParams // bool enableServerInteractions = false; - uint16_t controllerVendorId; + chip::VendorId controllerVendorId; }; struct CommissionerInitParams : public ControllerInitParams @@ -262,7 +262,7 @@ class DLL_EXPORT DeviceController : public SessionRecoveryDelegate, public Abstr OperationalCredentialsDelegate * mOperationalCredentialsDelegate; - uint16_t mVendorId; + chip::VendorId mVendorId; /// Fetches the session to use for the current device. Allows overriding /// in case subclasses want to create the session if it does not yet exist diff --git a/src/controller/CHIPDeviceControllerFactory.h b/src/controller/CHIPDeviceControllerFactory.h index 24eb450b6414a0..e8b8fa62c665fb 100644 --- a/src/controller/CHIPDeviceControllerFactory.h +++ b/src/controller/CHIPDeviceControllerFactory.h @@ -51,7 +51,7 @@ struct SetupParams ByteSpan controllerICAC; ByteSpan controllerRCAC; - uint16_t controllerVendorId; + chip::VendorId controllerVendorId; // The Device Pairing Delegated used to initialize a Commissioner DevicePairingDelegate * pairingDelegate = nullptr; diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index d0d4ac5608f30c..9ffa786aa2ae44 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -2869,7 +2869,7 @@ client cluster OperationalCredentials = 62 { struct FabricDescriptor { OCTET_STRING<65> rootPublicKey = 1; - INT16U vendorId = 2; + VENDOR_ID vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; @@ -2904,7 +2904,7 @@ client cluster OperationalCredentials = 62 { optional OCTET_STRING ICACValue = 1; OCTET_STRING IPKValue = 2; NODE_ID caseAdminNode = 3; - INT16U adminVendorId = 4; + VENDOR_ID adminVendorId = 4; } request struct UpdateNOCRequest { diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp index 3f7bf898e3eb08..cad410356049a9 100644 --- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp @@ -9654,9 +9654,9 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR jobject newElement_0_vendorId; std::string newElement_0_vendorIdClassName = "java/lang/Integer"; std::string newElement_0_vendorIdCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_vendorIdClassName.c_str(), - newElement_0_vendorIdCtorSignature.c_str(), - entry_0.vendorId, newElement_0_vendorId); + chip::JniReferences::GetInstance().CreateBoxedObject( + newElement_0_vendorIdClassName.c_str(), newElement_0_vendorIdCtorSignature.c_str(), + static_cast(entry_0.vendorId), newElement_0_vendorId); jobject newElement_0_fabricId; std::string newElement_0_fabricIdClassName = "java/lang/Long"; std::string newElement_0_fabricIdCtorSignature = "(J)V"; diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp index 1c25efa1be67cb..d3ab60759f718f 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp @@ -14262,9 +14262,9 @@ void CHIPOperationalCredentialsFabricsAttributeCallback::CallbackFn( jobject newElement_0_vendorId; std::string newElement_0_vendorIdClassName = "java/lang/Integer"; std::string newElement_0_vendorIdCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_vendorIdClassName.c_str(), - newElement_0_vendorIdCtorSignature.c_str(), entry_0.vendorId, - newElement_0_vendorId); + chip::JniReferences::GetInstance().CreateBoxedObject( + newElement_0_vendorIdClassName.c_str(), newElement_0_vendorIdCtorSignature.c_str(), + static_cast(entry_0.vendorId), newElement_0_vendorId); jobject newElement_0_fabricId; std::string newElement_0_fabricIdClassName = "java/lang/Long"; std::string newElement_0_fabricIdCtorSignature = "(J)V"; diff --git a/src/darwin/Framework/CHIP/CHIPDeviceController.mm b/src/darwin/Framework/CHIP/CHIPDeviceController.mm index b3dc9ca8345abd..b5eb9b1770e152 100644 --- a/src/darwin/Framework/CHIP/CHIPDeviceController.mm +++ b/src/darwin/Framework/CHIP/CHIPDeviceController.mm @@ -215,7 +215,7 @@ - (BOOL)startup:(CHIPDeviceControllerStartupParams *)startupParams commissionerParams.controllerRCAC = rcac; commissionerParams.controllerICAC = icac; commissionerParams.controllerNOC = noc; - commissionerParams.controllerVendorId = startupParams.vendorId; + commissionerParams.controllerVendorId = static_cast(startupParams.vendorId); auto & factory = chip::Controller::DeviceControllerFactory::GetInstance(); diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm index c198804cd3fdf8..44e2b1fa71d82e 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm @@ -10282,7 +10282,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader newElement_0 = [CHIPOperationalCredentialsClusterFabricDescriptor new]; newElement_0.rootPublicKey = [NSData dataWithBytes:entry_0.rootPublicKey.data() length:entry_0.rootPublicKey.size()]; - newElement_0.vendorId = [NSNumber numberWithUnsignedShort:entry_0.vendorId]; + newElement_0.vendorId = [NSNumber numberWithUnsignedShort:chip::to_underlying(entry_0.vendorId)]; newElement_0.fabricId = [NSNumber numberWithUnsignedLongLong:entry_0.fabricId]; newElement_0.nodeId = [NSNumber numberWithUnsignedLongLong:entry_0.nodeId]; newElement_0.label = [[NSString alloc] initWithBytes:entry_0.label.data() diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm index ef6d64a413cfc4..817d2392560743 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm @@ -7639,7 +7639,7 @@ CHIPOperationalCredentialsClusterFabricDescriptor * newElement_0; newElement_0 = [CHIPOperationalCredentialsClusterFabricDescriptor new]; newElement_0.rootPublicKey = [NSData dataWithBytes:entry_0.rootPublicKey.data() length:entry_0.rootPublicKey.size()]; - newElement_0.vendorId = [NSNumber numberWithUnsignedShort:entry_0.vendorId]; + newElement_0.vendorId = [NSNumber numberWithUnsignedShort:chip::to_underlying(entry_0.vendorId)]; newElement_0.fabricId = [NSNumber numberWithUnsignedLongLong:entry_0.fabricId]; newElement_0.nodeId = [NSNumber numberWithUnsignedLongLong:entry_0.nodeId]; newElement_0.label = [[NSString alloc] initWithBytes:entry_0.label.data() diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm index a14becd2b99fd5..bc89c0ca1e6ecd 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm @@ -48515,7 +48515,8 @@ - (void)addNOCWithParams:(CHIPOperationalCredentialsClusterAddNOCParams *)params } request.IPKValue = [self asByteSpan:params.ipkValue]; request.caseAdminNode = params.caseAdminNode.unsignedLongLongValue; - request.adminVendorId = params.adminVendorId.unsignedShortValue; + request.adminVendorId + = static_cast>(params.adminVendorId.unsignedShortValue); new CHIPOperationalCredentialsClusterNOCResponseCallbackBridge( self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { diff --git a/zzz_generated/app-common/app-common/zap-generated/af-structs.h b/zzz_generated/app-common/app-common/zap-generated/af-structs.h index 9e60fb8e373b13..c034671b834a3c 100644 --- a/zzz_generated/app-common/app-common/zap-generated/af-structs.h +++ b/zzz_generated/app-common/app-common/zap-generated/af-structs.h @@ -266,7 +266,7 @@ typedef struct _ExtensionEntry typedef struct _FabricDescriptor { chip::ByteSpan RootPublicKey; - uint16_t VendorId; + chip::VendorId VendorId; chip::FabricId FabricId; chip::NodeId NodeId; chip::CharSpan Label; 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 322c76cb61a72c..c452fefa9a7934 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 @@ -15149,7 +15149,7 @@ struct Type { public: chip::ByteSpan rootPublicKey; - uint16_t vendorId = static_cast(0); + chip::VendorId vendorId = static_cast(0); chip::FabricId fabricId = static_cast(0); chip::NodeId nodeId = static_cast(0); chip::CharSpan label; @@ -15497,8 +15497,8 @@ struct Type chip::ByteSpan NOCValue; Optional ICACValue; chip::ByteSpan IPKValue; - chip::NodeId caseAdminNode = static_cast(0); - uint16_t adminVendorId = static_cast(0); + chip::NodeId caseAdminNode = static_cast(0); + chip::VendorId adminVendorId = static_cast(0); CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -15516,8 +15516,8 @@ struct DecodableType chip::ByteSpan NOCValue; Optional ICACValue; chip::ByteSpan IPKValue; - chip::NodeId caseAdminNode = static_cast(0); - uint16_t adminVendorId = static_cast(0); + chip::NodeId caseAdminNode = static_cast(0); + chip::VendorId adminVendorId = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace AddNOC diff --git a/zzz_generated/chip-tool-darwin/zap-generated/cluster/CHIPTestClustersObjc.mm b/zzz_generated/chip-tool-darwin/zap-generated/cluster/CHIPTestClustersObjc.mm index 2f1f889320653f..82eec559ec6c81 100644 --- a/zzz_generated/chip-tool-darwin/zap-generated/cluster/CHIPTestClustersObjc.mm +++ b/zzz_generated/chip-tool-darwin/zap-generated/cluster/CHIPTestClustersObjc.mm @@ -13870,7 +13870,9 @@ new CHIPDefaultSuccessCallbackBridge( } auto element_0 = (CHIPOperationalCredentialsClusterFabricDescriptor *) value[i_0]; listHolder_0->mList[i_0].rootPublicKey = [self asByteSpan:element_0.rootPublicKey]; - listHolder_0->mList[i_0].vendorId = element_0.vendorId.unsignedShortValue; + listHolder_0->mList[i_0].vendorId + = static_castmList[i_0].vendorId)>>( + element_0.vendorId.unsignedShortValue); listHolder_0->mList[i_0].fabricId = element_0.fabricId.unsignedLongLongValue; listHolder_0->mList[i_0].nodeId = element_0.nodeId.unsignedLongLongValue; listHolder_0->mList[i_0].label = [self asCharSpan:element_0.label]; diff --git a/zzz_generated/chip-tool-darwin/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool-darwin/zap-generated/cluster/Commands.h index 3daf45d7bc303a..b02f250525fc52 100644 --- a/zzz_generated/chip-tool-darwin/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool-darwin/zap-generated/cluster/Commands.h @@ -60661,7 +60661,7 @@ class OperationalCredentialsAddNOC : public ClusterCommand { chip::Optional mICACValue; chip::ByteSpan mIPKValue; chip::NodeId mCaseAdminNode; - uint16_t mAdminVendorId; + chip::VendorId mAdminVendorId; }; /*