Skip to content

Commit ffb66b4

Browse files
sabollim-silabssabollim-silabs
authored
Merge branch 'feature/closure_dimension_cluster_xml_zap_code_generation' into closure_dimension_cluster_server_code
2 parents a68b358 + 7776e40 commit ffb66b4

File tree

483 files changed

+77587
-4914
lines changed

Some content is hidden

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

483 files changed

+77587
-4914
lines changed

‎.devcontainer/Dockerfile

+8-13
Original file line numberDiff line numberDiff line change
@@ -56,23 +56,18 @@ RUN curl https://raw.githubusercontent.com/restyled-io/restyler/master/bin/resty
5656

5757
RUN mkdir -p /opt/android/sdk \
5858
&& chown -R $USERNAME:$USERNAME \
59-
/opt/android/sdk `# NXP uses a patch_sdk script to change SDK files` \
6059
$ANDROID_HOME \
6160
$IDF_TOOLS_PATH \
62-
&& find $AMEBA_PATH -name "inc_lp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
63-
&& find $AMEBA_PATH -name "inc_hp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
64-
&& find $AMEBA_PATH -name "project_lp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
65-
&& find $AMEBA_PATH -name "project_hp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
66-
&& chmod -R +x \
67-
$ANDROID_HOME/cmdline-tools/10.0/bin `# sdkmanager for accepting licenses`\
61+
&& find $AMEBA_PATH \
62+
-name "inc_lp" -print0 -or \
63+
-name "inc_hp" -print0 -or \
64+
-name "project_lp" -print0 -or \
65+
-name "project_hp" -print0 \
66+
| xargs -0 -I {} sh -c 'chown -R $USERNAME:$USERNAME {}; chmod -R +w {}' \
67+
&& find $ANDROID_HOME/cmdline-tools/ -type d -name bin | xargs chmod -R +x `# sdkmanager for accepting licenses` \
6868
&& chmod -R +w \
6969
$IDF_TOOLS_PATH \
70-
&& find $AMEBA_PATH -name "inc_lp" -print0 | xargs -0 chmod -R +w \
71-
&& find $AMEBA_PATH -name "inc_hp" -print0 | xargs -0 chmod -R +w \
72-
&& find $AMEBA_PATH -name "project_lp" -print0 | xargs -0 chmod -R +w \
73-
&& find $AMEBA_PATH -name "project_hp" -print0 | xargs -0 chmod -R +w \
74-
# Safe directory is preferred over chown.
75-
&& git config --global --add safe.directory "*" \
70+
&& git config --global --add safe.directory "*" `# Safe directory is preferred over chown.` \
7671
&& :
7772

7873
# Fix Tizen SDK paths for new user

‎.devcontainer/build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
HERE="$(dirname "$0")"
2020
CHIP_ROOT="$(realpath "$HERE"/..)"
21-
BUILD_VERSION="latest"
21+
BUILD_VERSION=$(sed 's/ .*//' "$CHIP_ROOT/integrations/docker/images/base/chip-build/version")
2222
IMAGE_TAG="matter-dev-environment:local"
2323
USER_UID=$UID
2424

@@ -32,7 +32,7 @@ Options:
3232
-h,--help Show this help
3333
-t,--tag Image tag - default is matter-dev-environment:local
3434
-u,--uid User UIDa - default is the current user ID
35-
-v,--version Build version - default is the latest
35+
-v,--version Build version - default is the version of the base chip-build docker image
3636
EOF
3737
}
3838

‎.devcontainer/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"type": "bind"
2121
}
2222
],
23-
"initializeCommand": "bash .devcontainer/build.sh --tag matter-dev-environment:local --version 97",
23+
"initializeCommand": "bash .devcontainer/build.sh",
2424
"image": "matter-dev-environment:local",
2525
"remoteUser": "vscode",
2626
"containerEnv": {

‎.github/.wordlist.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1201,6 +1201,7 @@ READMEs
12011201
readonly
12021202
readthedocs
12031203
Reag
1204+
Realtek
12041205
rebase
12051206
recommand
12061207
recommanded

‎.github/workflows/build.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ jobs:
210210
./scripts/run_in_build_env.sh "./scripts/run_codegen_targets.sh out/sanitizers"
211211
- name: Find changed files
212212
id: changed-files
213-
uses: tj-actions/changed-files@v45
213+
uses: tj-actions/changed-files@v46
214214
with:
215215
# Exclude all files under "third_party/"
216216
files-ignore: |
@@ -446,7 +446,7 @@ jobs:
446446
./scripts/run_in_build_env.sh "./scripts/run_codegen_targets.sh out/default"
447447
- name: Find changed files
448448
id: changed-files
449-
uses: tj-actions/changed-files@v45
449+
uses: tj-actions/changed-files@v46
450450
- name: Clang-tidy validation
451451
# NOTE: clang-tidy crashes on CodegenDataModel_Write due to Nullable/std::optional check.
452452
# See https://github.com/llvm/llvm-project/issues/97426

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ jobs:
247247
build"
248248
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
249249
linux debug camera-controller \
250-
out/linux-x64-camera-controller/camera-controller \
250+
out/linux-x64-camera-controller/chip-camera-controller \
251251
/tmp/bloat_reports/
252252
- name: Uploading Size Reports
253253
uses: ./.github/actions/upload-size-reports

‎.github/workflows/restyled.yml

-5
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ jobs:
1515
uses: actions/checkout@v4
1616

1717
- uses: restyled-io/actions/setup@v4
18-
with:
19-
# TODO: Pinned to v0.6.0.2 because the latest release does not have a pre-built
20-
# 'restyler-linux' asset. This broke our workflow as we rely on the pre-built binary.
21-
# Remove this pin once a new release with the 'restyler-linux' asset is available.
22-
tag: 'v0.6.0.2'
2318

2419
- id: restyler
2520
uses: restyled-io/actions/run@v4

‎.gitmodules

+5-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
path = third_party/freertos/repo
5151
url = https://github.com/FreeRTOS/FreeRTOS-Kernel.git
5252
branch = V10.3.1-kernel-only
53-
platforms = ameba,cc13xx_26xx,bouffalolab,esp32,infineon,qpg,cc32xx
53+
platforms = ameba,cc13xx_26xx,bouffalolab,esp32,infineon,qpg,cc32xx,realtek_bee
5454
[submodule "simw-top-mini"]
5555
path = third_party/simw-top-mini/repo
5656
url = https://github.com/NXP/plug-and-trust.git
@@ -354,3 +354,7 @@
354354
url = https://github.com/paullouisageneau/libdatachannel.git
355355
platforms = linux
356356
recursive = true
357+
[submodule "third_party/openthread/ot-realtek"]
358+
path = third_party/openthread/ot-realtek
359+
url = https://github.com/rtkconnectivity/ot-realtek.git
360+
platforms = realtek_bee

‎CONTRIBUTING.md

+9
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,15 @@ out of convenience.
253253
fixing a typo in an ID still requires some description on how you checked
254254
that the new ID takes effect.
255255

256+
> [!TIP]
257+
>
258+
> When working on a pull request for Matter SDK refrain from using the "Update
259+
> branch" feature in the GitHub UI too often. Updating the PR branch in this way
260+
> triggers the CI workflows cancellation and restart. This feature should be
261+
> used only when a PR has not been worked on for a long time and a lot of
262+
> divergence has accumulated. Your PR branch being out of sync with master is
263+
> not a blocker for merging an approved PR.
264+
256265
### Review Requirements
257266

258267
#### Documentation Best Practices

‎build_overrides/bee_sdk.gni

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Copyright (c) 2020-2021 Project CHIP Authors
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
declare_args() {
16+
# Root directory for Bee SDK.
17+
bee_sdk_build_root = "//third_party/bee_sdk"
18+
}

‎config/esp32/components/chip/idf_component.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ dependencies:
3737
- if: "idf_version >=4.3"
3838

3939
espressif/esp_wifi_remote:
40-
version: ">=0.1.12"
40+
version: "^0.7.0"
4141
rules:
4242
- if: "target in [esp32p4]"

‎config/realtek_bee/.gn

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# Copyright (c) 2020 Project CHIP Authors
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
import("//build_overrides/build.gni")
16+
17+
# The location of the build configuration file.
18+
buildconfig = "${build_root}/config/BUILDCONFIG.gn"
19+
20+
# CHIP uses angle bracket includes.
21+
check_system_includes = true
22+
23+
default_args = {
24+
target_cpu = "arm"
25+
target_os = "freertos"
26+
27+
import("//args.gni")
28+
}

‎config/realtek_bee/BUILD.gn

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Copyright (c) 2020 Project CHIP Authors
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
# Options from standalone-chip.mk that differ from configure defaults. These
16+
# options are used from examples/.
17+
18+
import("//build_overrides/build.gni")
19+
import("//build_overrides/chip.gni")
20+
21+
import("${chip_root}/build/chip/tests.gni")
22+
23+
declare_args() {
24+
chip_build_pw_rpc_lib = false
25+
}
26+
27+
group("realtek_bee") {
28+
deps = [ "${chip_root}/src/lib" ]
29+
30+
if (chip_build_pw_rpc_lib) {
31+
deps += [ "//lib/pw_rpc" ]
32+
}
33+
34+
if (chip_build_tests) {
35+
deps += [ "${chip_root}/src:tests" ]
36+
}
37+
}

‎config/realtek_bee/args.gni

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# Copyright (c) 2020 Project CHIP Authors
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
# Options from standalone-chip.mk that differ from configure defaults. These
16+
# options are used from examples/.
17+
18+
import("//build_overrides/chip.gni")
19+
import("//build_overrides/pigweed.gni")
20+
21+
chip_device_platform = "realtek_bee"
22+
23+
# ARM architecture flags will be set for Bee
24+
arm_platform_config = "${chip_root}/config/realtek_bee/bee_arm.gni"
25+
26+
chip_project_config_include = ""
27+
chip_system_project_config_include = ""
28+
chip_ble_project_config_include = ""
29+
30+
mbedtls_target = "//mbedtls:mbedtls"
31+
lwip_platform = "external"
32+
33+
chip_build_tests = false
34+
35+
chip_enable_openthread = true
36+
37+
chip_inet_config_enable_ipv4 = false
38+
chip_inet_config_enable_tcp_endpoint = false
39+
chip_enable_nfc_onboarding_payload = false
40+
chip_build_libshell = false
41+
chip_enable_ota_requestor = false
42+
43+
openthread_root = ""
44+
45+
chip_config_network_layer_ble = true
46+
47+
custom_toolchain =
48+
"//third_party/connectedhomeip/config/realtek_bee/toolchain:realtek_bee"

‎config/realtek_bee/bee_arm.gni

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Copyright (c) 2020 Project CHIP Authors
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
arm_arch = "armv8.1-m.main+dsp+mve+fp"
16+
17+
arm_float_abi = "hard"

‎config/realtek_bee/build

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
third_party/connectedhomeip/build

‎config/realtek_bee/build_overrides

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../examples/build_overrides

0 commit comments

Comments
 (0)