Skip to content

Commit a870763

Browse files
author
Rafal Miecznik
committed
CI/CD: Synchronize ncs-aliro@116a4d04c638 and ncs-door-lock-app
Source commit ID: @116a4d04c638 sync-ncs-aliro-116a4d04c638-#4 Signed-off-by: Rafal Miecznik <rafal.miecznik@nordicsemi.com>
1 parent f962efa commit a870763

68 files changed

Lines changed: 1479 additions & 671 deletions

Some content is hidden

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

‎CODEOWNERS‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎Kconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ menuconfig NCS_DOOR_LOCK
1111
bool "NCS Door Lock Application [EXPERIMENTAL]"
1212
depends on (SOC_SERIES_NRF54LX || SOC_SERIES_NRF53X || SOC_SERIES_NRF52X)
1313
select EXPERIMENTAL
14+
select NCS_ALIRO
1415
imply NFC_T4T_APDU
1516
imply POLL
1617
# storage
@@ -29,6 +30,7 @@ orsource "lib/aliro/interfaces/logger/Kconfig"
2930

3031
config DOOR_LOCK_BLE_UWB
3132
bool "Aliro Bluetooth LE (BLE) transport together with ultra wideband (UWB)"
33+
select NCS_ALIRO_BLE_UWB
3234
help
3335
Enable the Aliro BLE transport protocol (TP). This is the transport layer
3436
used by the Reader to communicate with the User Device. It is used to send and

‎app/boards/nrf54lm20dk_spi_nrfutil_config.json‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"firmware_config": {
3+
"peripheral": "SPIM00"
4+
},
5+
"pins": {
6+
"sck": 65,
7+
"csn": 69,
8+
"io0": 66,
9+
"io1": 68,
10+
"io2": 67,
11+
"io3": 64
12+
},
13+
"flash_size": 67108864,
14+
"sck_frequency": 8000000,
15+
"page_size": 4096,
16+
"address_mode": "MODE24BIT"
17+
}

‎app/pm_static_nrf54lm20dk_nrf54lm20a_cpuapp.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@ mcuboot_secondary_app:
5151
size: 0x1E2800
5252
external_flash:
5353
address: 0x1E3000
54-
size: 0x5DB000
54+
size: 0x61D000
5555
device: MX25R64
5656
region: external_flash

‎app/pm_static_nrf54lm20dk_nrf54lm20a_cpuapp_uwb_dfu.yml‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
mcuboot:
2+
address: 0x0
3+
region: flash_primary
4+
size: 0xD000
5+
mcuboot_pad:
6+
address: 0xD000
7+
region: flash_primary
8+
size: 0x800
9+
app:
10+
address: 0xD800
11+
region: flash_primary
12+
size: 0x1E2800
13+
mcuboot_primary:
14+
address: 0xD000
15+
orig_span: &id001
16+
- app
17+
- mcuboot_pad
18+
region: flash_primary
19+
size: 0x1E3000
20+
span: *id001
21+
mcuboot_primary_app:
22+
address: 0xD800
23+
orig_span: &id002
24+
- app
25+
region: flash_primary
26+
size: 0x1E2800
27+
span: *id002
28+
factory_data:
29+
address: 0x1F0000
30+
region: flash_primary
31+
size: 0x1000
32+
settings_storage:
33+
address: 0x1F1000
34+
region: flash_primary
35+
size: 0xC000
36+
mcuboot_secondary:
37+
address: 0x0
38+
orig_span: &id003
39+
- mcuboot_secondary_pad
40+
- mcuboot_secondary_app
41+
region: external_flash
42+
size: 0x1E3000
43+
span: *id003
44+
mcuboot_secondary_pad:
45+
region: external_flash
46+
address: 0x0
47+
size: 0x800
48+
mcuboot_secondary_app:
49+
region: external_flash
50+
address: 0x800
51+
size: 0x1E2800
52+
qm35_fw_mcuboot_pad:
53+
address: 0x1E3000
54+
size: 0x800
55+
device: MX25R64
56+
region: external_flash
57+
qm35_fw:
58+
address: 0x1E3800
59+
size: 0x80000
60+
region: external_flash
61+
qm35_fw_pad:
62+
address: 0x263800
63+
size: 0x800
64+
region: external_flash
65+
mcuboot_primary_1:
66+
orig_span: &id004
67+
- qm35_fw_mcuboot_pad
68+
- qm35_fw
69+
- qm35_fw_pad
70+
span: *id004
71+
address: 0x1E3000
72+
size: 0x81000
73+
region: external_flash
74+
mcuboot_secondary_1:
75+
address: 0x264000
76+
size: 0x81000
77+
region: external_flash
78+
external_flash:
79+
address: 0x2E5000
80+
size: 0x51B000
81+
region: external_flash

‎app/sample.yaml‎

Lines changed: 99 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -5,66 +5,128 @@ common:
55
sysbuild: true
66
build_only: true
77
tests:
8-
app.nfc_door_lock:
9-
platform_allow: &platforms_all
10-
- nrf52840dk/nrf52840
8+
app.door_lock.nfc-ble-uwb.bt_nus-dfu_smp-exp_fast-step_up:
9+
platform_allow:
1110
- nrf5340dk/nrf5340/cpuapp
12-
- nrf54l15dk/nrf54l15/cpuapp
13-
- nrf54lm20dk/nrf54lm20a/cpuapp
14-
integration_platforms: *platforms_all
15-
app.door_lock_ble_uwb:
16-
platform_allow: &platforms_uwb
11+
integration_platforms:
1712
- nrf5340dk/nrf5340/cpuapp
18-
- nrf54lm20dk/nrf54lm20a/cpuapp
19-
integration_platforms: *platforms_uwb
2013
extra_args:
21-
- app_SNIPPET=uwb_qm35
22-
app.nfc_door_lock.matter:
23-
platform_allow: *platforms_all
24-
integration_platforms: *platforms_all
14+
- app_SNIPPET="uwb_qm35;dfu_smp;bt_nus"
15+
- CONFIG_DFU_SMP_LOG_LEVEL_DBG=y
16+
- CONFIG_DOOR_LOCK_EXPEDITED_FAST_PHASE=y
17+
- CONFIG_DOOR_LOCK_STEP_UP_PHASE=y
18+
app.door_lock.nfc-ble-uwb.dfu_smp-matter-exp_fast-step_up:
19+
platform_allow:
20+
- nrf54lm20dk/nrf54lm20a/cpuapp
21+
integration_platforms:
22+
- nrf54lm20dk/nrf54lm20a/cpuapp
2523
extra_args:
24+
- app_SNIPPET="uwb_qm35_src;dfu_smp"
2625
- SNIPPET=matter
27-
app.door_lock_ble_uwb.matter:
28-
platform_allow: *platforms_uwb
29-
integration_platforms: *platforms_uwb
26+
- CONFIG_DFU_SMP_LOG_LEVEL_DBG=y
27+
- CONFIG_DOOR_LOCK_EXPEDITED_FAST_PHASE=y
28+
- CONFIG_DOOR_LOCK_STEP_UP_PHASE=y
29+
app.door_lock.ble-uwb.dfu_smp-matter-step_up:
30+
platform_allow:
31+
- nrf54lm20dk/nrf54lm20a/cpuapp
32+
integration_platforms:
33+
- nrf54lm20dk/nrf54lm20a/cpuapp
3034
extra_args:
35+
- app_SNIPPET="uwb_qm35;dfu_smp"
3136
- SNIPPET=matter
32-
- app_SNIPPET=uwb_qm35
33-
app.door_lock_ble_uwb.matter.bt_nus:
34-
platform_allow: *platforms_uwb
35-
integration_platforms: *platforms_uwb
37+
- CONFIG_DFU_SMP_LOG_LEVEL_DBG=y
38+
- CONFIG_DOOR_LOCK_EXPEDITED_FAST_PHASE=n
39+
- CONFIG_DOOR_LOCK_STEP_UP_PHASE=y
40+
app.door_lock.nfc.dfu_smp-matter-step_up:
41+
platform_allow:
42+
- nrf54l15dk/nrf54l15/cpuapp
43+
- nrf52840dk/nrf52840
44+
- nrf5340dk/nrf5340/cpuapp
45+
integration_platforms:
46+
- nrf54l15dk/nrf54l15/cpuapp
47+
- nrf52840dk/nrf52840
48+
- nrf5340dk/nrf5340/cpuapp
3649
extra_args:
50+
- app_SNIPPET=dfu_smp
3751
- SNIPPET=matter
38-
- app_SNIPPET=uwb_qm35
39-
- CONFIG_CHIP_NUS=y
40-
app.door_lock_ble_uwb.exp_fast:
41-
platform_allow: *platforms_uwb
42-
integration_platforms: *platforms_uwb
52+
- CONFIG_DFU_SMP_LOG_LEVEL_DBG=y
53+
- CONFIG_DOOR_LOCK_EXPEDITED_FAST_PHASE=n
54+
- CONFIG_DOOR_LOCK_STEP_UP_PHASE=y
55+
app.door_lock.ble-uwb.dfu_smp-step_up:
56+
platform_allow:
57+
- nrf54lm20dk/nrf54lm20a/cpuapp
58+
integration_platforms:
59+
- nrf54lm20dk/nrf54lm20a/cpuapp
4360
extra_args:
44-
- app_SNIPPET=uwb_qm35
45-
- CONFIG_DOOR_LOCK_EXPEDITED_FAST_PHASE=y
46-
app.nfc_door_lock.dfu_smp:
47-
platform_allow: &platforms_5340_54l15
61+
- app_SNIPPET="uwb_qm35_src;dfu_smp"
62+
- CONFIG_DFU_SMP_LOG_LEVEL_DBG=y
63+
- CONFIG_DOOR_LOCK_EXPEDITED_FAST_PHASE=n
64+
- CONFIG_DOOR_LOCK_STEP_UP_PHASE=y
65+
app.door_lock.nfc.dfu_smp-step_up:
66+
platform_allow:
67+
- nrf54l15dk/nrf54l15/cpuapp
68+
- nrf52840dk/nrf52840
4869
- nrf5340dk/nrf5340/cpuapp
70+
integration_platforms:
4971
- nrf54l15dk/nrf54l15/cpuapp
50-
integration_platforms: *platforms_5340_54l15
72+
- nrf52840dk/nrf52840
73+
- nrf5340dk/nrf5340/cpuapp
5174
extra_args:
5275
- app_SNIPPET=dfu_smp
53-
app.nfc_door_lock_ble_uwb.matter.exp_fast.dfu_smp:
76+
- CONFIG_DFU_SMP_LOG_LEVEL_DBG=y
77+
- CONFIG_DOOR_LOCK_EXPEDITED_FAST_PHASE=n
78+
- CONFIG_DOOR_LOCK_STEP_UP_PHASE=y
79+
app.door_lock.nfc:
5480
platform_allow:
81+
- nrf52840dk/nrf52840
5582
- nrf5340dk/nrf5340/cpuapp
83+
- nrf54l15dk/nrf54l15/cpuapp
84+
- nrf54lm20dk/nrf54lm20a/cpuapp
5685
integration_platforms:
86+
- nrf52840dk/nrf52840
5787
- nrf5340dk/nrf5340/cpuapp
88+
- nrf54l15dk/nrf54l15/cpuapp
89+
- nrf54lm20dk/nrf54lm20a/cpuapp
5890
extra_args:
59-
- app_SNIPPET=dfu_smp
60-
- SNIPPET=matter
61-
- app_SNIPPET=uwb_qm35
62-
- CONFIG_DOOR_LOCK_EXPEDITED_FAST_PHASE=y
63-
app.nfc_door_lock_ble_uwb.step_up:
91+
- SB_CONFIG_BOOTLOADER_NONE=y
92+
- SB_CONFIG_NETCORE_NONE=y
93+
app.door_lock.ble-uwb:
94+
platform_allow:
95+
- nrf5340dk/nrf5340/cpuapp
96+
- nrf54lm20dk/nrf54lm20a/cpuapp
97+
integration_platforms:
98+
- nrf5340dk/nrf5340/cpuapp
99+
- nrf54lm20dk/nrf54lm20a/cpuapp
100+
extra_args:
101+
- app_SNIPPET=uwb_qm35_src
102+
- SB_CONFIG_BOOTLOADER_NONE=y
103+
- SB_CONFIG_NETCORE_NONE=y
104+
smoke.door_lock.nfc-ble-uwb.matter-exp_fast-step_up:
64105
platform_allow:
65106
- nrf5340dk/nrf5340/cpuapp
66107
integration_platforms:
67108
- nrf5340dk/nrf5340/cpuapp
109+
extra_args:
110+
- app_SNIPPET="uwb_qm35"
111+
- SNIPPET=matter
112+
- CONFIG_DFU_SMP_LOG_LEVEL_DBG=y
113+
- CONFIG_DOOR_LOCK_EXPEDITED_FAST_PHASE=y
114+
- CONFIG_DOOR_LOCK_STEP_UP_PHASE=y
115+
smoke.door_lock.ble-uwb:
116+
platform_allow:
117+
- nrf54lm20dk/nrf54lm20a/cpuapp
118+
integration_platforms:
119+
- nrf54lm20dk/nrf54lm20a/cpuapp
68120
extra_args:
69121
- app_SNIPPET=uwb_qm35
122+
- CONFIG_DOOR_LOCK_EXPEDITED_FAST_PHASE=n
123+
- CONFIG_DOOR_LOCK_STEP_UP_PHASE=n
124+
smoke.door_lock.nfc.bt_nus-step_up:
125+
platform_allow:
126+
- nrf52840dk/nrf52840
127+
integration_platforms:
128+
- nrf52840dk/nrf52840
129+
extra_args:
130+
- app_SNIPPET=bt_nus
131+
- CONFIG_DOOR_LOCK_EXPEDITED_FAST_PHASE=n
70132
- CONFIG_DOOR_LOCK_STEP_UP_PHASE=y

‎app/src/aliro/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ config DOOR_LOCK_STEP_UP_PHASE
2020

2121
config DOOR_LOCK_CREDENTIAL_ISSUER_CA
2222
bool "Support for Credential Issuer CA public key"
23-
default y if DOOR_LOCK_STEP_UP_PHASE
23+
default y if DOOR_LOCK_STEP_UP_PHASE && !CHIP
2424
help
2525
If enabled, the Credential Issuer CA public key is supported.
2626
The Credential Issuer CA public key is used to verify the signature of the Credential Issuer certificate.

0 commit comments

Comments
 (0)