Merge branch 'master' into fix/ActivePresetHandle-subscription-report

Author: lboue

data_model/1.5.1/clusters/OccupancySensing.xml

@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 
 :xrefstyle: basic
 -->
-<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0406" name="Occupancy Sensing Cluster" revision="7">
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0406" name="Occupancy Sensing Cluster" revision="6">
   <revisionHistory>
     <revision revision="1" summary="Mandatory global ClusterRevision attribute added"/>
     <revision revision="2" summary="Physical Contact Occupancy feature with mandatory OccupancySensorTypeBitmap"/>

data_model/1.5.1/device_types/RoomAirConditioner.xml

@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 
 :xrefstyle: basic
 -->
-<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0072" name="Room Air Conditioner" revision="4">
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0072" name="Room Air Conditioner" revision="3">
   <revisionHistory>
     <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Thermostat User Interface Configuration cluster added; Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>

examples/tv-casting-app/android/App/app/src/main/jni/cpp/core/CastingApp-JNI.cpp

@@ -120,8 +120,11 @@ JNI_METHOD(jobject, finishStartup)(JNIEnv *, jobject)
 #if CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY_CLIENT
     // Set a handler for Commissioner's CommissionerDeclaration messages. This is set in
     // connectedhomeip/src/protocols/user_directed_commissioning/UserDirectedCommissioning.h
-    chip::Server::GetInstance().GetUserDirectedCommissioningClient()->SetCommissionerDeclarationHandler(
-        CommissionerDeclarationHandler::GetInstance());
+    auto * client = chip::Server::GetInstance().GetUserDirectedCommissioningClient();
+    if (client != nullptr)
+    {
+        client->SetCommissionerDeclarationHandler(CommissionerDeclarationHandler::GetInstance());
+    }
 #endif // CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY_CLIENT
 
     return support::convertMatterErrorFromCppToJava(CHIP_NO_ERROR);
@@ -134,7 +137,11 @@ JNI_METHOD(void, finishStopping)(JNIEnv *, jobject)
 
 #if CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY_CLIENT
     // Remove the handler previously set for Commissioner's CommissionerDeclaration messages.
-    chip::Server::GetInstance().GetUserDirectedCommissioningClient()->SetCommissionerDeclarationHandler(nullptr);
+    auto * client = chip::Server::GetInstance().GetUserDirectedCommissioningClient();
+    if (client != nullptr)
+    {
+        client->SetCommissionerDeclarationHandler(nullptr);
+    }
 #endif // CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY_CLIENT
 }
 

examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge.xcodeproj/project.pbxproj

@@ -81,6 +81,10 @@
 		3CD73F1E2A9E83C1009D82D1 /* MCCommissionableDataProvider.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3CD73F1D2A9E83C1009D82D1 /* MCCommissionableDataProvider.mm */; };
 		3CD73F202A9EA060009D82D1 /* MCDeviceAttestationCredentials.h in Headers */ = {isa = PBXBuildFile; fileRef = 3CD73F1F2A9EA060009D82D1 /* MCDeviceAttestationCredentials.h */; };
 		3CD73F222A9EA078009D82D1 /* MCDeviceAttestationCredentials.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3CD73F212A9EA077009D82D1 /* MCDeviceAttestationCredentials.mm */; };
+		3CD73F242B1EA001009D82D1 /* MCDeviceInstanceInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 3CD73F232B1EA001009D82D1 /* MCDeviceInstanceInfo.h */; };
+		3CD73F262B1EA002009D82D1 /* MCDeviceInstanceInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CD73F252B1EA002009D82D1 /* MCDeviceInstanceInfo.m */; };
+		3CD73F282B1EA003009D82D1 /* MCDeviceInstanceInfoProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 3CD73F272B1EA003009D82D1 /* MCDeviceInstanceInfoProvider.h */; };
+		3CD73F2A2B1EA004009D82D1 /* MCDeviceInstanceInfoProvider.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3CD73F292B1EA004009D82D1 /* MCDeviceInstanceInfoProvider.mm */; };
 		3CE5ECCE2A673B30007CF331 /* CommissioningCallbackHandlers.h in Headers */ = {isa = PBXBuildFile; fileRef = 3CE5ECCD2A673B30007CF331 /* CommissioningCallbackHandlers.h */; };
 		3CE5ECD02A673E2C007CF331 /* CommissioningCallbackHandlers.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CE5ECCF2A673E2C007CF331 /* CommissioningCallbackHandlers.m */; };
 		3CF71C0A2A992D0D003A5CE5 /* MCCastingApp.h in Headers */ = {isa = PBXBuildFile; fileRef = 3CF71C092A992D0D003A5CE5 /* MCCastingApp.h */; };
@@ -178,6 +182,10 @@
 		3CD73F1D2A9E83C1009D82D1 /* MCCommissionableDataProvider.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MCCommissionableDataProvider.mm; sourceTree = "<group>"; };
 		3CD73F1F2A9EA060009D82D1 /* MCDeviceAttestationCredentials.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCDeviceAttestationCredentials.h; sourceTree = "<group>"; };
 		3CD73F212A9EA077009D82D1 /* MCDeviceAttestationCredentials.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MCDeviceAttestationCredentials.mm; sourceTree = "<group>"; };
+		3CD73F232B1EA001009D82D1 /* MCDeviceInstanceInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCDeviceInstanceInfo.h; sourceTree = "<group>"; };
+		3CD73F252B1EA002009D82D1 /* MCDeviceInstanceInfo.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MCDeviceInstanceInfo.m; sourceTree = "<group>"; };
+		3CD73F272B1EA003009D82D1 /* MCDeviceInstanceInfoProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCDeviceInstanceInfoProvider.h; sourceTree = "<group>"; };
+		3CD73F292B1EA004009D82D1 /* MCDeviceInstanceInfoProvider.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MCDeviceInstanceInfoProvider.mm; sourceTree = "<group>"; };
 		3CE5ECCD2A673B30007CF331 /* CommissioningCallbackHandlers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CommissioningCallbackHandlers.h; sourceTree = "<group>"; };
 		3CE5ECCF2A673E2C007CF331 /* CommissioningCallbackHandlers.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CommissioningCallbackHandlers.m; sourceTree = "<group>"; };
 		3CF71C092A992D0D003A5CE5 /* MCCastingApp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCCastingApp.h; sourceTree = "<group>"; };
@@ -321,6 +329,10 @@
 				3CD73F212A9EA077009D82D1 /* MCDeviceAttestationCredentials.mm */,
 				3C6920452AA1093300D0F613 /* MCDeviceAttestationCredentialsProvider.h */,
 				3C6920472AA1094000D0F613 /* MCDeviceAttestationCredentialsProvider.mm */,
+				3CD73F232B1EA001009D82D1 /* MCDeviceInstanceInfo.h */,
+				3CD73F252B1EA002009D82D1 /* MCDeviceInstanceInfo.m */,
+				3CD73F272B1EA003009D82D1 /* MCDeviceInstanceInfoProvider.h */,
+				3CD73F292B1EA004009D82D1 /* MCDeviceInstanceInfoProvider.mm */,
 				3C69204B2AA136BA00D0F613 /* MCCommonCaseDeviceServerInitParamsProvider.h */,
 				3CF8532528E37ED800F07B9F /* MatterError.h */,
 				3CF8532628E37F1000F07B9F /* MatterError.mm */,
@@ -370,6 +382,8 @@
 				3CF71C102A99312D003A5CE5 /* MCCommissionableData.h in Headers */,
 				3C4F522A2B51DFAE00BB8A10 /* MCCommand_Internal.h in Headers */,
 				3CD73F202A9EA060009D82D1 /* MCDeviceAttestationCredentials.h in Headers */,
+				3CD73F242B1EA001009D82D1 /* MCDeviceInstanceInfo.h in Headers */,
+				3CD73F282B1EA003009D82D1 /* MCDeviceInstanceInfoProvider.h in Headers */,
 				3CCB8740286A593700771BAD /* CastingServerBridge.h in Headers */,
 				3CE5ECCE2A673B30007CF331 /* CommissioningCallbackHandlers.h in Headers */,
 				39589F162B91556B00BE040C /* MCInteractionModelStructs.h in Headers */,
@@ -506,6 +520,8 @@
 				3CD73F1E2A9E83C1009D82D1 /* MCCommissionableDataProvider.mm in Sources */,
 				39F589E02C1781E4000AAADD /* MCCommissionerDeclaration.mm in Sources */,
 				3CD73F222A9EA078009D82D1 /* MCDeviceAttestationCredentials.mm in Sources */,
+				3CD73F262B1EA002009D82D1 /* MCDeviceInstanceInfo.m in Sources */,
+				3CD73F2A2B1EA004009D82D1 /* MCDeviceInstanceInfoProvider.mm in Sources */,
 				39BF57C72B8CFFB90081653C /* MCAttributeObjects.mm in Sources */,
 				3C2346252B362BBB00FA276E /* MCCastingPlayerDiscovery.mm in Sources */,
 				3C4F52242B507CA800BB8A10 /* MCCluster.mm in Sources */,

examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/MCCastingApp.mm

@@ -20,12 +20,14 @@
 #import "MCCommissionableDataProvider.h"
 #import "MCCommonCaseDeviceServerInitParamsProvider.h"
 #import "MCDeviceAttestationCredentialsProvider.h"
+#import "MCDeviceInstanceInfoProvider.h"
 #import "MCErrorUtils.h"
 #import "MCRotatingDeviceIdUniqueIdProvider.h"
 
 #import "core/Types.h"
 #include <credentials/attestation_verifier/DefaultDeviceAttestationVerifier.h>
 #include <credentials/attestation_verifier/DeviceAttestationVerifier.h>
+#include <platform/DeviceInstanceInfoProvider.h>
 
 #import <Foundation/Foundation.h>
 
@@ -35,6 +37,7 @@ @interface MCCastingApp ()
 @property matter::casting::support::MCRotatingDeviceIdUniqueIdProvider uniqueIdProvider;
 @property matter::casting::support::MCCommissionableDataProvider * commissionableDataProvider;
 @property matter::casting::support::MCDeviceAttestationCredentialsProvider * dacProvider;
+@property matter::casting::support::MCDeviceInstanceInfoProviderBridge * deviceInstanceInfoProvider;
 @property MCCommonCaseDeviceServerInitParamsProvider * serverInitParamsProvider;
 
 // queue used when calling the client code on completion blocks from any MatterTvCastingBridge API
@@ -92,6 +95,17 @@ - (NSError *)initializeWithDataSource:(id)dataSource
 
     _serverInitParamsProvider = new MCCommonCaseDeviceServerInitParamsProvider();
 
+    // Initialize MCDeviceInstanceInfoProviderBridge if the dataSource provides a delegate
+    if ([dataSource respondsToSelector:@selector(castingAppDidReceiveRequestForDeviceInstanceInfoProvider:)]) {
+        id<MCDeviceInstanceInfoProvider> infoProvider = [dataSource castingAppDidReceiveRequestForDeviceInstanceInfoProvider:self];
+        if (infoProvider != nil) {
+            ChipLogProgress(AppServer, "MCCastingApp.initializeWithDataSource() setting up pull-based MCDeviceInstanceInfoProviderBridge");
+            delete _deviceInstanceInfoProvider;
+            _deviceInstanceInfoProvider = new matter::casting::support::MCDeviceInstanceInfoProviderBridge();
+            _deviceInstanceInfoProvider->SetDelegate(infoProvider);
+        }
+    }
+
     // Create cpp AppParameters
     // TODO: Properly validate revocation!
     chip::Credentials::DeviceAttestationRevocationDelegate * kDeviceAttestationRevocationNotChecked = nullptr;
@@ -105,6 +119,12 @@ - (NSError *)initializeWithDataSource:(id)dataSource
     VerifyOrReturnValue(matter::casting::core::CastingApp::GetInstance()->Initialize(_appParameters) == CHIP_NO_ERROR,
         [MCErrorUtils NSErrorFromChipError:CHIP_ERROR_INCORRECT_STATE]);
 
+    // Register the custom DeviceInstanceInfoProvider if one was created
+    if (_deviceInstanceInfoProvider != nullptr) {
+        ChipLogProgress(AppServer, "MCCastingApp.initializeWithDataSource() setting custom DeviceInstanceInfoProvider");
+        chip::DeviceLayer::SetDeviceInstanceInfoProvider(_deviceInstanceInfoProvider);
+    }
+
     // Get and store the CHIP Work queue
     _workQueue = chip::DeviceLayer::PlatformMgrImpl().GetWorkQueue();
 

examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/MCDataSource.h

@@ -17,6 +17,7 @@
 
 #import "MCCommissionableData.h"
 #import "MCDeviceAttestationCredentials.h"
+#import "MCDeviceInstanceInfo.h"
 #import "MatterError.h"
 
 #ifndef MCDataSource_h
@@ -54,6 +55,19 @@
  */
 - (MatterError * _Nonnull)castingApp:(id _Nonnull)sender didReceiveRequestToSignCertificateRequest:(NSData * _Nonnull)csrData outRawSignature:(NSData * _Nonnull * _Nonnull)outRawSignature;
 
+@optional
+
+/**
+ * @brief Provides an object conforming to MCDeviceInstanceInfoProvider that the platform
+ * will query at runtime for device instance info fields (vendorName, productName, etc.)
+ * used during Matter commissioning.
+ *
+ * The platform pulls values from the returned provider each time they are needed,
+ * allowing the app to return dynamic data. Methods not implemented or returning nil
+ * will fall back to compile-time defaults.
+ */
+- (id<MCDeviceInstanceInfoProvider> _Nullable)castingAppDidReceiveRequestForDeviceInstanceInfoProvider:(id _Nonnull)sender;
+
 @end
 
 #endif /* MCDataSource_h */

examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/MCDeviceInstanceInfo.h

@@ -0,0 +1,46 @@
+/**
+ *
+ *    Copyright (c) 2024 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#import <Foundation/Foundation.h>
+
+#ifndef MCDeviceInstanceInfo_h
+#define MCDeviceInstanceInfo_h
+
+/**
+ * @brief Pull-based protocol for providing device instance info at runtime.
+ *
+ * Implement this protocol to supply device instance information fields
+ * used during Matter commissioning. The platform layer queries these methods
+ * when it needs each value, allowing the app to return dynamic/current data.
+ *
+ * All methods are optional. If a method is not implemented or returns nil,
+ * the platform falls back to compile-time defaults.
+ */
+@protocol MCDeviceInstanceInfoProvider <NSObject>
+@optional
+
+- (NSString * _Nullable)vendorName;
+- (NSNumber * _Nullable)vendorId;
+- (NSString * _Nullable)productName;
+- (NSNumber * _Nullable)productId;
+- (NSString * _Nullable)serialNumber;
+- (NSNumber * _Nullable)hardwareVersion;
+- (NSString * _Nullable)hardwareVersionString;
+
+@end
+
+#endif /* MCDeviceInstanceInfo_h */

examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/MCDeviceInstanceInfo.m

@@ -0,0 +1,19 @@
+/**
+ *
+ *    Copyright (c) 2024 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+// MCDeviceInstanceInfo.h now defines a protocol (@protocol MCDeviceInstanceInfoProvider).
+// No implementation file is needed for a protocol definition.

examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/MCDeviceInstanceInfoProvider.h

@@ -0,0 +1,70 @@
+/*
+ *
+ *    Copyright (c) 2024 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#import "MCDeviceInstanceInfo.h"
+
+#include <lib/core/CHIPError.h>
+#include <lib/core/Optional.h>
+#include <platform/ConfigurationManager.h>
+#include <platform/Darwin/DeviceInstanceInfoProviderImpl.h>
+#include <platform/DeviceInstanceInfoProvider.h>
+
+#ifndef MCDeviceInstanceInfoProvider_h
+#define MCDeviceInstanceInfoProvider_h
+
+namespace matter {
+namespace casting {
+namespace support {
+
+/**
+ * Pull-based DeviceInstanceInfoProvider that queries an ObjC delegate
+ * each time the platform layer requests a value.
+ */
+class MCDeviceInstanceInfoProviderBridge : public chip::DeviceLayer::DeviceInstanceInfoProvider
+{
+public:
+    void SetDelegate(id<MCDeviceInstanceInfoProvider> _Nullable delegate) { mDelegate = delegate; }
+
+    // Overridden methods — query delegate if available, else fall back to default
+    CHIP_ERROR GetVendorName(char * buf, size_t bufSize) override;
+    CHIP_ERROR GetVendorId(uint16_t & vendorId) override;
+    CHIP_ERROR GetProductName(char * buf, size_t bufSize) override;
+    CHIP_ERROR GetProductId(uint16_t & productId) override;
+    CHIP_ERROR GetSerialNumber(char * buf, size_t bufSize) override;
+    CHIP_ERROR GetHardwareVersion(uint16_t & hardwareVersion) override;
+    CHIP_ERROR GetHardwareVersionString(char * buf, size_t bufSize) override;
+
+    // Delegated methods — always use default implementation
+    CHIP_ERROR GetPartNumber(char * buf, size_t bufSize) override;
+    CHIP_ERROR GetProductURL(char * buf, size_t bufSize) override;
+    CHIP_ERROR GetProductLabel(char * buf, size_t bufSize) override;
+    CHIP_ERROR GetManufacturingDate(uint16_t & year, uint8_t & month, uint8_t & day) override;
+    CHIP_ERROR GetRotatingDeviceIdUniqueId(chip::MutableByteSpan & uniqueIdSpan) override;
+
+private:
+    __weak id<MCDeviceInstanceInfoProvider> _Nullable mDelegate = nil;
+    chip::DeviceLayer::DeviceInstanceInfoProviderImpl mDefaultProvider;
+};
+
+}; // namespace support
+}; // namespace casting
+}; // namespace matter
+
+#endif /* MCDeviceInstanceInfoProvider_h */