Skip to content

Commit f9c333f

Browse files
Rafal Miecznikrami-nordic
authored andcommitted
CI/CD: Synchronize ncs-aliro@ac3225111d4d and ncs-door-lock-app
Source commit ID: @ac3225111d4d sync-ncs-aliro-ac3225111d4d-#1 Signed-off-by: Rafal Miecznik <rafal.miecznik@nordicsemi.com>
1 parent 3895f19 commit f9c333f

96 files changed

Lines changed: 35450 additions & 549 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: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ project(door-lock-app)
1212
file(GLOB app_sources CONFIGURE_DEPENDS src/*.cpp)
1313

1414
add_subdirectory(src/platform)
15+
add_subdirectory(src/storage)
1516

1617
if (CONFIG_ACCESS_MANAGER_IMPLEMENTATION_DEFAULT)
1718
add_subdirectory(src/access_manager_impl_default)
@@ -21,4 +22,8 @@ else()
2122
message(FATAL_ERROR "No access manager implementation selected")
2223
endif()
2324

25+
if(CONFIG_DOOR_LOCK_CLI)
26+
add_subdirectory(src/cli)
27+
endif(CONFIG_DOOR_LOCK_CLI)
28+
2429
target_sources(app PRIVATE ${app_sources})

app/Kconfig

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,23 @@ endchoice
3737
if ACCESS_MANAGER_IMPLEMENTATION_DEFAULT
3838
rsource "src/access_manager_impl_default/Kconfig"
3939
endif
40+
41+
config DOOR_LOCK_CLI
42+
bool "Door Lock CLI support"
43+
default y
44+
select SHELL
45+
select REBOOT
46+
help
47+
Enable support for Door Lock CLI.
48+
49+
config DOOR_LOCK_PRINT_READER_GROUP_IDENTIFIER
50+
bool "Print reader group identifier that should be provisioned into the User Device"
51+
default y
52+
help
53+
Enable printing of the reader group identifier that should be provisioned into the User Device.
54+
55+
config DOOR_LOCK_USE_TEST_READER_IDENTIFIER
56+
bool "Use test reader identifier"
57+
default y
58+
help
59+
Initialize the reader Group Identifier and Group Sub Identifier to test values.

app/boards/nrf54l15dk_nrf54l15_cpuapp.overlay

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,19 @@
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_1;
12+
/delete-node/ button_2;
13+
/delete-node/ button_3;
14+
};
1015

1116
aliases {
1217
/delete-property/ sw0;
1318
/delete-property/ sw1;
1419
/delete-property/ sw2;
1520
/delete-property/ sw3;
21+
/delete-property/ mcuboot-button0;
1622
};
1723
};
1824

app/src/cli/CMakeLists.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#
2+
# Copyright (c) 2025 Nordic Semiconductor ASA
3+
#
4+
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
5+
#
6+
7+
file(GLOB src CONFIGURE_DEPENDS ./*.cpp)
8+
9+
zephyr_library_sources(${src})
10+
zephyr_include_directories(.)

0 commit comments

Comments
 (0)