Skip to content

Commit 01531a0

Browse files
author
Jonas Fritzke Emdal
committed
Support old and new api for mcuboot trait.
1 parent f4505bf commit 01531a0

File tree

4 files changed

+11
-3
lines changed

4 files changed

+11
-3
lines changed

Changelog.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 3.0.3 - 2022-06-17
2+
3+
### Fixed
4+
5+
- Correctly detect some MCUboot devices (notably Thingy53).
6+
17
## 3.0.2 - 2022-06-09
28

39
### Fixed

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "pc-nrfconnect-programmer",
3-
"version": "3.0.2",
3+
"version": "3.0.3",
44
"description": "Program a Nordic SoC with HEX files from nRF Connect",
55
"displayName": "Programmer",
66
"repository": {

src/actions/targetActions.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ export const openDevice = (device: Device) => (dispatch: TDispatch) => {
4949
usageData.sendUsageData(EventAction.OPEN_DEVICE, 'jlink');
5050
return;
5151
}
52-
if (device.traits.mcuboot || mcubootTargetActions.isMcuboot(vid, pid)) {
52+
// Trait changed between nrfdl-version, will be rectified in device-lib-js in later.
53+
const mcuBootTrait = device.traits.mcuboot || (<any>device.traits).mcuBoot;
54+
if (mcuBootTrait || mcubootTargetActions.isMcuboot(vid, pid)) {
5355
usageData.sendUsageData(EventAction.OPEN_DEVICE, 'mcuboot');
5456
dispatch(mcubootTargetActions.openDevice());
5557
return;

0 commit comments

Comments
 (0)