CI/CD: Promote lib files to ncs-door-lock-app @8974e1364b22

Source commit ID: @8974e1364b22

Signed-off-by: Miecznik, Rafał <rafal.miecznik@nordicsemi.com>

Author: Miecznik, Rafał

CMakeLists.txt

@@ -5,4 +5,3 @@
 #
 
 add_subdirectory(drivers)
-add_subdirectory(lib)

app/CMakeLists.txt

@@ -13,12 +13,29 @@ file(GLOB app_sources CONFIGURE_DEPENDS src/*.cpp)
 
 add_subdirectory(src/platform)
 
-if (CONFIG_ACCESS_MANAGER_IMPLEMENTATION_DEFAULT)
-  add_subdirectory(src/access_manager_impl_default)
-elseif (CONFIG_ACCESS_MANAGER_IMPLEMENTATION_CUSTOM)
-  add_subdirectory(src/access_manager_impl_custom)
-else()
-  message(FATAL_ERROR "No access manager implementation selected")
+target_sources(app PRIVATE ${app_sources})
+
+set(PUBLIC_API ${ZEPHYR_NCS_ALIRO_MODULE_DIR})
+
+if(CONFIG_SOC_SERIES_NRF52X)
+  set(ALIRO_LIB_PATH ${ZEPHYR_NCS_ALIRO_MODULE_DIR}/applications/doorlock/lib/aliro/bin/cortex-m4)
+elseif(CONFIG_SOC_SERIES_NRF54LX OR CONFIG_SOC_SERIES_NRF53X)
+  set(ALIRO_LIB_PATH ${ZEPHYR_NCS_ALIRO_MODULE_DIR}/applications/doorlock/lib/aliro/bin/cortex-m33)
 endif()
 
-target_sources(app PRIVATE ${app_sources})
+add_library(aliro_stack STATIC IMPORTED GLOBAL)
+
+if(CONFIG_ALIRO_BLE_TP)
+  set_target_properties(aliro_stack PROPERTIES IMPORTED_LOCATION ${ALIRO_LIB_PATH}/libaliro_ble.a)
+else(CONFIG_ALIRO_BLE_TP)
+  set_target_properties(aliro_stack PROPERTIES IMPORTED_LOCATION ${ALIRO_LIB_PATH}/libaliro.a)
+endif(CONFIG_ALIRO_BLE_TP)
+
+target_link_libraries(app PRIVATE aliro_stack)
+target_link_libraries(aliro_stack INTERFACE zephyr_interface)
+
+zephyr_include_directories(
+  ${PUBLIC_API}/include
+  ${PUBLIC_API}/interfaces
+  ${PUBLIC_API}/interfaces/crypto/backend_crypto_psa
+)

app/Kconfig

@@ -5,6 +5,7 @@
 #
 
 rsource "src/platform/Kconfig"
+rsource "../lib/aliro/Kconfig.defconfig"
 
 menu "Zephyr"
 source "Kconfig.zephyr"
@@ -15,25 +16,3 @@ module-str = NCS_DOOR_LOCK_APP
 module-dep = LOG
 module-help = Enables nRF Connect SDK Door Lock Application log messages.
 source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config"
-
-choice ACCESS_MANAGER_IMPLEMENTATION
-	prompt "Access Manager implementation"
-	default ACCESS_MANAGER_IMPLEMENTATION_DEFAULT
-
-	config ACCESS_MANAGER_IMPLEMENTATION_DEFAULT
-		bool "Access Manager default implementation"
-		help
-		  Uses the default implementation of the Access Manager
-		  provided by the Door Lock Reference Application.
-
-	config ACCESS_MANAGER_IMPLEMENTATION_CUSTOM
-		bool "Access Manager custom implementation"
-		help
-		  Uses a custom implementation of the Access Manager.
-		  This implementation is based on provided template
-		  that can be tailored to specific requirements.
-endchoice
-
-if ACCESS_MANAGER_IMPLEMENTATION_DEFAULT
-rsource "src/access_manager_impl_default/Kconfig"
-endif

app/VERSION

@@ -1,5 +1,5 @@
 VERSION_MAJOR = 0
-VERSION_MINOR = 3
+VERSION_MINOR = 1
 PATCHLEVEL = 0
 VERSION_TWEAK = 0
 EXTRAVERSION =

app/prj.conf

@@ -4,9 +4,6 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-# Aliro stack
-CONFIG_NCS_ALIRO=y
-
 # Basic system configuration
 CONFIG_MAIN_STACK_SIZE=4096
 CONFIG_HEAP_MEM_POOL_SIZE=4096
@@ -15,12 +12,12 @@ CONFIG_STD_CPP17=y
 CONFIG_REQUIRES_FULL_LIBCPP=y
 CONFIG_RESET_ON_FATAL_ERROR=n
 CONFIG_ASSERT=y
-CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
 
 # Logging
 CONFIG_CONSOLE=y
 CONFIG_LOG=y
 CONFIG_NCS_ALIRO_RFAL_LOG_LEVEL_DBG=y
+CONFIG_DEBUG_STATE_MACHINE=y
 CONFIG_USE_SEGGER_RTT=n
 CONFIG_LOG_BACKEND_RTT=n
 CONFIG_LOG_BACKEND_SHOW_COLOR=n
@@ -37,6 +34,9 @@ CONFIG_SHELL_BACKEND_SERIAL_TX_RING_BUFFER_SIZE=1024
 # Adjust logs queue size
 CONFIG_SHELL_BACKEND_SERIAL_LOG_MESSAGE_QUEUE_SIZE=2048
 
+# Print reader key that can be provisioned to the User Device
+CONFIG_ALIRO_PRINT_READER_GROUP_ID=y
+
 # RFAL worker stack size (TODO: optimize)
 CONFIG_RFAL_WORKER_THREAD_STACK_SIZE=8192
 

app/src/main.cpp

@@ -6,18 +6,20 @@
 
 #include "aliro/aliro.h"
 #include "aliro/shell.h"
-#include "aliro/types.h"
 #include "aliro/utils.h"
 
-#ifdef CONFIG_ACCESS_DECISION_INDICATOR
-#include "access_decision_indicator.h"
-#endif // CONFIG_ACCESS_DECISION_INDICATOR
-
-#include "access_manager/access_manager.h"
+#ifdef CONFIG_ALIRO_BLE_TP
+#include "uwb/uwb.h"
+#include "uwb_impl.h"
+#endif // CONFIG_ALIRO_BLE_TP
 
 #include <zephyr/logging/log.h>
 #include <zephyr/shell/shell.h>
 
+#ifdef CONFIG_ACCESS_DECISION_INDICATOR
+#include "access_decision_indicator.h"
+#endif // CONFIG_ACCESS_DECISION_INDICATOR
+
 #include <cstdio>
 #include <stdlib.h>
 
@@ -36,20 +38,29 @@ int main()
 			    LOG_ERR("Failed to initialize access decision indicator"));
 #endif // CONFIG_ACCESS_DECISION_INDICATOR
 
-	AccessManagerInstance().Init({ .mAccessGrantedIndicatorClb = Indicator::SignalAccessGranted });
-
-	const AliroConfig config{
-#ifdef CONFIG_DISABLE_ALIRO_NFC_TP
-		.mEnableNfc = false,
-#endif // CONFIG_DISABLE_ALIRO_NFC_TP
-
 #ifdef CONFIG_ALIRO_BLE_TP
-		.mMaxBleSessions = CONFIG_ALIRO_BLE_TP_MAX_SESSIONS,
+	Uwb::UltraWideBandImpl::Callbacks callbacks{};
+	ec = Uwb::UltraWideBandImpl::Instance().Init(callbacks);
+	if (ec == ALIRO_ERROR_NOT_IMPLEMENTED) {
+		LOG_INF("UWB is not implemented");
+	} else {
+		VerifyOrReturnValue(ec == ALIRO_NO_ERROR, EXIT_FAILURE, LOG_ERR("Failed to initialize UWB module"));
+	}
 #endif // CONFIG_ALIRO_BLE_TP
-	};
 
 	ec = AliroStack::Instance().Init(
-		{ .mOnError = [](AliroError error) { LOG_ERR("Aliro error: %s", error.ToString()); } }, config);
+		{ .mOnAccessAttempt =
+			  [](Status status) {
+				  if (status == Status::Denied) {
+					  LOG_INF("ACCESS DENIED");
+				  } else {
+					  LOG_INF("ACCESS GRANTED");
+#ifdef CONFIG_ACCESS_DECISION_INDICATOR
+					  Indicator::SignalAccessGranted();
+#endif // CONFIG_ACCESS_DECISION_INDICATOR
+				  }
+			  },
+		  .mOnError = [](AliroError error) { LOG_ERR("Aliro error: %s", error.ToString()); } });
 
 	VerifyOrDie(ec == ALIRO_NO_ERROR, "Aliro stack initialization failed");
 

app/src/platform/CMakeLists.txt

@@ -9,6 +9,5 @@ zephyr_include_directories(.)
 add_subdirectory(nfc_transport_impl)
 add_subdirectory(logger)
 
-add_subdirectory_ifdef(CONFIG_ALIRO_BLE_TP ble)
 add_subdirectory_ifdef(CONFIG_ALIRO_BLE_TP uwb_impl)
 add_subdirectory_ifdef(CONFIG_ACCESS_DECISION_INDICATOR access_decision_indicator)

app/src/platform/logger/platform_log.cpp

@@ -10,35 +10,51 @@
 
 #include <stdarg.h>
 
-LOG_MODULE_REGISTER(platform, CONFIG_NCS_ALIRO_LOG_LEVEL_VALUE);
+LOG_MODULE_REGISTER(platform, CONFIG_NCS_DOOR_LOCK_APP_LOG_LEVEL);
 
-void _AliroPlatformLogHexdump(uint8_t platformLogLevel, const void *data, size_t size, const char *str)
+void AliroPlatformLogHexdump(AliroLogLevel logLevel, const void *data, size_t size, const char *str)
 {
-	switch (platformLogLevel) {
-	case LOG_LEVEL_ERR:
+	switch (logLevel) {
+	case ALIRO_LOG_LEVEL_ERROR:
 		LOG_HEXDUMP_ERR(data, size, str);
 		break;
-	case LOG_LEVEL_WRN:
+	case ALIRO_LOG_LEVEL_WARN:
 		LOG_HEXDUMP_WRN(data, size, str);
 		break;
-	case LOG_LEVEL_INF:
+	case ALIRO_LOG_LEVEL_INFO:
 		LOG_HEXDUMP_INF(data, size, str);
 		break;
-	case LOG_LEVEL_DBG:
+	case ALIRO_LOG_LEVEL_DEBUG:
 		LOG_HEXDUMP_DBG(data, size, str);
 		break;
-	case LOG_LEVEL_NONE:
+	case ALIRO_LOG_LEVEL_NONE:
 	default:
 		break;
 	}
 }
 
-void _AliroPlatformLog(uint8_t platformLogLevel, const char *logFormat, ...)
+void AliroPlatformLog(AliroLogLevel logLevel, const char *logFormat, ...)
 {
 #if defined(CONFIG_LOG) && !defined(CONFIG_LOG_MODE_MINIMAL)
 
-	if (platformLogLevel > CONFIG_NCS_ALIRO_LOG_LEVEL_VALUE) {
-		return;
+	uint8_t platformLogLevel{ LOG_LEVEL_NONE };
+
+	switch (logLevel) {
+	case ALIRO_LOG_LEVEL_ERROR:
+		platformLogLevel = LOG_LEVEL_ERR;
+		break;
+	case ALIRO_LOG_LEVEL_WARN:
+		platformLogLevel = LOG_LEVEL_WRN;
+		break;
+	case ALIRO_LOG_LEVEL_INFO:
+		platformLogLevel = LOG_LEVEL_INF;
+		break;
+	case ALIRO_LOG_LEVEL_DEBUG:
+		platformLogLevel = LOG_LEVEL_DBG;
+		break;
+	case ALIRO_LOG_LEVEL_NONE:
+	default:
+		platformLogLevel = LOG_LEVEL_NONE;
 	}
 
 	va_list paramList;
@@ -48,7 +64,7 @@ void _AliroPlatformLog(uint8_t platformLogLevel, const char *logFormat, ...)
 
 #else // defined(CONFIG_LOG) && !defined(CONFIG_LOG_MODE_MINIMAL)
 
-	ARG_UNUSED(platformLogLevel);
+	ARG_UNUSED(logLevel);
 	ARG_UNUSED(logFormat);
 
 #endif // defined(CONFIG_LOG) && !defined(CONFIG_LOG_MODE_MINIMAL)

app/src/platform/nfc_transport_impl/nfc_transport_rfal.cpp

@@ -23,7 +23,7 @@ K_THREAD_STACK_DEFINE(mStack, CONFIG_RFAL_WORKER_THREAD_STACK_SIZE);
 [[noreturn]] void NfcTransportRfal::Run()
 {
 	while (true) {
-		if (mRecoverPolling && !mSendInProgress) {
+		if (mRecoverPolling) {
 			mRecoverPolling = false;
 			RecoverPolling();
 		}
@@ -62,18 +62,15 @@ void NfcTransportRfal::RfalNotifyCallback(rfalNfcState state)
 	case RFAL_NFC_STATE_START_DISCOVERY:
 		LOG_DBG("RFAL: Start discovery state");
 		mMultiSel = false;
-		mSendInProgress = false;
 		break;
 	case RFAL_NFC_STATE_DATAEXCHANGE:
 		LOG_DBG("RFAL: Data exchange state");
 		break;
 	case RFAL_NFC_STATE_DATAEXCHANGE_DONE:
-		mSendInProgress = false;
 		CaptureRxData();
 		break;
 	case RFAL_NFC_STATE_DEACTIVATION:
 		LOG_DBG("RFAL: Deactivation State");
-		mSendInProgress = false;
 		break;
 	case RFAL_NFC_STATE_ACTIVATED:
 		LOG_DBG("RFAL: Activated state");
@@ -220,13 +217,11 @@ AliroError NfcTransportRfal::_Init(NfcDriver::Callbacks callbacks)
 AliroError NfcTransportRfal::_Send(Data data, [[maybe_unused]] uint32_t maximumFrameDelayTime)
 {
 	LOG_HEXDUMP_DBG(data.mData, data.mLength, "RFAL: TX data:");
-	mSendInProgress = true;
 
 	// use RFAL_FWT_NONE as FWT because the driver with ISO-DEP enabled will ignore it anyway
 	ReturnCode err = rfalNfcDataExchangeStart(data.mData, data.mLength, &mRxData, &mRcvLen, RFAL_FWT_NONE);
 	VerifyOrReturnStatus(err == RFAL_ERR_NONE, ALIRO_ERROR_INTERNAL,
-			     LOG_ERR("RFAL: Data exchange failed, return code: %d", err);
-			     mSendInProgress = false);
+			     LOG_ERR("RFAL: Data exchange failed, return code: %d", err));
 
 	return ALIRO_NO_ERROR;
 }

app/src/platform/nfc_transport_impl/nfc_transport_rfal.h

@@ -64,7 +64,6 @@ class NfcTransportRfal : public IsoDep, public NfcDriver {
 	uint16_t *mRcvLen{};
 
 	bool mRecoverPolling{ false };
-	bool mSendInProgress{ false };
 
 	static constexpr uint32_t sIdleTimerTimeoutMs{ CONFIG_RFAL_IDLE_TIMEOUT_MS };
 };