CI/CD: Synchronize ncs-aliro@9ef50ce78f21 and ncs-door-lock-app

Source commit ID: @9ef50ce78f21
sync-ncs-aliro-9ef50ce78f21

Signed-off-by: Rafal Miecznik <rafal.miecznik@nordicsemi.com>

Author: Rafal Miecznik

app/CMakeLists.txt

@@ -12,6 +12,7 @@ project(door-lock-app)
 file(GLOB app_sources CONFIGURE_DEPENDS src/*.cpp)
 
 add_subdirectory(src/platform)
+add_subdirectory(src/storage)
 
 if (CONFIG_ACCESS_MANAGER_IMPLEMENTATION_DEFAULT)
   add_subdirectory(src/access_manager_impl_default)
@@ -21,4 +22,8 @@ else()
   message(FATAL_ERROR "No access manager implementation selected")
 endif()
 
+if(CONFIG_DOOR_LOCK_CLI)
+  add_subdirectory(src/cli)
+endif(CONFIG_DOOR_LOCK_CLI)
+
 target_sources(app PRIVATE ${app_sources})

app/Kconfig

@@ -37,3 +37,23 @@ endchoice
 if ACCESS_MANAGER_IMPLEMENTATION_DEFAULT
 rsource "src/access_manager_impl_default/Kconfig"
 endif
+
+config DOOR_LOCK_CLI
+	bool "Door Lock CLI support"
+	default y
+	select SHELL
+	select REBOOT
+	help
+	  Enable support for Door Lock CLI.
+
+config DOOR_LOCK_PRINT_READER_GROUP_IDENTIFIER
+	bool "Print reader group identifier that should be provisioned into the User Device"
+	default y
+	help
+	  Enable printing of the reader group identifier that should be provisioned into the User Device.
+
+config DOOR_LOCK_USE_TEST_READER_IDENTIFIER
+	bool "Use test reader identifier"
+	default y
+	help
+	  Initialize the reader Group Identifier and Group Sub Identifier to test values.

app/boards/nrf54l15dk_nrf54l15_cpuapp.overlay

@@ -6,13 +6,19 @@
 
 /{
 	/* Disable buttons to avoid collision with interrupt and SCK pins for NFC tag reader. */
-	/delete-node/ buttons;
+	buttons {
+		/delete-node/ button_0;
+		/delete-node/ button_1;
+		/delete-node/ button_2;
+		/delete-node/ button_3;
+	};
 
 	aliases {
 		/delete-property/ sw0;
 		/delete-property/ sw1;
 		/delete-property/ sw2;
 		/delete-property/ sw3;
+		/delete-property/ mcuboot-button0;
 	};
 };
 

app/src/access_manager_impl_default/access_manager_impl.cpp

@@ -82,13 +82,13 @@ AliroError AccessManagerImpl::_AddPublicKey(const CryptoTypes::PublicKey &public
 
 	// Check if storage is full
 	VerifyOrReturnStatus(mStoredKeyCount < kMaxStoredKeys, ALIRO_NO_MEMORY,
-			     LOG_WRN("Cannot add public key - storage is full (%zu/%zu)", mStoredKeyCount,
+			     LOG_WRN("Cannot add public key - storage is full (%u/%u)", mStoredKeyCount,
 				     kMaxStoredKeys));
 	// Add the key to storage
 	mStoredKeys[mStoredKeyCount] = publicKey;
 	mStoredKeyCount++;
 
-	LOG_INF("Added public key to storage. Total keys: %zu", mStoredKeyCount);
+	LOG_INF("Added public key to storage. Total keys: %u", mStoredKeyCount);
 
 	return ALIRO_NO_ERROR;
 }
@@ -105,7 +105,7 @@ AliroError AccessManagerImpl::_RemovePublicKey(const CryptoTypes::PublicKey &pub
 				mStoredKeys[i] = mStoredKeys[mStoredKeyCount - 1];
 			}
 			mStoredKeyCount--;
-			LOG_INF("Removed public key from storage. Total keys: %zu", mStoredKeyCount);
+			LOG_INF("Removed public key from storage. Total keys: %u", mStoredKeyCount);
 			return ALIRO_NO_ERROR;
 		}
 	}
@@ -146,7 +146,7 @@ uint32_t AccessManagerImpl::_GetMaxAllowedDistance()
 
 void AccessManagerImpl::_HandleRangingSessionData(SessionContext sessionContext, const UwbRangingData &uwbData)
 {
-	LOG_DBG("Handling ranging session data - length: %zu for session: %p", uwbData.mLength, sessionContext);
+	LOG_DBG("Handling ranging session data - length: %u for session: %p", uwbData.mLength, sessionContext);
 
 #ifdef CONFIG_ALIRO_BLE_TP
 	const auto currentSessionInRange = AnalyzeUwbRangingData(uwbData);
@@ -204,7 +204,7 @@ void AccessManagerImpl::_HandleSessionTermination(SessionContext sessionContext)
 
 bool AccessManagerImpl::VerifyPublicKey(const CryptoTypes::PublicKey &userPublicKey)
 {
-	LOG_DBG("Verifying public key against %zu stored keys", mStoredKeyCount);
+	LOG_DBG("Verifying public key against %u stored keys", mStoredKeyCount);
 
 	// Check if the user's public key matches any stored key
 	VerifyOrReturnFalse(IsPublicKeyStored(userPublicKey), LOG_DBG("No matching public key found"));
@@ -236,7 +236,7 @@ void AccessManagerImpl::AccessDeniedAction() const
 #ifdef CONFIG_ALIRO_BLE_TP
 bool AccessManagerImpl::AnalyzeUwbRangingData(const UwbRangingData &uwbData)
 {
-	LOG_DBG("Analyzing UWB ranging data - length: %zu", uwbData.mLength);
+	LOG_DBG("Analyzing UWB ranging data - length: %u", uwbData.mLength);
 
 	// Check if UWB data is valid
 	VerifyOrReturnFalse(uwbData.mData && uwbData.mLength, LOG_WRN("Invalid UWB ranging data"));

app/src/cli/CMakeLists.txt

@@ -0,0 +1,10 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+file(GLOB src CONFIGURE_DEPENDS ./*.cpp)
+
+zephyr_library_sources(${src})
+zephyr_include_directories(.)