applications: nrf_desktop: Remove legacy nRF52 naming scheme

alstrzebonski · nordicjm · commit 5b80e4647846 · 2025-04-01T07:46:59.000+01:00
Removes "52" infix from the nRF Desktop devices names. This change
breaks backwards compatibility. New peripherals won't pair with old
dongles and the other way around. Also aligned HID configurator script.

Jira: NCSDK-29954

Signed-off-by: Aleksander Strzebonski &lt;aleksander.strzebonski@nordicsemi.no&gt;
diff --git a/applications/nrf_desktop/CMakeLists.txt b/applications/nrf_desktop/CMakeLists.txt
@@ -12,7 +12,7 @@ cmake_minimum_required(VERSION 3.20.0)
 set(APPLICATION_CONFIG_DIR "${CMAKE_CURRENT_LIST_DIR}/configuration/\${NORMALIZED_BOARD_TARGET}")
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project("nRF52 Desktop"
+project("nRF Desktop"
         VERSION 0.1)
 
 ################################################################################
diff --git a/applications/nrf_desktop/Kconfig b/applications/nrf_desktop/Kconfig
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-menu "nRF52 Desktop"
+menu "nRF Desktop"
 rsource "Kconfig.hid"
 rsource "Kconfig.ble"
 rsource "Kconfig.debug"
diff --git a/applications/nrf_desktop/Kconfig.hid b/applications/nrf_desktop/Kconfig.hid
@@ -182,10 +182,10 @@ menu "HID device identification"
 
 config DESKTOP_DEVICE_PRODUCT
 	string "Product name"
-	default "Dongle nRF52 Desktop" if DESKTOP_ROLE_HID_DONGLE
-	default "Mouse nRF52 Desktop" if DESKTOP_PERIPHERAL_TYPE_MOUSE
-	default "Keyboard nRF52 Desktop" if DESKTOP_PERIPHERAL_TYPE_KEYBOARD
-	default "HID nRF52 Desktop"
+	default "Dongle nRF Desktop" if DESKTOP_ROLE_HID_DONGLE
+	default "Mouse nRF Desktop" if DESKTOP_PERIPHERAL_TYPE_MOUSE
+	default "Keyboard nRF Desktop" if DESKTOP_PERIPHERAL_TYPE_KEYBOARD
+	default "HID nRF Desktop"
 	help
 	  Product name used for both GATT Device Information Service and USB
 	  device. By default, name is determined by nRF Desktop device role and
diff --git a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/ble_scan_def.h b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/ble_scan_def.h
@@ -16,6 +16,6 @@ const struct {} ble_scan_include_once;
 #include "ble_event.h"
 
 static const char *peer_name[] = {
-	[PEER_TYPE_MOUSE] = "Mouse nRF52 Desktop",
-	[PEER_TYPE_KEYBOARD] = "Keyboard nRF52 Desktop",
+	[PEER_TYPE_MOUSE] = "Mouse nRF Desktop",
+	[PEER_TYPE_KEYBOARD] = "Keyboard nRF Desktop",
 };
diff --git a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/prj_release.conf b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/prj_release.conf
@@ -35,7 +35,7 @@ CONFIG_MULTITHREADING=y
 
 # USB
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
-CONFIG_USB_DEVICE_PRODUCT="Bootloader nRF52 Desktop"
+CONFIG_USB_DEVICE_PRODUCT="Bootloader nRF Desktop"
 CONFIG_USB_DEVICE_VID=0x1915
 CONFIG_USB_DEVICE_PID=0x52DF
 CONFIG_USB_DEVICE_STACK=y
diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/ble_scan_def.h b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/ble_scan_def.h
@@ -16,6 +16,6 @@ const struct {} ble_scan_include_once;
 #include "ble_event.h"
 
 static const char *peer_name[] = {
-	[PEER_TYPE_MOUSE] = "Mouse nRF52 Desktop",
-	[PEER_TYPE_KEYBOARD] = "Keyboard nRF52 Desktop",
+	[PEER_TYPE_MOUSE] = "Mouse nRF Desktop",
+	[PEER_TYPE_KEYBOARD] = "Keyboard nRF Desktop",
 };
diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/prj_release.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/prj_release.conf
@@ -35,7 +35,7 @@ CONFIG_MULTITHREADING=y
 
 # USB
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
-CONFIG_USB_DEVICE_PRODUCT="Bootloader nRF52 Desktop"
+CONFIG_USB_DEVICE_PRODUCT="Bootloader nRF Desktop"
 CONFIG_USB_DEVICE_VID=0x1915
 CONFIG_USB_DEVICE_PID=0x52DF
 CONFIG_USB_DEVICE_STACK=y
diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/ble_scan_def.h b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/ble_scan_def.h
@@ -16,6 +16,6 @@ const struct {} ble_scan_include_once;
 #include "ble_event.h"
 
 static const char *peer_name[] = {
-	[PEER_TYPE_MOUSE] = "Mouse nRF52 Desktop",
-	[PEER_TYPE_KEYBOARD] = "Keyboard nRF52 Desktop",
+	[PEER_TYPE_MOUSE] = "Mouse nRF Desktop",
+	[PEER_TYPE_KEYBOARD] = "Keyboard nRF Desktop",
 };
diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj.conf
@@ -37,7 +37,7 @@ CONFIG_MULTITHREADING=y
 
 # USB
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
-CONFIG_USB_DEVICE_PRODUCT="Bootloader nRF52 Desktop"
+CONFIG_USB_DEVICE_PRODUCT="Bootloader nRF Desktop"
 CONFIG_USB_DEVICE_VID=0x1915
 CONFIG_USB_DEVICE_PID=0x52DF
 CONFIG_USB_DEVICE_STACK=y
diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_dongle_small.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_dongle_small.conf
@@ -39,7 +39,7 @@ CONFIG_MULTITHREADING=y
 
 # USB
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
-CONFIG_USB_DEVICE_PRODUCT="Bootloader nRF52 Desktop"
+CONFIG_USB_DEVICE_PRODUCT="Bootloader nRF Desktop"
 CONFIG_USB_DEVICE_VID=0x1915
 CONFIG_USB_DEVICE_PID=0x52DF
 CONFIG_USB_DEVICE_STACK=y
diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_release.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_release.conf
@@ -39,7 +39,7 @@ CONFIG_MULTITHREADING=y
 
 # USB
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
-CONFIG_USB_DEVICE_PRODUCT="Bootloader nRF52 Desktop"
+CONFIG_USB_DEVICE_PRODUCT="Bootloader nRF Desktop"
 CONFIG_USB_DEVICE_VID=0x1915
 CONFIG_USB_DEVICE_PID=0x52DF
 CONFIG_USB_DEVICE_STACK=y
diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/ble_scan_def.h b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/ble_scan_def.h
@@ -16,6 +16,6 @@ const struct {} ble_scan_include_once;
 #include "ble_event.h"
 
 static const char *peer_name[] = {
-	[PEER_TYPE_MOUSE] = "Mouse nRF52 Desktop",
-	[PEER_TYPE_KEYBOARD] = "Keyboard nRF52 Desktop",
+	[PEER_TYPE_MOUSE] = "Mouse nRF Desktop",
+	[PEER_TYPE_KEYBOARD] = "Keyboard nRF Desktop",
 };
diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj.conf
@@ -37,7 +37,7 @@ CONFIG_MULTITHREADING=y
 
 # USB
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
-CONFIG_USB_DEVICE_PRODUCT="Bootloader nRF52 Desktop"
+CONFIG_USB_DEVICE_PRODUCT="Bootloader nRF Desktop"
 CONFIG_USB_DEVICE_VID=0x1915
 CONFIG_USB_DEVICE_PID=0x52DF
 CONFIG_USB_DEVICE_STACK=y
diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj_release.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj_release.conf
@@ -37,7 +37,7 @@ CONFIG_MULTITHREADING=y
 
 # USB
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
-CONFIG_USB_DEVICE_PRODUCT="Bootloader nRF52 Desktop"
+CONFIG_USB_DEVICE_PRODUCT="Bootloader nRF Desktop"
 CONFIG_USB_DEVICE_VID=0x1915
 CONFIG_USB_DEVICE_PID=0x52DF
 CONFIG_USB_DEVICE_STACK=y
diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/ble_scan_def.h b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/ble_scan_def.h
@@ -16,6 +16,6 @@ const struct {} ble_scan_include_once;
 #include "ble_event.h"
 
 static const char *peer_name[] = {
-	[PEER_TYPE_MOUSE] = "Mouse nRF52 Desktop",
-	[PEER_TYPE_KEYBOARD] = "Keyboard nRF52 Desktop",
+	[PEER_TYPE_MOUSE] = "Mouse nRF Desktop",
+	[PEER_TYPE_KEYBOARD] = "Keyboard nRF Desktop",
 };
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/ble_scan_def.h b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/ble_scan_def.h
@@ -16,6 +16,6 @@ const struct {} ble_scan_include_once;
 #include "ble_event.h"
 
 static const char *peer_name[] = {
-	[PEER_TYPE_MOUSE] = "Mouse nRF52 Desktop",
-	[PEER_TYPE_KEYBOARD] = "Keyboard nRF52 Desktop",
+	[PEER_TYPE_MOUSE] = "Mouse nRF Desktop",
+	[PEER_TYPE_KEYBOARD] = "Keyboard nRF Desktop",
 };
diff --git a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/ble_scan_def.h b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/ble_scan_def.h
@@ -16,6 +16,6 @@ const struct {} ble_scan_include_once;
 #include "ble_event.h"
 
 static const char * const peer_name[] = {
-	[PEER_TYPE_MOUSE] = "Mouse nRF52 Desktop",
-	[PEER_TYPE_KEYBOARD] = "Keyboard nRF52 Desktop",
+	[PEER_TYPE_MOUSE] = "Mouse nRF Desktop",
+	[PEER_TYPE_KEYBOARD] = "Keyboard nRF Desktop",
 };
diff --git a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/prj.conf b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/prj.conf
@@ -21,7 +21,6 @@ CONFIG_CAF_LEDS=y
 
 CONFIG_DESKTOP_ROLE_HID_DONGLE=y
 CONFIG_DESKTOP_DEVICE_PID=0x52DC
-CONFIG_DESKTOP_DEVICE_PRODUCT="Dongle nRF53 Desktop"
 CONFIG_DESKTOP_HID_BOOT_INTERFACE_KEYBOARD=y
 
 CONFIG_DESKTOP_BLE_PEER_CONTROL=y
diff --git a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/prj_release.conf b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/prj_release.conf
@@ -16,7 +16,6 @@ CONFIG_CAF_LEDS=y
 
 CONFIG_DESKTOP_ROLE_HID_DONGLE=y
 CONFIG_DESKTOP_DEVICE_PID=0x52DC
-CONFIG_DESKTOP_DEVICE_PRODUCT="Dongle nRF53 Desktop"
 CONFIG_DESKTOP_HID_BOOT_INTERFACE_KEYBOARD=y
 
 CONFIG_DESKTOP_BLE_PEER_CONTROL=y
diff --git a/scripts/hid_configurator/99-hid.rules b/scripts/hid_configurator/99-hid.rules
@@ -1,4 +1,4 @@
-# udev rules which allow using configuration channel for nRF52 Desktop without
+# udev rules which allow using configuration channel for nRF Desktop without
 # root permissions on Linux. Adapted from HIDAPI project.
 #
 # Symbolic links are only used for identification of attached devices and
@@ -13,15 +13,15 @@
 
 ### Mouse over USB
 # HIDAPI + libusb/hidraw
-ATTRS{idVendor}=="1915", ATTRS{idProduct}=="52de", MODE="0666", SYMLINK+="nrf52-desktop-mouse-usb"
+ATTRS{idVendor}=="1915", ATTRS{idProduct}=="52de", MODE="0666", SYMLINK+="nrf-desktop-mouse-usb"
 
 ### Dongle over USB
 # HIDAPI + libusb/hidraw
-ATTRS{idVendor}=="1915", ATTRS{idProduct}=="52dc", MODE="0666", SYMLINK+="nrf52-desktop-dongle-usb"
+ATTRS{idVendor}=="1915", ATTRS{idProduct}=="52dc", MODE="0666", SYMLINK+="nrf-desktop-dongle-usb"
 #
 # Note that the hexadecimal values for VID and PID are case sensitive and
 # must be lower case.
 
 ### Mouse over BLE
 # HIDAPI + hidraw
-ATTRS{name}=="Mouse nRF52 Desktop", SUBSYSTEMS=="input", MODE="0666", SYMLINK+="nrf52-desktop-mouse-ble"
+ATTRS{name}=="Mouse nRF Desktop", SUBSYSTEMS=="input", MODE="0666", SYMLINK+="nrf-desktop-mouse-ble"
diff --git a/scripts/hid_configurator/README.rst b/scripts/hid_configurator/README.rst
@@ -138,10 +138,10 @@ Complete the following steps:
       :class: highlight
 
       Device connected using USB:
-      ATTRS{idVendor}=="my Vendor ID", ATTRS{idProduct}=="my Product ID", MODE="0666", SYMLINK+="nrf52-desktop-my-dev-name"
+      ATTRS{idVendor}=="my Vendor ID", ATTRS{idProduct}=="my Product ID", MODE="0666", SYMLINK+="nrf-desktop-my-dev-name"
 
       Device connected using Bluetooth:
-      ATTRS{name}=="Name of my Bluetooth device ", SUBSYSTEMS=="input", MODE="0666", SYMLINK+="nrf52-desktop-my-dev-name"
+      ATTRS{name}=="Name of my Bluetooth device ", SUBSYSTEMS=="input", MODE="0666", SYMLINK+="nrf-desktop-my-dev-name"
 
 #. If you want to display an LED stream based on sound data, you must also install the additional requirements using the following commands:
 
diff --git a/scripts/hid_configurator/configurator_cli.py b/scripts/hid_configurator/configurator_cli.py
@@ -259,7 +259,7 @@ def parse_arguments():
 
 def configurator():
     logging.basicConfig(level=logging.ERROR)
-    logging.info('Configuration channel for nRF52 Desktop')
+    logging.info('Configuration channel for nRF Desktop')
 
     args = parse_arguments()
     backend = NrfHidManager()

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause`
`5`	`5`	`#`
`6`	`6`
`7`		`-menu "nRF52 Desktop"`
	`7`	`+menu "nRF Desktop"`
`8`	`8`	`rsource "Kconfig.hid"`
`9`	`9`	`rsource "Kconfig.ble"`
`10`	`10`	`rsource "Kconfig.debug"`