Skip to content

Commit a7b44ae

Browse files
committed
Regenerate v1.4-branch patches
This also includes the pending PR: - project-chip/connectedhomeip#36572
1 parent 38f0828 commit a7b44ae

4 files changed

+47
-21
lines changed

0001-Support-custom-platform-tag.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 43848867c2b6ef73c348066029eb8bc0a90500aa Mon Sep 17 00:00:00 2001
1+
From a3eb36ccb35c4fa8a4cf816a5acf665dcfbb0484 Mon Sep 17 00:00:00 2001
22
From: Stefan Agner <stefan@agner.ch>
33
Date: Tue, 22 Nov 2022 10:51:17 +0100
44
Subject: [PATCH] Support custom platform tag

0002-Use-data-as-platform-storage-location.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 61ab506f9c0cefde811532415b2cc5fe1b84b84f Mon Sep 17 00:00:00 2001
1+
From 0ebf0f8cfea2d4b23b3fa78c681dc6ff6536d699 Mon Sep 17 00:00:00 2001
22
From: Stefan Agner <stefan@agner.ch>
33
Date: Fri, 27 May 2022 16:38:14 +0200
44
Subject: [PATCH] Use /data as platform storage location
@@ -8,10 +8,10 @@ Subject: [PATCH] Use /data as platform storage location
88
1 file changed, 6 insertions(+)
99

1010
diff --git a/src/platform/Linux/BUILD.gn b/src/platform/Linux/BUILD.gn
11-
index 7961b3d648..7ec0d6472d 100644
11+
index 35b5047c9f..4886bc3ebb 100644
1212
--- a/src/platform/Linux/BUILD.gn
1313
+++ b/src/platform/Linux/BUILD.gn
14-
@@ -34,6 +34,12 @@ if (chip_mdns == "platform") {
14+
@@ -38,6 +38,12 @@ if (chip_mdns == "platform") {
1515
}
1616

1717
static_library("Linux") {

0006-Add-raw-attribute-callback.patch 0003-Add-raw-attribute-callback.patch

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 749cd076e35127092efa8f680902bebf8967389d Mon Sep 17 00:00:00 2001
1+
From 0f6dc07cb5c20d89b7e51342a32a73d58dd91b7d Mon Sep 17 00:00:00 2001
22
From: Stefan Agner <stefan@agner.ch>
33
Date: Thu, 23 May 2024 12:48:54 +0200
44
Subject: [PATCH] Add raw attribute callback
@@ -14,18 +14,18 @@ directly from the subscription transaction.
1414
1 file changed, 38 insertions(+), 10 deletions(-)
1515

1616
diff --git a/src/controller/python/chip/clusters/Attribute.py b/src/controller/python/chip/clusters/Attribute.py
17-
index 9e46eed469..ce522bf452 100644
17+
index 4d5bc1d17a..cb7bdb0bc4 100644
1818
--- a/src/controller/python/chip/clusters/Attribute.py
1919
+++ b/src/controller/python/chip/clusters/Attribute.py
20-
@@ -466,6 +466,7 @@ class SubscriptionTransaction:
21-
def __init__(self, transaction: AsyncReadTransaction, subscriptionId, devCtrl):
22-
self._onResubscriptionAttemptedCb = DefaultResubscriptionAttemptedCallback
23-
self._onAttributeChangeCb = DefaultAttributeChangeCallback
24-
+ self._onRawAttributeChangeCb = None
25-
self._onEventChangeCb = DefaultEventChangeCallback
26-
self._onErrorCb = DefaultErrorCallback
20+
@@ -429,6 +429,7 @@ class SubscriptionTransaction:
21+
self._onResubscriptionAttemptedCb: Callable[[SubscriptionTransaction,
22+
int, int], None] = DefaultResubscriptionAttemptedCallback
23+
self._onAttributeChangeCb: Callable[[TypedAttributePath, SubscriptionTransaction], None] = DefaultAttributeChangeCallback
24+
+ self._onRawAttributeChangeCb: Optional[Callable[[AttributePath, SubscriptionTransaction]]] = None
25+
self._onEventChangeCb: Callable[[EventReadResult, SubscriptionTransaction], None] = DefaultEventChangeCallback
26+
self._onErrorCb: Callable[[int, SubscriptionTransaction], None] = DefaultErrorCallback
2727
self._readTransaction = transaction
28-
@@ -491,6 +492,18 @@ class SubscriptionTransaction:
28+
@@ -454,6 +455,18 @@ class SubscriptionTransaction:
2929
else:
3030
return data[path.Path.EndpointId][path.ClusterType][path.AttributeType]
3131

@@ -44,7 +44,7 @@ index 9e46eed469..ce522bf452 100644
4444
def GetEvents(self):
4545
return self._readTransaction.GetAllEventValues()
4646

47-
@@ -564,8 +577,14 @@ class SubscriptionTransaction:
47+
@@ -534,8 +547,14 @@ class SubscriptionTransaction:
4848
Sets the callback function for the attribute value change event,
4949
accepts a Callable accepts an attribute path and the cached data.
5050
'''
@@ -61,7 +61,7 @@ index 9e46eed469..ce522bf452 100644
6161

6262
def SetEventUpdateCallback(self, callback: Callable[[EventReadResult, SubscriptionTransaction], None]):
6363
if callback is not None:
64-
@@ -583,6 +602,10 @@ class SubscriptionTransaction:
64+
@@ -553,6 +572,10 @@ class SubscriptionTransaction:
6565
def OnAttributeChangeCb(self) -> Callable[[TypedAttributePath, SubscriptionTransaction], None]:
6666
return self._onAttributeChangeCb
6767

@@ -72,15 +72,15 @@ index 9e46eed469..ce522bf452 100644
7272
@property
7373
def OnEventChangeCb(self) -> Callable[[EventReadResult, SubscriptionTransaction], None]:
7474
return self._onEventChangeCb
75-
@@ -785,14 +808,19 @@ class AsyncReadTransaction:
76-
75+
@@ -767,14 +790,19 @@ class AsyncReadTransaction:
76+
def _handleReportEnd(self):
7777
if (self._subscription_handler is not None):
7878
for change in self._changedPathSet:
7979
- try:
8080
- attribute_path = TypedAttributePath(Path=change)
8181
- except (KeyError, ValueError) as err:
8282
- # path could not be resolved into a TypedAttributePath
83-
- logging.getLogger(__name__).exception(err)
83+
- LOGGER.exception(err)
8484
- continue
8585
- self._subscription_handler.OnAttributeChangeCb(
8686
- attribute_path, self._subscription_handler)
@@ -89,7 +89,7 @@ index 9e46eed469..ce522bf452 100644
8989
+ attribute_path = TypedAttributePath(Path=change)
9090
+ except (KeyError, ValueError) as err:
9191
+ # path could not be resolved into a TypedAttributePath
92-
+ logging.getLogger(__name__).exception(err)
92+
+ LOGGER.exception(err)
9393
+ continue
9494
+ self._subscription_handler.OnAttributeChangeCb(
9595
+ attribute_path, self._subscription_handler)
@@ -101,5 +101,5 @@ index 9e46eed469..ce522bf452 100644
101101
# Clear it out once we've notified of all changes in this transaction.
102102
self._changedPathSet = set()
103103
--
104-
2.45.2
104+
2.47.0
105105

0004-Update-matter-devices.xml.patch

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
From 1e4590e6cc935dbadbd95ca339c87517fb16760f Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?Ludovic=20BOU=C3=89?= <lboue@users.noreply.github.com>
3+
Date: Wed, 20 Nov 2024 07:53:48 +0100
4+
Subject: [PATCH] Update matter-devices.xml
5+
6+
Fix Carbon Monoxide Concentration Measurement cluster
7+
---
8+
src/app/zap-templates/zcl/data-model/chip/matter-devices.xml | 2 +-
9+
1 file changed, 1 insertion(+), 1 deletion(-)
10+
11+
diff --git a/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml b/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
12+
index 93fc3915e4..5b28393120 100644
13+
--- a/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
14+
+++ b/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
15+
@@ -2076,7 +2076,7 @@ limitations under the License.
16+
<include cluster="Smoke CO Alarm" client="false" server="true" clientLocked="true" serverLocked="true"></include>
17+
<include cluster="Relative Humidity Measurement" client="false" server="false" clientLocked="true" serverLocked="false"></include>
18+
<include cluster="Temperature Measurement" client="false" server="false" clientLocked="true" serverLocked="false"></include>
19+
- <include cluster="Carbon Monoxide" client="false" server="false" clientLocked="true" serverLocked="false"></include>
20+
+ <include cluster="Carbon Monoxide Concentration Measurement" client="false" server="false" clientLocked="true" serverLocked="false"></include>
21+
<include cluster="Power Source" client="false" server="true" clientLocked="true" serverLocked="true"></include>
22+
<include cluster="Descriptor" client="false" server="true" clientLocked="true" serverLocked="true"></include>
23+
</clusters>
24+
--
25+
2.47.0
26+

0 commit comments

Comments
 (0)