Skip to content

Commit 3a194fe

Browse files
senthilkusenthilku
authored
Merge branch 'master' into feature/closure_dimension_cluster_xml_zap_code_generation
2 parents 1a0ff21 + cbf664f commit 3a194fe

File tree

51 files changed

+888
-518
lines changed

Some content is hidden

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

51 files changed

+888
-518
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/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

‎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]"

‎examples/air-purifier-app/air-purifier-common/air-purifier-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1998,7 +1998,7 @@ cluster FanControl = 514 {
19981998

19991999
/** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
20002000
cluster TemperatureMeasurement = 1026 {
2001-
revision 1; // NOTE: Default/not specifically set
2001+
revision 4;
20022002

20032003
readonly attribute nullable temperature measuredValue = 0;
20042004
readonly attribute nullable temperature minMeasuredValue = 1;

‎examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1734,7 +1734,7 @@ cluster AirQuality = 91 {
17341734

17351735
/** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
17361736
cluster TemperatureMeasurement = 1026 {
1737-
revision 1; // NOTE: Default/not specifically set
1737+
revision 4;
17381738

17391739
readonly attribute nullable temperature measuredValue = 0;
17401740
readonly attribute nullable temperature minMeasuredValue = 1;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6280,7 +6280,7 @@ cluster IlluminanceMeasurement = 1024 {
62806280

62816281
/** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
62826282
cluster TemperatureMeasurement = 1026 {
6283-
revision 1; // NOTE: Default/not specifically set
6283+
revision 4;
62846284

62856285
readonly attribute nullable temperature measuredValue = 0;
62866286
readonly attribute nullable temperature minMeasuredValue = 1;

‎examples/all-clusters-app/esp32/sdkconfig.defaults.esp32p4

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ CONFIG_IDF_TARGET="esp32p4"
22

33
# Enable BLE Host but use remote controller
44
CONFIG_BT_NIMBLE_TRANSPORT_UART=n
5-
CONFIG_ESP_ENABLE_BT=y
5+
CONFIG_ESP_HOSTED_ENABLE_BT_NIMBLE=y
66

77
# Increase main task stack size
88
CONFIG_ESP_MAIN_TASK_STACK_SIZE=4096

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4692,7 +4692,7 @@ cluster IlluminanceMeasurement = 1024 {
46924692

46934693
/** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
46944694
cluster TemperatureMeasurement = 1026 {
4695-
revision 1; // NOTE: Default/not specifically set
4695+
revision 4;
46964696

46974697
readonly attribute nullable temperature measuredValue = 0;
46984698
readonly attribute nullable temperature minMeasuredValue = 1;

‎examples/bridge-app/bridge-common/bridge-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -2132,7 +2132,7 @@ cluster UserLabel = 65 {
21322132

21332133
/** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
21342134
cluster TemperatureMeasurement = 1026 {
2135-
revision 1; // NOTE: Default/not specifically set
2135+
revision 4;
21362136

21372137
readonly attribute nullable temperature measuredValue = 0;
21382138
readonly attribute nullable temperature minMeasuredValue = 1;

‎examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1921,7 +1921,7 @@ cluster FanControl = 514 {
19211921

19221922
/** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
19231923
cluster TemperatureMeasurement = 1026 {
1924-
revision 1; // NOTE: Default/not specifically set
1924+
revision 4;
19251925

19261926
readonly attribute nullable temperature measuredValue = 0;
19271927
readonly attribute nullable temperature minMeasuredValue = 1;

‎examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1774,7 +1774,7 @@ cluster AirQuality = 91 {
17741774

17751775
/** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
17761776
cluster TemperatureMeasurement = 1026 {
1777-
revision 1; // NOTE: Default/not specifically set
1777+
revision 4;
17781778

17791779
readonly attribute nullable temperature measuredValue = 0;
17801780
readonly attribute nullable temperature minMeasuredValue = 1;

‎examples/chef/devices/rootnode_contactsensor_lightsensor_occupancysensor_temperaturesensor_pressuresensor_flowsensor_humiditysensor_airqualitysensor_powersource_367e7cea91.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1697,7 +1697,7 @@ cluster IlluminanceMeasurement = 1024 {
16971697

16981698
/** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
16991699
cluster TemperatureMeasurement = 1026 {
1700-
revision 1; // NOTE: Default/not specifically set
1700+
revision 4;
17011701

17021702
readonly attribute nullable temperature measuredValue = 0;
17031703
readonly attribute nullable temperature minMeasuredValue = 1;

‎examples/chef/devices/rootnode_heatpump_87ivjRAECh.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -2398,7 +2398,7 @@ cluster Thermostat = 513 {
23982398

23992399
/** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
24002400
cluster TemperatureMeasurement = 1026 {
2401-
revision 1; // NOTE: Default/not specifically set
2401+
revision 4;
24022402

24032403
readonly attribute nullable temperature measuredValue = 0;
24042404
readonly attribute nullable temperature minMeasuredValue = 1;

‎examples/chef/devices/rootnode_pump_5f904818cc.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1450,7 +1450,7 @@ cluster PumpConfigurationAndControl = 512 {
14501450

14511451
/** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
14521452
cluster TemperatureMeasurement = 1026 {
1453-
revision 1; // NOTE: Default/not specifically set
1453+
revision 4;
14541454

14551455
readonly attribute nullable temperature measuredValue = 0;
14561456
readonly attribute nullable temperature minMeasuredValue = 1;

‎examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1398,7 +1398,7 @@ cluster RefrigeratorAlarm = 87 {
13981398

13991399
/** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
14001400
cluster TemperatureMeasurement = 1026 {
1401-
revision 1; // NOTE: Default/not specifically set
1401+
revision 4;
14021402

14031403
readonly attribute nullable temperature measuredValue = 0;
14041404
readonly attribute nullable temperature minMeasuredValue = 1;

‎examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1895,7 +1895,7 @@ cluster ThermostatUserInterfaceConfiguration = 516 {
18951895

18961896
/** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
18971897
cluster TemperatureMeasurement = 1026 {
1898-
revision 1; // NOTE: Default/not specifically set
1898+
revision 4;
18991899

19001900
readonly attribute nullable temperature measuredValue = 0;
19011901
readonly attribute nullable temperature minMeasuredValue = 1;

‎examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1583,7 +1583,7 @@ cluster FixedLabel = 64 {
15831583

15841584
/** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
15851585
cluster TemperatureMeasurement = 1026 {
1586-
revision 1; // NOTE: Default/not specifically set
1586+
revision 4;
15871587

15881588
readonly attribute nullable temperature measuredValue = 0;
15891589
readonly attribute nullable temperature minMeasuredValue = 1;

‎examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -2115,7 +2115,7 @@ cluster ThermostatUserInterfaceConfiguration = 516 {
21152115

21162116
/** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
21172117
cluster TemperatureMeasurement = 1026 {
2118-
revision 1; // NOTE: Default/not specifically set
2118+
revision 4;
21192119

21202120
readonly attribute nullable temperature measuredValue = 0;
21212121
readonly attribute nullable temperature minMeasuredValue = 1;

‎examples/placeholder/linux/apps/app1/config.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -6602,7 +6602,7 @@ cluster IlluminanceMeasurement = 1024 {
66026602

66036603
/** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
66046604
cluster TemperatureMeasurement = 1026 {
6605-
revision 1; // NOTE: Default/not specifically set
6605+
revision 4;
66066606

66076607
readonly attribute nullable temperature measuredValue = 0;
66086608
readonly attribute nullable temperature minMeasuredValue = 1;
@@ -6618,7 +6618,7 @@ cluster TemperatureMeasurement = 1026 {
66186618

66196619
/** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
66206620
cluster TemperatureMeasurement = 1026 {
6621-
revision 1; // NOTE: Default/not specifically set
6621+
revision 4;
66226622

66236623
readonly attribute nullable temperature measuredValue = 0;
66246624
readonly attribute nullable temperature minMeasuredValue = 1;

‎examples/placeholder/linux/apps/app2/config.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -6559,7 +6559,7 @@ cluster IlluminanceMeasurement = 1024 {
65596559

65606560
/** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
65616561
cluster TemperatureMeasurement = 1026 {
6562-
revision 1; // NOTE: Default/not specifically set
6562+
revision 4;
65636563

65646564
readonly attribute nullable temperature measuredValue = 0;
65656565
readonly attribute nullable temperature minMeasuredValue = 1;
@@ -6575,7 +6575,7 @@ cluster TemperatureMeasurement = 1026 {
65756575

65766576
/** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
65776577
cluster TemperatureMeasurement = 1026 {
6578-
revision 1; // NOTE: Default/not specifically set
6578+
revision 4;
65796579

65806580
readonly attribute nullable temperature measuredValue = 0;
65816581
readonly attribute nullable temperature minMeasuredValue = 1;

‎examples/pump-app/pump-common/pump-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1890,7 +1890,7 @@ cluster PumpConfigurationAndControl = 512 {
18901890

18911891
/** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
18921892
cluster TemperatureMeasurement = 1026 {
1893-
revision 1; // NOTE: Default/not specifically set
1893+
revision 4;
18941894

18951895
readonly attribute nullable temperature measuredValue = 0;
18961896
readonly attribute nullable temperature minMeasuredValue = 1;

‎examples/pump-app/silabs/data_model/pump-thread-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1890,7 +1890,7 @@ cluster PumpConfigurationAndControl = 512 {
18901890

18911891
/** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
18921892
cluster TemperatureMeasurement = 1026 {
1893-
revision 1; // NOTE: Default/not specifically set
1893+
revision 4;
18941894

18951895
readonly attribute nullable temperature measuredValue = 0;
18961896
readonly attribute nullable temperature minMeasuredValue = 1;

‎examples/pump-app/silabs/data_model/pump-wifi-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1890,7 +1890,7 @@ cluster PumpConfigurationAndControl = 512 {
18901890

18911891
/** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
18921892
cluster TemperatureMeasurement = 1026 {
1893-
revision 1; // NOTE: Default/not specifically set
1893+
revision 4;
18941894

18951895
readonly attribute nullable temperature measuredValue = 0;
18961896
readonly attribute nullable temperature minMeasuredValue = 1;

‎examples/pump-controller-app/pump-controller-common/pump-controller-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1765,7 +1765,7 @@ cluster PumpConfigurationAndControl = 512 {
17651765

17661766
/** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
17671767
cluster TemperatureMeasurement = 1026 {
1768-
revision 1; // NOTE: Default/not specifically set
1768+
revision 4;
17691769

17701770
readonly attribute nullable temperature measuredValue = 0;
17711771
readonly attribute nullable temperature minMeasuredValue = 1;

‎examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1598,7 +1598,7 @@ cluster UserLabel = 65 {
15981598

15991599
/** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
16001600
cluster TemperatureMeasurement = 1026 {
1601-
revision 1; // NOTE: Default/not specifically set
1601+
revision 4;
16021602

16031603
readonly attribute nullable temperature measuredValue = 0;
16041604
readonly attribute nullable temperature minMeasuredValue = 1;

‎integrations/docker/images/base/chip-build/version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
121 : [Telink] Update Docker image (Zephyr 3.3 & 3.7 support)
1+
123 : [Tizen] Add arm64 target - Docker part

‎integrations/docker/images/stage-2/chip-build-telink-zephyr_3_3/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN set -x \
1818
&& : # last line
1919

2020
# Setup Zephyr version: 3.3.0; branch: develop_3.3
21-
ARG ZEPHYR_REVISION=fdccaba1ebc147908e9cca653e6c6743def3332b
21+
ARG ZEPHYR_REVISION=c02df4a2bf7598d0a62b4d98f7f274bcbc1af4af
2222
WORKDIR /opt/telink/zephyrproject
2323
RUN set -x \
2424
&& python3 -m pip install --break-system-packages -U --no-cache-dir west \

‎integrations/docker/images/stage-2/chip-build-telink/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN set -x \
1818
&& : # last line
1919

2020
# Setup Zephyr version: 3.7.0; branch: develop
21-
ARG ZEPHYR_REVISION=46b82695b9390d74bcfa4b01a14a009c01b96895
21+
ARG ZEPHYR_REVISION=eff83ae8b6e5bfdda87bcdb96760a938317e8c3c
2222
WORKDIR /opt/telink/zephyrproject
2323
RUN set -x \
2424
&& python3 -m pip install --break-system-packages -U --no-cache-dir west \

‎integrations/docker/images/stage-2/chip-build-tizen/Dockerfile

+11-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ ENV TIZEN_SDK_ROOT=/opt/tizen-sdk
2626
COPY tizen-sdk-installer $TIZEN_SDK_ROOT/files/installer
2727
RUN set -x \
2828
&& bash $TIZEN_SDK_ROOT/files/installer/install.sh \
29+
--cpu arm,arm64 \
2930
--tizen-sdk-path $TIZEN_SDK_ROOT \
3031
--tizen-sdk-data-path /home/ubuntu/tizen-sdk-data \
3132
--tizen-version $TIZEN_VERSION \
@@ -34,9 +35,18 @@ RUN set -x \
3435

3536
# ------------------------------------------------------------------------------
3637
# Set environment
38+
# Tools
39+
ENV PATH="$TIZEN_SDK_ROOT/tools/ide/bin:$TIZEN_SDK_ROOT/tools:$PATH"
40+
41+
# ARM
3742
ENV TIZEN_SDK_TOOLCHAIN=$TIZEN_SDK_ROOT/tools/arm-linux-gnueabi-gcc-9.2
3843
ENV TIZEN_SDK_SYSROOT=$TIZEN_SDK_ROOT/platforms/tizen-$TIZEN_VERSION/tizen/rootstraps/tizen-$TIZEN_VERSION-device.core
39-
ENV PATH="$TIZEN_SDK_TOOLCHAIN/bin:$TIZEN_SDK_ROOT/tools/ide/bin:$TIZEN_SDK_ROOT/tools:$PATH"
44+
ENV PATH="$TIZEN_SDK_TOOLCHAIN/bin:$PATH"
45+
46+
# ARM64
47+
ENV TIZEN_SDK_TOOLCHAIN_ARM64=$TIZEN_SDK_ROOT/tools/aarch64-linux-gnu-gcc-9.2
48+
ENV TIZEN_SDK_SYSROOT_ARM64=$TIZEN_SDK_ROOT/platforms/tizen-$TIZEN_VERSION/tizen/rootstraps/tizen-$TIZEN_VERSION-device64.core
49+
ENV PATH="$TIZEN_SDK_TOOLCHAIN_ARM64/bin:$PATH"
4050

4151
# ------------------------------------------------------------------------------
4252
# Switch to the non-root user

0 commit comments

Comments
 (0)