FOSS
/
BangleApps
mirror of https://github.com/espruino/BangleApps
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Fix error in 'Install Default Apps' if Flash storage is full enough that erasing takes a while

pull/486/head
Gordon Williams 2020-06-04 11:45:53 +01:00
parent 50a2df66d9
commit 57d89d3534
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -21,3 +21,4 @@ Changed for individual apps are listed in `apps/appname/ChangeLog`
* Improve upload of binary files * Improve upload of binary files
* App description can now be markdown * App description can now be markdown
* Fix `marked is not defined` error (and include in repo, just in case) * Fix `marked is not defined` error (and include in repo, just in case)
* Fix error in 'Install Default Apps' if Flash storage is full enough that erasing takes a while

24
js/comms.js
View File

@ -145,14 +145,28 @@ const Comms = {
}); });
}, },
removeAllApps : () => { removeAllApps : () => {
console.log("<COMMS> removeAllApps start");
Progress.show({title:"Removing all apps",progess:"animate",sticky:true}); Progress.show({title:"Removing all apps",progess:"animate",sticky:true});
return new Promise((resolve,reject) => { return new Promise((resolve,reject) => {
var timeout = 5;
function handleResult(result,err) {
console.log("<COMMS> removeAllApps: received "+JSON.stringify(result));
if (result=="" && (timeout--)) {
console.log("<COMMS> removeAllApps: no result - waiting some more ("+timeout+").");
// send space and delete - so it's something, but it should just cancel out
Puck.write(" \u0008", handleResult, true /* wait for newline */);
} else {
Progress.hide({sticky:true});
if (!result || result.trim()!="OK") {
if (!result) result = "No response";
else result = "Got "+JSON.stringify(result.trim());
return reject(err || result);
} else resolve();
}
}
// Use write with newline here so we wait for it to finish // Use write with newline here so we wait for it to finish
Puck.write('\x10E.showMessage("Erasing...");require("Storage").eraseAll();Bluetooth.println("OK");reset()\n', (result,err) => { var cmd = '\x10E.showMessage("Erasing...");require("Storage").eraseAll();Bluetooth.println("OK");reset()\n';
Progress.hide({sticky:true}); Puck.write(cmd, handleResult, true /* wait for newline */);
if (!result || result.trim()!="OK") return reject(err || "");
resolve();
}, true /* wait for newline */);
}); });
}, },
setTime : () => { setTime : () => {