Skip to content

Commit 831a154

Browse files
MarekPietakapi-no
MarekPieta
authored and
kapi-no
committed
applications: nrf_desktop: Do not use deprecated Kconfig options
Change updates application configurations to ensure that deprecated Kconfig options are no longer used to configure the HID eventq utility in HID report providers. JiraL NCSDK-35359 Signed-off-by: Marek Pieta <[email protected]> Signed-off-by: Pekka Niskanen <[email protected]>
1 parent 109ae33 commit 831a154

File tree

8 files changed

+45
-14
lines changed

8 files changed

+45
-14
lines changed

‎applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_keyboard.conf‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,12 @@ CONFIG_DESKTOP_HID_BOOT_INTERFACE_KEYBOARD=y
2424
CONFIG_DESKTOP_HID_STATE_SUBSCRIBER_COUNT=2
2525
CONFIG_DESKTOP_HID_KEYMAP_DEF_PATH="hid_keymap_def_keyboard.h"
2626
CONFIG_DESKTOP_HID_STATE_HID_KEYBOARD_LEDS_DEF_PATH="hid_keyboard_leds_def_keyboard.h"
27-
CONFIG_DESKTOP_HID_REPORT_EXPIRATION=10000
28-
CONFIG_DESKTOP_HID_EVENT_QUEUE_SIZE=60
27+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_KEYBOARD_KEYPRESS_EXPIRATION=10000
28+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_SYSTEM_CTRL_KEYPRESS_EXPIRATION=10000
29+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_CONSUMER_CTRL_KEYPRESS_EXPIRATION=10000
30+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_KEYBOARD_EVENT_QUEUE_SIZE=60
31+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_SYSTEM_CTRL_EVENT_QUEUE_SIZE=10
32+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_CONSUMER_CTRL_EVENT_QUEUE_SIZE=10
2933

3034
CONFIG_CAF_BUTTONS=y
3135
CONFIG_CAF_BUTTONS_POLARITY_INVERSED=y

‎applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj.conf‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,12 @@ CONFIG_DESKTOP_ROLE_HID_PERIPHERAL=y
1515
CONFIG_DESKTOP_PERIPHERAL_TYPE_KEYBOARD=y
1616
CONFIG_DESKTOP_DEVICE_PID=0x52DD
1717
CONFIG_DESKTOP_HID_BOOT_INTERFACE_KEYBOARD=y
18-
CONFIG_DESKTOP_HID_REPORT_EXPIRATION=10000
19-
CONFIG_DESKTOP_HID_EVENT_QUEUE_SIZE=60
18+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_KEYBOARD_KEYPRESS_EXPIRATION=10000
19+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_SYSTEM_CTRL_KEYPRESS_EXPIRATION=10000
20+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_CONSUMER_CTRL_KEYPRESS_EXPIRATION=10000
21+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_KEYBOARD_EVENT_QUEUE_SIZE=60
22+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_SYSTEM_CTRL_EVENT_QUEUE_SIZE=10
23+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_CONSUMER_CTRL_EVENT_QUEUE_SIZE=10
2024

2125
CONFIG_CAF_BUTTONS=y
2226
CONFIG_CAF_BUTTONS_SCAN_INTERVAL=6

‎applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj_release.conf‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,12 @@ CONFIG_DESKTOP_ROLE_HID_PERIPHERAL=y
1010
CONFIG_DESKTOP_PERIPHERAL_TYPE_KEYBOARD=y
1111
CONFIG_DESKTOP_DEVICE_PID=0x52DD
1212
CONFIG_DESKTOP_HID_BOOT_INTERFACE_KEYBOARD=y
13-
CONFIG_DESKTOP_HID_REPORT_EXPIRATION=10000
14-
CONFIG_DESKTOP_HID_EVENT_QUEUE_SIZE=60
13+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_KEYBOARD_KEYPRESS_EXPIRATION=10000
14+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_SYSTEM_CTRL_KEYPRESS_EXPIRATION=10000
15+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_CONSUMER_CTRL_KEYPRESS_EXPIRATION=10000
16+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_KEYBOARD_EVENT_QUEUE_SIZE=60
17+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_SYSTEM_CTRL_EVENT_QUEUE_SIZE=10
18+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_CONSUMER_CTRL_EVENT_QUEUE_SIZE=10
1519

1620
CONFIG_CAF_BUTTONS=y
1721
CONFIG_CAF_BUTTONS_SCAN_INTERVAL=6

‎applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj_release_fast_pair.conf‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,12 @@ CONFIG_DESKTOP_PERIPHERAL_TYPE_KEYBOARD=y
1616
CONFIG_DESKTOP_DEVICE_PID=0x52DD
1717
CONFIG_DESKTOP_DEVICE_GENERATION="FastPair"
1818
CONFIG_DESKTOP_HID_BOOT_INTERFACE_KEYBOARD=y
19-
CONFIG_DESKTOP_HID_REPORT_EXPIRATION=10000
20-
CONFIG_DESKTOP_HID_EVENT_QUEUE_SIZE=60
19+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_KEYBOARD_KEYPRESS_EXPIRATION=10000
20+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_SYSTEM_CTRL_KEYPRESS_EXPIRATION=10000
21+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_CONSUMER_CTRL_KEYPRESS_EXPIRATION=10000
22+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_KEYBOARD_EVENT_QUEUE_SIZE=60
23+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_SYSTEM_CTRL_EVENT_QUEUE_SIZE=10
24+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_CONSUMER_CTRL_EVENT_QUEUE_SIZE=10
2125

2226
CONFIG_CAF_BUTTONS=y
2327
CONFIG_CAF_BUTTONS_SCAN_INTERVAL=6

‎applications/nrf_desktop/configuration/nrf54l15dk_nrf54l05_cpuapp/prj_release_keyboard.conf‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,12 @@ CONFIG_DESKTOP_DEVICE_PID=0x52DD
1616
CONFIG_DESKTOP_HID_BOOT_INTERFACE_KEYBOARD=y
1717
CONFIG_DESKTOP_HID_KEYMAP_DEF_PATH="hid_keymap_def_keyboard.h"
1818
CONFIG_DESKTOP_HID_STATE_HID_KEYBOARD_LEDS_DEF_PATH="hid_keyboard_leds_def_keyboard.h"
19-
CONFIG_DESKTOP_HID_REPORT_EXPIRATION=10000
20-
CONFIG_DESKTOP_HID_EVENT_QUEUE_SIZE=60
19+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_KEYBOARD_KEYPRESS_EXPIRATION=10000
20+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_SYSTEM_CTRL_KEYPRESS_EXPIRATION=10000
21+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_CONSUMER_CTRL_KEYPRESS_EXPIRATION=10000
22+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_KEYBOARD_EVENT_QUEUE_SIZE=60
23+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_SYSTEM_CTRL_EVENT_QUEUE_SIZE=10
24+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_CONSUMER_CTRL_EVENT_QUEUE_SIZE=10
2125

2226
CONFIG_CAF_BUTTONS=y
2327
CONFIG_CAF_BUTTONS_POLARITY_INVERSED=y

‎applications/nrf_desktop/configuration/nrf54l15dk_nrf54l10_cpuapp/prj_keyboard.conf‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,12 @@ CONFIG_DESKTOP_DEVICE_PID=0x52DD
2020
CONFIG_DESKTOP_HID_BOOT_INTERFACE_KEYBOARD=y
2121
CONFIG_DESKTOP_HID_KEYMAP_DEF_PATH="hid_keymap_def_keyboard.h"
2222
CONFIG_DESKTOP_HID_STATE_HID_KEYBOARD_LEDS_DEF_PATH="hid_keyboard_leds_def_keyboard.h"
23-
CONFIG_DESKTOP_HID_REPORT_EXPIRATION=10000
24-
CONFIG_DESKTOP_HID_EVENT_QUEUE_SIZE=60
23+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_KEYBOARD_KEYPRESS_EXPIRATION=10000
24+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_SYSTEM_CTRL_KEYPRESS_EXPIRATION=10000
25+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_CONSUMER_CTRL_KEYPRESS_EXPIRATION=10000
26+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_KEYBOARD_EVENT_QUEUE_SIZE=60
27+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_SYSTEM_CTRL_EVENT_QUEUE_SIZE=10
28+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_CONSUMER_CTRL_EVENT_QUEUE_SIZE=10
2529

2630
CONFIG_CAF_BUTTONS=y
2731
CONFIG_CAF_BUTTONS_POLARITY_INVERSED=y

‎applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/prj_keyboard.conf‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,12 @@ CONFIG_DESKTOP_DEVICE_PID=0x52DD
2020
CONFIG_DESKTOP_HID_BOOT_INTERFACE_KEYBOARD=y
2121
CONFIG_DESKTOP_HID_KEYMAP_DEF_PATH="hid_keymap_def_keyboard.h"
2222
CONFIG_DESKTOP_HID_STATE_HID_KEYBOARD_LEDS_DEF_PATH="hid_keyboard_leds_def_keyboard.h"
23-
CONFIG_DESKTOP_HID_REPORT_EXPIRATION=10000
24-
CONFIG_DESKTOP_HID_EVENT_QUEUE_SIZE=60
23+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_KEYBOARD_KEYPRESS_EXPIRATION=10000
24+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_SYSTEM_CTRL_KEYPRESS_EXPIRATION=10000
25+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_CONSUMER_CTRL_KEYPRESS_EXPIRATION=10000
26+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_KEYBOARD_EVENT_QUEUE_SIZE=60
27+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_SYSTEM_CTRL_EVENT_QUEUE_SIZE=10
28+
CONFIG_DESKTOP_HID_REPORT_PROVIDER_CONSUMER_CTRL_EVENT_QUEUE_SIZE=10
2529

2630
CONFIG_CAF_BUTTONS=y
2731
CONFIG_CAF_BUTTONS_POLARITY_INVERSED=y

‎doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,9 @@ nRF Desktop
252252
The public key used by MCUboot for validating the application image is securely stored in the KMU hardware peripheral.
253253
To simplify the programming procedure, the application is configured to use the automatic KMU provisioning.
254254
The KMU provisioning is performed by the west runner as a part of the ``west flash`` command when the ``--erase`` or ``--recover`` flag is used.
255+
* Application configurations to avoid using the deprecated Kconfig options :ref:`CONFIG_DESKTOP_HID_REPORT_EXPIRATION <config_desktop_app_options>` and :ref:`CONFIG_DESKTOP_HID_EVENT_QUEUE_SIZE <config_desktop_app_options>`.
256+
The configurations rely on Kconfig options specific to HID providers instead.
257+
The HID keypress queue sizes for HID consumer control (:ref:`CONFIG_DESKTOP_HID_REPORT_PROVIDER_CONSUMER_CTRL_EVENT_QUEUE_SIZE <config_desktop_app_options>`) and HID system control (:ref:`CONFIG_DESKTOP_HID_REPORT_PROVIDER_SYSTEM_CTRL_EVENT_QUEUE_SIZE <config_desktop_app_options>`) reports were decreased to ``10``.
255258

256259
nRF Machine Learning (Edge Impulse)
257260
-----------------------------------

0 commit comments

Comments
 (0)