Skip to content

Commit 5eea43c

Browse files
rlubosrlubos
committed
manifest: update fw-nrfconnect-zephyr
Update fw-nrfconnect-zephyr revision to reference latest upmerge. Apply fixes needed to align with recent upstream changes: * Do not define PWM name, use DT symbol instead, * Use K_MSEC macro instead of MSEC. Signed-off-by: Robert Lubos <[email protected]>
1 parent d23edbe commit 5eea43c

11 files changed

+8
-26
lines changed

‎samples/nrf_desktop/configuration/nrf52840_pca10056_ZDebug.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ CONFIG_PWM_NRF5_SW=n
5555
CONFIG_PWM_NRFX=y
5656

5757
CONFIG_PWM_0=y
58-
CONFIG_PWM_0_NAME="PWM_0"
5958

6059
CONFIG_USB=y
6160
CONFIG_USB_NRF52840=y

‎samples/nrf_desktop/configuration/nrf52840_pca10056_ZDebugWithShell.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ CONFIG_PWM_NRF5_SW=n
5959
CONFIG_PWM_NRFX=y
6060

6161
CONFIG_PWM_0=y
62-
CONFIG_PWM_0_NAME="PWM_0"
6362

6463
CONFIG_USB=y
6564
CONFIG_USB_NRF52840=y

‎samples/nrf_desktop/configuration/nrf52840_pca10056_ZRelease.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ CONFIG_PWM_NRF5_SW=n
4949
CONFIG_PWM_NRFX=y
5050

5151
CONFIG_PWM_0=y
52-
CONFIG_PWM_0_NAME="PWM_0"
5352

5453
CONFIG_BT=y
5554
CONFIG_BT_CTLR=y

‎samples/nrf_desktop/configuration/nrf52840_pca20041_ZDebug.conf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,7 @@ CONFIG_PWM_NRF5_SW=n
8888
CONFIG_PWM_NRFX=y
8989

9090
CONFIG_PWM_0=y
91-
CONFIG_PWM_0_NAME="PWM_0"
92-
9391
CONFIG_PWM_1=y
94-
CONFIG_PWM_1_NAME="PWM_1"
9592

9693
CONFIG_USB=y
9794
CONFIG_USB_NRF52840=y

‎samples/nrf_desktop/configuration/nrf52840_pca20041_ZDebugMCUBoot.conf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,7 @@ CONFIG_PWM_NRF5_SW=n
9090
CONFIG_PWM_NRFX=y
9191

9292
CONFIG_PWM_0=y
93-
CONFIG_PWM_0_NAME="PWM_0"
94-
9593
CONFIG_PWM_1=y
96-
CONFIG_PWM_1_NAME="PWM_1"
9794

9895
CONFIG_USB=y
9996
CONFIG_USB_NRF52840=y

‎samples/nrf_desktop/configuration/nrf52840_pca20041_ZDebugWithShell.conf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,7 @@ CONFIG_PWM_NRF5_SW=n
9292
CONFIG_PWM_NRFX=y
9393

9494
CONFIG_PWM_0=y
95-
CONFIG_PWM_0_NAME="PWM_0"
96-
9795
CONFIG_PWM_1=y
98-
CONFIG_PWM_1_NAME="PWM_1"
9996

10097
CONFIG_USB=y
10198
CONFIG_USB_NRF52840=y

‎samples/nrf_desktop/configuration/nrf52840_pca20041_ZRelease.conf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,7 @@ CONFIG_PWM_NRF5_SW=n
8282
CONFIG_PWM_NRFX=y
8383

8484
CONFIG_PWM_0=y
85-
CONFIG_PWM_0_NAME="PWM_0"
86-
8785
CONFIG_PWM_1=y
88-
CONFIG_PWM_1_NAME="PWM_1"
8986

9087
CONFIG_USB=y
9188
CONFIG_USB_NRF52840=y

‎samples/nrf_desktop/configuration/nrf52840_pca20041_ZReleaseMCUBoot.conf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,7 @@ CONFIG_PWM_NRF5_SW=n
8484
CONFIG_PWM_NRFX=y
8585

8686
CONFIG_PWM_0=y
87-
CONFIG_PWM_0_NAME="PWM_0"
88-
8987
CONFIG_PWM_1=y
90-
CONFIG_PWM_1_NAME="PWM_1"
9188

9289
CONFIG_USB=y
9390
CONFIG_USB_NRF52840=y

‎samples/nrf_desktop/src/hw_interface/leds.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,16 +107,16 @@ static int leds_init(void)
107107
{
108108
const char *dev_name[] = {
109109
#if CONFIG_PWM_0
110-
CONFIG_PWM_0_NAME,
110+
DT_NORDIC_NRF_PWM_PWM_0_LABEL,
111111
#endif
112112
#if CONFIG_PWM_1
113-
CONFIG_PWM_1_NAME,
113+
DT_NORDIC_NRF_PWM_PWM_1_LABEL,
114114
#endif
115115
#if CONFIG_PWM_2
116-
CONFIG_PWM_2_NAME,
116+
DT_NORDIC_NRF_PWM_PWM_2_LABEL,
117117
#endif
118118
#if CONFIG_PWM_3
119-
CONFIG_PWM_3_NAME,
119+
DT_NORDIC_NRF_PWM_PWM_3_LABEL,
120120
#endif
121121
};
122122

‎samples/nrf_desktop/src/modules/hid_state.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ static void eventq_append(struct eventq *eventq, u16_t usage_id, s16_t value)
223223

224224
hid_event->item.usage_id = usage_id;
225225
hid_event->item.value = value;
226-
hid_event->timestamp = MSEC(z_tick_get());
226+
hid_event->timestamp = K_MSEC(z_tick_get());
227227

228228
/* Add a new event to the queue. */
229229
sys_slist_append(&eventq->root, &hid_event->node);
@@ -771,7 +771,7 @@ static void connect(const void *subscriber_id, enum target_report tr)
771771

772772
if (!eventq_is_empty(&rd->eventq)) {
773773
/* Remove all stale events from the queue. */
774-
eventq_cleanup(&rd->eventq, MSEC(z_tick_get()));
774+
eventq_cleanup(&rd->eventq, K_MSEC(z_tick_get()));
775775
}
776776

777777
report_send(tr, false, true);
@@ -802,7 +802,7 @@ static void enqueue(enum target_report tr, u16_t usage_id, s16_t value,
802802
{
803803
struct report_data *rd = &state.report_data[tr];
804804

805-
eventq_cleanup(&rd->eventq, MSEC(z_tick_get()));
805+
eventq_cleanup(&rd->eventq, K_MSEC(z_tick_get()));
806806

807807
if (eventq_is_full(&rd->eventq)) {
808808
if (!connected) {

‎west.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ manifest:
3434
- name: fw-nrfconnect-zephyr
3535
path: zephyr
3636
west-commands: scripts/west-commands.yml
37-
revision: 1d6219ffec845a43f66469354d997fbea2f283a4
37+
revision: 745326266d9c32ba3aa67d5af1f727059d9a88e3
3838
- name: fw-nrfconnect-mcuboot
3939
path: mcuboot
4040
revision: d75212468ce0f88ed57a4aacac8aa07cc8a725bc

0 commit comments

Comments
 (0)