Skip to content

Commit 1a9d6d1

Browse files
mkardous-silabsmkardous-silabs
authored
Sync csa branch with main (#292)
2 parents d3f3c85 + 33aec35 commit 1a9d6d1

File tree

159 files changed

+11841
-371
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

159 files changed

+11841
-371
lines changed

‎.github/workflows/cherry-picks.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
with:
2424
fetch-depth: 0
2525
- name: Cherry-Pick into sve branch
26-
uses: carloscastrojumo/github-cherry-pick-action@v1.0.9
26+
uses: carloscastrojumo/github-cherry-pick-action@v1.0.10
2727
with:
2828
token: ${{ secrets.MATTER_PAT }}
2929
branch: 1.3-sve

‎.github/workflows/cirque.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
- name: Get Cirque Bootstrap cache key
7676
id: cirque-bootstrap-cache-key
7777
run: echo "val=$(scripts/tests/cirque_tests.sh cachekeyhash)" >> $GITHUB_OUTPUT
78-
- uses: Wandalen/wretry.action@v1.4.10
78+
- uses: Wandalen/wretry.action@v3.8.0
7979
name: Cirque Bootstrap cache
8080
if: ${{ !env.ACT }}
8181
continue-on-error: true

‎.github/workflows/docbuild.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
touch _build/html/.nojekyll
4747
- name: Deploy to gh-pages
4848
if: github.repository == 'project-chip/connectedhomeip' && github.event_name == 'push' && github.ref_name == 'master'
49-
uses: peaceiris/actions-gh-pages@v3
49+
uses: peaceiris/actions-gh-pages@v4
5050
with:
5151
deploy_key: ${{ secrets.DOXYGEN_DEPLOY_KEY }}
5252
external_repository: project-chip/connectedhomeip-doc

‎.github/workflows/doxygen.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
id: extract_branch
102102
- name: Deploy if master
103103
if: steps.extract_branch.outputs.branch == 'master' && github.repository == 'project-chip/connectedhomeip'
104-
uses: peaceiris/actions-gh-pages@v3
104+
uses: peaceiris/actions-gh-pages@v4
105105
with:
106106
deploy_key: ${{ secrets.DOXYGEN_DEPLOY_KEY }}
107107
external_repository: project-chip/connectedhomeip-doc

‎.github/workflows/gradle-wrapper-validation.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- uses: actions/checkout@v4
15-
- uses: Wandalen/wretry.action@v1.4.5
15+
- uses: Wandalen/wretry.action@v3.8.0
1616
name: Gradle Validation
1717
continue-on-error: true
1818
with:

‎.github/workflows/kotlin-style.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: actions/checkout@v4
2323

2424
- name: "detekt"
25-
uses: natiginfo/action-detekt-all@1.23.6
25+
uses: natiginfo/action-detekt-all@1.23.7
2626
# Detekt seems not to like circular symlinks, so we set up
2727
# explicit paths below
2828
#

‎.github/workflows/recent_fail_summary.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
env:
3535
GH_TOKEN: ${{ github.token }}
3636
- name: Update Docs
37-
uses: test-room-7/action-update-file@v1
37+
uses: test-room-7/action-update-file@v2
3838
with:
3939
file-path: docs/daily_pass_percentage.md
4040
commit-msg: Update daily pass percentage

‎.github/workflows/restyled.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
!cancelled() &&
3131
steps.restyler.outputs.success == 'true' &&
3232
github.event.pull_request.head.repo.full_name == github.repository
33-
uses: peter-evans/create-pull-request@v6
33+
uses: peter-evans/create-pull-request@v7
3434
with:
3535
base: ${{ steps.restyler.outputs.restyled-base }}
3636
branch: ${{ steps.restyler.outputs.restyled-head }}

‎.github/workflows/spell.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ jobs:
3434
steps:
3535
- name: Checkout
3636
uses: actions/checkout@v4
37-
- uses: rojopolis/spellcheck-github-actions@0.36.0
37+
- uses: rojopolis/spellcheck-github-actions@0.47.0

‎.github/workflows/tests.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ jobs:
9393
--log-level info \
9494
src/app/zap-templates/zcl/data-model/chip/global-attributes.xml \
9595
src/app/zap-templates/zcl/data-model/chip/chime-cluster.xml \
96+
src/app/zap-templates/zcl/data-model/chip/closure-control-cluster.xml \
9697
src/app/zap-templates/zcl/data-model/chip/global-bitmaps.xml \
9798
src/app/zap-templates/zcl/data-model/chip/global-enums.xml \
9899
src/app/zap-templates/zcl/data-model/chip/global-structs.xml \

‎docs/ids_and_codes/zap_clusters.md

+1
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ Generally regenerate using one of:
8989
| 159 | 0x9F | DeviceEnergyManagementMode |
9090
| 257 | 0x101 | DoorLock |
9191
| 258 | 0x102 | WindowCovering |
92+
| 260 | 0x104 | ClosureControl |
9293
| 336 | 0x150 | ServiceArea |
9394
| 512 | 0x200 | PumpConfigurationAndControl |
9495
| 513 | 0x201 | Thermostat |

‎examples/air-quality-sensor-app/linux/AirQualitySensorAppAttrUpdateDelegate.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include <app/clusters/software-diagnostics-server/software-diagnostics-server.h>
2424
#include <app/clusters/switch-server/switch-server.h>
2525
#include <app/server/Server.h>
26-
#include <app/util/att-storage.h>
2726
#include <platform/PlatformManager.h>
2827

2928
#include <air-quality-sensor-manager.h>

‎examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include <app/clusters/software-diagnostics-server/software-diagnostics-server.h>
2727
#include <app/clusters/switch-server/switch-server.h>
2828
#include <app/server/Server.h>
29-
#include <app/util/att-storage.h>
3029
#include <app/util/attribute-storage.h>
3130
#include <platform/PlatformManager.h>
3231

‎examples/all-clusters-app/linux/main-common.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
#include <app/clusters/time-synchronization-server/time-synchronization-server.h>
5454
#include <app/clusters/valve-configuration-and-control-server/valve-configuration-and-control-server.h>
5555
#include <app/server/Server.h>
56-
#include <app/util/att-storage.h>
5756
#include <app/util/attribute-storage.h>
5857
#include <lib/support/CHIPMem.h>
5958
#include <platform/DeviceInstanceInfoProvider.h>

‎examples/all-clusters-minimal-app/linux/main-common.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include <app/CommandHandler.h>
2222
#include <app/clusters/identify-server/identify-server.h>
2323
#include <app/server/Server.h>
24-
#include <app/util/att-storage.h>
2524
#include <lib/support/CHIPMem.h>
2625
#include <new>
2726
#include <platform/PlatformManager.h>

‎examples/bridge-app/esp32/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ defined:
5454
definition.
5555

5656
- All attributes defined with these macros will be configured as
57-
`ATTRIBUTE_MASK_EXTERNAL_STORAGE` in the ZCL database and therefore will
58-
rely on the application to maintain storage for the attribute. Consequently,
59-
reads or writes to these attributes must be handled within the application
60-
by the `emberAfExternalAttributeWriteCallback` and
57+
`MATTER_ATTRIBUTE_FLAG_EXTERNAL_STORAGE` in the ZCL database and therefore
58+
will rely on the application to maintain storage for the attribute.
59+
Consequently, reads or writes to these attributes must be handled within the
60+
application by the `emberAfExternalAttributeWriteCallback` and
6161
`emberAfExternalAttributeReadCallback` functions. See the bridge
6262
application's `main.cpp` for an example of this implementation.
6363

‎examples/bridge-app/linux/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ defined:
4545
definition.
4646

4747
- All attributes defined with these macros will be configured as
48-
`ATTRIBUTE_MASK_EXTERNAL_STORAGE` in the ZCL database and therefore will
49-
rely on the application to maintain storage for the attribute. Consequently,
50-
reads or writes to these attributes must be handled within the application
51-
by the `emberAfExternalAttributeWriteCallback` and
48+
`MATTER_ATTRIBUTE_FLAG_EXTERNAL_STORAGE` in the ZCL database and therefore
49+
will rely on the application to maintain storage for the attribute.
50+
Consequently, reads or writes to these attributes must be handled within the
51+
application by the `emberAfExternalAttributeWriteCallback` and
5252
`emberAfExternalAttributeReadCallback` functions. See the bridge
5353
application's `main.cpp` for an example of this implementation.
5454

‎examples/bridge-app/telink/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ defined:
5656
definition.
5757

5858
- All attributes defined with these macros will be configured as
59-
`ATTRIBUTE_MASK_EXTERNAL_STORAGE` in the ZCL database and therefore will
60-
rely on the application to maintain storage for the attribute. Consequently,
61-
reads or writes to these attributes must be handled within the application
62-
by the `emberAfExternalAttributeWriteCallback` and
59+
`MATTER_ATTRIBUTE_FLAG_EXTERNAL_STORAGE` in the ZCL database and therefore
60+
will rely on the application to maintain storage for the attribute.
61+
Consequently, reads or writes to these attributes must be handled within the
62+
application by the `emberAfExternalAttributeWriteCallback` and
6363
`emberAfExternalAttributeReadCallback` functions. See the bridge
6464
application's `main.cpp` for an example of this implementation.
6565

‎examples/chef/chef.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -884,7 +884,7 @@ def main() -> int:
884884
"""))
885885
if options.do_clean:
886886
shell.run_cmd("rm -rf out")
887-
shell.run_cmd("gn gen --add-export-compile-commands=* out")
887+
shell.run_cmd("gn gen --add-export-compile-commands=\"*\" out")
888888
shell.run_cmd("ninja -C out")
889889

890890
#

‎examples/chef/common/clusters/switch/SwitchEventHandler.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#ifdef MATTER_DM_PLUGIN_SWITCH_SERVER
2121
#include <app/clusters/switch-server/switch-server.h>
2222
#include <app/server/Server.h>
23-
#include <app/util/att-storage.h>
2423
#include <platform/PlatformManager.h>
2524

2625
#include "SwitchEventHandler.h"

‎examples/chef/common/clusters/switch/SwitchManager.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include <app-common/zap-generated/attributes/Accessors.h>
2222
#include <app/clusters/switch-server/switch-server.h>
2323
#include <app/server/Server.h>
24-
#include <app/util/att-storage.h>
2524
#include <app/util/attribute-storage.h>
2625
#include <platform/PlatformManager.h>
2726

‎examples/chef/esp32/main/main.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
#include <app-common/zap-generated/callback.h>
4343
#include <app-common/zap-generated/cluster-objects.h>
4444
#include <app/server/Dnssd.h>
45-
#include <app/util/att-storage.h>
4645
#include <setup_payload/QRCodeSetupPayloadGenerator.h>
4746

4847
#include "Display.h"

‎examples/fabric-bridge-app/linux/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ defined:
5151
definition.
5252

5353
- All attributes defined with these macros will be configured as
54-
`ATTRIBUTE_MASK_EXTERNAL_STORAGE` in the ZCL database and therefore will
55-
rely on the application to maintain storage for the attribute. Consequently,
56-
reads or writes to these attributes must be handled within the application
57-
by the `emberAfExternalAttributeWriteCallback` and
54+
`MATTER_ATTRIBUTE_FLAG_EXTERNAL_STORAGE` in the ZCL database and therefore
55+
will rely on the application to maintain storage for the attribute.
56+
Consequently, reads or writes to these attributes must be handled within the
57+
application by the `emberAfExternalAttributeWriteCallback` and
5858
`emberAfExternalAttributeReadCallback` functions. See the bridge
5959
application's `main.cpp` for an example of this implementation.
6060

‎examples/fabric-sync/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ defined:
5151
definition.
5252

5353
- All attributes defined with these macros will be configured as
54-
`ATTRIBUTE_MASK_EXTERNAL_STORAGE` in the ZCL database and therefore will
55-
rely on the application to maintain storage for the attribute. Consequently,
56-
reads or writes to these attributes must be handled within the application
57-
by the `emberAfExternalAttributeWriteCallback` and
54+
`MATTER_ATTRIBUTE_FLAG_EXTERNAL_STORAGE` in the ZCL database and therefore
55+
will rely on the application to maintain storage for the attribute.
56+
Consequently, reads or writes to these attributes must be handled within the
57+
application by the `emberAfExternalAttributeWriteCallback` and
5858
`emberAfExternalAttributeReadCallback` functions. See the bridge
5959
application's `main.cpp` for an example of this implementation.
6060

‎examples/light-switch-app/cc13x4_26x4/src/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
#include <ti/drivers/apps/LED.h>
6363

6464
#if CHIP_CONFIG_ENABLE_ICD_UAT
65-
#include "app/icd/server/ICDNotifier.h"
65+
#include "app/icd/server/ICDNotifier.h" // nogncheck
6666
#endif
6767

6868
/* syscfg */

‎examples/lighting-app-data-mode-no-unique-id/linux/LightingAppCommandDelegate.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include <app/clusters/software-diagnostics-server/software-diagnostics-server.h>
2424
#include <app/clusters/switch-server/switch-server.h>
2525
#include <app/server/Server.h>
26-
#include <app/util/att-storage.h>
2726
#include <app/util/attribute-storage.h>
2827
#include <platform/PlatformManager.h>
2928

‎examples/lighting-app/cc13x4_26x4/src/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
#include <ti/drivers/apps/LED.h>
5858

5959
#if CHIP_CONFIG_ENABLE_ICD_UAT
60-
#include "app/icd/server/ICDNotifier.h"
60+
#include "app/icd/server/ICDNotifier.h" // nogncheck
6161
#endif
6262

6363
/* syscfg */

‎examples/lighting-app/infineon/cyw30739/src/LightingManager.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
#include "LightingManager.h"
2121
#include <app-common/zap-generated/attributes/Accessors.h>
22-
#include <app/util/att-storage.h>
2322
#include <stdio.h>
2423

2524
using namespace chip;

‎examples/lighting-app/linux/LightingAppCommandDelegate.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include <app/clusters/software-diagnostics-server/software-diagnostics-server.h>
2424
#include <app/clusters/switch-server/switch-server.h>
2525
#include <app/server/Server.h>
26-
#include <app/util/att-storage.h>
2726
#include <app/util/attribute-storage.h>
2827
#include <platform/PlatformManager.h>
2928

‎examples/lock-app/cc13x4_26x4/src/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
#include <ti/drivers/apps/LED.h>
5757

5858
#if CHIP_CONFIG_ENABLE_ICD_UAT
59-
#include "app/icd/server/ICDNotifier.h"
59+
#include "app/icd/server/ICDNotifier.h" // nogncheck
6060
#endif
6161

6262
/* syscfg */

‎examples/platform/linux/AppMain.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
#include <app/clusters/device-energy-management-server/DeviceEnergyManagementTestEventTriggerHandler.h>
9999
#endif
100100
#if CHIP_CONFIG_ENABLE_ICD_SERVER
101-
#include <app/icd/server/ICDManager.h>
101+
#include <app/icd/server/ICDManager.h> // nogncheck
102102
#endif
103103
#include <app/TestEventTriggerDelegate.h>
104104

0 commit comments

Comments
 (0)