Skip to content

Commit 19945a6

Browse files
Damian-Nordicrlubos
authored andcommitted
samples: protocols_serialization: fix button removal
Remove buttons forbidden due to overlapping with UART correctly, including swX aliases. Signed-off-by: Damian Krolik <[email protected]>
1 parent 3e12072 commit 19945a6

File tree

3 files changed

+17
-10
lines changed

3 files changed

+17
-10
lines changed

samples/nrf_rpc/protocols_serialization/client/boards/nrf54l15dk_nrf54l15_cpuapp.overlay

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,17 @@
99
};
1010

1111
/* delete all buttons except button0 to free GPIO pins assigned to uart21 below */
12-
buttons {
13-
/delete-node/ button1;
14-
/delete-node/ button2;
15-
/delete-node/ button3;
12+
aliases {
13+
/delete-property/ sw1;
14+
/delete-property/ sw2;
15+
/delete-property/ sw3;
1616
};
1717
};
1818

19+
/delete-node/ &button1;
20+
/delete-node/ &button2;
21+
/delete-node/ &button3;
22+
1923
&pinctrl {
2024
uart21_default: uart21_default {
2125
group1 {

samples/nrf_rpc/protocols_serialization/server/boards/nrf54l15dk_nrf54l15_cpuapp.overlay

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,17 @@
99
};
1010

1111
/* delete all buttons except button0 to free GPIO pins assigned to uart21 below */
12-
buttons {
13-
/delete-node/ button1;
14-
/delete-node/ button2;
15-
/delete-node/ button3;
12+
aliases {
13+
/delete-property/ sw1;
14+
/delete-property/ sw2;
15+
/delete-property/ sw3;
1616
};
1717
};
1818

19+
/delete-node/ &button1;
20+
/delete-node/ &button2;
21+
/delete-node/ &button3;
22+
1923
&pinctrl {
2024
uart21_default: uart21_default {
2125
group1 {

samples/nrf_rpc/protocols_serialization/server/src/fatal_error_trigger.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@ LOG_MODULE_DECLARE(nrf_ps_server, CONFIG_NRF_PS_SERVER_LOG_LEVEL);
1414

1515
static void button_handler(uint32_t button_state, uint32_t has_changed)
1616
{
17-
LOG_ERR("Fatal error button pressed - triggering k_oops");
18-
1917
if (button_state & DK_BTN1_MSK) {
18+
LOG_ERR("Fatal error button pressed - triggering k_oops");
2019
k_oops();
2120
}
2221
}

0 commit comments

Comments
 (0)