applications: nrf_desktop: Add support for nRF54L PDK (code only) #14364

MarekPieta · 2024-03-05T09:59:22Z

The PDK can act as either keyboard or mouse. The PR also brings in watchdog alignment.

Jira: NCSDK-26216

MarekPieta · 2024-03-05T09:59:43Z

Aligning with @annwoj's suggestions, doc update will be added later with #14363

NordicBuilder · 2024-03-05T09:59:59Z

The following west manifest projects have been modified in this Pull Request:

Name	Old Revision	New Revision	Diff
zephyr	nrfconnect/sdk-zephyr@`3912101`	nrfconnect/sdk-zephyr#1559	nrfconnect/sdk-zephyr#1559/files

Note: This message is automatically posted and updated by the Manifest GitHub Action.

NordicBuilder · 2024-03-05T10:04:50Z

Test specification

CI/Jenkins/NRF

Integration Platforms

CI/Jenkins/integration

Test Module	File based changes	Manually selected	West overwrite
desktop52_verification	X

Detailed information of selected test modules

Note: This message is automatically posted and updated by the CI

NordicBuilder · 2024-03-05T10:32:18Z

You can find the documentation preview for this PR at this link. It will be updated about 10 minutes after the documentation build succeeds.

Note: This comment is automatically posted by the Documentation Publishing GitHub Action.

applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/led_state_def.h

zycz · 2024-03-05T12:01:38Z

applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/prj_keyboard.conf

+
+CONFIG_LOG=y
+CONFIG_LOG_BACKEND_UART=y
+CONFIG_LOG_BACKEND_SHOW_COLOR=n


isn't it by default "n"?

nRF Desktop's logging configuration updates default of the CONFIG_LOG_BACKEND_SHOW_COLOR if CONFIG_LOG_BACKEND_RTT is enabled. I would set this Kconfig option here explicitly for consistency (and to avoid relying on default).

zycz · 2024-03-05T12:07:47Z

applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/app.overlay

+		status = "disabled";
+	};
+
+	gpioled0 {


Do I understand correctly that we cannot use default leds because we need to have one led per node?
Maybe do not disable but remove original leds node?

Also consider using default leds names: led0_g: led_0 -> led0: led_0

Yes, that's the reason behind disabling the node. The node is currently disabled (not removed) for other configuration so I would disable it also here for consistency.
I would prefer to stick to the current naming scheme too (also for consistency with existing GPIO LED configurations - e.g. nrf52833dk_nrf52820).

mkapala-nordic · 2024-03-05T14:05:30Z

applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/app.overlay

+/* Redefine the partition map. */
+&rram0 {
+	/delete-node/ partitions;
+
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+		app_partition: partition@0 {
+			label = "application";
+			reg = <0x0 0x177000>;
+		};
+
+		storage_partition: partition@177000 {
+			label = "storage";
+			reg = <0x177000 0x6000>;
+		};
+	};
+};


To be considered: Maybe we could wait for your PM fix (#14368) and replace this DTS partition definitions with pm_static (if necessary)? It would be consistent then with the other targets :D

To be honest, I would merge it as is and then switch to Partition Manager together with MCUboot integration. I guess we will do it soon and that would prevent from freezing code on PR

Alright, if no one will object then let's leave it for now as it is.

kapi-no

Looking good, just left some informational comments below

kapi-no · 2024-03-06T13:52:57Z

applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/prj_release.conf

+# 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.


We would need to have a way to distinguish between v0.2.x PDKs and v0.3.0. However, this is a topic for subsequent PR when the v0.3 support is ready

That would require a new approach globally

kapi-no · 2024-03-06T13:53:26Z

applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/buttons_def.h

+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.


kapi-no · 2024-03-06T13:53:39Z

applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/prj.conf

+CONFIG_DESKTOP_MOTION_BUTTONS_ENABLE=y
+CONFIG_DESKTOP_MOTION_BUTTONS_LEFT_KEY_ID=0
+CONFIG_DESKTOP_MOTION_BUTTONS_RIGHT_KEY_ID=1
+# GPIOs assigned to Button 3 and Button 4 on the PDK v0.2.1 do not support interrupts.


and here :)

applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/prj.conf

The PDK can act as either keyboard or mouse. Jira: NCSDK-26216 Signed-off-by: Marek Pieta <[email protected]> Signed-off-by: Pirun Lee <[email protected]>

MarekPieta requested review from kapi-no, zycz, alstrzebonski and mkapala-nordic March 5, 2024 09:59

MarekPieta requested review from carlescufi and tejlmand as code owners March 5, 2024 09:59

github-actions bot added manifest changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Mar 5, 2024

MarekPieta added Platform: nRF54L PRs specific to nRF54L platform that can be merged during stabilization period. and removed changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Mar 5, 2024

NordicBuilder added manifest-zephyr DNM labels Mar 5, 2024

MarekPieta changed the title ~~applications: nrf_desktop: Add support for nRF54L PDK~~ applications: nrf_desktop: Add support for nRF54L PDK (code only) Mar 5, 2024

zycz approved these changes Mar 5, 2024

View reviewed changes

MarekPieta mentioned this pull request Mar 5, 2024

applications: nrf_desktop: Add support for nRF54L PDK (documentation) #14363

Merged

MarekPieta force-pushed the upstream_nrf54l_nrf_desktop_code_only branch from 6b62631 to d6f9cb5 Compare March 5, 2024 14:04

github-actions bot added changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. and removed manifest labels Mar 5, 2024

mkapala-nordic reviewed Mar 5, 2024

View reviewed changes

MarekPieta force-pushed the upstream_nrf54l_nrf_desktop_code_only branch from d6f9cb5 to 8b3c77a Compare March 6, 2024 10:19

MarekPieta removed DNM changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. manifest-zephyr labels Mar 6, 2024

MarekPieta force-pushed the upstream_nrf54l_nrf_desktop_code_only branch from 8b3c77a to df8f3da Compare March 6, 2024 10:31

MarekPieta requested a review from mkapala-nordic March 6, 2024 10:31

github-actions bot added the changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. label Mar 6, 2024

mkapala-nordic approved these changes Mar 6, 2024

View reviewed changes

MarekPieta removed the changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. label Mar 6, 2024

MarekPieta added this to the 2.6.0 milestone Mar 6, 2024

MarekPieta requested a review from SeppoTakalo March 6, 2024 13:43

kapi-no approved these changes Mar 6, 2024

View reviewed changes

SeppoTakalo approved these changes Mar 6, 2024

View reviewed changes

mkapala-nordic requested changes Mar 6, 2024

View reviewed changes

applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/prj.conf Outdated Show resolved Hide resolved

applications: nrf_desktop: Add support for nRF54L PDK

63b1040

The PDK can act as either keyboard or mouse. Jira: NCSDK-26216 Signed-off-by: Marek Pieta <[email protected]> Signed-off-by: Pirun Lee <[email protected]>

MarekPieta force-pushed the upstream_nrf54l_nrf_desktop_code_only branch from df8f3da to 63b1040 Compare March 6, 2024 14:14

github-actions bot added the changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. label Mar 6, 2024

mkapala-nordic approved these changes Mar 6, 2024

View reviewed changes

MarekPieta removed the changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. label Mar 6, 2024

jfischer-no merged commit bf03ee8 into nrfconnect:main Mar 6, 2024
15 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

applications: nrf_desktop: Add support for nRF54L PDK (code only) #14364

applications: nrf_desktop: Add support for nRF54L PDK (code only) #14364

MarekPieta commented Mar 5, 2024

MarekPieta commented Mar 5, 2024

NordicBuilder commented Mar 5, 2024

NordicBuilder commented Mar 5, 2024 •

edited

Loading

NordicBuilder commented Mar 5, 2024

zycz Mar 5, 2024

MarekPieta Mar 5, 2024

zycz Mar 5, 2024

MarekPieta Mar 5, 2024 •

edited

Loading

mkapala-nordic Mar 5, 2024 •

edited

Loading

MarekPieta Mar 6, 2024 •

edited

Loading

mkapala-nordic Mar 6, 2024

kapi-no left a comment

kapi-no Mar 6, 2024

MarekPieta Mar 6, 2024

kapi-no Mar 6, 2024

kapi-no Mar 6, 2024

applications: nrf_desktop: Add support for nRF54L PDK (code only) #14364

applications: nrf_desktop: Add support for nRF54L PDK (code only) #14364

Conversation

MarekPieta commented Mar 5, 2024

MarekPieta commented Mar 5, 2024

NordicBuilder commented Mar 5, 2024

NordicBuilder commented Mar 5, 2024 • edited Loading

Test specification

NordicBuilder commented Mar 5, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MarekPieta Mar 5, 2024 • edited Loading

Choose a reason for hiding this comment

mkapala-nordic Mar 5, 2024 • edited Loading

Choose a reason for hiding this comment

MarekPieta Mar 6, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kapi-no left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

NordicBuilder commented Mar 5, 2024 •

edited

Loading

MarekPieta Mar 5, 2024 •

edited

Loading

mkapala-nordic Mar 5, 2024 •

edited

Loading

MarekPieta Mar 6, 2024 •

edited

Loading