Skip to content

Commit b706e75

Browse files
arkqarkq
authored
Merge branch 'master' into tizen-update
2 parents a545fea + ba375be commit b706e75

File tree

147 files changed

+8577
-877
lines changed

Some content is hidden

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

147 files changed

+8577
-877
lines changed

‎.github/actions/bootstrap-cache/action.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ runs:
1111
attempt_limit: 3
1212
attempt_delay: 2000
1313
with: |
14-
key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
14+
key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**', '/etc/lsb-release') }}
1515
path: |
1616
.environment
1717
build_overrides/pigweed_environment.gni

‎.github/actions/bootstrap/action.yaml

+6-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,12 @@ runs:
2626
# because the bootstrapped Pigweed environment contains absolute paths.
2727
echo "Calculating bootstrap cache key for '$PWD'"
2828
FILES_HASH="${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}"
29-
FINAL_HASH="$(echo "$PWD:$FILES_HASH" | shasum -a 256 | cut -d' ' -f1)"
29+
case "$RUNNER_OS" in
30+
macOS) OS_HASH="$(sw_vers | shasum -a 256 | cut -d' ' -f1)";;
31+
*) OS_HASH="$(shasum -a 256 /etc/lsb-release | cut -d' ' -f1)";;
32+
esac
33+
PYTHON_HASH="$(python --version | shasum -a 256 | cut -d' ' -f1)"
34+
FINAL_HASH="$(echo "$PWD:$FILES_HASH:$OS_HASH:$PYTHON_HASH" | shasum -a 256 | cut -d' ' -f1)"
3035
echo key="${RUNNER_OS}-${RUNNER_ARCH}-${{ inputs.platform }}-${FINAL_HASH}" | tee -a "$GITHUB_OUTPUT"
3136
3237
# Split caches across backends

‎.github/workflows/bloat_check.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
runs-on: ubuntu-latest
3535

3636
container:
37-
image: ghcr.io/project-chip/chip-build:54
37+
image: ghcr.io/project-chip/chip-build:65
3838

3939
steps:
4040
- name: Checkout

‎.github/workflows/build.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
if: github.actor != 'restyled-io[bot]'
4343

4444
container:
45-
image: ghcr.io/project-chip/chip-build:54
45+
image: ghcr.io/project-chip/chip-build:65
4646
volumes:
4747
- "/:/runner-root-volume"
4848
- "/tmp/log_output:/tmp/test_logs"
@@ -456,7 +456,7 @@ jobs:
456456
if: github.actor != 'restyled-io[bot]'
457457

458458
container:
459-
image: ghcr.io/project-chip/chip-build:54
459+
image: ghcr.io/project-chip/chip-build:65
460460
volumes:
461461
- "/:/runner-root-volume"
462462
- "/tmp/log_output:/tmp/test_logs"

‎.github/workflows/chef.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
if: github.actor != 'restyled-io[bot]'
3636

3737
container:
38-
image: ghcr.io/project-chip/chip-build:54
38+
image: ghcr.io/project-chip/chip-build:65
3939
options: --user root
4040

4141
steps:

‎.github/workflows/examples-asr.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
if: github.actor != 'restyled-io[bot]'
3737

3838
container:
39-
image: ghcr.io/project-chip/chip-build-asr:54
39+
image: ghcr.io/project-chip/chip-build-asr:65
4040
options: --user root
4141

4242
steps:

‎.github/workflows/examples-efr32.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
if: github.actor != 'restyled-io[bot]'
4141

4242
container:
43-
image: ghcr.io/project-chip/chip-build-efr32:56
43+
image: ghcr.io/project-chip/chip-build-efr32:65
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646
steps:

‎.github/workflows/examples-linux-standalone.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
if: github.actor != 'restyled-io[bot]'
3737

3838
container:
39-
image: ghcr.io/project-chip/chip-build:54
39+
image: ghcr.io/project-chip/chip-build:65
4040
volumes:
4141
- "/tmp/bloat_reports:/tmp/bloat_reports"
4242

‎.github/workflows/examples-linux-tv-casting-app.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
if: github.actor != 'restyled-io[bot]'
3737

3838
container:
39-
image: ghcr.io/project-chip/chip-build:54
39+
image: ghcr.io/project-chip/chip-build:65
4040

4141
steps:
4242
- name: Checkout

‎.github/workflows/examples-mbed.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
if: github.actor != 'restyled-io[bot]'
4343

4444
container:
45-
image: ghcr.io/project-chip/chip-build-mbed-os:54
45+
image: ghcr.io/project-chip/chip-build-mbed-os:65
4646
volumes:
4747
- "/tmp/bloat_reports:/tmp/bloat_reports"
4848

‎.github/workflows/examples-mw320.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
if: github.actor != 'restyled-io[bot]'
4040

4141
container:
42-
image: ghcr.io/project-chip/chip-build:54
42+
image: ghcr.io/project-chip/chip-build:65
4343
volumes:
4444
- "/tmp/bloat_reports:/tmp/bloat_reports"
4545
steps:

‎.github/workflows/examples-nuttx.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
if: github.actor != 'restyled-io[bot]'
3636

3737
container:
38-
image: ghcr.io/project-chip/chip-build-nuttx:54
38+
image: ghcr.io/project-chip/chip-build-nuttx:65
3939
volumes:
4040
- "/tmp/bloat_reports:/tmp/bloat_reports"
4141
steps:

‎.github/workflows/examples-nxp.yaml

+28-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
if: github.actor != 'restyled-io[bot]'
4040

4141
container:
42-
image: ghcr.io/project-chip/chip-build-k32w:54
42+
image: ghcr.io/project-chip/chip-build-k32w:65
4343
volumes:
4444
- "/tmp/bloat_reports:/tmp/bloat_reports"
4545
steps:
@@ -96,3 +96,30 @@ jobs:
9696
if: ${{ !env.ACT }}
9797
with:
9898
platform-name: K32W
99+
100+
zephyr:
101+
name: ZEPHYR_RW61X
102+
103+
runs-on: ubuntu-latest
104+
if: github.actor != 'restyled-io[bot]'
105+
106+
container:
107+
image: ghcr.io/project-chip/chip-build-nxp-zephyr:65
108+
109+
steps:
110+
- name: Checkout
111+
uses: actions/checkout@v4
112+
- name: Checkout submodules & Bootstrap
113+
uses: ./.github/actions/checkout-submodules-and-bootstrap
114+
with:
115+
platform: nxp
116+
117+
- name: Build RW61x Zephyr examples
118+
run: |
119+
scripts/run_in_build_env.sh "\
120+
./scripts/build/build_examples.py \
121+
--target nxp-rw61x-zephyr-all-clusters \
122+
--target nxp-rw61x-zephyr-thermostat \
123+
--target nxp-rw61x-zephyr-laundry-washer-factory \
124+
build \
125+
"

‎.github/workflows/examples-openiotsdk.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
if: github.actor != 'restyled-io[bot]'
4141

4242
container:
43-
image: ghcr.io/project-chip/chip-build-openiotsdk:54
43+
image: ghcr.io/project-chip/chip-build-openiotsdk:65
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646
options: --privileged

‎.github/workflows/examples-qpg.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
if: github.actor != 'restyled-io[bot]'
4040

4141
container:
42-
image: ghcr.io/project-chip/chip-build:54
42+
image: ghcr.io/project-chip/chip-build:65
4343
volumes:
4444
- "/tmp/bloat_reports:/tmp/bloat_reports"
4545
steps:

‎.github/workflows/examples-rw61x.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
if: github.actor != 'restyled-io[bot]'
4040

4141
container:
42-
image: ghcr.io/project-chip/chip-build-rw61x:54
42+
image: ghcr.io/project-chip/chip-build-rw61x:65
4343
volumes:
4444
- "/tmp/bloat_reports:/tmp/bloat_reports"
4545
steps:

‎.github/workflows/examples-stm32.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
if: github.actor != 'restyled-io[bot]'
4141

4242
container:
43-
image: ghcr.io/project-chip/chip-build:54
43+
image: ghcr.io/project-chip/chip-build:65
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646
steps:

‎.github/workflows/examples-telink.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
if: github.actor != 'restyled-io[bot]'
3939

4040
container:
41-
image: ghcr.io/project-chip/chip-build-telink:57
41+
image: ghcr.io/project-chip/chip-build-telink:65
4242
volumes:
4343
- "/tmp/bloat_reports:/tmp/bloat_reports"
4444

‎.github/workflows/examples-tizen.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
if: github.actor != 'restyled-io[bot]'
3737

3838
container:
39-
image: ghcr.io/project-chip/chip-build-tizen:54
39+
image: ghcr.io/project-chip/chip-build-tizen:65
4040
options: --user root
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"

‎.github/workflows/full-android.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
if: github.actor != 'restyled-io[bot]'
3939

4040
container:
41-
image: ghcr.io/project-chip/chip-build-android:54
41+
image: ghcr.io/project-chip/chip-build-android:65
4242
volumes:
4343
- "/tmp/log_output:/tmp/test_logs"
4444

‎.github/workflows/fuzzing-build.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
if: github.actor != 'restyled-io[bot]'
3434

3535
container:
36-
image: ghcr.io/project-chip/chip-build:54
36+
image: ghcr.io/project-chip/chip-build:65
3737
volumes:
3838
- "/tmp/log_output:/tmp/test_logs"
3939

‎.github/workflows/lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
if: github.actor != 'restyled-io[bot]'
3636

3737
container:
38-
image: ghcr.io/project-chip/chip-build:54
38+
image: ghcr.io/project-chip/chip-build:65
3939

4040
steps:
4141
- name: Checkout

‎.github/workflows/minimal-build.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
runs-on: ubuntu-latest
3434

3535
container:
36-
image: ghcr.io/project-chip/chip-build-minimal:54
36+
image: ghcr.io/project-chip/chip-build-minimal:65
3737

3838
steps:
3939
- name: Checkout
@@ -55,7 +55,7 @@ jobs:
5555
runs-on: ubuntu-latest
5656

5757
container:
58-
image: ghcr.io/project-chip/chip-build-minimal:54
58+
image: ghcr.io/project-chip/chip-build-minimal:65
5959

6060
steps:
6161
- name: Checkout

‎.github/workflows/smoketest-android.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
if: github.actor != 'restyled-io[bot]'
3838

3939
container:
40-
image: ghcr.io/project-chip/chip-build-android:54
40+
image: ghcr.io/project-chip/chip-build-android:65
4141
volumes:
4242
- "/:/runner-root-volume"
4343
- "/tmp/log_output:/tmp/test_logs"

‎.github/workflows/tests.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ jobs:
445445
runs-on: ubuntu-latest
446446

447447
container:
448-
image: ghcr.io/project-chip/chip-build:54
448+
image: ghcr.io/project-chip/chip-build:65
449449
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
450450
net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0"
451451

@@ -582,6 +582,8 @@ jobs:
582582
scripts/run_in_python_env.sh out/venv './scripts/tests/TestTimeSyncTrustedTimeSourceRunner.py'
583583
scripts/run_in_python_env.sh out/venv './src/python_testing/test_testing/test_TC_ICDM_2_1.py'
584584
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestIdChecks.py'
585+
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestSpecParsingDeviceType.py'
586+
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestConformanceSupport.py'
585587
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/test_testing/test_IDM_10_4.py'
586588
587589
- name: Uploading core files

‎.github/workflows/unit_integration_test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
runs-on: ubuntu-latest
4040

4141
container:
42-
image: ghcr.io/project-chip/chip-build:54
42+
image: ghcr.io/project-chip/chip-build:65
4343
volumes:
4444
- "/:/runner-root-volume"
4545
- "/tmp/log_output:/tmp/test_logs"

‎.github/workflows/zap_regeneration.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
runs-on: ubuntu-20.04
3232
container:
33-
image: ghcr.io/project-chip/chip-build:54
33+
image: ghcr.io/project-chip/chip-build:65
3434
defaults:
3535
run:
3636
shell: sh

‎.github/workflows/zap_templates.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
runs-on: ubuntu-20.04
3636
container:
37-
image: ghcr.io/project-chip/chip-build:54
37+
image: ghcr.io/project-chip/chip-build:65
3838
defaults:
3939
run:
4040
shell: sh

‎.vscode/settings.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,8 @@
133133
"random": "cpp",
134134
"thread": "cpp",
135135
"variant": "cpp",
136-
"any": "cpp"
136+
"any": "cpp",
137+
"future": "cpp"
137138
},
138139
// Configure paths or glob patterns to exclude from file watching.
139140
"files.watcherExclude": {

‎docs/zap_clusters.md

+1
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ Generally regenerate using one of:
8787
| 155 | 0x9B | EnergyPreference |
8888
| 156 | 0x9C | PowerTopology |
8989
| 157 | 0x9D | EnergyEvseMode |
90+
| 158 | 0x9E | WaterHeaterMode |
9091
| 159 | 0x9F | DeviceEnergyManagementMode |
9192
| 257 | 0x101 | DoorLock |
9293
| 258 | 0x102 | WindowCovering |

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

+42
Original file line numberDiff line numberDiff line change
@@ -9265,6 +9265,48 @@ endpoint 2 {
92659265
ram attribute clusterRevision default = 4;
92669266
}
92679267
}
9268+
endpoint 3 {
9269+
device type ma_genericswitch = 15, version 3;
9270+
9271+
9272+
server cluster Identify {
9273+
ram attribute identifyTime default = 0x0000;
9274+
ram attribute identifyType default = 0x00;
9275+
callback attribute generatedCommandList;
9276+
callback attribute acceptedCommandList;
9277+
callback attribute attributeList;
9278+
ram attribute featureMap default = 0;
9279+
ram attribute clusterRevision default = 4;
9280+
9281+
handle command Identify;
9282+
handle command TriggerEffect;
9283+
}
9284+
9285+
server cluster Descriptor {
9286+
callback attribute deviceTypeList;
9287+
callback attribute serverList;
9288+
callback attribute clientList;
9289+
callback attribute partsList;
9290+
callback attribute tagList;
9291+
callback attribute generatedCommandList;
9292+
callback attribute acceptedCommandList;
9293+
callback attribute attributeList;
9294+
callback attribute featureMap;
9295+
callback attribute clusterRevision;
9296+
}
9297+
9298+
server cluster Switch {
9299+
emits event InitialPress;
9300+
emits event LongPress;
9301+
emits event LongRelease;
9302+
emits event MultiPressComplete;
9303+
ram attribute numberOfPositions default = 2;
9304+
ram attribute currentPosition default = 0;
9305+
ram attribute multiPressMax default = 3;
9306+
ram attribute featureMap default = 58;
9307+
ram attribute clusterRevision default = 2;
9308+
}
9309+
}
92689310
endpoint 65534 {
92699311
device type ma_secondary_network_interface = 25, version 1;
92709312

0 commit comments

Comments
 (0)