Skip to content

Commit ec50ec1

Browse files
authored
Device setup fixes (#1234)
1 parent 1f44c5c commit ec50ec1

File tree

11 files changed

+248
-175
lines changed

11 files changed

+248
-175
lines changed
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2.16 KB
Binary file not shown.
Binary file not shown.

src/assets/files/versionInfo.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -661,5 +661,5 @@
661661
"semVer": "3.2.0-rc.1"
662662
}
663663
],
664-
"updated": 1641413166
664+
"updated": 1641919517
665665
}

src/assets/js/device-restore-dfu.js

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ async function dfuDeviceRestore(usbDevice, options) {
7575
resolve();
7676
})
7777
.catch(function(err) {
78-
console.log('error', err);
7978
setStatus();
8079
reject();
8180
});
@@ -359,6 +358,7 @@ async function dfuDeviceRestore(usbDevice, options) {
359358
*/
360359

361360
dfuseDevice.logInfo = function(msg) {
361+
console.log(msg); // TEMPORARY
362362
};
363363

364364
return dfuseDevice;
@@ -370,10 +370,10 @@ async function dfuDeviceRestore(usbDevice, options) {
370370
{ name: 'system-part1', title: 'Device OS System Part 1' },
371371
{ name: 'system-part2', title: 'Device OS System Part 2' },
372372
{ name: 'system-part3', title: 'Device OS System Part 3' },
373-
{ name: 'bootloader', title: 'Device OS Bootloader' },
374373
{ name: 'softdevice', title: 'nRF52 Soft Device' },
375374
{ name: 'tinker', reset:true, title: 'User Firmware' },
376-
{ name: 'tracker-edge', reset:true, title: 'Tracker Edge Firmware' }
375+
{ name: 'tracker-edge', reset:true, title: 'Tracker Edge Firmware' },
376+
{ name: 'bootloader', title: 'Device OS Bootloader' },
377377
];
378378
let dfuParts = [];
379379

@@ -479,13 +479,6 @@ async function dfuDeviceRestore(usbDevice, options) {
479479
dfuseDevice.startAddress = 0x80C0000;
480480
await dfuseDevice.do_download(4096, part, {});
481481
}
482-
if (options.progressUpdate) {
483-
options.progressUpdate('', 100, {
484-
func: 'program',
485-
pct: 100,
486-
partName
487-
});
488-
}
489482
}
490483
else
491484
if (options.userFirmwareBinary && (partName == 'tinker' || partName == 'tracker-edge')) {
@@ -595,7 +588,7 @@ async function dfuDeviceRestore(usbDevice, options) {
595588
if (options.progressShowHide) {
596589
options.progressShowHide(false);
597590
}
598-
591+
599592
await dfuseAltDevice.close();
600593
}
601594

0 commit comments

Comments
 (0)