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

Merge pull request #488 from matjaz/patch-2 

bootloader syntax
pull/490/head
Gordon Williams 2020-06-08 08:00:20 +01:00 committed by GitHub
parent 487af79643 5db167a81d
commit 1c712d8039
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/boot/bootloader.js
View File

@ -2,10 +2,10 @@
var settings=require("Storage").readJSON('setting.json',1)||{};
// load clock if specified
var clockApp = settings.clock;
if (clockApp) clockApp = require("Storage").read(clockApp)
if (clockApp) clockApp = require("Storage").read(clockApp);
if (!clockApp) {
var clockApps = require("Storage").list(/\.info$/).map(app=>require("Storage").readJSON(app,1)||{}).filter(app=>app.type=="clock").sort((a, b) => a.sortorder - b.sortorder);
if (clockApps && clockApps.length > 0)
if (clockApps && clockApps.length)
clockApp = require("Storage").read(clockApps[0].src);
delete clockApps;
}
@ -24,7 +24,8 @@ if ((new Date()).getFullYear()<2000) {
if (!g.time || (g.time.getFullYear()<2000) ||
(g.time.getFullYear()>2200)) {
// GPS receiver's time not set - just boot clock anyway
eval(clockApp);delete clockApp;
eval(clockApp);
delete clockApp;
return;
}
// We have a GPS time. Set time and reboot (to load alarms properly)