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.

Sign up for GitHub

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

Jump to bottom

Make smp and sidewalk parallel #643

Merged
merged 12 commits into from
Nov 26, 2024
Merged

Make smp and sidewalk parallel #643

merged 12 commits into from
Nov 26, 2024

Conversation

RobertGalatNordic
Copy link
Collaborator

@RobertGalatNordic RobertGalatNordic commented Nov 13, 2024 •
edited
Loading

CI parameters

Github_actions:
  #(branch, hash, pull/XXX/head)
  NRF_revision: main

  # Do not change after creating PR
  Create_NRF_PR: false
Jenkins:
  test-sdk-sidewalk: master

extends on #603

Description

JIRA ticket: KRKNWK-17860, KRKNWK-18460

Self review

  • There is no commented code.
  • There are no TODO/FIXME comments without associated issue ticket.
  • Commits are properly organized.
  • Change has been tested.
  • Tests were updated (if applicable).

@github-actions github-actions bot added source PR changing src files tests scripts labels Nov 13, 2024
@RobertGalatNordic RobertGalatNordic force-pushed the make_smp_and_sidewalk_parallel branch 4 times, most recently from 1b9529d to 5a55397 Compare November 13, 2024 10:04
@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 13, 2024 •
edited
Loading

Sample diff used total
nrf54l15dk/nrf54l15/cpuapp/ns:sample.sidewalk.hello.ble_only RAM 4.3 KB 95.84 KB 0 B
ROM 10.98 KB 326.82 KB 0 B
nrf54l15dk/nrf54l15/cpuapp/ns:sample.sidewalk.hello.ble_only.release RAM 4.3 KB 91.21 KB 0 B
ROM 8.8 KB 256.27 KB 0 B
nrf54l15dk/nrf54l15/cpuapp/ns:sample.sidewalk.hello.release RAM 4.3 KB 106.27 KB 0 B
ROM 8.78 KB 332.13 KB 0 B
nrf54l15dk/nrf54l15/cpuapp:sample.sidewalk.demo RAM 4.3 KB 121.62 KB 0 B
ROM 11.01 KB 456.25 KB 0 B
nrf54l15dk/nrf54l15/cpuapp:sample.sidewalk.demo.ble_only RAM 4.3 KB 106.58 KB 0 B
ROM 10.99 KB 378.49 KB 0 B
nrf54l15dk/nrf54l15/cpuapp:sample.sidewalk.dut RAM 4.3 KB 145.37 KB 0 B
ROM 11.73 KB 522.55 KB 0 B
nrf54l15dk/nrf54l15/cpuapp:sample.sidewalk.dut.no_secure RAM 4.3 KB 145.36 KB 0 B
ROM 11.75 KB 514.88 KB 0 B
nrf54l15dk/nrf54l15/cpuapp:sample.sidewalk.hello RAM 4.3 KB 123.07 KB 0 B
ROM 11.27 KB 471.53 KB 0 B
nrf54l15dk/nrf54l15/cpuapp:sample.sidewalk.hello.ble_only RAM 4.3 KB 96.62 KB 0 B
ROM 10.98 KB 376.8 KB 0 B
nrf54l15dk/nrf54l15/cpuapp:sample.sidewalk.hello.ble_only.release RAM 4.3 KB 91.99 KB 0 B
ROM 8.8 KB 305.3 KB 0 B
nrf54l15dk/nrf54l15/cpuapp:sample.sidewalk.hello.release RAM 4.3 KB 107.05 KB 0 B
ROM 8.8 KB 381.18 KB 0 B
thingy53/nrf5340/cpuapp:sample.sidewalk.demo.ble_only RAM 3.1 KB 109.44 KB 0 B
ROM 6.13 KB 357.71 KB 0 B
nrf52840dk/nrf52840:sample.sidewalk.demo RAM 5.46 KB 123.74 KB 0 B
ROM 28.23 KB 478.81 KB 0 B
nrf52840dk/nrf52840:sample.sidewalk.demo.ble_only RAM 5.46 KB 108.39 KB 0 B
ROM 28.23 KB 396.34 KB 0 B
nrf52840dk/nrf52840:sample.sidewalk.dut RAM 5.46 KB 147.38 KB 0 B
ROM 28.97 KB 544.64 KB 0 B
nrf52840dk/nrf52840:sample.sidewalk.dut.no_secure RAM 5.46 KB 147.35 KB 0 B
ROM 28.97 KB 536.09 KB 0 B
nrf52840dk/nrf52840:sample.sidewalk.hello RAM 5.46 KB 124.96 KB 0 B
ROM 28.51 KB 494.13 KB 0 B
nrf52840dk/nrf52840:sample.sidewalk.hello.ble_only RAM 5.46 KB 98.22 KB 0 B
ROM 28.21 KB 394.66 KB 0 B
nrf52840dk/nrf52840:sample.sidewalk.hello.ble_only.release RAM 5.46 KB 93.41 KB 0 B
ROM 26.04 KB 325.23 KB 0 B
nrf52840dk/nrf52840:sample.sidewalk.hello.release RAM 5.46 KB 108.76 KB 0 B
ROM 26.02 KB 404.2 KB 0 B
nrf5340dk/nrf5340/cpuapp:sample.sidewalk.demo RAM 3.1 KB 114.87 KB 0 B
ROM 6.14 KB 401.78 KB 0 B
nrf5340dk/nrf5340/cpuapp:sample.sidewalk.demo.ble_only RAM 3.1 KB 99.68 KB 0 B
ROM 6.14 KB 318.17 KB 0 B
nrf5340dk/nrf5340/cpuapp:sample.sidewalk.dut RAM 3.1 KB 138.64 KB 0 B
ROM 6.87 KB 468.32 KB 0 B
nrf5340dk/nrf5340/cpuapp:sample.sidewalk.dut.no_secure RAM 3.1 KB 138.62 KB 0 B
ROM 6.89 KB 460.89 KB 0 B
nrf5340dk/nrf5340/cpuapp:sample.sidewalk.hello RAM 3.1 KB 116.37 KB 0 B
ROM 6.41 KB 417.34 KB 0 B
nrf5340dk/nrf5340/cpuapp:sample.sidewalk.hello.ble_only RAM 3.1 KB 89.77 KB 0 B
ROM 6.12 KB 316.73 KB 0 B
nrf5340dk/nrf5340/cpuapp:sample.sidewalk.hello.ble_only.release RAM 3.1 KB 85.12 KB 0 B
ROM 3.92 KB 244.99 KB 0 B
nrf5340dk/nrf5340/cpuapp:sample.sidewalk.hello.release RAM 3.1 KB 100.31 KB 0 B
ROM 3.92 KB 324.76 KB 0 B
nrf54l15dk/nrf54l15/cpuapp/ns:sample.sidewalk.demo RAM 4.3 KB 120.84 KB 0 B
ROM 11 KB 406.26 KB 0 B
nrf54l15dk/nrf54l15/cpuapp/ns:sample.sidewalk.demo.ble_only RAM 4.3 KB 105.8 KB 0 B
ROM 10.99 KB 328.5 KB 0 B
nrf54l15dk/nrf54l15/cpuapp/ns:sample.sidewalk.dut RAM 4.3 KB 144.59 KB 0 B
ROM 11.75 KB 472.79 KB 0 B
nrf54l15dk/nrf54l15/cpuapp/ns:sample.sidewalk.dut.no_secure RAM 4.3 KB 144.59 KB 0 B
ROM 11.75 KB 470.09 KB 0 B
nrf54l15dk/nrf54l15/cpuapp/ns:sample.sidewalk.hello RAM 4.3 KB 122.29 KB 0 B
ROM 11.29 KB 421.55 KB 0 B

@RobertGalatNordic RobertGalatNordic force-pushed the make_smp_and_sidewalk_parallel branch 10 times, most recently from 7e16d63 to d9da400 Compare November 14, 2024 12:28
@RobertGalatNordic RobertGalatNordic force-pushed the make_smp_and_sidewalk_parallel branch from da45118 to d373619 Compare November 15, 2024 11:00
ktaborowski
ktaborowski requested changes Nov 15, 2024
View reviewed changes
Copy link
Contributor

@ktaborowski ktaborowski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a first-look review. Code looks good in gerenal, but naming and file location is incositent withe the rest of the repo. Plus some question about work.
To be continued.

subsys/sal/common/sid_ifc/bt_app_callbacks.c Outdated Show resolved Hide resolved
subsys/sal/common/sid_ifc/bt_app_callbacks.h Outdated Show resolved Hide resolved
subsys/sal/common/sid_ifc/bt_app_callbacks.c Outdated Show resolved Hide resolved
subsys/sal/sid_pal/src/sid_ble_adapter.c Show resolved Hide resolved
subsys/sal/sid_pal/src/sid_ble_adapter.c Show resolved Hide resolved
subsys/sal/common/sid_ifc/bt_app_callbacks.h Outdated Show resolved Hide resolved
subsys/sal/common/sid_ifc/bt_app_callbacks.h Outdated Show resolved Hide resolved
subsys/sal/common/sid_ifc/bt_app_callbacks.h Outdated Show resolved Hide resolved
subsys/sal/sid_pal/src/sid_ble_connection.c Outdated Show resolved Hide resolved
utils/sidewalk_dfu/nordic_dfu.c Outdated Show resolved Hide resolved
ktaborowski
ktaborowski approved these changes Nov 18, 2024
View reviewed changes
Copy link
Contributor

@ktaborowski ktaborowski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, no need to change form me

@RobertGalatNordic RobertGalatNordic force-pushed the make_smp_and_sidewalk_parallel branch 4 times, most recently from 0ca10a7 to 4b0c6e3 Compare November 19, 2024 14:33
@konradderda @RobertGalatNordic
pal: switch to multi-advertising BLE API
c500259 
This commit prepares PAL to be used alongside other BLE instances.

Signed-off-by: Konrad Derda <[email protected]>
@konradderda @RobertGalatNordic
tests: update tests
8ab30e0 
update unit tests

Co-authored-by: Robert Gałat <[email protected]>
Co-authored-by: Konrad Derda <[email protected]>

Signed-off-by: Konrad Derda <[email protected]>
Signed-off-by: Robert Gałat <[email protected]>
@RobertGalatNordic
app: generalize ext adv for smp
4386e00 
remove id from kconfig, as it should not be concern for the user.
collisions are prevented by using enum.

Signed-off-by: Robert Gałat <[email protected]>
@RobertGalatNordic
app: allow DFU and Sidewalk to run in parallel
d38e084 
remove disabling of Sidewalk when entering to DFU mode

Signed-off-by: Robert Gałat <[email protected]>
@RobertGalatNordic
ble: Avoid using the same BLE name for SMP and app
cfe9fbc 
define new name for BLE ADV for Sidewalk services.

Signed-off-by: Robert Gałat <[email protected]>
@RobertGalatNordic
dfu: add connection callback to DFU
3c8f593 
allow to restart adv when disconnected and log connection

Signed-off-by: Robert Gałat <[email protected]>
@RobertGalatNordic
ble: apply changes suggested in review
2a0eea2 
code style fixes

Signed-off-by: Robert Gałat <[email protected]>
@RobertGalatNordic
ble: add authorization to sample
b7bf808 
add ble authorization to samples to filter service

Signed-off-by: Robert Gałat <[email protected]>
@RobertGalatNordic
sbdt: disable sidewalk file transfer when in DFU mode
71f2b0f 
To prevent conflict with SMP DFU, disable sbdt

Signed-off-by: Robert Gałat <[email protected]>
@RobertGalatNordic
sample: extract filtration of GATT to a function
0438cd7 
simplify gatt authorize function

Signed-off-by: Robert Gałat <[email protected]>
@RobertGalatNordic RobertGalatNordic force-pushed the make_smp_and_sidewalk_parallel branch 4 times, most recently from 4a3bd20 to b2e2a97 Compare November 21, 2024 12:31
@RobertGalatNordic
ble: stop adv when connected
b7e3e6b 
prevent calling change_adv_work when already connected

Signed-off-by: Robert Gałat <[email protected]>
@RobertGalatNordic RobertGalatNordic force-pushed the make_smp_and_sidewalk_parallel branch 3 times, most recently from 05e7532 to db91143 Compare November 22, 2024 14:38
@RobertGalatNordic
sbdt: block callbacks if in SMP DFU mode
ecec552 
prevent sidewalk from handling sbdt events in DFU mode

Signed-off-by: Robert Gałat <[email protected]>
@RobertGalatNordic RobertGalatNordic force-pushed the make_smp_and_sidewalk_parallel branch from db91143 to ecec552 Compare November 26, 2024 09:30
@RobertGalatNordic RobertGalatNordic merged commit e04a8ef into nrfconnect:main Nov 26, 2024
57 checks passed
@ktaborowski ktaborowski mentioned this pull request Nov 26, 2024
Closed
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ktaborowski ktaborowski ktaborowski approved these changes

@totyz totyz totyz approved these changes

Assignees
No one assigned
Labels
scripts source PR changing src files tests
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@RobertGalatNordic @ktaborowski @totyz @konradderda