Device setup fixes (#1234)

particle-iot · Jan 12, 2022 · ec50ec1 · ec50ec1
1 parent 1f44c5c
commit ec50ec1
Show file tree

Hide file tree

Showing 11 changed files with 248 additions and 175 deletions.
diff --git a/src/assets/files/docs-usb-setup-firmware/argon.bin b/src/assets/files/docs-usb-setup-firmware/argon.bin
diff --git a/src/assets/files/docs-usb-setup-firmware/b5som.bin b/src/assets/files/docs-usb-setup-firmware/b5som.bin
diff --git a/src/assets/files/docs-usb-setup-firmware/boron.bin b/src/assets/files/docs-usb-setup-firmware/boron.bin
diff --git a/src/assets/files/docs-usb-setup-firmware/bsom.bin b/src/assets/files/docs-usb-setup-firmware/bsom.bin
diff --git a/src/assets/files/docs-usb-setup-firmware/electron.bin b/src/assets/files/docs-usb-setup-firmware/electron.bin
diff --git a/src/assets/files/docs-usb-setup-firmware/p1.bin b/src/assets/files/docs-usb-setup-firmware/p1.bin
diff --git a/src/assets/files/docs-usb-setup-firmware/photon.bin b/src/assets/files/docs-usb-setup-firmware/photon.bin
diff --git a/src/assets/files/versionInfo.json b/src/assets/files/versionInfo.json
@@ -661,5 +661,5 @@
       "semVer": "3.2.0-rc.1"
     }
   ],
-  "updated": 1641413166
+  "updated": 1641919517
 }
diff --git a/src/assets/js/device-restore-dfu.js b/src/assets/js/device-restore-dfu.js
@@ -75,7 +75,6 @@ async function dfuDeviceRestore(usbDevice, options) {
                         resolve();
                     })
                     .catch(function(err) {
-                        console.log('error', err);
                         setStatus();
                         reject();
                     });
@@ -359,6 +358,7 @@ async function dfuDeviceRestore(usbDevice, options) {
         */
 
         dfuseDevice.logInfo = function(msg) {
+            console.log(msg); // TEMPORARY
         };
 
         return dfuseDevice;
@@ -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 = [];
 
@@ -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')) {
@@ -595,7 +588,7 @@ async function dfuDeviceRestore(usbDevice, options) {
         if (options.progressShowHide) {
             options.progressShowHide(false);
         }
-
+        
         await dfuseAltDevice.close();
     }