From e08ead31f546a00f137fe30a222b21b417b5f392 Mon Sep 17 00:00:00 2001 From: Denis Pynkin Date: Wed, 19 Jan 2022 22:21:59 +0100 Subject: [PATCH] plugins/nordic-hid: fix the bootloader type detection The initial name of the varianle has been changed upon review in [nrf_desktop DFU PR](https://github.com/nrfconnect/sdk-nrf/pull/6343) This commit align the naming with NRF desktop upstream and fix testing images URLs for device testing. --- data/device-tests/nordic-hid-nrf52840-mcuboot.json | 8 ++++---- plugins/nordic-hid/fu-nordic-hid-cfg-channel.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/device-tests/nordic-hid-nrf52840-mcuboot.json b/data/device-tests/nordic-hid-nrf52840-mcuboot.json index 19179692f..4ca02e307 100644 --- a/data/device-tests/nordic-hid-nrf52840-mcuboot.json +++ b/data/device-tests/nordic-hid-nrf52840-mcuboot.json @@ -3,10 +3,10 @@ "interactive": false, "steps": [ { - "url": "https://fwupd.org/downloads/839c1a8177b19ef3db5e67f31be92c35a25ae5c7bf431740e6568d5b005313b7-nordic-nrf52840dk-mcuboot-0.0.0_0.cab", + "url": "https://fwupd.org/downloads/904ff137256218bc617661bb4fc2bfddad19522c7e54773d1fd0290b54adfcee-nordic-nrf52840dk-mcuboot-0.0.0_2.cab", "components": [ { - "version": "0.0.0.0", + "version": "0.0.0.2", "guids": [ "43b38427-fdf5-5400-a23c-f3eb7ea00e7c" ] @@ -14,10 +14,10 @@ ] }, { - "url": "https://fwupd.org/downloads/6fb9dcfc1e26a5b0367d0a8a484f93ba156f846c1fb49013f3a934adc964788c-nordic-nrf52840dk-mcuboot-0.0.0_1.cab", + "url": "https://fwupd.org/downloads/2eb21f9439f0c4928c14548ff5c5c73ad6590d23fa704c58c4afa88168bcea90-nordic-nrf52840dk-mcuboot-0.0.0_3.cab", "components": [ { - "version": "0.0.0.1", + "version": "0.0.0.3", "guids": [ "43b38427-fdf5-5400-a23c-f3eb7ea00e7c" ] diff --git a/plugins/nordic-hid/fu-nordic-hid-cfg-channel.c b/plugins/nordic-hid/fu-nordic-hid-cfg-channel.c index d732e162f..d1b701e24 100644 --- a/plugins/nordic-hid/fu-nordic-hid-cfg-channel.c +++ b/plugins/nordic-hid/fu-nordic-hid-cfg-channel.c @@ -493,10 +493,10 @@ fu_nordic_hid_cfg_channel_get_bl_name(FuNordicHidCfgChannel *self, GError **erro g_autoptr(FuNordicCfgChannelMsg) res = g_new0(FuNordicCfgChannelMsg, 1); /* query for the bootloader name if the board support it */ - if (fu_nordic_hid_cfg_channel_get_event_id(self, "dfu", "bootloader_var", &event_id)) { + if (fu_nordic_hid_cfg_channel_get_event_id(self, "dfu", "module_variant", &event_id)) { if (!fu_nordic_hid_cfg_channel_cmd_send(self, "dfu", - "bootloader_var", + "module_variant", CONFIG_STATUS_FETCH, NULL, 0,