Skip to content

Device setup fixes #1234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 12, 2022
Merged

Device setup fixes #1234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified src/assets/files/docs-usb-setup-firmware/argon.bin
View file
Open in desktop
Binary file not shown.
Binary file modified src/assets/files/docs-usb-setup-firmware/b5som.bin
View file
Open in desktop
Binary file not shown.
Binary file modified src/assets/files/docs-usb-setup-firmware/boron.bin
View file
Open in desktop
Binary file not shown.
Binary file modified src/assets/files/docs-usb-setup-firmware/bsom.bin
View file
Open in desktop
Binary file not shown.
Binary file modified src/assets/files/docs-usb-setup-firmware/electron.bin
View file
Open in desktop
Binary file not shown.
Binary file modified src/assets/files/docs-usb-setup-firmware/p1.bin
View file
Open in desktop
Binary file not shown.
Binary file modified src/assets/files/docs-usb-setup-firmware/photon.bin
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion src/assets/files/versionInfo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,5 +661,5 @@
"semVer": "3.2.0-rc.1"
}
],
"updated": 1641413166
"updated": 1641919517
}
15 changes: 4 additions & 11 deletions src/assets/js/device-restore-dfu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ async function dfuDeviceRestore(usbDevice, options) {
resolve();
})
.catch(function(err) {
console.log('error', err);
setStatus();
reject();
});
Expand Down Expand Up @@ -359,6 +358,7 @@ async function dfuDeviceRestore(usbDevice, options) {
*/

dfuseDevice.logInfo = function(msg) {
console.log(msg); // TEMPORARY
};

return dfuseDevice;
Expand All @@ -370,10 +370,10 @@ async function dfuDeviceRestore(usbDevice, options) {
{ name: 'system-part1', title: 'Device OS System Part 1' },
{ name: 'system-part2', title: 'Device OS System Part 2' },
{ name: 'system-part3', title: 'Device OS System Part 3' },
{ name: 'bootloader', title: 'Device OS Bootloader' },
{ name: 'softdevice', title: 'nRF52 Soft Device' },
{ name: 'tinker', reset:true, title: 'User Firmware' },
{ name: 'tracker-edge', reset:true, title: 'Tracker Edge Firmware' }
{ name: 'tracker-edge', reset:true, title: 'Tracker Edge Firmware' },
{ name: 'bootloader', title: 'Device OS Bootloader' },
];
let dfuParts = [];

Expand Down Expand Up @@ -479,13 +479,6 @@ async function dfuDeviceRestore(usbDevice, options) {
dfuseDevice.startAddress = 0x80C0000;
await dfuseDevice.do_download(4096, part, {});
}
if (options.progressUpdate) {
options.progressUpdate('', 100, {
func: 'program',
pct: 100,
partName
});
}
}
else
if (options.userFirmwareBinary && (partName == 'tinker' || partName == 'tracker-edge')) {
Expand Down Expand Up @@ -595,7 +588,7 @@ async function dfuDeviceRestore(usbDevice, options) {
if (options.progressShowHide) {
options.progressShowHide(false);
}

await dfuseAltDevice.close();
}

Expand Down
Loading