diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 000000000..5c055c12e --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,6 @@ +App Loader ChangeLog +==================== + +Changed for individual apps are listed in `apps/appname/ChangeLog` + +* `Remove All Apps` now doesn't perform a reset before erase - fixes inability to update firmware if settings are wrong diff --git a/js/comms.js b/js/comms.js index 05b94ffde..e2cbf0cdd 100644 --- a/js/comms.js +++ b/js/comms.js @@ -73,13 +73,13 @@ removeApp : app => { // expects an app structure })); }, removeAllApps : () => { - return Comms.reset("wipe").then(() => new Promise((resolve,reject) => { + return new Promise((resolve,reject) => { // Use write with newline here so we wait for it to finish - Puck.write('\x10E.showMessage("Erasing...");require("Storage").eraseAll();Bluetooth.println("OK")\n', (result,err) => { + Puck.write('\x10E.showMessage("Erasing...");require("Storage").eraseAll();Bluetooth.println("OK");reset()\n', (result,err) => { if (!result || result.trim()!="OK") return reject(err || ""); resolve(); }, true /* wait for newline */); - })); + }); }, setTime : () => { return new Promise((resolve,reject) => {