Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V1.3 nrfconnect and zephyr platforms cherry picks #33352

Merged

Conversation

kkasperczyk-no
Copy link
Contributor

Cherrypicked commits from the master branch into the 1.3 branch that contain platform fixes and enhancements for nrfconnect and Zephyr platforms.

kkasperczyk-no and others added 6 commits May 8, 2024 07:24
Enhance attaching to Thread network by verifying
if the current dataset is the same as provided.
In the current solution implementation will not
reset the Thread interface while the dataset
are equal to the active dataset.
…-chip#33194)

* [nrfconnect] Disable Zephyr socket extensions

The recvmsg() is now implemented natively in Zephyr,
so we are not supposed to define a custom one.

Signed-off-by: Marcin Kajor <[email protected]>

* [nrfconnect] Remove D_SYS__PTHREADTYPES_H_ flag

... from the gnu17 configuration to avoid missing
pthread types definitions (_pthreadtypes.h).

This tricked the preprocessor the header was already
included, hence we didn't get its content.

Signed-off-by: Marcin Kajor <[email protected]>

* [nrfconnect] Use newlib as a default libc implementation.

The PICOLIB is now used by the default.
NEWLIB_LIBC symbol is no longer selected by hostap.
OpenThread selects NEWLIB_LIBC anyway.

Signed-off-by: Marcin Kajor <[email protected]>

* [zephyr] Added OpenThread dependencies to a few Kconfigs

Co-authored-by: Damian Krolik <[email protected]>

* [zephyr] Lock Thread stack before factory reset

This fixes a problem with Thread activity interrupting factory
reset. This activity used to led to “Factory reset fail: -6”.
Writing to the cleared nvm flash pages caused the problem.

Signed-off-by: Patryk Lipinski <[email protected]>
Signed-off-by: Michał Szablowski <[email protected]>

* [nrfconnect] Increase default number of packet buffers and stack size

This commit reverts the previous optimization of reducing the number
of packet buffers in the system. Additionally increase of stack size
is needed to accomodate LTO.

Signed-off-by: Łukasz Duda <[email protected]>

* [nrfconnect] Select Experimental for persistent subscriptions

Currently, there is an issue with persistent subscriptions when
multiple controllers create subscriptions.

* [nrfconnect] Fixed mcuboot default configuration

Removed the defaults from Kconfig.mcuboot.defaults configuration
that should not be set there:
* BOOT_ENCRYPT_X - are configs without a prompt, so it should
not be modified outside of the mcuboot module
* SPI_NOR and NORDIC_QSPI_NOR - are set based on the device
tree configuration, so we should not set it, as it may lead
to configuration and dts mismatch.

Signed-off-by: Kamil Kasperczyk <[email protected]>

* Revert "[nrfconnect] Disable Zephyr socket extensions"

This reverts commit bb09061.

---------

Signed-off-by: Marcin Kajor <[email protected]>
Signed-off-by: Patryk Lipinski <[email protected]>
Signed-off-by: Michał Szablowski <[email protected]>
Signed-off-by: Łukasz Duda <[email protected]>
Signed-off-by: Kamil Kasperczyk <[email protected]>
Co-authored-by: Marcin Kajor <[email protected]>
Co-authored-by: Damian Krolik <[email protected]>
Co-authored-by: Patryk Lipinski <[email protected]>
Co-authored-by: Łukasz Duda <[email protected]>
Co-authored-by: Arkadiusz Balys <[email protected]>
…ject-chip#33189)

* [zephyr] Enabled support for bonding in the BLEManager

Currently the Zephyr BLE Manager rotates Bluetooth addresses
on every boot and it does this by creating new Bluetooth identity.
Because of that the Zephyr stack does not create default Bluetooth
ID, which is required e.g. for the bonding purposes.

Added creating two separate Bluetooth identities - for the Matter
service advertising and for the bonding purposes.

Signed-off-by: Kamil Kasperczyk <[email protected]>

* [zephyr] Added check to drop handling callbacks for BT central

Matter BLEManager handles all BT connect and disconnect callbacks
no matter if these are Matter related ones or not. It collides
with other not Matter-related services that trigger Matter
CHIPoBLE service advertising changes. Added role check that
allows to at least drop all callbacks related to BT central role.

Signed-off-by: Kamil Kasperczyk <[email protected]>

* [zephyr]: allow BLE advertising restarts

* allow BLE advertising restarts in case of failures
* which can be triggered by calling SetBLEAdvertisingEnabled(true)
  ConnectivityMgr public API from the application code
* do not register CHIPoBLE GATT services when the advertising
  cannot be started
* this allows the disconnection handler to filter out non-Matter
  BLE connections that were terminated
* fix possible underflow of connection counters

Signed-off-by: Marcin Kajor <[email protected]>

---------

Signed-off-by: Kamil Kasperczyk <[email protected]>
Signed-off-by: Marcin Kajor <[email protected]>
Co-authored-by: Marcin Kajor <[email protected]>
…33196)

* [nrfconnect] Adapt Matter SDK to the WiFi FW patch on external flash

This commit sets the default kconfigs if the WiFi FW patch on
external flash is enabled.

* [nrfconnect] Wi-FI directed scan implementation

This patch implements directed scanning and
single ssid scanning during commissioning.

Signed-off-by: Marcin Kajor <[email protected]>

* [nrfconnect] Fix build for 7001 Emulation

For nRF7001DK (emulation) build fails with SPI driver errors, this fixes
the build.

Signed-off-by: Chaitanya Tata <[email protected]>

---------

Signed-off-by: Marcin Kajor <[email protected]>
Signed-off-by: Chaitanya Tata <[email protected]>
Co-authored-by: Arkadiusz Balys <[email protected]>
Co-authored-by: Marcin Kajor <[email protected]>
…p#33216)

* [nrfconnect] Versioning with VERSION file for matter implemented

This commit adds posibility to use VERSION file which will work properly for
DFU SMP and Matter OTA.

Signed-off-by: Patryk Lipinski <[email protected]>

* [nrfconnect] Use version string with tweak

This commit modifies the string format of versioning to include tweak.

Signed-off-by: Łukasz Duda <[email protected]>

---------

Signed-off-by: Patryk Lipinski <[email protected]>
Signed-off-by: Łukasz Duda <[email protected]>
Co-authored-by: Patryk Lipinski <[email protected]>
…agement (project-chip#33195)

* [nrfconnect] Added FactoryDataBase to facilitate dynamic
assignments of FactoryDataProvider concrete types to
to the generic pointer.

Signed-off-by: Marcin Kajor <[email protected]>

* [nrfconnect] Added non-PM based factory data support

Added support for platforms not built using PM. This commit
includes fixes only firmware implementation and does not include
cmake changes for factory data generation.

Signed-off-by: Kamil Kasperczyk <[email protected]>

* [nrfconnect] Improved generation of the factory data

Allow to merge the factory data .hex file with the firmware's .hex
file when partition manager is not available.

* [nrfconnect] Disable External FD if QSPI NOR is not available

We need to have support for factory data when the partition manager
is enabled but there is no support for QSPI external flash.

---------

Signed-off-by: Marcin Kajor <[email protected]>
Signed-off-by: Kamil Kasperczyk <[email protected]>
Co-authored-by: Marcin Kajor <[email protected]>
Co-authored-by: Arkadiusz Balys <[email protected]>
@kkasperczyk-no kkasperczyk-no merged commit 07e3098 into project-chip:v1.3-branch May 8, 2024
68 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants