Bram
/
BangleApps
forked from FOSS/BangleApps
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'chukharev-master'

master
Gordon Williams 2020-06-03 08:09:25 +01:00
parent 2075127dfe c71aedcef9
commit 7f3fb6506c
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps.json
View File

@ -2,7 +2,7 @@
{ "id": "boot", { "id": "boot",
"name": "Bootloader", "name": "Bootloader",
"icon": "bootloader.png", "icon": "bootloader.png",
"version":"0.17", "version":"0.18",
"description": "This is needed by Bangle.js to automatically load the clock, menu, widgets and settings", "description": "This is needed by Bangle.js to automatically load the clock, menu, widgets and settings",
"tags": "tool,system", "tags": "tool,system",
"type":"bootloader", "type":"bootloader",

1
apps/boot/ChangeLog
View File

@ -16,3 +16,4 @@
0.15: Added BLE HID option for Joystick and bare Keyboard 0.15: Added BLE HID option for Joystick and bare Keyboard
0.16: Detect out of memory errors and draw them onto the bottom of the screen in red 0.16: Detect out of memory errors and draw them onto the bottom of the screen in red
0.17: Don't modify beep/buzz behaviour if firmware does it automatically 0.17: Don't modify beep/buzz behaviour if firmware does it automatically
0.18: Fix 'GPS time' checks for western hemisphere

4
apps/boot/bootloader.js
View File

@ -16,13 +16,13 @@ setWatch(() => {
`; `;
delete settings; delete settings;
// check to see if our clock is wrong - if it is use GPS time // check to see if our clock is wrong - if it is use GPS time
if ((new Date()).getFullYear()==1970) { if ((new Date()).getFullYear()<2000) {
E.showMessage("Searching for\nGPS time"); E.showMessage("Searching for\nGPS time");
Bangle.on('GPS',function cb(g) { Bangle.on('GPS',function cb(g) {
Bangle.setGPSPower(0); Bangle.setGPSPower(0);
Bangle.removeListener("GPS",cb); Bangle.removeListener("GPS",cb);
if (!g.time || (g.time.getFullYear()<2000) || if (!g.time || (g.time.getFullYear()<2000) ||
(g.time.getFullYear()==2250)) { (g.time.getFullYear()>2200)) {
// GPS receiver's time not set - just boot clock anyway // GPS receiver's time not set - just boot clock anyway
eval(clockApp);delete clockApp; eval(clockApp);delete clockApp;
return; return;