From 59bd29339927d94061fce319e9cc720af876b728 Mon Sep 17 00:00:00 2001 From: Justin Wood Date: Mon, 17 Jun 2024 12:12:43 -0700 Subject: [PATCH 1/2] Removing these errors --- src/darwin/Framework/CHIP/MTRDevice.mm | 8 +++++--- .../CHIP/MTRDeviceStorageBehaviorConfiguration.mm | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/darwin/Framework/CHIP/MTRDevice.mm b/src/darwin/Framework/CHIP/MTRDevice.mm index fff962dcc94188..a4908c7d7085a7 100644 --- a/src/darwin/Framework/CHIP/MTRDevice.mm +++ b/src/darwin/Framework/CHIP/MTRDevice.mm @@ -177,8 +177,8 @@ - (void)_deviceInternalStateChanged:(MTRDevice *)device; UnsolicitedMessageFromPublisherHandler unsolicitedMessageFromPublisherHandler, ReportBeginHandler reportBeginHandler, ReportEndHandler reportEndHandler) : MTRBaseSubscriptionCallback(attributeReportCallback, eventReportCallback, errorCallback, resubscriptionCallback, - subscriptionEstablishedHandler, onDoneHandler, unsolicitedMessageFromPublisherHandler, reportBeginHandler, - reportEndHandler) + subscriptionEstablishedHandler, onDoneHandler, unsolicitedMessageFromPublisherHandler, reportBeginHandler, + reportEndHandler) { } @@ -3667,7 +3667,9 @@ - (NSArray *)_getAttributesToReportWithReportedValues:(NSArray 0) { + MTR_LOG("%@ report from reported values %@", self, attributePathsToReport); + } return attributesToReport; } diff --git a/src/darwin/Framework/CHIP/MTRDeviceStorageBehaviorConfiguration.mm b/src/darwin/Framework/CHIP/MTRDeviceStorageBehaviorConfiguration.mm index 4522c7e69b4ad6..6afa2358c83b06 100644 --- a/src/darwin/Framework/CHIP/MTRDeviceStorageBehaviorConfiguration.mm +++ b/src/darwin/Framework/CHIP/MTRDeviceStorageBehaviorConfiguration.mm @@ -75,7 +75,7 @@ - (void)checkValuesAndResetToDefaultIfNecessary // Sanity check all the values, and if any is out of range, reset to default values if ((_reportToPersistenceDelayTime <= 0) || (_reportToPersistenceDelayTimeMax <= 0) || (_reportToPersistenceDelayTimeMax < _reportToPersistenceDelayTime) || (_recentReportTimesMaxCount < 2) || (_timeBetweenReportsTooShortThreshold <= 0) || (_timeBetweenReportsTooShortMinThreshold <= 0) || (_timeBetweenReportsTooShortMinThreshold > _timeBetweenReportsTooShortThreshold) || (_reportToPersistenceDelayMaxMultiplier <= 1) || (_deviceReportingExcessivelyIntervalThreshold <= 0)) { - MTR_LOG_ERROR("%@ storage behavior: MTRDeviceStorageBehaviorConfiguration values out of bounds - resetting to default", self); + MTR_LOG("%@ storage behavior: MTRDeviceStorageBehaviorConfiguration values out of bounds - resetting to default", self); _reportToPersistenceDelayTime = kReportToPersistenceDelayTimeDefault; _reportToPersistenceDelayTimeMax = kReportToPersistenceDelayTimeMaxDefault; From 81b763f74b0e880c48d12e6bddbf762a68e3b3f4 Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Wed, 17 Jul 2024 04:57:54 +0000 Subject: [PATCH 2/2] Restyled by clang-format --- src/darwin/Framework/CHIP/MTRDevice.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/darwin/Framework/CHIP/MTRDevice.mm b/src/darwin/Framework/CHIP/MTRDevice.mm index a4908c7d7085a7..767fcd9c8307eb 100644 --- a/src/darwin/Framework/CHIP/MTRDevice.mm +++ b/src/darwin/Framework/CHIP/MTRDevice.mm @@ -177,8 +177,8 @@ - (void)_deviceInternalStateChanged:(MTRDevice *)device; UnsolicitedMessageFromPublisherHandler unsolicitedMessageFromPublisherHandler, ReportBeginHandler reportBeginHandler, ReportEndHandler reportEndHandler) : MTRBaseSubscriptionCallback(attributeReportCallback, eventReportCallback, errorCallback, resubscriptionCallback, - subscriptionEstablishedHandler, onDoneHandler, unsolicitedMessageFromPublisherHandler, reportBeginHandler, - reportEndHandler) + subscriptionEstablishedHandler, onDoneHandler, unsolicitedMessageFromPublisherHandler, reportBeginHandler, + reportEndHandler) { }