Repository navigation
Upmerge 1.5 - #655
Merged
ArekBalysNordic merged 1358 commits intoNov 14, 2025
Merged
Upmerge 1.5#655
Conversation
### Testing This code bug was preventing the test step from doing what it wanted to do
There is warning about the format string is not using literal. This commit adds progma to suppress the warning.
Bumps [third_party/imgui/repo](https://github.com/ocornut/imgui) from `e11b7a0` to `a1632c6`. - [Release notes](https://github.com/ocornut/imgui/releases) - [Commits](ocornut/imgui@e11b7a0...a1632c6) --- updated-dependencies: - dependency-name: third_party/imgui/repo dependency-version: a1632c6116d3d5f0cd1eccb8a0b49e61acc5398c dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [third_party/ot-br-posix/repo](https://github.com/openthread/ot-br-posix) from `570a6c3` to `aa98dad`. - [Release notes](https://github.com/openthread/ot-br-posix/releases) - [Commits](openthread/ot-br-posix@570a6c3...aa98dad) --- updated-dependencies: - dependency-name: third_party/ot-br-posix/repo dependency-version: aa98dadadadca2a0e5e03ec032727ad7983d5aa0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
In Matter 1.4.0 the allowed range for MinSetpointDeadband was adjusted from 0..25 to 0..127 but SDK and tests were not updated to reflect this. This PR shall be considered for backport into 1.4.0, 1.4.1 and 1.4.2 SDK branches
* Remove semantic tags from endpoint interface * remove semantic tag endpoint interface tests * Restyled by clang-format * Remove semantic tag related test code from TestCodeDrivenDataModelProvider --------- Co-authored-by: Restyled.io <commits@restyled.io>
* Prepare utilities for when [[nodiscard]] is added to ChipError * Apply gemini suggestions * Apply suggestions from code review Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Change name to not conflict with platform/Darwin/dnssd/DnssdImpl.cpp LogOnFailure * Resolve name conflict for SuccessOrLog * Resolve name conflict for SuccessOrLog * Resolve name conflict for SuccessOrLog --------- Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>
…41160) * Add GetScheduleTypeAtIndex delegate method and use in thermostat server * Implement delegate method in thermostat example * Populate max schedules like max presets * Add python test for ScheduleTypes * Add pics TSTAT.S.A0049 condition * Address lint issues in python test * Restyled by whitespace * Restyled by clang-format * Restyled by autopep8 * Regenerate .matter file * Enable Matter Schedule Feature in ZAP * Remove MSCH attributes and command not yet implemented. * Remove the TSTAT_4_4.py file that I added * Restore original 0 value to undo the changes I made to certificate tests * Regenerated the thermostat.matter file * Change storage and initialization of scheduleTypes in example * Set thermostate example FeatureMap to hex and regenerated .matter file * Move InitializeScheduleTypes (PR review) * Rename mMaxSchedules member to give more clarity. * Correct comment formatting --------- Co-authored-by: Restyled.io <commits@restyled.io> Co-authored-by: jamesharrow <93921463+jamesharrow@users.noreply.github.com>
…T Devices to Improve CASE Reliability (#41350) * Bump the received SII to a larger value * Restyled by clang-format * address comments * address comments * add CHIP_CONFIG_ADDITIONAL_LIT_BACKOFF_INTERVAL * Restyled by clang-format * revert the outdated change * fix * Update src/lib/core/CHIPConfig.h Co-authored-by: Junior Martinez <67972863+jmartinez-silabs@users.noreply.github.com> * address comments * Restyled by whitespace * Restyled by clang-format * address comments * Update src/app/OperationalSessionSetup.cpp Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Update OperationalSessionSetup.h * Modify NOLINT comment for DequeueConnectionCallbacks Updated NOLINT comment to specify clang-analyzer. --------- Co-authored-by: Restyled.io <commits@restyled.io> Co-authored-by: Junior Martinez <67972863+jmartinez-silabs@users.noreply.github.com> Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>
…s (#41625) * Expand TestGroupcastCluster with skeleton to test Commands through InvokeCommands. Add Featuremap configuration in Groupcast constructor * Update src/app/clusters/groupcast/tests/TestGroupcastCluster.cpp Co-authored-by: Andrei Litvin <andy314@gmail.com> * address comments about magic numer * Fix test issue caught in darwin asan+target_os=all --------- Co-authored-by: Andrei Litvin <andy314@gmail.com>
* Fix local.py dependency on python testing env * better naming and fix path to matter testing * Restyled by autopep8 --------- Co-authored-by: Restyled.io <commits@restyled.io>
…41654) * ttempt at moving code within the new code driven structure without changing the logic * Restyled by clang-format * reverted the CodegenIntegration usage * Restyled by whitespace * Restyled by clang-format * Moved MeasurementDataForEndpoint and MeasurementData to electrical-energy-measurement-server.h * removed un-necessary include in EVSEManufacturerImpl * Restyled by clang-format --------- Co-authored-by: Restyled.io <commits@restyled.io>
* Seperating zap file for wifi and thread * PR comments'
* Decouple time synchronization cluster part 1 * Restyled by gn --------- Co-authored-by: Restyled.io <commits@restyled.io>
…nWrt (#33968) * SystemLayerSelect: Don't log EINTR as an error * lib/support: Add CompileTimeString * lib/support: Document and test in-place HexToBytes * network-manager-app: Add support for OpenThread BR integration on OpenWrt * Address review comments / tweaks - Use SA_RESETHAND instead of manual resetting to SIG_DFL - Call ubus_shutdown() in HandleConnectionLost - Re-install connection_lost handler in Connect() * Comment wording * Enable the dummy implementation of Thread Network Diagnostics server by default
* SUBase Test class start * OTA Provider Wrapper changes for SU 2.7 * Fix Wrapper updated * Added kwargs as the params as we are just forwarding params * Updates for OTAProviderSubprocess * Treat the logs as separate. * Changes for SoftwareUpdate base class * Removed static values. Updated methods with defaults. Added commissionprovider method. * Mypy fixes * Fix the log_path in base class. Added some method description * Updated name for TC_SUTestBase.py added TC_SUTestBase.py into not_automated at test_metadata.yaml * Close fd if is not None * Ignore TC_SUTestBase.py * Methods updated * Removed hardcoded from launch_provider, accept kwargs and filter arguments. Added method to get ota_image_path * Fix ruff check * Update wrapper: removed acl. Updated SUBaseTest added create_acl_entry and removed commisionprovider from base. Added Class ACL Handler into SuBaseTest as it will be used by in other tests. * Removed unused import * Update TC_SUTestBase.py Fixed method name typo * Restyled by autopep8 * Added Requestor to wrapper * Added changes for RequestorSubProcess * Update TC_SUTestBase.py Fix: invalid method * Removed requestor wrapper. Removed requestor start. Removed hardcoded paths. ota-image path and chip-ota-provider path will be provider to the test as an argument, Removed static versions version should be provided in the test as argument. * Mypy fixes. Review fixes. * Update append and read logs * Fix typo in variable * ANSI clean chagnes * Dont delete the file * Remove read_from_logs * Remove ACLHandler Class and remove unused import --------- Co-authored-by: Restyled.io <commits@restyled.io>
* [Realtek] add CONFIG_DAC_KEY_ENC * [Realtek] Improve code maintainability * [Realtek] Add cg dac vendor * [Realtek] Restyle files * [Realtek] Modify according to bot * [Realtek] Modify according by bot * [Realtek] modify according to bot * [Realtek] Fix some error * [Realtek] Fix some error * [Realtek] Fix some error * [Realtek] Modify return value * [Realtek] Support RTK trustzone * [Realtek] Restyle files * [Realtek] modify according bot * [Realtek] Optimize code * [Realtek] Fix bug * [Realtek] Fix some bug * [Realtek] Restyle files
* PoC EM4 * Apply comments
* Add pairDeviceThroughNfc() Change-Id: I25e3e0a1b7619498523ba7215927610b116beeaf * Restyled by google-java-format * Restyled by clang-format * Fix trace Change-Id: I9a78e4de7facb7e04a3d4da3d99b050953072536 * Changes requested by Andrei. * Restyled by google-java-format * Restyled by clang-format * Fixed compilation error. * Restyled by google-java-format * Change from Kotlin format check. Change-Id: Ic78892aad7846e0d0a9a3ac9d161876b2f9250bf * Fixed error in DeviceProvisioningFragment when calling the new function pairDeviceThroughBLE(). Change-Id: I384e77254f0fed1dfa1edf7099c23ad6277c434f * Reformat Change-Id: I68cd0bd3f6c23860fb1299ab5f3f2db7c37bd3d3 --------- Co-authored-by: Restyled.io <commits@restyled.io>
* Update file operations using C++ filesystem APIs. Signed-off-by: Raveendra Karu <r.karu@samsung.com> * Update EnsureDirectoryExists API Signed-off-by: Raveendra Karu <r.karu@samsung.com> * Restyled by clang-format * Fix segment path. Signed-off-by: Raveendra Karu <r.karu@samsung.com> * Restyled by clang-format * Address review comments. Signed-off-by: Raveendra Karu <r.karu@samsung.com> * Restyled by clang-format * Address review comments. Signed-off-by: Raveendra Karu <r.karu@samsung.com> * Remove unnecessary file permissions to others Signed-off-by: Raveendra Karu <r.karu@samsung.com> * Restyled by clang-format * Update comments. Signed-off-by: Raveendra Karu <r.karu@samsung.com> --------- Signed-off-by: Raveendra Karu <r.karu@samsung.com> Co-authored-by: Restyled.io <commits@restyled.io>
…ation … (#40313) * Update get function to return max value between the IdleModeDuration and the SubscriptionMaxIntervalPublisherLimit * Restyled by clang-format * Use duration cast instead of static cast * Restyled by clang-format * Enable report on active * Use IdleModeDuration and not GetPublisherSelectedIntervalLimit function * Restyled by clang-format * Add missing dependency * Remove build flag icd unit tests --------- Co-authored-by: Restyled.io <commits@restyled.io>
* Attempt at parallelizing builds in REPL workflow * Measure build time and parallelize build_examples.py * Remove parallel exec, didn't help much. * add a few more apps to root build.gn * attempt to use unified build for most linux apps in CI * Restyled by gn * Don't rm out because other tests need out/venv * Fix paths to executables * Fix fabric sync dep * undo fabric-admin and fabric-bridge app dep changes * Add conditional for linux_apps_for_ci * Restyled by gn * Try to fix out of space issues by building apps that use build_examples.py in separate calls and deleting out dir * add more args to gn gen to attempt to fix apps test failures * Add support for unified builds in build_examples for host builds. * Restyled by autopep8 * Restyled by isort * Use build_examples.py again in CI for unified builds * Fix build_examples.py to work with both unified and non unified targets * Fix tv casting app target * Undo unwanted formatting changes in targets.py * remove unwanted formatting from host.py * lit icd it not generated under standalone... * Update all_targets_linux for unit testing. * Fix paths to unified build artifacts * fix missing tsan modifier * Add trace support to standalone build * Restyled by gn * Attempted to scrape apps and aggregate args.gni options in standalone args.ngi * Need chip_eanble_read_client=true * Add missing define, disable test event triggers * attempt to conditionally import the right args.gni * Restyled by gn * Remove tv casting app from unified build * Disable lit-icd and ota-requestor from unified build * Restyled by gn * Removed all_clusters, energy-mgmt, energy-gateway and terms-and-conditions from unified build in CI as they require special args.gni * Restyled by gn * fix paths * Add unified build back, accidentally removed in the last commit * Removed network management app from unified build * fix braces * Clean up commented out code * removed unused app builds from unified * restyle * remove changes to standalone args.gni * Enable specific args.gni for linux or mac * add host_args.gni back as it breaks other platforms when removed * Revert unintended change to all-clusters-app/linux/diagnostic-logs-provider-delegate-impl.cpp * address code review suggestions * Remove targets that didn't pass CI from build_examples.py --------- Co-authored-by: Restyled.io <commits@restyled.io> Co-authored-by: Andrei Litvin <andy314@gmail.com>
…est plan (#41633) * [TC-RVCOPSTATE-2.4] [TC-RVCOPSTATE-2.5] Missing PICS guard from the test plan * Update src/python_testing/TC_RVCOPSTATE_2_4.py Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> * improve code readability * add missing PICS --------- Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
…n phase (#41692) * [TC_ZONEMGMT-2_4] Remove unnecessary user prompt during blind duration phase after triggering zone events beyond max duration. * Update src/python_testing/TC_ZONEMGMT_2_4.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Apply suggestion from @Copilot Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Apply suggestion from @gemini-code-assist[bot] Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> * Remove the extra triggers beyond maxDuration, since we are triggering after the ZoneStopped event in CI. --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Remove CHIP_OPENTHREAD_JOINER_ENABLED Kconfig as it's no longer used. Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>
Extend MapSendError to treat TX buffer exhaustion (e.g. ERR_MEM, ENOBUFS) and temporary network connection issues (e.g. ERR_CONN, ENETDOWN) as non-fatal errors. This prevents premature teardown of exchanges or subscriptions in transient conditions. Signed-off-by: Łukasz Duda <lukasz.duda@nordicsemi.no>
Error conditions use the opposite logic than intended and because of that KVS delete operations fail. Signed-off-by: Kamil Kasperczyk <kamil.kasperczyk@nordicsemi.no>
Enabled OT configuration without L2 by default for nrfconnect platform. Additionally moved some L2 related Kconfigs implied by CHIP to a separate Kconfig. Signed-off-by: Kamil Kasperczyk <kamil.kasperczyk@nordicsemi.no>
Added LM20DK to the if conditions that result in enabling SPI Signed-off-by: Kamil Kasperczyk <kamil.kasperczyk@nordicsemi.no>
Added functionality that can be enabled using Kconfig option and allows to measure the time between factory reset schedule and factory reset end to know this process duration. Signed-off-by: Kamil Kasperczyk <kamil.kasperczyk@nordicsemi.no>
…Matter messages This commit adds a new Kconfig which enables enhanced verbosity for logging content of Matter messages. Signed-off-by: Łukasz Duda <lukasz.duda@nordicsemi.no>
For certification testing it is better to have two locales instead of one. Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
The pending keypair was handled in a wrong way in the PSA PAL. This keypair should be saved to ITS as volatile persistence, then all operations should be done using this instance, and it must be saved to persistent storage in the CommitOpKeypairForFabric function. Previously, the same KeyId was used both to active and pending keypairs, and when a failsafe occurs, then this key has been removed and there is no key for the fabric anymore. Main changes: - PersistentP256Keypair::Generate generates a pending keypair as volatile with additional usage flag PSA_KEY_USAGE_COPY. - In the CommitOpKeypairForFabric function the pending keypair is copied to persistent location, and the keyId for fabric is replaced. Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
If the host system is Windows, we need to add `python3` to the subprocess command to avoid issues like: `OSError: [WinError 193] %1 is not a valid Win32 application` Also, inform Windows users what they can do if paths to the files are too long, and how to resolve issues like: `FileNotFoundError: [WinError 206] The filename or extension is too long` Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
After switching to picolib we should not imply NEWLIB_LIBC_NANO. Also _reent wrappers are not supported in picolib and as a result redundant for System Heap Matter's wrappers. Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
Switched from newlibc to picolibc in Nordic platform. Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
In Matter configuration there must not be anything related to DK. All DK-related Kconfigs must be defined in the application. Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no> [nrf toup] [nrfconnect] Remove CHIP_*_NOR configs The CHIP_SPI_NOR and CHIP_QSPI_NOR configs are no longer needed and we can use NORDIC_QSPI_NOR and SPI_NOR instead. Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no> [nrf toup][nrfconnect] Fix Kconfig complaince According to the Zephyr guidelines, do not write "Enable" for boolean prompts. Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
…window Added commands to open and close basic commissioning window using shell that can be used for test purposes. Signed-off-by: Kamil Kasperczyk <kamil.kasperczyk@nordicsemi.no>
In case of using NUS with 54L family the BT RX stack size has to be increased. Signed-off-by: Kamil Kasperczyk <kamil.kasperczyk@nordicsemi.no>
According to the Zephyr guidelines, do not write "Enable" for boolean prompts. Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
The commit contains new fixes in zap_regen_all.py for Windows platform. The issues occur especially on Windows 11. It can be merged squashed with the c34b9e5 commit. Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
The file.unlink funciton was called wrongly when the file was still opened. Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no> [nrf noup][ZAP] Improve west zap generate command When arguments have a custom type (such as struct or enum), they must be added to the `attributeAccessInterfaceAttributes` list in the `zcl.json` file. If this is not done, the generated Accessors.h/.cpp files will not have access to these custom types. This commit introduces a new `add_custom_attributes` function to the west `zap-append`/`zap-gui` command to handle updating the zcl file with all custom-type attributes. The second improvement is the ability to synchronize the zcl file with the "base" zcl file located in the Matter SDK. This is useful if the base file has changed, for example due to a new Matter SDK version, and the custom zcl file does not contain all the "base" clusters. Both improvements are necessary only when calling west `zap-generate` with the `--full` argument. Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
Currently, commissioning to real Matter ecosystems requires more than 8 kB of HEAP. We need to increase the default value to meet this requirement. Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
- Changed some paths for persistence directory - Added CodeDrivenInitShutdown - Added CodeDrivenCallback - Removed CHIPClientCallbacks - Adjusted function description to cause less conflicts Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
* Now we can obtain the recommended zap version from the `scripts/setup/zap.version` file instead of reading it from the `zap_execution.py` file. Sometimes the nightly version is recommended whereas in the python file there is no `-nightly` postfix. * If the sandbox is not configured on a Linux PC, an annoying issue with the sandbox occurs after updating to the newest ZAP tool. To resolve it, ask the user if they want to add permissions automatically. * `update_zcl_in_zap` function must be called only while the specific clusters are known. * Added the new zap-update command to synchronize the .zap and zcl.json files with the new Matter Data Model from SDK. Restyled by prettier-yaml Restyled by isort Restyled by ruff
If the routingRole enum variable is not initilaized the compilator returns warning which may be treated as error. Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
Restyled by ruff
Cherry-picked from f3b5a63
ArekBalysNordic
force-pushed
the
upmerge_1_5
branch
3 times, most recently
from
November 14, 2025 07:46
8089bf1 to
881ee00
Compare
In the docker image there is a change in the zephyr-env.sh script that breaks the checkout. We need to stash the changes and reapply them after the NCS update. It should be fixed during the next NCS bump in the Matter upstream repository. Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
ArekBalysNordic
force-pushed
the
upmerge_1_5
branch
from
November 14, 2025 07:56
881ee00 to
a85100a
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Upmerge to Matter 1.5.
Testing
NCS