From 5b6ef863df9ac638e1600ae03f5e65bf4fece54f Mon Sep 17 00:00:00 2001 From: Marek Pieta Date: Wed, 19 Mar 2025 16:38:23 +0100 Subject: [PATCH 1/2] applications: nrf_desktop: Drop nrf52810dmouse support Change drops support for the nRF52810 Desktop Mouse in the nRF Desktop application. Change also applies a few documentation alignments. Jira: NCSDK-31719 Signed-off-by: Marek Pieta Signed-off-by: Divya Pillai Signed-off-by: Francesco Domenico Servidio --- .../nrf_desktop/board_configuration.rst | 12 +- .../nrf52810dmouse_nrf52810/app.overlay | 18 --- .../nrf52810dmouse_nrf52810/battery_def.h | 33 ----- .../nrf52810dmouse_nrf52810/buttons_def.h | 25 ---- .../click_detector_def.h | 25 ---- .../hid_keyboard_leds_def.h | 23 ---- .../nrf52810dmouse_nrf52810/hid_keymap_def.h | 28 ---- .../nrf52810dmouse_nrf52810/port_state_def.h | 44 ------- .../nrf52810dmouse_nrf52810/prj.conf | 120 ------------------ .../nrf52810dmouse_nrf52810/prj_release.conf | 109 ---------------- applications/nrf_desktop/description.rst | 2 +- applications/nrf_desktop/sample.yaml | 4 - .../releases/release-notes-changelog.rst | 13 +- scripts/hid_configurator/NrfHidManager.py | 2 +- scripts/quarantine_integration.yaml | 1 - 15 files changed, 16 insertions(+), 443 deletions(-) delete mode 100644 applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/app.overlay delete mode 100644 applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/battery_def.h delete mode 100644 applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/buttons_def.h delete mode 100644 applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/click_detector_def.h delete mode 100644 applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/hid_keyboard_leds_def.h delete mode 100644 applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/hid_keymap_def.h delete mode 100644 applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/port_state_def.h delete mode 100644 applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj.conf delete mode 100644 applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj_release.conf diff --git a/applications/nrf_desktop/board_configuration.rst b/applications/nrf_desktop/board_configuration.rst index 82f4d6691055..5797f68f9c89 100644 --- a/applications/nrf_desktop/board_configuration.rst +++ b/applications/nrf_desktop/board_configuration.rst @@ -37,7 +37,7 @@ nRF Desktop board configuration files The nRF Desktop application comes with configuration files for the following reference designs: nRF52840 Gaming Mouse (``nrf52840gmouse``) - * The reference design is defined in :file:`nrf/boards/nordic/nrf52840gmouse` for the project-specific hardware. + * The reference design for the project-specific hardware is defined in the :file:`nrf/boards/nordic/nrf52840gmouse` directory. * To achieve gaming-grade performance: * The application is configured to act as a gaming mouse, with both Bluetooth® LE and USB transports enabled. @@ -47,12 +47,12 @@ nRF52840 Gaming Mouse (``nrf52840gmouse``) * The board supports the ``debug`` (``fast_pair`` file suffix) and ``release`` (``release_fast_pair`` file suffix) configurations for :ref:`nrf_desktop_bluetooth_guide_fast_pair`. Both configurations use the MCUboot bootloader built in the direct-xip mode (``MCUBOOT+XIP``), and they support the firmware updates using the :ref:`nrf_desktop_dfu` and the :ref:`nrf_desktop_dfu_mcumgr`. -nRF52832 Desktop Mouse (``nrf52dmouse``) and nRF52810 Desktop Mouse (``nrf52810dmouse``) - * Both reference designs are meant for the project-specific hardware and are defined in :file:`nrf/boards/nordic/nrf52dmouse` and :file:`nrf/boards/nordic/nrf52810dmouse`, respectively. +nRF52832 Desktop Mouse (``nrf52dmouse``) + * The reference design for the project-specific hardware is defined in the :file:`nrf/boards/nordic/nrf52dmouse` directory. * The application is configured to act as a mouse. * Only the Bluetooth LE transport is enabled. - Bluetooth uses either Zephyr's software link layer (``nrf52810dmouse``) or Nordic's SoftDevice link layer (``nrf52dmouse``). - * The preconfigured build types for both ``nrf52dmouse`` and ``nrf52810dmouse`` boards are without the bootloader due to memory size limits on the ``nrf52810dmouse`` board. + Bluetooth uses Nordic's SoftDevice link layer with Low Latency Packet Mode (LLPM) support disabled. + * The preconfigured build types do not use a bootloader. Sample mouse, keyboard or dongle (``nrf52840dk/nrf52840``) * The configuration uses the nRF52840 Development Kit. @@ -80,7 +80,7 @@ Sample dongle (``nrf52833dk/nrf52820``) * |preconfigured_build_types| nRF52832 Desktop Keyboard (``nrf52kbd``) - * The reference design used is defined in :file:`nrf/boards/nordic/nrf52kbd` for the project-specific hardware. + * The reference design for the project-specific hardware is defined in the :file:`nrf/boards/nordic/nrf52kbd` directory. * The application is configured to act as a keyboard, with the Bluetooth LE transport enabled. * Bluetooth is configured to use Nordic Semiconductor's SoftDevice link layer. * The preconfigured build types configure the device without the bootloader in debug mode and with B0 bootloader in release mode due to memory size limits. diff --git a/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/app.overlay b/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/app.overlay deleted file mode 100644 index c4d37722d6ba..000000000000 --- a/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/app.overlay +++ /dev/null @@ -1,18 +0,0 @@ -&spi0 { - compatible = "nordic,nrf-spim"; - status = "okay"; -}; - -&bt_hci_controller { - status = "okay"; -}; - -&bt_hci_sdc { - status = "disabled"; -}; - -/ { - chosen { - zephyr,bt-hci = &bt_hci_controller; - }; -}; diff --git a/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/battery_def.h b/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/battery_def.h deleted file mode 100644 index 067d0fff3d8f..000000000000 --- a/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/battery_def.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2019 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/* This configuration file is included only once from battery level measuring - * module and holds information about battery characteristic. - */ - -/* This structure enforces the header file is included only once in the build. - * Violating this requirement triggers a multiple definition error at link time. - */ -const struct {} battery_def_include_once; - -#define BATTERY_MEAS_ADC_INPUT NRF_SAADC_INPUT_AIN2 -#define BATTERY_MEAS_ADC_GAIN ADC_GAIN_1_4 -#define BATTERY_MEAS_VOLTAGE_GAIN 4 - -/* Converting measured battery voltage[mV] to State of Charge[%]. - * First element corresponds to CONFIG_DESKTOP_BATTERY_MIN_LEVEL. - * Each element is CONFIG_DESKTOP_VOLTAGE_TO_SOC_DELTA higher than previous. - * Defined separately for every configuration. - */ -static const uint8_t battery_voltage_to_soc[] = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, - 1, 1, 2, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 6, 6, 7, 8, 9, 9, 10, -11, 13, 14, 15, 16, 18, 19, 21, 23, 24, 26, 28, 31, 33, 35, 37, 40, 42, 45, 47, -50, 52, 54, 57, 59, 62, 64, 66, 68, 71, 73, 75, 76, 78, 80, 81, 83, 84, 85, 86, -88, 89, 90, 90, 91, 92, 93, 93, 94, 94, 95, 95, 96, 96, 96, 97, 97, 97, 97, 98, -98, 98, 98, 98, 98, 98, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 100, -100 -}; diff --git a/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/buttons_def.h b/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/buttons_def.h deleted file mode 100644 index b1fdc2bd1e7f..000000000000 --- a/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/buttons_def.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2019 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -#include - -/* This configuration file is included only once from button module and holds - * information about pins forming keyboard matrix. - */ - -/* This structure enforces the header file is included only once in the build. - * Violating this requirement triggers a multiple definition error at link time. - */ -const struct {} buttons_def_include_once; - -static const struct gpio_pin col[] = { -}; - -static const struct gpio_pin row[] = { - { .port = 0, .pin = 28 }, - { .port = 0, .pin = 25 }, - { .port = 0, .pin = 30 }, -}; diff --git a/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/click_detector_def.h b/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/click_detector_def.h deleted file mode 100644 index 3398fe99017e..000000000000 --- a/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/click_detector_def.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2019 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -#include - -/* This configuration file is included only once from click_detector module - * and holds information about click detector configuration. - */ - -/* This structure enforces the header file is included only once in the build. - * Violating this requirement triggers a multiple definition error at link time. - */ -const struct {} click_detector_def_include_once; - -static const struct click_detector_config click_detector_config[] = { -#if CONFIG_DESKTOP_BLE_PEER_CONTROL - { - .key_id = CONFIG_DESKTOP_BLE_PEER_CONTROL_BUTTON, - .consume_button_event = false, - }, -#endif /* CONFIG_DESKTOP_BLE_PEER_CONTROL */ -}; diff --git a/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/hid_keyboard_leds_def.h b/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/hid_keyboard_leds_def.h deleted file mode 100644 index 46a245bd6b76..000000000000 --- a/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/hid_keyboard_leds_def.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2021 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -#include "hid_keyboard_leds.h" - -/* This configuration file is included only once from hid_state module and holds - * information about LEDs associated with HID keyboard LEDs report. - */ - -/* This structure enforces the header file is included only once in the build. - * Violating this requirement triggers a multiple definition error at link time. - */ -const struct {} hid_keyboard_leds_def_include_once; - -static const struct led_effect keyboard_led_on = LED_EFFECT_LED_ON(LED_COLOR(255, 255, 255)); -static const struct led_effect keyboard_led_off = LED_EFFECT_LED_OFF(); - -/* Map HID keyboard LEDs to application LED IDs. */ -static const uint8_t keyboard_led_map[] = { -}; diff --git a/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/hid_keymap_def.h b/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/hid_keymap_def.h deleted file mode 100644 index 29a2a99484a2..000000000000 --- a/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/hid_keymap_def.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) 2019 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -#include "hid_keymap.h" -#include - -/* This configuration file is included only once from hid_state module and holds - * information about mapping between buttons and generated reports. - */ - -/* This structure enforces the header file is included only once in the build. - * Violating this requirement triggers a multiple definition error at link time. - */ -const struct {} hid_keymap_def_include_once; - -/* - * HID keymap. The Consumer Control keys are defined in section 15 of - * the HID Usage Tables document under the following URL: - * https://www.usb.org/sites/default/files/hut1_12.pdf - */ -static const struct hid_keymap hid_keymap[] = { - { KEY_ID(0, 0), 0x01, REPORT_ID_MOUSE }, /* Left Mouse Button */ - { KEY_ID(0, 1), 0x02, REPORT_ID_MOUSE }, /* Right Mouse Button */ - { KEY_ID(0, 2), 0x03, REPORT_ID_MOUSE }, /* Middle Mouse Button */ -}; diff --git a/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/port_state_def.h b/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/port_state_def.h deleted file mode 100644 index a82e8e2f7287..000000000000 --- a/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/port_state_def.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2019 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -#include - -#include "port_state.h" - -/* This configuration file is included only once from board module and holds - * information about default pin states set while board is on and off. - */ - -/* This structure enforces the header file is included only once in the build. - * Violating this requirement triggers a multiple definition error at link time. - */ -const struct {} port_state_def_include_once; - - -static const struct pin_state port0_on[] = { - -}; - -static const struct pin_state port0_off[] = { - -}; - - -static const struct port_state port_state_on[] = { - { - .port = DEVICE_DT_GET(DT_NODELABEL(gpio0)), - .ps = port0_on, - .ps_count = ARRAY_SIZE(port0_on), - } -}; - -static const struct port_state port_state_off[] = { - { - .port = DEVICE_DT_GET(DT_NODELABEL(gpio0)), - .ps = port0_off, - .ps_count = ARRAY_SIZE(port0_off), - } -}; diff --git a/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj.conf b/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj.conf deleted file mode 100644 index 5c296e7c39e0..000000000000 --- a/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj.conf +++ /dev/null @@ -1,120 +0,0 @@ -# -# Copyright (c) 2019 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# -################################################################################ -# Application Configuration - -CONFIG_DESKTOP_INIT_LOG_MOTION_EVENT=n -CONFIG_DESKTOP_INIT_LOG_HID_REPORT_EVENT=n -CONFIG_DESKTOP_INIT_LOG_HID_REPORT_SENT_EVENT=n -CONFIG_CAF_INIT_LOG_KEEP_ALIVE_EVENTS=n - -CONFIG_DESKTOP_ROLE_HID_PERIPHERAL=y -CONFIG_DESKTOP_PERIPHERAL_TYPE_MOUSE=y -CONFIG_DESKTOP_DEVICE_PID=0x52DB -CONFIG_DESKTOP_HID_BOOT_INTERFACE_MOUSE=y - -CONFIG_DESKTOP_WHEEL_ENABLE=y -CONFIG_DESKTOP_WHEEL_SENSOR_VALUE_DIVIDER=15 - -CONFIG_DESKTOP_MOTION_SENSOR_PAW3212_ENABLE=y -CONFIG_DESKTOP_MOTION_SENSOR_THREAD_STACK_SIZE=512 -CONFIG_DESKTOP_MOTION_SENSOR_CPI=1026 -CONFIG_DESKTOP_MOTION_SENSOR_SLEEP1_TIMEOUT_MS=256 -CONFIG_DESKTOP_MOTION_SENSOR_SLEEP2_TIMEOUT_MS=20480 -CONFIG_DESKTOP_MOTION_SENSOR_SLEEP3_TIMEOUT_MS=20480 -CONFIG_DESKTOP_MOTION_SENSOR_SLEEP1_SAMPLE_TIME_DEFAULT=32 -CONFIG_DESKTOP_MOTION_SENSOR_SLEEP2_SAMPLE_TIME_DEFAULT=64 -CONFIG_DESKTOP_MOTION_SENSOR_SLEEP3_SAMPLE_TIME_DEFAULT=512 -CONFIG_DESKTOP_MOTION_SENSOR_SLEEP3_SAMPLE_TIME_CONNECTED=128 - -CONFIG_CAF_BUTTONS=y -CONFIG_CAF_BUTTONS_POLARITY_INVERSED=y -CONFIG_CAF_BUTTONS_PM_KEEP_ALIVE=n - -CONFIG_CAF_CLICK_DETECTOR=y - -CONFIG_DESKTOP_BATTERY_MEAS=y -CONFIG_DESKTOP_BATTERY_MEAS_MIN_LEVEL=1000 -CONFIG_DESKTOP_BATTERY_MEAS_MAX_LEVEL=1600 -CONFIG_DESKTOP_VOLTAGE_TO_SOC_DELTA=5 - -CONFIG_DESKTOP_BLE_USE_DEFAULT_ID=y - -CONFIG_DESKTOP_BLE_SECURITY_FAIL_TIMEOUT_S=10 - -CONFIG_DESKTOP_BLE_PEER_CONTROL=y -CONFIG_DESKTOP_BLE_PEER_CONTROL_BUTTON=0x0002 -CONFIG_DESKTOP_BLE_PEER_ERASE_ON_START=y - -CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=n - -################################################################################ -# Zephyr Configuration - -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=1792 -CONFIG_ISR_STACK_SIZE=1536 -CONFIG_MAIN_STACK_SIZE=840 - -# Reuse system workqueue as Bluetooth RX context to reduce memory consumption -CONFIG_BT_RECV_WORKQ_SYS=y -# Disable Bluetooth long workqueue to reduce memory consumption -CONFIG_BT_LONG_WQ=n -# Limit number of key slots in the PSA Crypto core to reduce memory consumption -CONFIG_MBEDTLS_PSA_KEY_SLOT_COUNT=10 - -CONFIG_BOOT_BANNER=n -CONFIG_NCS_BOOT_BANNER=n - -CONFIG_NUM_COOP_PRIORITIES=10 -CONFIG_NUM_PREEMPT_PRIORITIES=11 -CONFIG_TIMESLICING=n -CONFIG_SPIN_VALIDATE=n - -CONFIG_HEAP_MEM_POOL_SIZE=512 - -CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000 -CONFIG_SYSTEM_CLOCK_NO_WAIT=y - -CONFIG_HW_STACK_PROTECTION=y -CONFIG_RESET_ON_FATAL_ERROR=n - -CONFIG_GPIO=y - -CONFIG_REBOOT=y - -CONFIG_SIZE_OPTIMIZATIONS=y - -CONFIG_ADC=y -CONFIG_ADC_ASYNC=y -CONFIG_ADC_NRFX_SAADC=y - -CONFIG_SENSOR=y -CONFIG_QDEC_NRFX=y - -CONFIG_SPI=y -CONFIG_SPI_NRFX_RAM_BUFFER_SIZE=8 - -CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y - -CONFIG_BT_MAX_PAIRED=2 -CONFIG_BT_ID_MAX=3 -CONFIG_BT_LL_SW_SPLIT=y - -CONFIG_BT_ATT_TX_COUNT=4 -CONFIG_BT_CONN_TX_MAX=4 -# Reduce memory footprint -CONFIG_BT_BUF_EVT_RX_COUNT=8 -CONFIG_BT_CTLR_FAL_SIZE=1 -CONFIG_BT_CTLR_RL_SIZE=2 - -CONFIG_PAW3212=y -CONFIG_PAW3212_ORIENTATION_180=y - -################################################################################ - -CONFIG_ASSERT=y -CONFIG_ASSERT_LEVEL=2 -CONFIG_ASSERT_VERBOSE=n diff --git a/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj_release.conf b/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj_release.conf deleted file mode 100644 index 9ff945ac00a3..000000000000 --- a/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj_release.conf +++ /dev/null @@ -1,109 +0,0 @@ -# -# Copyright (c) 2019 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# -################################################################################ -# Application Configuration - -CONFIG_DESKTOP_ROLE_HID_PERIPHERAL=y -CONFIG_DESKTOP_PERIPHERAL_TYPE_MOUSE=y -CONFIG_DESKTOP_DEVICE_PID=0x52DB -CONFIG_DESKTOP_HID_BOOT_INTERFACE_MOUSE=y - -CONFIG_DESKTOP_WHEEL_ENABLE=y -CONFIG_DESKTOP_WHEEL_SENSOR_VALUE_DIVIDER=15 - -CONFIG_DESKTOP_MOTION_SENSOR_PAW3212_ENABLE=y -CONFIG_DESKTOP_MOTION_SENSOR_THREAD_STACK_SIZE=512 -CONFIG_DESKTOP_MOTION_SENSOR_CPI=1026 -CONFIG_DESKTOP_MOTION_SENSOR_SLEEP1_TIMEOUT_MS=256 -CONFIG_DESKTOP_MOTION_SENSOR_SLEEP2_TIMEOUT_MS=20480 -CONFIG_DESKTOP_MOTION_SENSOR_SLEEP3_TIMEOUT_MS=20480 -CONFIG_DESKTOP_MOTION_SENSOR_SLEEP1_SAMPLE_TIME_DEFAULT=32 -CONFIG_DESKTOP_MOTION_SENSOR_SLEEP2_SAMPLE_TIME_DEFAULT=64 -CONFIG_DESKTOP_MOTION_SENSOR_SLEEP3_SAMPLE_TIME_DEFAULT=512 -CONFIG_DESKTOP_MOTION_SENSOR_SLEEP3_SAMPLE_TIME_CONNECTED=128 - -CONFIG_CAF_BUTTONS=y -CONFIG_CAF_BUTTONS_POLARITY_INVERSED=y -CONFIG_CAF_BUTTONS_PM_KEEP_ALIVE=n - -CONFIG_CAF_CLICK_DETECTOR=y - -CONFIG_DESKTOP_BATTERY_MEAS=y -CONFIG_DESKTOP_BATTERY_MEAS_MIN_LEVEL=1000 -CONFIG_DESKTOP_BATTERY_MEAS_MAX_LEVEL=1600 -CONFIG_DESKTOP_VOLTAGE_TO_SOC_DELTA=5 - -CONFIG_DESKTOP_BLE_SECURITY_FAIL_TIMEOUT_S=10 - -CONFIG_DESKTOP_BLE_PEER_CONTROL=y -CONFIG_DESKTOP_BLE_PEER_CONTROL_BUTTON=0x0002 -CONFIG_DESKTOP_BLE_PEER_ERASE_ON_START=y - -CONFIG_DESKTOP_WATCHDOG_ENABLE=y -CONFIG_DESKTOP_FAILSAFE_ENABLE=y - -CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=n - -################################################################################ -# Zephyr Configuration - -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=1792 -CONFIG_ISR_STACK_SIZE=1536 -CONFIG_MAIN_STACK_SIZE=840 - -# Reuse system workqueue as Bluetooth RX context to reduce memory consumption -CONFIG_BT_RECV_WORKQ_SYS=y -# Disable Bluetooth long workqueue to reduce memory consumption -CONFIG_BT_LONG_WQ=n -# Limit number of key slots in the PSA Crypto core to reduce memory consumption -CONFIG_MBEDTLS_PSA_KEY_SLOT_COUNT=10 - -CONFIG_BOOT_BANNER=n -CONFIG_NCS_BOOT_BANNER=n - -CONFIG_NUM_COOP_PRIORITIES=10 -CONFIG_NUM_PREEMPT_PRIORITIES=11 -CONFIG_TIMESLICING=n - -CONFIG_HEAP_MEM_POOL_SIZE=512 - -CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000 -CONFIG_SYSTEM_CLOCK_NO_WAIT=y - -CONFIG_HW_STACK_PROTECTION=n -CONFIG_RESET_ON_FATAL_ERROR=n - -CONFIG_GPIO=y - -CONFIG_REBOOT=y - -CONFIG_SIZE_OPTIMIZATIONS=y - -CONFIG_ADC=y -CONFIG_ADC_ASYNC=y -CONFIG_ADC_NRFX_SAADC=y - -CONFIG_SENSOR=y -CONFIG_QDEC_NRFX=y - -CONFIG_SPI=y -CONFIG_SPI_NRFX_RAM_BUFFER_SIZE=8 - -CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y - -CONFIG_BT_MAX_PAIRED=2 -CONFIG_BT_ID_MAX=3 -CONFIG_BT_LL_SW_SPLIT=y - -CONFIG_BT_ATT_TX_COUNT=4 -CONFIG_BT_CONN_TX_MAX=4 -# Reduce memory footprint -CONFIG_BT_BUF_EVT_RX_COUNT=8 -CONFIG_BT_CTLR_FAL_SIZE=1 -CONFIG_BT_CTLR_RL_SIZE=2 - -CONFIG_PAW3212=y -CONFIG_PAW3212_ORIENTATION_180=y diff --git a/applications/nrf_desktop/description.rst b/applications/nrf_desktop/description.rst index 8412ebb7372d..7f487e6a704e 100644 --- a/applications/nrf_desktop/description.rst +++ b/applications/nrf_desktop/description.rst @@ -339,7 +339,7 @@ Depending on the development kit you use, you need to select the respective conf .. table-from-rows:: /includes/sample_board_rows.txt :header: heading - :rows: nrf52dmouse_nrf52832, nrf52810dmouse_nrf52810 + :rows: nrf52dmouse_nrf52832 .. tab:: Keyboard diff --git a/applications/nrf_desktop/sample.yaml b/applications/nrf_desktop/sample.yaml index db6ab45f9cc6..9d403b6758be 100644 --- a/applications/nrf_desktop/sample.yaml +++ b/applications/nrf_desktop/sample.yaml @@ -39,7 +39,6 @@ tests: platform_allow: - nrf52dmouse/nrf52832 - nrf52kbd/nrf52832 - - nrf52810dmouse/nrf52810 - nrf52820dongle/nrf52820 - nrf52833dk/nrf52820 - nrf52833dk/nrf52833 @@ -52,7 +51,6 @@ tests: integration_platforms: - nrf52dmouse/nrf52832 - nrf52kbd/nrf52832 - - nrf52810dmouse/nrf52810 - nrf52820dongle/nrf52820 - nrf52833dk/nrf52820 - nrf52833dk/nrf52833 @@ -193,7 +191,6 @@ tests: platform_allow: - nrf52dmouse/nrf52832 - nrf52kbd/nrf52832 - - nrf52810dmouse/nrf52810 - nrf52820dongle/nrf52820 - nrf52833dk/nrf52820 - nrf52833dk/nrf52833 @@ -209,7 +206,6 @@ tests: integration_platforms: - nrf52dmouse/nrf52832 - nrf52kbd/nrf52832 - - nrf52810dmouse/nrf52810 - nrf52820dongle/nrf52820 - nrf52833dk/nrf52820 - nrf52833dk/nrf52833 diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst index 0b706dbece7a..511a98b0594f 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst @@ -261,7 +261,7 @@ nRF Desktop * Application configurations for nRF54L05, nRF54L10, and nRF54L15 SoCs to use Fast Pair PSA cryptography (:kconfig:option:`CONFIG_BT_FAST_PAIR_CRYPTO_PSA`). Using PSA cryptography improves security and reduces memory footprint. Also increased the size of the Bluetooth receiving thread stack (:kconfig:option:`CONFIG_BT_RX_STACK_SIZE`) to prevent stack overflows. - * Application configurations for nRF52810 and nRF52820 SoCs to reduce memory footprint: + * Application configurations for the nRF52820 SoC to reduce memory footprint: * Disabled Bluetooth long workqueue (:kconfig:option:`CONFIG_BT_LONG_WQ`). * Limited the number of key slots in the PSA Crypto core to 10 (:kconfig:option:`CONFIG_MBEDTLS_PSA_KEY_SLOT_COUNT`). @@ -302,10 +302,13 @@ nRF Desktop * Requirement for zero latency in Zephyr's :ref:`zephyr:pm-system` while USB is active (:ref:`CONFIG_DESKTOP_USB_PM_REQ_NO_PM_LATENCY ` Kconfig option of the :ref:`nrf_desktop_usb_state_pm`). The feature is enabled by default if Zephyr Power Management (:kconfig:option:`CONFIG_PM`) is enabled to prevent entering power states that introduce wakeup latency and ensure high performance. -* Removed an imply from the nRF Desktop Bluetooth connectivity Kconfig option (:ref:`CONFIG_DESKTOP_BT `). - The imply enabled a separate workqueue for connection TX notify processing (:kconfig:option:`CONFIG_BT_CONN_TX_NOTIFY_WQ`) if MPSL was used for synchronization between the flash memory driver and radio (:kconfig:option:`CONFIG_SOC_FLASH_NRF_RADIO_SYNC_MPSL`). - The MPSL flash synchronization issue (``NCSDK-29354`` in the :ref:`known_issues`) is fixed. - The workaround is no longer needed. +* Removed: + + * An imply from the nRF Desktop Bluetooth connectivity Kconfig option (:ref:`CONFIG_DESKTOP_BT `). + The imply enabled a separate workqueue for connection TX notify processing (:kconfig:option:`CONFIG_BT_CONN_TX_NOTIFY_WQ`) if MPSL was used for synchronization between the flash memory driver and the radio (:kconfig:option:`CONFIG_SOC_FLASH_NRF_RADIO_SYNC_MPSL`). + The workaround for the MPSL flash synchronization issue (``NCSDK-29354`` in the :ref:`known_issues` page) is no longer needed, as the issue is now fixed. + * Application configurations for the nRF52810 Desktop Mouse board (``nrf52810dmouse/nrf52810``). + The board is no longer supported in the |NCS|. nRF Machine Learning (Edge Impulse) ----------------------------------- diff --git a/scripts/hid_configurator/NrfHidManager.py b/scripts/hid_configurator/NrfHidManager.py index 3d5ec9cd1a48..9d455a83b49b 100644 --- a/scripts/hid_configurator/NrfHidManager.py +++ b/scripts/hid_configurator/NrfHidManager.py @@ -12,7 +12,7 @@ class NrfHidManager(): 'gaming_mouse' : ['nrf52840gmouse'], 'dongle' : ['nrf52840dongle', 'nrf52833dongle', 'nrf52820dongle'], 'keyboard' : ['nrf52kbd'], - 'desktop_mouse' : ['nrf52dmouse', 'nrf52810dmouse'], + 'desktop_mouse' : ['nrf52dmouse'], } def __init__(self, vid=NORDIC_VID): diff --git a/scripts/quarantine_integration.yaml b/scripts/quarantine_integration.yaml index a2222377a251..73c20eda9663 100644 --- a/scripts/quarantine_integration.yaml +++ b/scripts/quarantine_integration.yaml @@ -492,7 +492,6 @@ - scenarios: - applications.nrf_desktop.zrelease platforms: - - nrf52810dmouse/nrf52810 - nrf52840dk/nrf52840 - nrf52833dk/nrf52833 - nrf52833dongle/nrf52833 From 0173b4a71a0de9a5a9145be2f2ec71115ba97659 Mon Sep 17 00:00:00 2001 From: Marek Pieta Date: Wed, 19 Mar 2025 16:44:43 +0100 Subject: [PATCH 2/2] boards: nordic: Drop nrf52810dmouse board Change drops support for the nRF52810 Desktop Mouse board in the NCS. Jira: NCSDK-31719 Signed-off-by: Marek Pieta Signed-off-by: Divya Pillai --- boards/deprecated.cmake | 1 - .../nordic/nrf52810dmouse/Kconfig.defconfig | 12 -- .../nrf52810dmouse/Kconfig.nrf52810dmouse | 5 - boards/nordic/nrf52810dmouse/board.cmake | 12 -- boards/nordic/nrf52810dmouse/board.yml | 5 - .../nrf52810dmouse_nrf52810-pinctrl.dtsi | 59 ---------- .../nrf52810dmouse_nrf52810.dts | 106 ------------------ .../nrf52810dmouse_nrf52810.yaml | 14 --- .../nrf52810dmouse_nrf52810_defconfig | 4 - .../nordic/nrf52810dmouse/pre_dt_board.cmake | 7 -- doc/nrf/app_dev/board_names.rst | 3 - .../boardname_tables/sample_boardnames.txt | 2 - doc/nrf/includes/sample_board_rows.txt | 4 - .../releases/release-notes-changelog.rst | 2 +- 14 files changed, 1 insertion(+), 235 deletions(-) delete mode 100644 boards/nordic/nrf52810dmouse/Kconfig.defconfig delete mode 100644 boards/nordic/nrf52810dmouse/Kconfig.nrf52810dmouse delete mode 100644 boards/nordic/nrf52810dmouse/board.cmake delete mode 100644 boards/nordic/nrf52810dmouse/board.yml delete mode 100644 boards/nordic/nrf52810dmouse/nrf52810dmouse_nrf52810-pinctrl.dtsi delete mode 100644 boards/nordic/nrf52810dmouse/nrf52810dmouse_nrf52810.dts delete mode 100644 boards/nordic/nrf52810dmouse/nrf52810dmouse_nrf52810.yaml delete mode 100644 boards/nordic/nrf52810dmouse/nrf52810dmouse_nrf52810_defconfig delete mode 100644 boards/nordic/nrf52810dmouse/pre_dt_board.cmake diff --git a/boards/deprecated.cmake b/boards/deprecated.cmake index e715471b0dcd..6bbaaf751cce 100644 --- a/boards/deprecated.cmake +++ b/boards/deprecated.cmake @@ -17,7 +17,6 @@ set(nrf9160_pca20035_DEPRECATED thingy91_nrf9160) set(nrf9160_pca20035ns_DEPRECATED thingy91_nrf9160_ns) set(thingy91_nrf9160ns_DEPRECATED thingy91_nrf9160_ns) -set(nrf52810dmouse_nrf52810_DEPRECATED nrf52810dmouse/nrf52810) set(nrf52820dongle_nrf52820_DEPRECATED nrf52820dongle/nrf52820) set(nrf52833dongle_nrf52833_DEPRECATED nrf52833dongle/nrf52833) set(nrf52840gmouse_nrf52840_DEPRECATED nrf52840gmouse/nrf52840) diff --git a/boards/nordic/nrf52810dmouse/Kconfig.defconfig b/boards/nordic/nrf52810dmouse/Kconfig.defconfig deleted file mode 100644 index d9866927ec40..000000000000 --- a/boards/nordic/nrf52810dmouse/Kconfig.defconfig +++ /dev/null @@ -1,12 +0,0 @@ -# -# Copyright (c) 2019 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -if BOARD_NRF52810DMOUSE - -config HW_STACK_PROTECTION - default ARCH_HAS_STACK_PROTECTION - -endif # BOARD_NRF52810DMOUSE diff --git a/boards/nordic/nrf52810dmouse/Kconfig.nrf52810dmouse b/boards/nordic/nrf52810dmouse/Kconfig.nrf52810dmouse deleted file mode 100644 index f8aa76d6416c..000000000000 --- a/boards/nordic/nrf52810dmouse/Kconfig.nrf52810dmouse +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (c) 2019 Nordic Semiconductor -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -config BOARD_NRF52810DMOUSE - select SOC_NRF52810_QFAA diff --git a/boards/nordic/nrf52810dmouse/board.cmake b/boards/nordic/nrf52810dmouse/board.cmake deleted file mode 100644 index dd5631677981..000000000000 --- a/boards/nordic/nrf52810dmouse/board.cmake +++ /dev/null @@ -1,12 +0,0 @@ -# -# Copyright (c) 2019 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -board_runner_args(nrfjprog "--softreset") -board_runner_args(nrfutil "--nrf-family=NRF52") -board_runner_args(jlink "--device=nRF52810_xxAA" "--speed=4000") -include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake) -include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake) -include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/nordic/nrf52810dmouse/board.yml b/boards/nordic/nrf52810dmouse/board.yml deleted file mode 100644 index 6c89782097b0..000000000000 --- a/boards/nordic/nrf52810dmouse/board.yml +++ /dev/null @@ -1,5 +0,0 @@ -board: - name: nrf52810dmouse - vendor: nordic - socs: - - name: nrf52810 diff --git a/boards/nordic/nrf52810dmouse/nrf52810dmouse_nrf52810-pinctrl.dtsi b/boards/nordic/nrf52810dmouse/nrf52810dmouse_nrf52810-pinctrl.dtsi deleted file mode 100644 index 57a6d4343365..000000000000 --- a/boards/nordic/nrf52810dmouse/nrf52810dmouse_nrf52810-pinctrl.dtsi +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -&pinctrl { - uart0_default: uart0_default { - group1 { - psels = , - , - , - ; - }; - }; - - uart0_sleep: uart0_sleep { - group1 { - psels = , - , - , - ; - low-power-enable; - }; - }; - - qdec_default: qdec_default { - group1 { - psels = , - ; - }; - }; - - qdec_sleep: qdec_sleep { - group1 { - psels = , - ; - low-power-enable; - }; - }; - - spi0_default: spi0_default { - group1 { - psels = , - , - ; - }; - }; - - spi0_sleep: spi0_sleep { - group1 { - psels = , - , - ; - low-power-enable; - }; - }; - -}; diff --git a/boards/nordic/nrf52810dmouse/nrf52810dmouse_nrf52810.dts b/boards/nordic/nrf52810dmouse/nrf52810dmouse_nrf52810.dts deleted file mode 100644 index e4e6ba952932..000000000000 --- a/boards/nordic/nrf52810dmouse/nrf52810dmouse_nrf52810.dts +++ /dev/null @@ -1,106 +0,0 @@ -/* - * Copyright (c) 2019-2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/dts-v1/; -#include -#include "nrf52810dmouse_nrf52810-pinctrl.dtsi" - -/ { - model = "Nordic nRF52810 DMouse NRF52810"; - compatible = "nordic,nrf52810-dmouse-nrf52810"; - - chosen { - zephyr,console = &uart0; - zephyr,sram = &sram0; - zephyr,flash = &flash0; - zephyr,code-partition = &slot0_partition; - }; - - /* These aliases are provided for compatibility with samples */ - aliases { - watchdog0 = &wdt0; - }; -}; - -&adc { - status = "okay"; -}; - -&gpiote { - status = "okay"; -}; - -&gpio0 { - status = "okay"; -}; - -&uart0 { - status = "okay"; - compatible = "nordic,nrf-uarte"; - current-speed = <115200>; - pinctrl-0 = <&uart0_default>; - pinctrl-1 = <&uart0_sleep>; - pinctrl-names = "default", "sleep"; -}; - -&qdec { - status = "okay"; - enable-pin = <9>; - led-pre = <0>; - steps = <24>; - pinctrl-0 = <&qdec_default>; - pinctrl-1 = <&qdec_sleep>; - pinctrl-names = "default", "sleep"; -}; - -&spi0 { - compatible = "nordic,nrf-spim"; - status = "okay"; - cs-gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; - - pinctrl-0 = <&spi0_default>; - pinctrl-1 = <&spi0_sleep>; - pinctrl-names = "default", "sleep"; - paw3212@0 { - compatible = "pixart,paw3212"; - reg = <0>; - irq-gpios = <&gpio0 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; - spi-max-frequency = <2000000>; - }; -}; - -&flash0 { - /* - * For more information, see: - * http://docs.zephyrproject.org/latest/guides/dts/index.html#flash-partitions - */ - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - boot_partition: partition@0 { - label = "mcuboot"; - reg = <0x00000000 0xc000>; - }; - slot0_partition: partition@c000 { - label = "image-0"; - reg = <0x0000c000 0xe000>; - }; - slot1_partition: partition@1a000 { - label = "image-1"; - reg = <0x0001a000 0xe000>; - }; - scratch_partition: partition@28000 { - label = "image-scratch"; - reg = <0x00028000 0x4000>; - }; - storage_partition: partition@2c000 { - label = "storage"; - reg = <0x0002c000 0x00004000>; - }; - }; -}; diff --git a/boards/nordic/nrf52810dmouse/nrf52810dmouse_nrf52810.yaml b/boards/nordic/nrf52810dmouse/nrf52810dmouse_nrf52810.yaml deleted file mode 100644 index 84707aa43240..000000000000 --- a/boards/nordic/nrf52810dmouse/nrf52810dmouse_nrf52810.yaml +++ /dev/null @@ -1,14 +0,0 @@ -identifier: nrf52810dmouse/nrf52810 -name: nRF52810-DMouse-NRF52810 -type: mcu -arch: arm -toolchain: - - zephyr - - gnuarmemb - - xtools -supported: - - ble - - gpio - - watchdog -ram: 24 -flash: 192 diff --git a/boards/nordic/nrf52810dmouse/nrf52810dmouse_nrf52810_defconfig b/boards/nordic/nrf52810dmouse/nrf52810dmouse_nrf52810_defconfig deleted file mode 100644 index 69e328438fde..000000000000 --- a/boards/nordic/nrf52810dmouse/nrf52810dmouse_nrf52810_defconfig +++ /dev/null @@ -1,4 +0,0 @@ -# Enable MPU -CONFIG_ARM_MPU=y - -CONFIG_PINCTRL=y diff --git a/boards/nordic/nrf52810dmouse/pre_dt_board.cmake b/boards/nordic/nrf52810dmouse/pre_dt_board.cmake deleted file mode 100644 index 87bbe65e8822..000000000000 --- a/boards/nordic/nrf52810dmouse/pre_dt_board.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2022 Nordic Semiconductor -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -# Suppress "unique_unit_address_if_enabled" to handle the following overlaps: -# - power@40000000 & clock@40000000 & bprot@40000000 -# - acl@4001e000 & flash-controller@4001e000 -list(APPEND EXTRA_DTC_FLAGS "-Wno-unique_unit_address_if_enabled") diff --git a/doc/nrf/app_dev/board_names.rst b/doc/nrf/app_dev/board_names.rst index 3bd9c0a27fef..e496e4c2ee37 100644 --- a/doc/nrf/app_dev/board_names.rst +++ b/doc/nrf/app_dev/board_names.rst @@ -163,9 +163,6 @@ The following boards are defined in the :file:`nrf/boards/nordic/` folder. | nRF Desktop | PCA20044 | :ref:`nrf52dmouse ` | ``nrf52dmouse/nrf52832`` | | Mouse | | | | +-------------------+------------+----------------------------------------------------------+---------------------------------------+ -| nRF Desktop | PCA20045 | :ref:`nrf52810dmouse ` | ``nrf52810dmouse/nrf52810`` | -| Mouse | | | | -+-------------------+------------+----------------------------------------------------------+---------------------------------------+ | nRF Desktop | PCA20037 | :ref:`nrf52kbd ` | ``nrf52kbd/nrf52832`` | | Keyboard | | | | +-------------------+------------+----------------------------------------------------------+---------------------------------------+ diff --git a/doc/nrf/includes/boardname_tables/sample_boardnames.txt b/doc/nrf/includes/boardname_tables/sample_boardnames.txt index 8fbe5c8f4e0f..a1b2d16e9b15 100644 --- a/doc/nrf/includes/boardname_tables/sample_boardnames.txt +++ b/doc/nrf/includes/boardname_tables/sample_boardnames.txt @@ -171,8 +171,6 @@ Set used by application (nRF Desktop - Desktop Mouse) +=================================================+===========+========================+===========================+ |nRF52832 Desktop Mouse |PCA20044 |nrf52dmouse |``nrf52dmouse/nrf52832`` | +-------------------------------------------------+-----------+------------------------+---------------------------+ -|nRF52810 Desktop Mouse |PCA20045 |nrf52810dmouse |``nrf52810dmouse/nrf52810``| -+-------------------------------------------------+-----------+------------------------+---------------------------+ .. set12_end diff --git a/doc/nrf/includes/sample_board_rows.txt b/doc/nrf/includes/sample_board_rows.txt index ebec678287c9..143ae3ed01f5 100644 --- a/doc/nrf/includes/sample_board_rows.txt +++ b/doc/nrf/includes/sample_board_rows.txt @@ -128,10 +128,6 @@ | nRF52832 Desktop Mouse | PCA20044 | nrf52dmouse | ``nrf52dmouse/nrf52832`` | -.. nrf52810dmouse_nrf52810 - -| nRF52810 Desktop Mouse | PCA20045 | nrf52810dmouse | ``nrf52810dmouse/nrf52810`` | - .. thingy91_nrf52840 | :ref:`Thingy:91 ` | PCA20035 | thingy91 | ``thingy91/nrf52840`` | diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst index 511a98b0594f..0e92c58cff2d 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst @@ -47,7 +47,7 @@ IDE, OS, and tool support Board support ============= -|no_changes_yet_note| +* Removed support for the nRF52810 Desktop Mouse board (``nrf52810dmouse/nrf52810``). Build and configuration system ==============================