sync ncs aliro 0ea91e9205c9

Kconfig

@@ -15,39 +15,42 @@ menuconfig NCS_ALIRO
 	imply POLL
 	# storage
 	imply SETTINGS
-	imply NVS
 	imply FLASH
 	imply FLASH_MAP
+	imply REQUIRES_FULL_LIBCPP
+	imply REQUIRES_FULL_LIBC
+	imply NEWLIB_LIBC_NANO
 	help
 	  This option enables the Aliro reader stack.
 
 if NCS_ALIRO
 
-rsource "lib/aliro/interfaces/logger/Kconfig"
+orsource "lib/aliro/interfaces/logger/Kconfig"
 
-config ALIRO_BLE_TP
-	bool "Aliro BLE transport"
+config ALIRO_BLE_UWB
+	bool "Aliro Bluetooth LE (BLE) transport together with ultra wideband (UWB)"
 	help
 	  Enable the Aliro BLE transport protocol (TP). This is the transport layer
-	  used by Reader to communicate with the User Device. It is used to send and
-	  receive packets over BLE.
+	  used by the Reader to communicate with the User Device. It is used to send and
+	  receive packets over BLE. Additionally the UWB is enabled in order to manage the
+	  ranging between the Reader and the User Device.
 
 config DISABLE_ALIRO_NFC_TP
 	bool "Disable NFC transport protocol for development purposes"
 	help
 	  Disable the NFC transport protocol. This is useful if you want to use Aliro with BLE only.
 
-if ALIRO_BLE_TP
+if ALIRO_BLE_UWB
 
-config ALIRO_BLE_TP_MAX_SESSIONS
-	int "Maximum number of BLE sessions"
+config ALIRO_BLE_UWB_MAX_SESSIONS
+	int "Maximum number of BLE and UWB sessions"
 	default BT_MAX_CONN
 	help
-	  The maximum number of BLE sessions that can be established.
+	  The maximum number of BLE and UWB sessions that can be established.
 
 rsource "lib/aliro/Kconfig.ble.defconfig"
 
-endif # ALIRO_BLE_TP
+endif # ALIRO_BLE_UWB
 
 rsource "lib/aliro/Kconfig.defconfig"
 

README.md

@@ -5,12 +5,12 @@ NCS manifest repo for the door lock reference application.
 
 Before getting started, you must set up the nRF Connect SDK development environment.
 
-Follow the official [Getting Started Guide](https://docs.nordicsemi.com/bundle/ncs-3.1.0/page/zephyr/develop/getting_started/index.html) article: execute the following steps:
+Follow the official [Getting Started Guide](https://docs.nordicsemi.com/bundle/ncs-2.9.0/page/zephyr/develop/getting_started/index.html) article: execute the following steps:
 
-- [Select and Update OS](https://docs.nordicsemi.com/bundle/ncs-3.1.0/page/zephyr/develop/getting_started/index.html#select_and_update_os)
-- [Install dependencies](https://docs.nordicsemi.com/bundle/ncs-3.1.0/page/zephyr/develop/getting_started/index.html#install_dependencies)
-- [Get Zephyr and install Python dependencies](https://docs.nordicsemi.com/bundle/ncs-3.1.0/page/zephyr/develop/getting_started/index.html#get_zephyr_and_install_python_dependencies)
-- [Install the Zephyr SDK](https://docs.nordicsemi.com/bundle/ncs-3.1.0/page/zephyr/develop/getting_started/index.html#install_the_zephyr_sdk)
+- [Select and Update OS](https://docs.nordicsemi.com/bundle/ncs-2.9.0/page/zephyr/develop/getting_started/index.html#select_and_update_os)
+- [Install dependencies](https://docs.nordicsemi.com/bundle/ncs-2.9.0/page/zephyr/develop/getting_started/index.html#install_dependencies)
+- [Get Zephyr and install Python dependencies](https://docs.nordicsemi.com/bundle/ncs-2.9.0/page/zephyr/develop/getting_started/index.html#get_zephyr_and_install_python_dependencies)
+- [Install the Zephyr SDK](https://docs.nordicsemi.com/bundle/ncs-2.9.0/page/zephyr/develop/getting_started/index.html#install_the_zephyr_sdk)
 
 ### Initialization
 
@@ -23,6 +23,10 @@ Run the following commands:
 west init -m https://github.com/nrfconnect/ncs-door-lock-app --mr main door-lock-workspace
 ```
 
+> **NOTE**
+>
+> Before executing `west update` make sure that you have access to `ncs-aliro` private repository.
+
 ```shell
 # update nRF Connect SDK modules
 cd door-lock-workspace

app/prj.conf

@@ -67,9 +67,6 @@ CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
 CONFIG_CHIP_DEVICE_DISCRIMINATOR=0xBBB
 CONFIG_CHIP_DEVICE_SPAKE2_PASSCODE=30033003
 
-# Configure ZAP file name
-CONFIG_NCS_SAMPLE_MATTER_ZAP_FILE_PATH="${APPLICATION_CONFIG_DIR}/src/matter/default_zap/lock.zap"
-
 # 32774 == 0x8006 (example lock-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32774
 

app/sample.yaml

@@ -4,30 +4,27 @@ sample:
 common:
   sysbuild: true
   build_only: true
-  platform_allow: &platforms
-    - nrf54l15dk/nrf54l15/cpuapp
-    - nrf52840dk/nrf52840
-    - nrf5340dk/nrf5340/cpuapp
-  integration_platforms: *platforms
 tests:
-  app.nfc_door_lock: {}
-  app.door_lock_ble_uwb:
-    platform_allow:
+  app.nfc_door_lock:
+    platform_allow: &platforms_all
+      - nrf52840dk/nrf52840
       - nrf5340dk/nrf5340/cpuapp
-    integration_platforms:
+      - nrf54l15dk/nrf54l15/cpuapp
+    integration_platforms: *platforms_all
+  app.door_lock_ble_uwb:
+    platform_allow: &platforms_uwb
       - nrf5340dk/nrf5340/cpuapp
+    integration_platforms: *platforms_uwb
     extra_args:
       - app_SNIPPET=uwb_qm35
   app.nfc_door_lock.matter:
-    platform_allow: *platforms
-    integration_platforms: *platforms
+    platform_allow: *platforms_all
+    integration_platforms: *platforms_all
     extra_args:
       - SNIPPET=matter
   app.door_lock_ble_uwb.matter:
-    platform_allow:
-      - nrf5340dk/nrf5340/cpuapp
-    integration_platforms:
-      - nrf5340dk/nrf5340/cpuapp
+    platform_allow: *platforms_uwb
+    integration_platforms: *platforms_uwb
     extra_args:
       - SNIPPET=matter
       - app_SNIPPET=uwb_qm35

app/snippets/schedules/lock.matter

@@ -1460,82 +1460,6 @@ cluster ThreadNetworkDiagnostics = 53 {
   command access(invoke: manage) ResetCounts(): DefaultSuccess = 0;
 }
 
-/** The Wi-Fi Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
-cluster WiFiNetworkDiagnostics = 54 {
-  revision 1;
-
-  enum AssociationFailureCauseEnum : enum8 {
-    kUnknown = 0;
-    kAssociationFailed = 1;
-    kAuthenticationFailed = 2;
-    kSsidNotFound = 3;
-  }
-
-  enum ConnectionStatusEnum : enum8 {
-    kConnected = 0;
-    kNotConnected = 1;
-  }
-
-  enum SecurityTypeEnum : enum8 {
-    kUnspecified = 0;
-    kNone = 1;
-    kWEP = 2 [spec_name = "WEP"];
-    kWPA = 3 [spec_name = "WPA"];
-    kWPA2 = 4 [spec_name = "WPA2"];
-    kWPA3 = 5 [spec_name = "WPA3"];
-  }
-
-  enum WiFiVersionEnum : enum8 {
-    kA = 0;
-    kB = 1;
-    kG = 2;
-    kN = 3;
-    kAc = 4;
-    kAx = 5;
-    kAh = 6;
-  }
-
-  bitmap Feature : bitmap32 {
-    kPacketCounts = 0x1;
-    kErrorCounts = 0x2;
-  }
-
-  info event Disconnection = 0 {
-    int16u reasonCode = 0;
-  }
-
-  info event AssociationFailure = 1 {
-    AssociationFailureCauseEnum associationFailureCause = 0;
-    int16u status = 1;
-  }
-
-  info event ConnectionStatus = 2 {
-    ConnectionStatusEnum connectionStatus = 0;
-  }
-
-  readonly attribute nullable octet_string<6> bssid = 0;
-  readonly attribute nullable SecurityTypeEnum securityType = 1;
-  readonly attribute nullable WiFiVersionEnum wiFiVersion = 2;
-  readonly attribute nullable int16u channelNumber = 3;
-  readonly attribute nullable int8s rssi = 4;
-  readonly attribute optional nullable int32u beaconLostCount = 5;
-  readonly attribute optional nullable int32u beaconRxCount = 6;
-  readonly attribute optional nullable int32u packetMulticastRxCount = 7;
-  readonly attribute optional nullable int32u packetMulticastTxCount = 8;
-  readonly attribute optional nullable int32u packetUnicastRxCount = 9;
-  readonly attribute optional nullable int32u packetUnicastTxCount = 10;
-  readonly attribute optional nullable int64u currentMaxRate = 11;
-  readonly attribute optional nullable int64u overrunCount = 12;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  /** This command is used to reset the count attributes. */
-  command ResetCounts(): DefaultSuccess = 0;
-}
-
 /** Accurate time is required for a number of reasons, including scheduling, display and validating security materials. */
 cluster TimeSynchronization = 56 {
   revision 2;
@@ -2958,7 +2882,6 @@ endpoint 0 {
     callback attribute lastNetworkingStatus;
     callback attribute lastNetworkID;
     callback attribute lastConnectErrorValue;
-    callback attribute supportedWiFiBands;
     callback attribute supportedThreadFeatures;
     callback attribute threadVersion;
     callback attribute generatedCommandList;
@@ -2969,7 +2892,6 @@ endpoint 0 {
 
     handle command ScanNetworks;
     handle command ScanNetworksResponse;
-    handle command AddOrUpdateWiFiNetwork;
     handle command AddOrUpdateThreadNetwork;
     handle command RemoveNetwork;
     handle command NetworkConfigResponse;
@@ -3090,24 +3012,6 @@ endpoint 0 {
     handle command ResetCounts;
   }
 
-  server cluster WiFiNetworkDiagnostics {
-    callback attribute bssid;
-    callback attribute securityType;
-    callback attribute wiFiVersion;
-    callback attribute channelNumber;
-    callback attribute rssi;
-    callback attribute beaconRxCount;
-    callback attribute packetMulticastRxCount;
-    callback attribute packetMulticastTxCount;
-    callback attribute packetUnicastRxCount;
-    callback attribute packetUnicastTxCount;
-    callback attribute generatedCommandList;
-    callback attribute acceptedCommandList;
-    callback attribute attributeList;
-    ram      attribute featureMap default = 1;
-    ram      attribute clusterRevision default = 0x0001;
-  }
-
   server cluster TimeSynchronization {
     callback attribute UTCTime;
     callback attribute granularity;