Skip to content

Commit 627e3f6

Browse files
committedAug 4, 2024
Merge branch 'master' of github.com:project-chip/connectedhomeip into add_presets_to_Sdk
# Conflicts: # examples/air-purifier-app/air-purifier-common/air-purifier-app.matter # examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter # examples/all-clusters-app/all-clusters-common/all-clusters-app.matter # examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter # examples/bridge-app/bridge-common/bridge-app.matter # examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter # examples/chef/devices/rootnode_airpurifier_73a6fe2651.matter # examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter # examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter # examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter # examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter # examples/chef/devices/rootnode_contactsensor_27f76aeaf5.matter # examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter # examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter # examples/chef/devices/rootnode_dimmablepluginunit_f8a9a0b9d4.matter # examples/chef/devices/rootnode_dishwasher_cc105034fe.matter # examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter # examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter # examples/chef/devices/rootnode_fan_7N2TobIlOX.matter # examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter # examples/chef/devices/rootnode_genericswitch_2dfff6e516.matter # examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter # examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter # examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter # examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter # examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter # examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter # examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter # examples/chef/devices/rootnode_onofflight_samplemei.matter # examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter # examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter # examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter # examples/chef/devices/rootnode_pump_5f904818cc.matter # examples/chef/devices/rootnode_pump_a811bb33a0.matter # examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter # examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter # examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter # examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter # examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter # examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter # examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter # examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter # examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter # examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.matter # examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.matter # examples/dishwasher-app/dishwasher-common/dishwasher-app.matter # examples/energy-management-app/energy-management-common/energy-management-app.matter # examples/fabric-bridge-app/fabric-bridge-common/fabric-bridge-app.matter # examples/laundry-washer-app/nxp/zap/laundry-washer-app.matter # examples/light-switch-app/light-switch-common/light-switch-app.matter # examples/light-switch-app/qpg/zap/switch.matter # examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter # examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter # examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter # examples/lighting-app/lighting-common/lighting-app.matter # examples/lighting-app/nxp/zap/lighting-on-off.matter # examples/lighting-app/qpg/zap/light.matter # examples/lighting-app/silabs/data_model/lighting-thread-app.matter # examples/lighting-app/silabs/data_model/lighting-wifi-app.matter # examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter # examples/lock-app/lock-common/lock-app.matter # examples/lock-app/nxp/zap/lock-app.matter # examples/lock-app/qpg/zap/lock.matter # examples/log-source-app/log-source-common/log-source-app.matter # examples/microwave-oven-app/microwave-oven-common/microwave-oven-app.matter # examples/network-manager-app/network-manager-common/network-manager-app.matter # examples/ota-provider-app/ota-provider-common/ota-provider-app.matter # examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter # examples/placeholder/linux/apps/app1/config.matter # examples/placeholder/linux/apps/app2/config.matter # examples/pump-app/pump-common/pump-app.matter # examples/pump-app/silabs/data_model/pump-thread-app.matter # examples/pump-app/silabs/data_model/pump-wifi-app.matter # examples/pump-controller-app/pump-controller-common/pump-controller-app.matter # examples/refrigerator-app/refrigerator-common/refrigerator-app.matter # examples/rvc-app/rvc-common/rvc-app.matter # examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter # examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter # examples/thermostat/nxp/zap/thermostat_matter_thread.matter # examples/thermostat/nxp/zap/thermostat_matter_wifi.matter # examples/thermostat/qpg/zap/thermostaticRadiatorValve.matter # examples/thermostat/thermostat-common/thermostat.matter # examples/tv-app/tv-common/tv-app.matter # examples/tv-casting-app/tv-casting-common/tv-casting-app.matter # examples/virtual-device-app/virtual-device-common/virtual-device-app.matter # examples/window-app/common/window-app.matter # src/controller/data_model/controller-clusters.matter # src/controller/python/chip/clusters/Objects.py # src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h # src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h # src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm # zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h # zzz_generated/app-common/app-common/zap-generated/cluster-enums.h # zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp # zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
2 parents ed59a01 + 44afdd2 commit 627e3f6

File tree

179 files changed

+20565
-2517
lines changed

Some content is hidden

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

179 files changed

+20565
-2517
lines changed
 

‎.github/labeler.yml

+9
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,15 @@ test driver:
119119
- src/test_driver/*
120120
- src/test_driver/**/*
121121

122+
# Cert tests touched: add current milestone delta-tracking label.
123+
# TODO: Change after Aug 15, 2024
124+
matter-1.4-te2-script-change:
125+
- changed-files:
126+
- any-glob-to-any-file:
127+
- src/python_testing/*
128+
- src/python_testing/**/*
129+
- src/app/tests/suites/certification/*
130+
122131
############################################################
123132
# Source Code
124133
############################################################

‎.github/workflows/qemu.yaml

+6-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,12 @@ jobs:
7575
name: Tizen
7676

7777
runs-on: ubuntu-latest
78-
if: github.actor != 'restyled-io[bot]'
78+
# NOTE: job temporarely disabled as it seems flaky. The flake does not result in usable
79+
# logs so the current theory is that we run out of space. This is unusual as
80+
# larger docker images succeed at bootstrap, however it needs more investigation
81+
# to detect an exact/real root cause.
82+
if: false
83+
# if: github.actor != 'restyled-io[bot]'
7984

8085
container:
8186
image: ghcr.io/project-chip/chip-build-tizen-qemu:54

0 commit comments

Comments
 (0)