mirror of https://github.com/espruino/BangleApps
Merge pull request #831 from hughbarney/master
Pastel fixed for Gadgetbridge on a Bangle 2pull/836/head
commit
44aa03e428
|
@ -3503,7 +3503,7 @@
|
|||
"name": "Pastel Clock",
|
||||
"shortName": "Pastel",
|
||||
"icon": "pastel.png",
|
||||
"version":"0.02",
|
||||
"version":"0.03",
|
||||
"description": "A Configurable clock with custom fonts and background",
|
||||
"tags": "clock,b2",
|
||||
"type":"clock",
|
||||
|
|
|
@ -1,2 +1,3 @@
|
|||
0.01: First release
|
||||
0.02: Display 12 hour clock as 12:xx not 00:xx when just into PM
|
||||
0.03: Make it work with Gadgetbridge, Notifications fullscreen on a Bangle 2
|
||||
|
|
|
@ -51,7 +51,7 @@ const SETTINGS_FILE = "pastel.json";
|
|||
let settings = undefined;
|
||||
|
||||
function loadSettings() {
|
||||
//console.log("loadSettings()");
|
||||
//Console.log("loadSettings()");
|
||||
settings = require("Storage").readJSON(SETTINGS_FILE,1)||{};
|
||||
settings.grid = settings.grid||false;
|
||||
settings.date = settings.date||false;
|
||||
|
@ -143,17 +143,22 @@ function draw() {
|
|||
}
|
||||
}
|
||||
|
||||
// handle switch display on by pressing BTN1
|
||||
// Only update when display turns on
|
||||
if (process.env.BOARD!="SMAQ3") // hack for Q3 which is always-on
|
||||
Bangle.on('lcdPower', function(on) {
|
||||
if (on) draw();
|
||||
if (secondInterval)
|
||||
clearInterval(secondInterval);
|
||||
secondInterval = undefined;
|
||||
if (on)
|
||||
secondInterval = setInterval(draw, 1000);
|
||||
draw();
|
||||
});
|
||||
|
||||
g.clear();
|
||||
Bangle.loadWidgets();
|
||||
Bangle.drawWidgets();
|
||||
loadSettings();
|
||||
setInterval(draw, 1000); // refresh every second
|
||||
g.clear();
|
||||
var secondInterval = setInterval(draw, 1000);
|
||||
draw();
|
||||
// Show launcher when button pressed
|
||||
Bangle.setUI("clock");
|
||||
|
||||
Bangle.loadWidgets();
|
||||
Bangle.drawWidgets();
|
||||
|
|
Loading…
Reference in New Issue