Skip to content

Commit 81f10e0

Browse files
drempelgdrempelg
committed
Merge branch 'master' into feature/presets
2 parents 245b8fe + a8df984 commit 81f10e0

File tree

689 files changed

+144927
-106771
lines changed

Some content is hidden

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

689 files changed

+144927
-106771
lines changed

‎.github/.wordlist.txt

+2
Original file line numberDiff line numberDiff line change
@@ -519,8 +519,10 @@ EthyleneOxideConcentrationMeasurement
519519
EvalCode
520520
EvalCodeWithName
521521
EvalFrameDefault
522+
EV
522523
EVB
523524
evk
525+
EVSE
524526
exceptfds
525527
ExchangeContext
526528
exe

‎.github/workflows/examples-qpg.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ jobs:
6363
--target qpg-qpg6105-light \
6464
--target qpg-qpg6105-shell \
6565
--target qpg-qpg6105-persistent-storage \
66+
--target qpg-qpg6105-light-switch \
67+
--target qpg-qpg6105-thermostat \
6668
build \
6769
--copy-artifacts-to out/artifacts \
6870
"

‎.github/workflows/tests.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -494,6 +494,7 @@ jobs:
494494
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-lock-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-lock-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_DRLK_2_12.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --PICS src/app/tests/suites/certification/ci-pics-values --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
495495
scripts/run_in_python_env.sh out/venv './scripts/tests/TestTimeSyncTrustedTimeSourceRunner.py'
496496
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TC_AccessChecker.py" --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
497+
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TC_DeviceConformance.py" --app out/linux-x64-lock-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-lock-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script-args "--storage-path admin_storage.json --manual-code 10054912339 --bool-arg ignore_in_progress:True allow_provisional:True --PICS src/app/tests/suites/certification/ci-pics-values --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto --tests test_TC_IDM_10_2"'
497498
- name: Uploading core files
498499
uses: actions/upload-artifact@v4
499500
if: ${{ failure() && !env.ACT }}

‎config/qpg/toolchain/BUILD.gn

+7
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,13 @@ arm_toolchain("qpg_lighting_app") {
3131
}
3232
}
3333

34+
arm_toolchain("qpg_light_switch_app") {
35+
toolchain_args = {
36+
current_os = "freertos"
37+
import("${chip_root}/examples/light-switch-app/qpg/args.gni")
38+
}
39+
}
40+
3441
arm_toolchain("qpg_shell_app") {
3542
toolchain_args = {
3643
current_os = "freertos"

‎config/telink/chip-module/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ matter_add_gn_arg_bool ("chip_config_network_layer_ble" CONFIG_BT)
9797
matter_add_gn_arg_bool ("chip_inet_config_enable_ipv4" CONFIG_NET_IPV4)
9898
matter_add_gn_arg_bool ("chip_enable_nfc" CONFIG_CHIP_NFC_COMMISSIONING)
9999
matter_add_gn_arg_bool ("chip_enable_ota_requestor" CONFIG_CHIP_OTA_REQUESTOR)
100-
matter_add_gn_arg_bool ("chip_enable_bootloader_mcuboot" CONFIG_BOOTLOADER_MCUBOOT)
101100
matter_add_gn_arg_bool ("chip_inet_config_enable_tcp_endpoint" CONFIG_CHIP_BUILD_TESTS)
102101
matter_add_gn_arg_bool ("chip_error_logging" CONFIG_MATTER_LOG_LEVEL GREATER_EQUAL 1)
103102
matter_add_gn_arg_bool ("chip_progress_logging" CONFIG_MATTER_LOG_LEVEL GREATER_EQUAL 3)

‎data_model/clusters/BooleanSensorConfiguration.xml

-184
This file was deleted.

0 commit comments

Comments
 (0)