Skip to content

Conversation

@HaavardRei
Copy link
Contributor

Pulls upstream mesh commits needed for 2.8

Audifaz and others added 8 commits October 23, 2024 09:35
Currently, dfu_suspended() sets the phase SUSPENDED
directly in the structure, bypassing the dfd_phase_set() function.
This prevents the phase change callback in the bt_mesh_dfd_srv_cb
structure from receiving the SUSPENDED event.

Signed-off-by: Emilio Aguila Escalante <[email protected]>
(cherry picked from commit dda9ba6)
Signed-off-by: Håvard Reierstad <[email protected]>
…esh tx segments

Increasing the number of max tx segments to be able to fit composition
page 0 into composition data status message.

After the subnet bridge config client and server are added to the
tester, the size needed to report composition data page 0 increased.
Current behaviour of the tester is correct, dropping the element when
there is not enough space in data field, however the PTS application
does not handle the composition data status message without element.

Signed-off-by: alperen sener <[email protected]>
(cherry picked from commit 9ae8ebf)
Signed-off-by: Håvard Reierstad <[email protected]>
Adds the `bt_mesh_brg_cfg` prefix to the public Subnet Bridge API, and
aligns the function and callback naming with the rest of the Bluetooth
Mesh API.

Signed-off-by: Håvard Reierstad <[email protected]>
(cherry picked from commit 8049c24)
Signed-off-by: Håvard Reierstad <[email protected]>
Removes duplicate declaration of the bridging direction, keeping the
one in the public header file.

Signed-off-by: Håvard Reierstad <[email protected]>
(cherry picked from commit 0fe6d34)
Signed-off-by: Håvard Reierstad <[email protected]>
Fix of the subnet bridging table function to only
compact the table if elements has been removed, and
fixing the compact function to compact the table if
several elemnts has been removed at the same time.

Fixes zephyrproject-rtos#78794

Signed-off-by: Ingar Kulbrandstad <[email protected]>
(cherry picked from commit b32eb0d)
Signed-off-by: Håvard Reierstad <[email protected]>
Move flag&handler to structure, not only save some flash size
but also make code more readable.

Signed-off-by: Lingao Meng <[email protected]>
(cherry picked from commit 664c087)
Signed-off-by: Håvard Reierstad <[email protected]>
…to send messages

When Proxy advertising or PB-GATT Advertising Enabled and use a same
advertising sets.

As adv\_start will call multi HCI Command will cause syswork_q yield.
At same time, if another thread(BT RX) all schedule\_send will cause
unable send mesh message, because ADV\_FLAG\_ACTIVE was be set, but
ADV\_FLAG\_PROXY not set currentlly.

Add ADV\_FLAG\_SCHEDULE\_PENDING indicate mesh buf has been pendings
but not scheduled, so when proxy advertising enable, let's take again,
as we can't break or terminated adv\_start, so we must waiting proxy
advertising enabled.

But after zephyrproject-rtos/zephyr#68558

The `k_work_is_pending` always true in `send_pending_adv`, which cause
unable to send more mesh message until more mesh message comming

Signed-off-by: Lingao Meng <[email protected]>
(cherry picked from commit 537d215)
Signed-off-by: Håvard Reierstad <[email protected]>
…f54l15pdk

Rename the config files according to nrf54l15dk.

Signed-off-by: alperen sener <[email protected]>
(cherry picked from commit a501050)
Signed-off-by: Håvard Reierstad <[email protected]>
@HaavardRei HaavardRei force-pushed the mesh_cherry_pick_2_8 branch from 5745e69 to 73ea724 Compare October 23, 2024 07:36
@rlubos rlubos merged commit e516ad3 into nrfconnect:main Oct 23, 2024
16 checks passed
@HaavardRei HaavardRei deleted the mesh_cherry_pick_2_8 branch October 24, 2024 05:48
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.