.vscode/settings.json

@@ -7,25 +7,29 @@
         "${workspaceFolder}/build/default/src/lib/**",
         "${workspaceFolder}/config/standalone/",
         "${workspaceFolder}/config/standalone/**",
+        "${workspaceFolder}/darwin/Framework/CHIP/**",
         "${workspaceFolder}/examples/**",
         "${workspaceFolder}/src/**",
+        "${workspaceFolder}/src/app/**",
+        "${workspaceFolder}/src/ble/**",
+        "${workspaceFolder}/src/controller/**",
+        "${workspaceFolder}/src/credentials/**",
+        "${workspaceFolder}/src/crypto/**",
+        "${workspaceFolder}/src/darwin/**",
         "${workspaceFolder}/src/include/",
         "${workspaceFolder}/src/include/**",
+        "${workspaceFolder}/src/inet/**",
         "${workspaceFolder}/src/lib/**",
-        "${workspaceFolder}/src/system/**",
-        "${workspaceFolder}/third_party/nlassert/repo/include/**",
-        "${workspaceFolder}/third_party/nlio/repo/include/**",
-        "${workspaceFolder}/darwin/Framework/CHIP/**",
+        "${workspaceFolder}/src/lwip/**",
         "${workspaceFolder}/src/messaging/**",
+        "${workspaceFolder}/src/platform/**",
         "${workspaceFolder}/src/protocols/**",
+        "${workspaceFolder}/src/setup_payload/**",
+        "${workspaceFolder}/src/system/**",
         "${workspaceFolder}/src/tracing/**",
         "${workspaceFolder}/src/transport/**",
-        "${workspaceFolder}/src/inet/**",
-        "${workspaceFolder}/src/credentials/**",
-        "${workspaceFolder}/src/data_model/**",
-        "${workspaceFolder}/src/app/**",
-        "${workspaceFolder}/src/crytpo/**",
-        "${workspaceFolder}/src/platform/**"
+        "${workspaceFolder}/third_party/nlassert/repo/include/**",
+        "${workspaceFolder}/third_party/nlio/repo/include/**"
     ],
     "[cpp]": {
         "editor.defaultFormatter": "xaver.clang-format"

examples/darwin-framework-tool/commands/pairing/DeviceControllerDelegateBridge.mm

@@ -22,7 +22,7 @@
 @implementation CHIPToolDeviceControllerDelegate
 - (void)controller:(MTRDeviceController *)controller statusUpdate:(MTRCommissioningStatus)status
 {
-    NSLog(@"Pairing Status Update: %tu", status);
+    NSLog(@"Pairing Status Update: %ld", static_cast<long>(status));
     switch (status) {
     case MTRCommissioningStatusSuccess:
         ChipLogProgress(chipTool, "Secure Pairing Success");

src/app/tests/suites/TestAccessControlConstraints.yaml

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: User Label Cluster Tests
+name: Test Access Control Constraints
 
 config:
     nodeId: 0x12344321

src/controller/AutoCommissioner.cpp

@@ -125,6 +125,8 @@ CHIP_ERROR AutoCommissioner::SetCommissioningParameters(const CommissioningParam
 
     mParams = params;
 
+    mNeedIcdRegistration = false;
+
     if (haveMaybeDanglingBufferPointers)
     {
         mParams.ClearExternalBufferDependentValues();

src/crypto/tests/TestChipCryptoPAL.cpp

@@ -2804,8 +2804,8 @@ TEST_F(TestChipCryptoPAL, TestVIDPID_x509Extraction)
         AttestationCertVidPid vidpid;
         CHIP_ERROR result = ExtractVIDPIDFromX509Cert(testCase.cert, vidpid);
         EXPECT_EQ(result, testCase.expectedResult);
-        EXPECT_EQ(vidpid.mVendorId.HasValue(), testCase.expectedVidPresent);
-        EXPECT_EQ(vidpid.mProductId.HasValue(), testCase.expectedPidPresent);
+        ASSERT_EQ(vidpid.mVendorId.HasValue(), testCase.expectedVidPresent);
+        ASSERT_EQ(vidpid.mProductId.HasValue(), testCase.expectedPidPresent);
 
         // If present, make sure the VID matches expectation.
         if (testCase.expectedVidPresent)

src/darwin/Framework/CHIP/MTRAsyncCallbackWorkQueue.mm

@@ -77,7 +77,7 @@ - (NSString *)description
     std::lock_guard lock(_lock);
 
     return [NSString
-        stringWithFormat:@"MTRAsyncCallbackWorkQueue context: %@ items count: %lu", self.context, (unsigned long) self.items.count];
+        stringWithFormat:@"MTRAsyncCallbackWorkQueue context: %@ items count: %lu", self.context, static_cast<unsigned long>(self.items.count)];
 }
 
 - (void)enqueueWorkItem:(MTRAsyncCallbackQueueWorkItem *)item

src/darwin/Framework/CHIP/MTRAsyncWorkQueue.mm

@@ -84,7 +84,7 @@ - (void)setDuplicateTypeID:(NSUInteger)opaqueDuplicateTypeID handler:(MTRAsyncWo
 
 - (void)assertMutable
 {
-    NSAssert(_state == MTRAsyncWorkItemMutable, @"work item is not mutable (%ld)", (long) _state);
+    NSAssert(_state == MTRAsyncWorkItemMutable, @"work item is not mutable (%ld)", static_cast<long>(_state));
 }
 
 #pragma mark Management by the work queue (queue lock held)
@@ -109,7 +109,7 @@ - (NSInteger)retryCount
 
 - (void)callReadyHandlerWithContext:(id)context completion:(MTRAsyncWorkCompletionBlock)completion
 {
-    NSAssert(_state >= MTRAsyncWorkItemEnqueued, @"work item is not enqueued (%ld)", (long) _state);
+    NSAssert(_state >= MTRAsyncWorkItemEnqueued, @"work item is not enqueued (%ld)", static_cast<long>(_state));
     NSInteger retryCount = 0;
     if (_state == MTRAsyncWorkItemEnqueued) {
         _state = MTRAsyncWorkItemRunning;
@@ -161,7 +161,7 @@ - (BOOL)isComplete
 
 - (void)markComplete
 {
-    NSAssert(_state >= MTRAsyncWorkItemEnqueued, @"work item was not enqueued (%ld)", (long) _state);
+    NSAssert(_state >= MTRAsyncWorkItemEnqueued, @"work item was not enqueued (%ld)", static_cast<long>(_state));
     _state = MTRAsyncWorkItemComplete;
 
     // Clear all handlers in case any of them captured this object.
@@ -185,7 +185,7 @@ - (NSString *)description
         state = @"enqueued";
         break;
     default:
-        return [NSString stringWithFormat:@"<%@ %llu running retry: %tu>", self.class, _uniqueID, self.retryCount];
+        return [NSString stringWithFormat:@"<%@ %llu running retry: %ld>", self.class, _uniqueID, static_cast<long>(self.retryCount)];
     }
     return [NSString stringWithFormat:@"<%@ %llu %@>", self.class, _uniqueID, state];
 }
@@ -236,7 +236,7 @@ - (NSString *)description
 {
     ContextSnapshot context(self);
     std::lock_guard lock(_lock);
-    return [NSString stringWithFormat:@"<%@ context: %@, items count: %tu>", self.class, context.description, _items.count];
+    return [NSString stringWithFormat:@"<%@ context: %@, items count: %lu>", self.class, context.description, static_cast<unsigned long>(_items.count)];
 }
 
 - (void)enqueueWorkItem:(MTRAsyncWorkItem *)item
@@ -268,9 +268,9 @@ - (void)enqueueWorkItem:(MTRAsyncWorkItem *)item
         // Logging the description once is enough because other log messages
         // related to the work item (execution, completion etc) can easily be
         // correlated using the unique id.
-        MTR_LOG("MTRAsyncWorkQueue<%@, items count: %tu> enqueued work item [%llu]: %@", context.description, _items.count, item.uniqueID, description);
+        MTR_LOG("MTRAsyncWorkQueue<%@, items count: %lu> enqueued work item [%llu]: %@", context.description, static_cast<unsigned long>(_items.count), item.uniqueID, description);
     } else {
-        MTR_LOG("MTRAsyncWorkQueue<%@, items count: %tu> enqueued work item [%llu]", context.description, _items.count, item.uniqueID);
+        MTR_LOG("MTRAsyncWorkQueue<%@, items count: %lu> enqueued work item [%llu]", context.description, static_cast<unsigned long>(_items.count), item.uniqueID);
     }
 
     [self _callNextReadyWorkItemWithContext:context];
@@ -280,7 +280,7 @@ - (void)invalidate
 {
     ContextSnapshot context(self); // outside of lock
     std::lock_guard lock(_lock);
-    MTR_LOG("MTRAsyncWorkQueue<%@> invalidate %tu items", context.description, _items.count);
+    MTR_LOG("MTRAsyncWorkQueue<%@> invalidate %lu items", context.description, static_cast<unsigned long>(_items.count));
     for (MTRAsyncWorkItem * item in _items) {
         [item cancel];
     }
@@ -316,7 +316,7 @@ - (void)_postProcessWorkItem:(MTRAsyncWorkItem *)workItem
 
     [workItem markComplete];
     [_items removeObjectAtIndex:indexOfWorkItem];
-    MTR_LOG("MTRAsyncWorkQueue<%@, items count: %tu> completed work item [%llu]", context.description, _items.count, workItem.uniqueID);
+    MTR_LOG("MTRAsyncWorkQueue<%@, items count: %lu> completed work item [%llu]", context.description, static_cast<unsigned long>(_items.count), workItem.uniqueID);
 
     // sanity check running work item count is positive
     if (_runningWorkItemCount == 0) {

src/darwin/Framework/CHIP/MTRBaseDevice.mm

@@ -571,7 +571,7 @@ - (void)subscribeWithQueue:(dispatch_queue_t)queue
         return _MakeDataValueDictionary(typeName, array, dataVersion);
     }
     default:
-        MTR_LOG_ERROR("Error: Unsupported TLV type for conversion: %u", (unsigned) data->GetType());
+        MTR_LOG_ERROR("Error: Unsupported TLV type for conversion: %u", static_cast<unsigned>(data->GetType()));
         return nil;
     }
 }