From 1ca9ac0a282c92b1dc334cea01f0cb66e85cb7b8 Mon Sep 17 00:00:00 2001 From: Rob Bultman Date: Mon, 8 Jul 2024 19:12:07 -0400 Subject: [PATCH 1/2] [DRYERCTRL] Align description with spec (#34236) * Align desc with spec * Update src/app/zap-templates/zcl/data-model/chip/laundry-dryer-controls-cluster.xml * Commit after zap regen --- .../all-clusters-common/all-clusters-app.matter | 4 ++-- .../zcl/data-model/chip/laundry-dryer-controls-cluster.xml | 4 ++-- src/controller/data_model/controller-clusters.matter | 4 ++-- src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h | 4 ++-- src/darwin/Framework/CHIP/zap-generated/MTRClusters.h | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) 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 b512a6b1399d58..f3b7b0d6b6e427 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 @@ -2731,8 +2731,8 @@ cluster OvenMode = 73 { command ChangeToMode(ChangeToModeRequest): ChangeToModeResponse = 0; } -/** This cluster supports remotely monitoring and controling the different typs of - functionality available to a drying device, such as a laundry dryer. */ +/** This cluster provides a way to access options associated with the operation of + a laundry dryer device type. */ cluster LaundryDryerControls = 74 { revision 1; diff --git a/src/app/zap-templates/zcl/data-model/chip/laundry-dryer-controls-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/laundry-dryer-controls-cluster.xml index 11837b8be0e8f4..f126d8836f720c 100644 --- a/src/app/zap-templates/zcl/data-model/chip/laundry-dryer-controls-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/laundry-dryer-controls-cluster.xml @@ -33,8 +33,8 @@ limitations under the License. LAUNDRY_DRYER_CONTROLS_CLUSTER true true - This cluster supports remotely monitoring and controling the different typs of - functionality available to a drying device, such as a laundry dryer. + This cluster provides a way to access options associated with the operation of + a laundry dryer device type. diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 0add2f8c6c5095..80aa1b74c29b59 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -2933,8 +2933,8 @@ cluster OvenMode = 73 { command ChangeToMode(ChangeToModeRequest): ChangeToModeResponse = 0; } -/** This cluster supports remotely monitoring and controling the different typs of - functionality available to a drying device, such as a laundry dryer. */ +/** This cluster provides a way to access options associated with the operation of + a laundry dryer device type. */ cluster LaundryDryerControls = 74 { revision 1; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index fbf61defa7fe56..e20ab1b24de185 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -4936,8 +4936,8 @@ MTR_PROVISIONALLY_AVAILABLE /** * Cluster Laundry Dryer Controls * - * This cluster supports remotely monitoring and controling the different typs of - functionality available to a drying device, such as a laundry dryer. + * This cluster provides a way to access options associated with the operation of + a laundry dryer device type. */ MTR_PROVISIONALLY_AVAILABLE @interface MTRBaseClusterLaundryDryerControls : MTRGenericBaseCluster diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h index 39024834ce0b37..735749163f8677 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h @@ -2301,8 +2301,8 @@ MTR_PROVISIONALLY_AVAILABLE /** * Cluster Laundry Dryer Controls - * This cluster supports remotely monitoring and controling the different typs of - functionality available to a drying device, such as a laundry dryer. + * This cluster provides a way to access options associated with the operation of + a laundry dryer device type. */ MTR_PROVISIONALLY_AVAILABLE @interface MTRClusterLaundryDryerControls : MTRGenericCluster From 90310f28f99a3703c8f9393a92ceaadaabcc794f Mon Sep 17 00:00:00 2001 From: Justin Wood Date: Mon, 8 Jul 2024 20:28:17 -0400 Subject: [PATCH 2/2] Disabling this darwin feature, doesn't seem to be of use, and is crashing (#34238) * Disabling this * Restyled by clang-format --------- Co-authored-by: Restyled.io --- src/darwin/Framework/CHIP/MTRDevice.mm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/darwin/Framework/CHIP/MTRDevice.mm b/src/darwin/Framework/CHIP/MTRDevice.mm index 89db49f077cdca..30d96d3c2e9f43 100644 --- a/src/darwin/Framework/CHIP/MTRDevice.mm +++ b/src/darwin/Framework/CHIP/MTRDevice.mm @@ -60,6 +60,9 @@ #define kSecondsToWaitBeforeMarkingUnreachableAfterSettingUpSubscription 10 +// Disabling pending crashes +#define ENABLE_CONNECTIVITY_MONITORING 0 + // Consider moving utility classes to their own file #pragma mark - Utility Classes @@ -1381,7 +1384,7 @@ - (void)_handleResubscriptionNeededWithDelay:(NSNumber *)resubscriptionDelayMs dispatch_after(dispatch_time(DISPATCH_TIME_NOW, resubscriptionDelayNs), self.queue, resubscriptionBlock); } - // Set up connectivity monitoring in case network routability changes for the positive, to accellerate resubscription + // Set up connectivity monitoring in case network routability changes for the positive, to accelerate resubscription [self _setupConnectivityMonitoring]; } @@ -1389,7 +1392,7 @@ - (void)_handleSubscriptionReset:(NSNumber * _Nullable)retryDelay { std::lock_guard lock(_lock); - // If we are here, then either we failed to establish initil CASE, or we + // If we are here, then either we failed to establish initial CASE, or we // failed to send the initial SubscribeRequest message, or our ReadClient // has given up completely. Those all count as "we have tried and failed to // subscribe". @@ -2253,6 +2256,7 @@ - (void)_createDataVersionFilterListFromDictionary:(NSDictionary