Skip to content

Commit 4e2221f

Browse files
author
Rafal Miecznik
committed
CI/CD: Synchronize ncs-aliro@18de2c264902 and ncs-door-lock-app
Source commit ID: @18de2c264902 sync-ncs-aliro-18de2c264902 Signed-off-by: Rafal Miecznik <rafal.miecznik@nordicsemi.com>
1 parent 3895f19 commit 4e2221f

244 files changed

Lines changed: 67191 additions & 23599 deletions

File tree

Some content is hidden

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

‎app/CMakeLists.txt‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,9 @@ cmake_minimum_required(VERSION 3.20.0)
99
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
1010
project(door-lock-app)
1111

12-
file(GLOB app_sources CONFIGURE_DEPENDS src/*.cpp)
13-
14-
add_subdirectory(src/platform)
15-
16-
if (CONFIG_ACCESS_MANAGER_IMPLEMENTATION_DEFAULT)
17-
add_subdirectory(src/access_manager_impl_default)
18-
elseif (CONFIG_ACCESS_MANAGER_IMPLEMENTATION_CUSTOM)
19-
add_subdirectory(src/access_manager_impl_custom)
20-
else()
21-
message(FATAL_ERROR "No access manager implementation selected")
22-
endif()
12+
add_subdirectory(src/aliro)
13+
add_subdirectory_ifdef(CONFIG_CHIP src/matter)
2314

15+
file(GLOB app_sources CONFIGURE_DEPENDS src/*.cpp)
2416
target_sources(app PRIVATE ${app_sources})
17+
target_include_directories(app PRIVATE src)

‎app/Kconfig‎

Lines changed: 38 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
#
66

7-
rsource "src/platform/Kconfig"
8-
9-
menu "Zephyr"
10-
source "Kconfig.zephyr"
11-
endmenu
12-
137
module = NCS_DOOR_LOCK_APP
148
module-str = NCS_DOOR_LOCK_APP
159
module-dep = LOG
@@ -34,6 +28,41 @@ choice ACCESS_MANAGER_IMPLEMENTATION
3428
that can be tailored to specific requirements.
3529
endchoice
3630

37-
if ACCESS_MANAGER_IMPLEMENTATION_DEFAULT
38-
rsource "src/access_manager_impl_default/Kconfig"
39-
endif
31+
config DOOR_LOCK_CLI
32+
bool "Door Lock CLI support"
33+
default y
34+
select SHELL
35+
select REBOOT
36+
help
37+
Enable support for Door Lock CLI.
38+
39+
config DOOR_LOCK_PRINT_READER_GROUP_IDENTIFIER
40+
bool "Print reader group identifier that should be provisioned into the User Device"
41+
default y
42+
help
43+
Enable printing of the reader group identifier that should be provisioned into the User Device.
44+
45+
config DOOR_LOCK_USE_TEST_READER_IDENTIFIER
46+
bool "Use test reader identifier"
47+
default y
48+
help
49+
Initialize the reader Group Identifier and Group Sub Identifier to test values.
50+
51+
config DOOR_LOCK_USE_TEST_KEYS
52+
bool "Use test keys"
53+
default y
54+
help
55+
Initialize the reader keys to test values.
56+
57+
rsource "src/aliro/Kconfig"
58+
59+
if CHIP
60+
61+
rsource "src/matter/Kconfig"
62+
source "${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.features"
63+
source "${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.defaults"
64+
source "${ZEPHYR_NRF_MODULE_DIR}/samples/matter/common/src/Kconfig"
65+
66+
endif # CHIP
67+
68+
source "Kconfig.zephyr"

‎app/Kconfig.sysbuild‎

Lines changed: 72 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,80 @@
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
#
66

7-
source "share/sysbuild/Kconfig"
8-
7+
#### Radio core selection
98
config NRF_DEFAULT_IPC_RADIO
109
default y
1110

11+
# Enable Bluetooth serialization to network core
12+
# This config automatically pulls in the `overlay-bt_hci_ipc.conf` in the ipc_radio image
1213
config NETCORE_IPC_RADIO_BT_HCI_IPC
14+
default y if SOC_SERIES_NRF53X
15+
16+
if MATTER
17+
18+
config WIFI_NRF70
19+
default y if BOARD_NRF7002DK
20+
21+
# Enable IEEE802.15.4 serialization to network core
22+
# This config automatically pulls in the `overlay-802154.conf` in the ipc_radio image
23+
config NETCORE_IPC_RADIO_IEEE802154
24+
default y if SOC_SERIES_NRF53X && !WIFI_NRF70
25+
26+
#### Bootloader
27+
choice BOOTLOADER
28+
default BOOTLOADER_MCUBOOT if !BOARD_NRF21540DK
29+
endchoice
30+
31+
if BOOTLOADER_MCUBOOT
32+
33+
#### DFU multi-image support
34+
config DFU_MULTI_IMAGE_PACKAGE_BUILD
35+
default y
36+
37+
config DFU_MULTI_IMAGE_PACKAGE_APP
38+
default y
39+
40+
config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY
41+
default y
42+
43+
#### DFU network core configuration
44+
if SOC_SERIES_NRF53X
45+
46+
config MCUBOOT_UPDATEABLE_IMAGES
47+
default 2
48+
49+
choice MCUBOOT_MODE
50+
default MCUBOOT_MODE_OVERWRITE_ONLY
51+
endchoice
52+
53+
choice BOOT_SIGNATURE_TYPE
54+
default BOOT_SIGNATURE_TYPE_RSA
55+
endchoice
56+
57+
config SECURE_BOOT_NETCORE
58+
default y
59+
60+
config NETCORE_APP_UPDATE
61+
default y
62+
63+
config DFU_MULTI_IMAGE_PACKAGE_NET
64+
default y
65+
66+
endif # SOC_SERIES_NRF53X
67+
68+
if BOARD_NRF54L15DK
69+
70+
config PM_OVERRIDE_EXTERNAL_DRIVER_CHECK
1371
default y
72+
73+
endif # BOARD_NRF54L15DK
74+
75+
endif # BOOTLOADER_MCUBOOT
76+
77+
#### Enable generating factory data
78+
config MATTER_FACTORY_DATA_GENERATE
79+
default y if !BOARD_NRF21540DK
80+
81+
endif # MATTER
82+
83+
source "share/sysbuild/Kconfig"

‎app/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
VERSION_MAJOR = 0
2-
VERSION_MINOR = 3
2+
VERSION_MINOR = 4
33
PATCHLEVEL = 0
44
VERSION_TWEAK = 0
55
EXTRAVERSION =

‎app/boards/nrf52840dk_nrf52840.overlay‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88
spi0_default_alt: spi0_default_alt {
99
group1 {
1010
psels = <NRF_PSEL(SPIM_SCK, 1, 15)>,
11-
<NRF_PSEL(SPIM_MOSI, 1, 13)>,
12-
<NRF_PSEL(SPIM_MISO, 1, 14)>;
11+
<NRF_PSEL(SPIM_MOSI, 1, 13)>,
12+
<NRF_PSEL(SPIM_MISO, 1, 14)>;
1313
};
1414
};
1515

1616
spi0_sleep_alt: spi0_sleep_alt {
1717
group1 {
1818
psels = <NRF_PSEL(SPIM_SCK, 1, 15)>,
19-
<NRF_PSEL(SPIM_MOSI, 1, 13)>,
20-
<NRF_PSEL(SPIM_MISO, 1, 14)>;
19+
<NRF_PSEL(SPIM_MOSI, 1, 13)>,
20+
<NRF_PSEL(SPIM_MISO, 1, 14)>;
2121
low-power-enable;
2222
};
2323
};

‎app/boards/nrf5340dk_nrf5340_cpuapp.overlay‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88
spi1_default_alt: spi1_default_alt {
99
group1 {
1010
psels = <NRF_PSEL(SPIM_SCK, 1, 15)>,
11-
<NRF_PSEL(SPIM_MOSI, 1, 13)>,
12-
<NRF_PSEL(SPIM_MISO, 1, 14)>;
11+
<NRF_PSEL(SPIM_MOSI, 1, 13)>,
12+
<NRF_PSEL(SPIM_MISO, 1, 14)>;
1313
};
1414
};
1515

1616
spi1_sleep_alt: spi1_sleep_alt {
1717
group1 {
1818
psels = <NRF_PSEL(SPIM_SCK, 1, 15)>,
19-
<NRF_PSEL(SPIM_MOSI, 1, 13)>,
20-
<NRF_PSEL(SPIM_MISO, 1, 14)>;
19+
<NRF_PSEL(SPIM_MOSI, 1, 13)>,
20+
<NRF_PSEL(SPIM_MISO, 1, 14)>;
2121
low-power-enable;
2222
};
2323
};
@@ -42,7 +42,7 @@
4242
};
4343

4444
/ {
45-
access_decision_indicator: access_decision_indicator{
45+
access_decision_indicator: access_decision_indicator {
4646
status = "okay";
4747
compatible = "access-decision-indicator";
4848
gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>;

‎app/boards/nrf54l15dk_nrf54l15_cpuapp.overlay‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@
66

77
/{
88
/* Disable buttons to avoid collision with interrupt and SCK pins for NFC tag reader. */
9-
/delete-node/ buttons;
9+
buttons {
10+
/delete-node/ button_0;
11+
/delete-node/ button_3;
12+
};
1013

1114
aliases {
1215
/delete-property/ sw0;
13-
/delete-property/ sw1;
14-
/delete-property/ sw2;
1516
/delete-property/ sw3;
17+
mcuboot-button0 = &button1;
1618
};
1719
};
1820

‎app/pm_static_nrf52840dk_nrf52840_matter.yml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
mcuboot:
2+
address: 0x0
3+
size: 0x7000
4+
region: flash_primary
5+
mcuboot_pad:
6+
address: 0x7000
7+
size: 0x200
8+
app:
9+
address: 0x7200
10+
size: 0xefe00
11+
mcuboot_primary:
12+
orig_span: &id001
13+
- mcuboot_pad
14+
- app
15+
span: *id001
16+
address: 0x7000
17+
size: 0xf0000
18+
region: flash_primary
19+
mcuboot_primary_app:
20+
orig_span: &id002
21+
- app
22+
span: *id002
23+
address: 0x7200
24+
size: 0xefe00
25+
factory_data:
26+
address: 0xf7000
27+
size: 0x1000
28+
region: flash_primary
29+
settings_storage:
30+
address: 0xf8000
31+
size: 0x8000
32+
region: flash_primary
33+
mcuboot_secondary:
34+
address: 0x0
35+
size: 0xf0000
36+
device: MX25R64
37+
region: external_flash
38+
external_flash:
39+
address: 0xf0000
40+
size: 0x710000
41+
device: MX25R64
42+
region: external_flash

‎app/pm_static_nrf5340dk_nrf5340_cpuapp_matter.yml‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
mcuboot:
2+
address: 0x0
3+
size: 0x8000
4+
region: flash_primary
5+
mcuboot_pad:
6+
address: 0x8000
7+
size: 0x200
8+
app:
9+
address: 0x8200
10+
size: 0xeee00
11+
mcuboot_primary:
12+
orig_span: &id001
13+
- mcuboot_pad
14+
- app
15+
span: *id001
16+
address: 0x8000
17+
size: 0xef000
18+
region: flash_primary
19+
mcuboot_primary_app:
20+
orig_span: &id002
21+
- app
22+
span: *id002
23+
address: 0x8200
24+
size: 0xeee00
25+
factory_data:
26+
address: 0xf7000
27+
size: 0x1000
28+
region: flash_primary
29+
settings_storage:
30+
address: 0xf8000
31+
size: 0x8000
32+
region: flash_primary
33+
mcuboot_primary_1:
34+
address: 0x0
35+
size: 0x40000
36+
device: flash_ctrl
37+
region: ram_flash
38+
mcuboot_secondary:
39+
address: 0x0
40+
size: 0xef000
41+
device: MX25R64
42+
region: external_flash
43+
mcuboot_secondary_1:
44+
address: 0xef000
45+
size: 0x40000
46+
device: MX25R64
47+
region: external_flash
48+
external_flash:
49+
address: 0x12F000
50+
size: 0x6D1000
51+
device: MX25R64
52+
region: external_flash
53+
pcd_sram:
54+
address: 0x20000000
55+
size: 0x2000
56+
region: sram_primary

‎app/pm_static_nrf54l15dk_nrf54l15_cpuapp_matter.yml‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
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: 0x164800
13+
mcuboot_primary:
14+
orig_span: &id001
15+
- mcuboot_pad
16+
- app
17+
span: *id001
18+
address: 0xD000
19+
region: flash_primary
20+
size: 0x165000
21+
mcuboot_primary_app:
22+
orig_span: &id002
23+
- app
24+
span: *id002
25+
address: 0xD800
26+
region: flash_primary
27+
size: 0x164800
28+
factory_data:
29+
address: 0x172000
30+
region: flash_primary
31+
size: 0x1000
32+
settings_storage:
33+
address: 0x173000
34+
region: flash_primary
35+
size: 0xA000
36+
mcuboot_secondary:
37+
address: 0x0
38+
orig_span: &id003
39+
- mcuboot_secondary_pad
40+
- mcuboot_secondary_app
41+
region: external_flash
42+
size: 0x165000
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: 0x164800
52+
external_flash:
53+
address: 0x165000
54+
size: 0x69B000
55+
device: MX25R64
56+
region: external_flash

0 commit comments

Comments
 (0)