update to nRF connect SDK v3.0.0

Author: benedekkupper

ble-keyboard/Kconfig

@@ -1,9 +1,15 @@
 rsource "../Kconfig"
 
-configdefault BT_DIS_MANUF
+configdefault BT_DIS_MANUF_NAME
+	default y
+
+configdefault BT_DIS_MANUF_NAME_STR
 	default DEMO_MANUFACTURER
 
-configdefault BT_DIS_MODEL
+configdefault BT_DIS_MODEL_NUMBER
+	default y
+
+configdefault BT_DIS_MODEL_NUMBER_STR
 	default DEMO_PRODUCT
 
 configdefault BT_DIS_PNP

ble-keyboard/src/main.cpp

@@ -9,6 +9,7 @@
 #include <zephyr/settings/settings.h>
 #include <zephyr/shell/shell.h>
 
+#include "simple_keyboard.hpp"
 #include <port/zephyr/bluetooth/hid.hpp>
 #include <port/zephyr/bluetooth/le.hpp>
 #include <port/zephyr/message_queue.hpp>
@@ -17,8 +18,6 @@
 
 LOG_MODULE_REGISTER(main, LOG_LEVEL_INF);
 
-#include "simple_keyboard.hpp"
-
 static const uint8_t adv_led = 1;
 
 static int advertise(void)
@@ -32,9 +31,8 @@ static int advertise(void)
     static constexpr auto ad = to_adv_data<ad_struct_count(ad_data)>(ad_data);
     static constexpr auto sd_data = join(ad_struct(BT_DATA_NAME_COMPLETE, CONFIG_BT_DEVICE_NAME));
     static constexpr auto sd = to_adv_data<ad_struct_count(sd_data)>(sd_data);
-    const bt_le_adv_param* adv_param =
-        BT_LE_ADV_PARAM(BT_LE_ADV_OPT_CONNECTABLE | BT_LE_ADV_OPT_ONE_TIME,
-                        BT_GAP_ADV_FAST_INT_MIN_2, BT_GAP_ADV_FAST_INT_MAX_2, NULL);
+    const bt_le_adv_param* adv_param = BT_LE_ADV_PARAM(
+        BT_LE_ADV_OPT_CONN, BT_GAP_ADV_FAST_INT_MIN_2, BT_GAP_ADV_FAST_INT_MAX_2, nullptr);
 
     auto err = bt_le_adv_start(adv_param, ad.data(), ad.size(), sd.data(), sd.size());
     if (err == 0)

patches/zephyr/0001-drivers-udc-avoid-infinite-loop-when-closing-OUT-EPs.patch

@@ -1,27 +1,27 @@
-From 2275a93c3cef6a920b36797488bf74ade0147ad9 Mon Sep 17 00:00:00 2001
+From 94ce17290aab6e4b17fa5d3fce19413d19d93e48 Mon Sep 17 00:00:00 2001
 From: Benedek Kupper <kupper.benedek@gmail.com>
-Date: Wed, 16 Apr 2025 09:34:37 +0200
+Date: Fri, 1 Aug 2025 23:32:59 +0200
 Subject: [PATCH] drivers: udc: avoid infinite loop when closing OUT EPs
 
 ---
  drivers/usb/udc/udc_common.c | 4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/drivers/usb/udc/udc_common.c b/drivers/usb/udc/udc_common.c
-index 86f5a7f854..065c705cc3 100644
+index 3718290ce4..597baefe4f 100644
 --- a/drivers/usb/udc/udc_common.c
 +++ b/drivers/usb/udc/udc_common.c
-@@ -145,6 +145,10 @@ struct net_buf *udc_buf_get_all(const struct device *dev, const uint8_t ep)
- 	LOG_DBG("ep 0x%02x dequeue %p", ep, buf);
+@@ -123,6 +123,10 @@ struct net_buf *udc_buf_get_all(struct udc_ep_config *const ep_cfg)
+ 	LOG_DBG("ep 0x%02x dequeue %p", ep_cfg->addr, buf);
  	for (struct net_buf *n = buf; !k_fifo_is_empty(&ep_cfg->fifo); n = n->frags) {
  		n->frags = k_fifo_get(&ep_cfg->fifo, K_NO_WAIT);
 +		if (n->frags == n) {
-+			LOG_WRN("ep 0x%02x dequeue FIFO corrupt: %p", ep, n);
++			LOG_WRN("ep 0x%02x dequeue FIFO corrupt: %p", ep_cfg->addr, n);
 +			n->frags = NULL;
 +		}
  		LOG_DBG("|-> %p ", n->frags);
  		if (n->frags == NULL) {
  			break;
 -- 
-2.44.0
+2.43.0
 

patches/zephyr/0001-drivers-udc-eliminate-C-compiler-warnings.patch

@@ -5,8 +5,8 @@
 			"name": "Manifest repository"
 		},
 		{
-			"path": "../c2usb",
-			"name": "c2usb"
+			"path": "..",
+			"name": "workspace"
 		},
 		{
 			"path": "ble-keyboard"

projects.code-workspace

@@ -21,7 +21,7 @@ manifest:
     - name: nrf
       repo-path: sdk-nrf
       remote: nrfconnect
-      revision: v2.9.0
+      revision: v3.0.0
       clone-depth: 1
       import:
         # By using name-allowlist we can clone only the modules that are
@@ -31,4 +31,5 @@ manifest:
           - cmsis
           - hal_nordic
           - nrfxlib
-          - tinycrypt
+          - mbedtls
+          - oberon-psa-crypto