Skip to content

Commit d9d339f

Browse files
author
Miecznik, Rafał
committed
CI/CD: Promote lib files to ncs-door-lock-app @418b06923630
Source commit ID: @418b06923630 Signed-off-by: Miecznik, Rafał <rafal.miecznik@nordicsemi.com>
1 parent f409bd2 commit d9d339f

89 files changed

Lines changed: 3913 additions & 1493 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.

‎CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55
#
66

77
add_subdirectory(drivers)
8+
add_subdirectory_ifdef(CONFIG_NCS_ALIRO lib/aliro)

‎Kconfig‎

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,46 @@
66

77
rsource "drivers/Kconfig"
88

9-
config ALIRO_PRINT_READER_GROUP_ID
10-
bool "Print reader group ID that should be provisioned into the User Device"
9+
menuconfig NCS_ALIRO
10+
bool "NCS Aliro reader [EXPERIMENTAL]"
11+
depends on (SOC_SERIES_NRF54LX || SOC_SERIES_NRF53X || SOC_SERIES_NRF52X)
12+
select EXPERIMENTAL
13+
imply NFC_T4T_APDU
14+
imply POLL
15+
# storage
16+
imply SETTINGS
17+
imply NVS
18+
imply FLASH
19+
imply FLASH_MAP
20+
help
21+
This option enables the Aliro reader stack.
22+
23+
if NCS_ALIRO
24+
25+
config ALIRO_BLE_TP
26+
bool "Aliro BLE transport"
27+
help
28+
Enable the Aliro BLE transport protocol (TP). This is the transport layer
29+
used by Reader to communicate with the User Device. It is used to send and
30+
receive packets over BLE.
31+
32+
config DISABLE_ALIRO_NFC_TP
33+
bool "Disable NFC transport protocol for development purposes"
34+
help
35+
Disable the NFC transport protocol. This is useful if you want to use Aliro with BLE only.
36+
37+
if ALIRO_BLE_TP
38+
39+
config ALIRO_BLE_TP_MAX_SESSIONS
40+
int "Maximum number of BLE sessions"
41+
default BT_MAX_CONN
42+
help
43+
The maximum number of BLE sessions that can be established.
44+
45+
rsource "lib/aliro/Kconfig.ble.defconfig"
46+
47+
endif # ALIRO_BLE_TP
48+
49+
rsource "lib/aliro/Kconfig.defconfig"
50+
51+
endif # NCS_ALIRO

‎app/CMakeLists.txt‎

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,8 @@ 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 src/*.cpp)
12+
file(GLOB app_sources CONFIGURE_DEPENDS src/*.cpp)
1313

14-
add_subdirectory(src/nfc_transport_impl)
14+
add_subdirectory(src/platform)
1515

16-
target_sources(app PRIVATE
17-
${app_sources}
18-
)
19-
20-
set(ALIRO_LIB_DIR ${ZEPHYR_NCS_DOOR_LOCK_APP_MODULE_DIR}/lib/aliro)
21-
22-
if(CONFIG_SOC_SERIES_NRF52X)
23-
set(ALIRO_LIB_BIN_PATH ${ALIRO_LIB_DIR}/bin/cortex-m4)
24-
elseif(CONFIG_SOC_SERIES_NRF54LX OR CONFIG_SOC_SERIES_NRF53X)
25-
set(ALIRO_LIB_BIN_PATH ${ALIRO_LIB_DIR}/bin/cortex-m33)
26-
endif()
27-
28-
add_library(aliro_stack STATIC IMPORTED GLOBAL)
29-
30-
set_target_properties(aliro_stack PROPERTIES IMPORTED_LOCATION ${ALIRO_LIB_BIN_PATH}/libaliro.a)
31-
32-
target_link_libraries(app PRIVATE aliro_stack)
33-
target_link_libraries(aliro_stack INTERFACE zephyr_interface)
34-
35-
zephyr_include_directories(${ALIRO_LIB_DIR}/include)
36-
zephyr_include_directories(${ALIRO_LIB_DIR}/interfaces)
37-
zephyr_include_directories(${ALIRO_LIB_DIR}/interfaces/crypto/backend_crypto_psa)
16+
target_sources(app PRIVATE ${app_sources})

‎app/Kconfig‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
#
66

7-
rsource "src/nfc_transport_impl/Kconfig"
8-
rsource "../lib/aliro/Kconfig.defconfig"
7+
rsource "src/platform/Kconfig"
98

109
menu "Zephyr"
1110
source "Kconfig.zephyr"

‎app/Kconfig.sysbuild‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#
2+
# Copyright (c) 2025 Nordic Semiconductor ASA
3+
#
4+
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
5+
#
6+
7+
source "share/sysbuild/Kconfig"
8+
9+
config NRF_DEFAULT_IPC_RADIO
10+
default y
11+
12+
config NETCORE_IPC_RADIO_BT_HCI_IPC
13+
default y

‎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 = 2
2+
VERSION_MINOR = 1
33
PATCHLEVEL = 0
44
VERSION_TWEAK = 0
55
EXTRAVERSION =

‎app/boards/nrf52840dk_nrf52840.overlay‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@
3434
nucleo_nfc@0 {
3535
compatible = "x-nucleo-nfc";
3636
reg = <0>;
37-
spi-max-frequency = <4000000>;
37+
spi-max-frequency = <DT_FREQ_M(4)>;
3838
irq-gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>;
39+
reset-gpios = <&gpio1 10 (GPIO_ACTIVE_LOW | GPIO_PULL_DOWN)>;
3940
};
4041
};
4142

@@ -57,3 +58,11 @@
5758
status = "okay";
5859
};
5960
};
61+
62+
/ {
63+
access_decision_indicator: access_decision_indicator{
64+
status = "okay";
65+
compatible = "access-decision-indicator";
66+
gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>;
67+
};
68+
};

‎app/boards/nrf5340dk_nrf5340_cpuapp.conf‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#
2+
# Copyright (c) 2025 Nordic Semiconductor ASA
3+
#
4+
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
5+
#
6+
7+
# Enable BLE Transport Protocol
8+
CONFIG_ALIRO_BLE_TP=y

‎app/boards/nrf5340dk_nrf5340_cpuapp.overlay‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
};
2626

27-
2827
&spi1 {
2928
compatible = "nordic,nrf-spim";
3029
status = "okay";
@@ -36,7 +35,16 @@
3635
nucleo_nfc@0 {
3736
compatible = "x-nucleo-nfc";
3837
reg = <0>;
39-
spi-max-frequency = <4000000>;
38+
spi-max-frequency = <DT_FREQ_M(5)>;
4039
irq-gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>;
40+
reset-gpios = <&gpio1 10 (GPIO_ACTIVE_LOW | GPIO_PULL_DOWN)>;
41+
};
42+
};
43+
44+
/ {
45+
access_decision_indicator: access_decision_indicator{
46+
status = "okay";
47+
compatible = "access-decision-indicator";
48+
gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>;
4149
};
4250
};

‎app/boards/nrf54l15dk_nrf54l15_cpuapp.overlay‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,12 @@
5757
compatible = "nfc-power-control";
5858
gpios = <&gpio2 6 ( GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN )>;
5959
};
60+
61+
access_decision_indicator: access_decision_indicator{
62+
status = "okay";
63+
compatible = "access-decision-indicator";
64+
gpios = <&gpio2 10 GPIO_ACTIVE_HIGH>;
65+
};
6066
};
6167

6268
&gpio0 {

0 commit comments

Comments
 (0)