From ed149fa6df439fb66a0308bb8bcd58eaeb0db324 Mon Sep 17 00:00:00 2001 From: Marek Pieta Date: Wed, 21 Aug 2024 10:06:26 +0200 Subject: [PATCH] applications: nrf_desktop: Drop support for nRF54L15 PDK v0.2.x Support for nRF54L15 PDK v0.2.x is no longer required. Drop it to simplify maintenance. Jira: NCSDK-25071 Signed-off-by: Marek Pieta --- .../nrf_desktop/board_configuration.rst | 8 +-- ...dk_nrf54l15_cpuapp.overlay => app.overlay} | 0 .../nrf54l15pdk_nrf54l15_cpuapp_0_2_1.conf | 15 ----- .../nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay | 46 ---------------- ...l15pdk_nrf54l15_cpuapp_0_2_1_keyboard.conf | 14 ----- ...4l15pdk_nrf54l15_cpuapp_0_2_1_release.conf | 15 ----- .../buttons_def_0_2_1.h | 26 --------- .../hid_keyboard_leds_def_keyboard.h | 6 +- .../hid_keymap_def_keyboard_0_2_1.h | 55 ------------------- .../led_state_def.h | 6 +- 10 files changed, 5 insertions(+), 186 deletions(-) rename applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/{boards/nrf54l15pdk_nrf54l15_cpuapp.overlay => app.overlay} (100%) delete mode 100644 applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.conf delete mode 100644 applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay delete mode 100644 applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1_keyboard.conf delete mode 100644 applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1_release.conf delete mode 100644 applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/buttons_def_0_2_1.h delete mode 100644 applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/hid_keymap_def_keyboard_0_2_1.h diff --git a/applications/nrf_desktop/board_configuration.rst b/applications/nrf_desktop/board_configuration.rst index b07330c042dd..673106276a29 100644 --- a/applications/nrf_desktop/board_configuration.rst +++ b/applications/nrf_desktop/board_configuration.rst @@ -107,14 +107,8 @@ Sample mouse or keyboard (``nrf54l15pdk/nrf54l15/cpuapp``) * The configuration uses the nRF54L15 Preview Development Kit (PDK). * The build types allow to build the application as a mouse or a keyboard. * Inputs are simulated based on the hardware button presses. - On the PDK PCA10156, revision v0.2.1, GPIOs assigned to **Button 3** and **Button 4** do not support interrupts. - Because of this, the application cannot use those buttons. * On the nRF54L15 SoC, you can only use the **GPIO1** port for PWM hardware peripheral output. - Because of that, the PDK PCA10156 has the following limitations: - - * On the PDK revision v0.2.1, **LED 1** cannot be used for PWM output. - * On the PDK revision v0.3.0, **LED 0** and **LED 2** cannot be used for PWM output. - + Because of that, on the PDK PCA10156 revision v0.3.0, **LED 0** and **LED 2** cannot be used for PWM output. You can still use these LEDs with the PWM LED driver, but you must set the LED color to ``LED_COLOR(255, 255, 255)`` or ``LED_COLOR(0, 0, 0)``. This ensures the PWM peripheral is not used for the mentioned LEDs. * Only Bluetooth LE transport is enabled. diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/app.overlay similarity index 100% rename from applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay rename to applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/app.overlay diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.conf b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.conf deleted file mode 100644 index 90a1bc7e644e..000000000000 --- a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.conf +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright (c) 2024 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# -################################################################################ - -# GPIOs assigned to Button 3 and Button 4 on the PDK v0.2.1 do not support interrupts. -# Because of this, the GPIOs are not supported by the CAF buttons module and cannot be used to -# generate motion. -CONFIG_CAF_BUTTONS_DEF_PATH="buttons_def_0_2_1.h" -CONFIG_DESKTOP_MOTION_BUTTONS_LEFT_KEY_ID=0 -CONFIG_DESKTOP_MOTION_BUTTONS_RIGHT_KEY_ID=1 -CONFIG_DESKTOP_MOTION_BUTTONS_UP_KEY_ID=2 -CONFIG_DESKTOP_MOTION_BUTTONS_DOWN_KEY_ID=3 diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay deleted file mode 100644 index 32dd842ffbbc..000000000000 --- a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -&pinctrl { - pwm20_default_alt: pwm20_default_alt { - group1 { - psels = ; - }; - }; - - pwm20_sleep_alt: pwm20_sleep_alt { - group1 { - psels = ; - low-power-enable; - }; - }; - - pwm21_default_alt: pwm21_default_alt { - group1 { - psels = ; - }; - }; - - pwm21_sleep_alt: pwm21_sleep_alt { - group1 { - psels = ; - low-power-enable; - }; - }; - - pwm22_default_alt: pwm22_default_alt { - group1 { - psels = ; - }; - }; - - pwm22_sleep_alt: pwm22_sleep_alt { - group1 { - psels = ; - low-power-enable; - }; - }; -}; diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1_keyboard.conf b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1_keyboard.conf deleted file mode 100644 index 52c52cd2661d..000000000000 --- a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1_keyboard.conf +++ /dev/null @@ -1,14 +0,0 @@ -# -# Copyright (c) 2024 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# -################################################################################ - - -# GPIOs assigned to Button 3 and Button 4 on the PDK v0.2.1 do not support interrupts. -# Because of this, the GPIOs are not supported by the CAF buttons module and cannot be used to -# generate keypresses. -CONFIG_CAF_BUTTONS_DEF_PATH="buttons_def_0_2_1.h" -CONFIG_DESKTOP_HID_STATE_HID_KEYMAP_DEF_PATH="hid_keymap_def_keyboard_0_2_1.h" -CONFIG_DESKTOP_BUTTONS_SIM_TRIGGER_KEY_ID=0x01 diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1_release.conf b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1_release.conf deleted file mode 100644 index 90a1bc7e644e..000000000000 --- a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1_release.conf +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright (c) 2024 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# -################################################################################ - -# GPIOs assigned to Button 3 and Button 4 on the PDK v0.2.1 do not support interrupts. -# Because of this, the GPIOs are not supported by the CAF buttons module and cannot be used to -# generate motion. -CONFIG_CAF_BUTTONS_DEF_PATH="buttons_def_0_2_1.h" -CONFIG_DESKTOP_MOTION_BUTTONS_LEFT_KEY_ID=0 -CONFIG_DESKTOP_MOTION_BUTTONS_RIGHT_KEY_ID=1 -CONFIG_DESKTOP_MOTION_BUTTONS_UP_KEY_ID=2 -CONFIG_DESKTOP_MOTION_BUTTONS_DOWN_KEY_ID=3 diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/buttons_def_0_2_1.h b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/buttons_def_0_2_1.h deleted file mode 100644 index 6bca390a720c..000000000000 --- a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/buttons_def_0_2_1.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2024 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 = 1, .pin = DT_GPIO_PIN(DT_NODELABEL(button0), gpios) }, - { .port = 1, .pin = DT_GPIO_PIN(DT_NODELABEL(button1), gpios) }, - /* GPIOs assigned to Button 3 and Button 4 on the PDK v0.2.1 do not support interrupts. - * Because of this, the GPIOs cannot be used by the CAF buttons module. - */ -}; diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/hid_keyboard_leds_def_keyboard.h b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/hid_keyboard_leds_def_keyboard.h index 5a22e001e202..22308715e464 100644 --- a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/hid_keyboard_leds_def_keyboard.h +++ b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/hid_keyboard_leds_def_keyboard.h @@ -16,10 +16,8 @@ const struct {} hid_keyboard_leds_def_include_once; /* On the nRF54L15 SoC, you can only use the **GPIO1** port for PWM hardware peripheral output. - * Because of that, the PDK PCA10156 has the following limitations: - * - * - On the PDK revision v0.2.1, **LED 1** cannot be used for PWM output. - * - On the PDK revision v0.3.0, **LED 0** and **LED 2** cannot be used for PWM output. + * Because of that, on the PDK PCA10156 revision v0.3.0, **LED 0** and **LED 2** cannot be used for + * PWM output. * * You can still use these LEDs with the PWM LED driver, but you must set the LED color to * ``LED_COLOR(255, 255, 255)`` or ``LED_COLOR(0, 0, 0)``. This ensures the PWM peripheral is not diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/hid_keymap_def_keyboard_0_2_1.h b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/hid_keymap_def_keyboard_0_2_1.h deleted file mode 100644 index 7720cc8331bc..000000000000 --- a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/hid_keymap_def_keyboard_0_2_1.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2024 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(0x00, 0x00), 0x0004, REPORT_ID_KEYBOARD_KEYS }, /* A */ - - { KEY_ID(0x00, 0x04), 0x0004, REPORT_ID_KEYBOARD_KEYS }, /* A */ - { KEY_ID(0x00, 0x05), 0x0005, REPORT_ID_KEYBOARD_KEYS }, /* B */ - { KEY_ID(0x00, 0x06), 0x0006, REPORT_ID_KEYBOARD_KEYS }, /* C */ - { KEY_ID(0x00, 0x07), 0x0007, REPORT_ID_KEYBOARD_KEYS }, /* D */ - { KEY_ID(0x00, 0x08), 0x0008, REPORT_ID_KEYBOARD_KEYS }, /* E */ - { KEY_ID(0x00, 0x09), 0x0009, REPORT_ID_KEYBOARD_KEYS }, /* F */ - { KEY_ID(0x00, 0x0A), 0x000A, REPORT_ID_KEYBOARD_KEYS }, /* G */ - { KEY_ID(0x00, 0x0B), 0x000B, REPORT_ID_KEYBOARD_KEYS }, /* H */ - { KEY_ID(0x00, 0x0C), 0x000C, REPORT_ID_KEYBOARD_KEYS }, /* I */ - { KEY_ID(0x00, 0x0D), 0x000D, REPORT_ID_KEYBOARD_KEYS }, /* J */ - { KEY_ID(0x00, 0x0E), 0x000E, REPORT_ID_KEYBOARD_KEYS }, /* K */ - { KEY_ID(0x00, 0x0F), 0x000F, REPORT_ID_KEYBOARD_KEYS }, /* L */ - { KEY_ID(0x00, 0x10), 0x0010, REPORT_ID_KEYBOARD_KEYS }, /* M */ - { KEY_ID(0x00, 0x11), 0x0011, REPORT_ID_KEYBOARD_KEYS }, /* N */ - { KEY_ID(0x00, 0x12), 0x0012, REPORT_ID_KEYBOARD_KEYS }, /* O */ - { KEY_ID(0x00, 0x13), 0x0013, REPORT_ID_KEYBOARD_KEYS }, /* P */ - { KEY_ID(0x00, 0x14), 0x0014, REPORT_ID_KEYBOARD_KEYS }, /* Q */ - { KEY_ID(0x00, 0x15), 0x0015, REPORT_ID_KEYBOARD_KEYS }, /* R */ - { KEY_ID(0x00, 0x16), 0x0016, REPORT_ID_KEYBOARD_KEYS }, /* S */ - { KEY_ID(0x00, 0x17), 0x0017, REPORT_ID_KEYBOARD_KEYS }, /* T */ - { KEY_ID(0x00, 0x18), 0x0018, REPORT_ID_KEYBOARD_KEYS }, /* U */ - { KEY_ID(0x00, 0x19), 0x0019, REPORT_ID_KEYBOARD_KEYS }, /* V */ - { KEY_ID(0x00, 0x1A), 0x001A, REPORT_ID_KEYBOARD_KEYS }, /* W */ - { KEY_ID(0x00, 0x1B), 0x001B, REPORT_ID_KEYBOARD_KEYS }, /* X */ - { KEY_ID(0x00, 0x1C), 0x001C, REPORT_ID_KEYBOARD_KEYS }, /* Y */ - { KEY_ID(0x00, 0x1D), 0x001D, REPORT_ID_KEYBOARD_KEYS }, /* Z */ - - { KEY_ID(0x00, 0x2C), 0x002C, REPORT_ID_KEYBOARD_KEYS }, /* spacebar */ -}; diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/led_state_def.h b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/led_state_def.h index 2ed42ce067b6..eeb15ce4d2e0 100644 --- a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/led_state_def.h +++ b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/led_state_def.h @@ -24,10 +24,8 @@ static const uint8_t led_map[LED_ID_COUNT] = { }; /* On the nRF54L15 SoC, you can only use the **GPIO1** port for PWM hardware peripheral output. - * Because of that, the PDK PCA10156 has the following limitations: - * - * - On the PDK revision v0.2.1, **LED 1** cannot be used for PWM output. - * - On the PDK revision v0.3.0, **LED 0** and **LED 2** cannot be used for PWM output. + * Because of that, on the PDK PCA10156 revision v0.3.0 **LED 0** and **LED 2** cannot be used + * for PWM output. * * You can still use these LEDs with the PWM LED driver, but you must set the LED color to * ``LED_COLOR(255, 255, 255)`` or ``LED_COLOR(0, 0, 0)``. This ensures the PWM peripheral is not