Skip to content

Commit 46bd742

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

90 files changed

Lines changed: 4796 additions & 1431 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.

‎Kconfig‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,21 @@ rsource "drivers/Kconfig"
88

99
config ALIRO_PRINT_READER_GROUP_ID
1010
bool "Print reader group ID that should be provisioned into the User Device"
11+
12+
config ALIRO_BLE_TP
13+
bool "Aliro BLE transport"
14+
help
15+
Enable the Aliro BLE transport protocol (TP). This is the transport layer
16+
used by Reader to communicate with the User Device. It is used to send and
17+
receive packets over BLE.
18+
19+
if ALIRO_BLE_TP
20+
21+
config ALIRO_BLE_TP_MAX_SESSIONS
22+
int "Maximum number of BLE sessions"
23+
default BT_MAX_CONN
24+
help
25+
The maximum number of BLE sessions that can be established.
26+
27+
rsource "lib/aliro/Kconfig.ble.defconfig"
28+
endif # ALIRO_BLE_TP

‎app/CMakeLists.txt‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,33 @@ 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-
)
16+
target_sources(app PRIVATE ${app_sources})
1917

20-
set(ALIRO_LIB_DIR ${ZEPHYR_NCS_DOOR_LOCK_APP_MODULE_DIR}/lib/aliro)
18+
set(PUBLIC_API ${ZEPHYR_NCS_ALIRO_MODULE_DIR})
2119

2220
if(CONFIG_SOC_SERIES_NRF52X)
23-
set(ALIRO_LIB_BIN_PATH ${ALIRO_LIB_DIR}/bin/cortex-m4)
21+
set(ALIRO_LIB_PATH ${ZEPHYR_NCS_ALIRO_MODULE_DIR}/applications/doorlock/lib/aliro/bin/cortex-m4)
2422
elseif(CONFIG_SOC_SERIES_NRF54LX OR CONFIG_SOC_SERIES_NRF53X)
25-
set(ALIRO_LIB_BIN_PATH ${ALIRO_LIB_DIR}/bin/cortex-m33)
23+
set(ALIRO_LIB_PATH ${ZEPHYR_NCS_ALIRO_MODULE_DIR}/applications/doorlock/lib/aliro/bin/cortex-m33)
2624
endif()
2725

2826
add_library(aliro_stack STATIC IMPORTED GLOBAL)
2927

30-
set_target_properties(aliro_stack PROPERTIES IMPORTED_LOCATION ${ALIRO_LIB_BIN_PATH}/libaliro.a)
28+
if(CONFIG_ALIRO_BLE_TP)
29+
set_target_properties(aliro_stack PROPERTIES IMPORTED_LOCATION ${ALIRO_LIB_PATH}/libaliro_ble.a)
30+
else(CONFIG_ALIRO_BLE_TP)
31+
set_target_properties(aliro_stack PROPERTIES IMPORTED_LOCATION ${ALIRO_LIB_PATH}/libaliro.a)
32+
endif(CONFIG_ALIRO_BLE_TP)
3133

3234
target_link_libraries(app PRIVATE aliro_stack)
3335
target_link_libraries(aliro_stack INTERFACE zephyr_interface)
3436

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)
37+
zephyr_include_directories(
38+
${PUBLIC_API}/include
39+
${PUBLIC_API}/interfaces
40+
${PUBLIC_API}/interfaces/crypto/backend_crypto_psa
41+
)

‎app/Kconfig‎

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

7-
rsource "src/nfc_transport_impl/Kconfig"
7+
rsource "src/platform/Kconfig"
88
rsource "../lib/aliro/Kconfig.defconfig"
99

1010
menu "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 {

‎app/prj.conf‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ CONFIG_ASSERT=y
1717
CONFIG_CONSOLE=y
1818
CONFIG_LOG=y
1919
CONFIG_NCS_ALIRO_RFAL_LOG_LEVEL_DBG=y
20+
CONFIG_DEBUG_STATE_MACHINE=y
2021
CONFIG_USE_SEGGER_RTT=n
2122
CONFIG_LOG_BACKEND_RTT=n
2223
CONFIG_LOG_BACKEND_SHOW_COLOR=n
@@ -27,14 +28,20 @@ CONFIG_SHELL_HISTORY=n
2728
CONFIG_SHELL_WILDCARD=n
2829

2930
# Increase shell buffer sizes
30-
CONFIG_SHELL_BACKEND_SERIAL_RX_RING_BUFFER_SIZE=512
31-
CONFIG_SHELL_BACKEND_SERIAL_TX_RING_BUFFER_SIZE=128
31+
CONFIG_SHELL_BACKEND_SERIAL_RX_RING_BUFFER_SIZE=2048
32+
CONFIG_SHELL_BACKEND_SERIAL_TX_RING_BUFFER_SIZE=1024
3233

3334
# Adjust logs queue size
34-
CONFIG_SHELL_BACKEND_SERIAL_LOG_MESSAGE_QUEUE_SIZE=768
35+
CONFIG_SHELL_BACKEND_SERIAL_LOG_MESSAGE_QUEUE_SIZE=2048
3536

3637
# Print reader key that can be provisioned to the User Device
3738
CONFIG_ALIRO_PRINT_READER_GROUP_ID=y
3839

3940
# RFAL worker stack size (TODO: optimize)
4041
CONFIG_RFAL_WORKER_THREAD_STACK_SIZE=8192
42+
43+
CONFIG_ACCESS_DECISION_INDICATOR=y
44+
45+
# Workaournd for Murata issue:
46+
# https://github.com/csa-access-control/aliro-actuator/issues/114
47+
CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n

0 commit comments

Comments
 (0)