From f32e178e46b043ccad839affe271c0776088da6f Mon Sep 17 00:00:00 2001 From: xxDUxx <96152564+xxDUxx@users.noreply.github.com> Date: Thu, 26 Jan 2023 17:53:30 +0100 Subject: [PATCH 1/5] Update widalt.settings.js --- apps/widalt/widalt.settings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/widalt/widalt.settings.js b/apps/widalt/widalt.settings.js index 57993474e..a05934d8d 100644 --- a/apps/widalt/widalt.settings.js +++ b/apps/widalt/widalt.settings.js @@ -1,6 +1,6 @@ (function(back) { var settings = Object.assign({ - interval: 5000, + interval: 60000, }, require('Storage').readJSON("widalt.json", true) || {}); o=Bangle.getOptions(); Bangle.getPressure().then((p)=>{ From 8c700386613ec9da01c173bbaf36224375a467ac Mon Sep 17 00:00:00 2001 From: xxDUxx <96152564+xxDUxx@users.noreply.github.com> Date: Thu, 26 Jan 2023 18:18:11 +0100 Subject: [PATCH 2/5] Update app.js --- apps/contourclock/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/contourclock/app.js b/apps/contourclock/app.js index 407203e6c..0bf34b0fd 100644 --- a/apps/contourclock/app.js +++ b/apps/contourclock/app.js @@ -16,7 +16,7 @@ require('Storage').writeJSON("contourclock.json", settings); } require("FontTeletext10x18Ascii").add(Graphics); - let extrasShown = (!settings.hidewhenlocked) && (!Bangle.isLocked()); + let extrasShown = (!settings.hidewhenlocked) || (!Bangle.isLocked()); let installedFonts = require('Storage').readJSON("contourclock-install.json") || {}; if (installedFonts.n > 0) { //New install - check for unused font files settings.fontIndex = E.clip(settings.fontIndex, -installedFonts.n + 1, installedFonts.n - 1); From 4e6cc0961d5568d59dae15a8d7d3d24c539cf2ec Mon Sep 17 00:00:00 2001 From: xxDUxx <96152564+xxDUxx@users.noreply.github.com> Date: Thu, 26 Jan 2023 18:18:55 +0100 Subject: [PATCH 3/5] Update widalt.wid.js --- apps/widalt/widalt.wid.js | 54 +++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/apps/widalt/widalt.wid.js b/apps/widalt/widalt.wid.js index dbd1a763e..2080a4197 100644 --- a/apps/widalt/widalt.wid.js +++ b/apps/widalt/widalt.wid.js @@ -1,38 +1,42 @@ -(()=>{ - var alt=""; - var lastAlt=0; +(() => { + var alt = ""; + var lastAlt; + var timeout; var settings = Object.assign({ - interval: 5000, + interval: 60000, }, require('Storage').readJSON("widalt.json", true) || {}); - Bangle.setBarometerPower(true,"widalt"); - Bangle.on("pressure", (p)=>{ - if (Math.floor(p.altitude)!=lastAlt) { - lastAlt=Math.floor(p.altitude); - alt=p.altitude.toFixed(0); - var w = WIDGETS["widalt"].width; - WIDGETS["widalt"].width = 1 + (alt.length)*12+16; - if (w!=WIDGETS["widalt"].width) Bangle.drawWidgets(); - else WIDGETS["widalt"].draw(); + Bangle.setBarometerPower(true, "widalt"); + Bangle.on("pressure", (p) => { + if (timeout) return; + //some other app is using the barometer - ignore new readings until our interval is up + if (Math.floor(p.altitude) != lastAlt) { + lastAlt = Math.floor(p.altitude); + nextUpdate = Date.now() + settings.interval; + alt = p.altitude.toFixed(0); + WIDGETS.widalt.draw(); } - Bangle.setBarometerPower(false,"widalt") - setTimeout(()=>{Bangle.setBarometerPower(true,"widalt");},settings.interval); + Bangle.setBarometerPower(false, "widalt"); + timeout = setTimeout(() => { + timeout = undefined; + Bangle.setBarometerPower(true, "widalt"); + }, settings.interval); }); - + function draw() { - if (!Bangle.isLCDOn()) return; + if (!Bangle.isLCDOn()) return; g.reset(); - g.setColor(g.theme.bg); - g.fillRect(this.x, this.y, this.x + this.width, this.y + 23); - g.setColor(g.theme.fg); - g.drawImage(atob("EBCBAAAAAAAIAAwgFXAX0BCYIIggTD/EYPZADkACf/4AAAAA"), this.x, this.y+4); -g.setFontCustom(atob("AAAAABwAAOAAAgAAHAADwAD4AB8AB8AA+AAeAADAAAAOAAP+AH/8B4DwMAGBgAwMAGBgAwOAOA//gD/4AD4AAAAAAAABgAAcAwDAGAwAwP/+B//wAAGAAAwAAGAAAAAAAAIAwHgOA4DwMA+BgOwMDmBg4wOeGA/gwDwGAAAAAAAAAGAHA8A4DwMAGBhAwMMGBjgwOcOA+/gDj4AAAAABgAAcAAHgADsAA5gAOMAHBgBwMAP/+B//wABgAAMAAAAAAAgD4OB/AwOYGBjAwMYGBjBwMe8Bh/AIHwAAAAAAAAAfAAP8AHxwB8GAdgwPMGBxgwMOOAB/gAH4AAAAAAABgAAMAABgAwMAeBgPgMHwBj4AN8AB+AAPAABAAAAAAAMfAH38B/xwMcGBhgwMMGBjgwP+OA+/gDj4AAAAAAAAOAAH4AA/gQMMGBgzwME8BhvAOPgA/4AD8AAEAAAAAAGAwA4OAHBwAAA="), 46, atob("BAgMDAwMDAwMDAwMBQ=="), 21+(1<<8)+(1<<16)); + g.clearRect(this.x, this.y, this.x + this.width, this.y + 23); + var w = this.width; + this.width = 1 + (alt.length) * 12 + 16; + if (w != this.width) Bangle.drawWidgets(); + g.drawImage(atob("EBCBAAAAAAAIAAwgFXAX0BCYIIggTD/EYPZADkACf/4AAAAA"), this.x, this.y + 4); + g.setFontCustom(atob("AAAAABwAAOAAAgAAHAADwAD4AB8AB8AA+AAeAADAAAAOAAP+AH/8B4DwMAGBgAwMAGBgAwOAOA//gD/4AD4AAAAAAAABgAAcAwDAGAwAwP/+B//wAAGAAAwAAGAAAAAAAAIAwHgOA4DwMA+BgOwMDmBg4wOeGA/gwDwGAAAAAAAAAGAHA8A4DwMAGBhAwMMGBjgwOcOA+/gDj4AAAAABgAAcAAHgADsAA5gAOMAHBgBwMAP/+B//wABgAAMAAAAAAAgD4OB/AwOYGBjAwMYGBjBwMe8Bh/AIHwAAAAAAAAAfAAP8AHxwB8GAdgwPMGBxgwMOOAB/gAH4AAAAAAABgAAMAABgAwMAeBgPgMHwBj4AN8AB+AAPAABAAAAAAAMfAH38B/xwMcGBhgwMMGBjgwP+OA+/gDj4AAAAAAAAOAAH4AA/gQMMGBgzwME8BhvAOPgA/4AD8AAEAAAAAAGAwA4OAHBwAAA="), 46, atob("BAgMDAwMDAwMDAwMBQ=="), 21 + (1 << 8) + (1 << 16)); g.setFontAlign(-1, 0); - g.drawString(alt, this.x+16, this.y + 12); + g.drawString(alt, this.x + 16, this.y + 12); } - WIDGETS["widalt"] = { + WIDGETS.widalt = { area: "tr", width: 6, draw: draw }; - })(); From c9fd5eebc00d1b8c53076ad982cd3a82e3be653c Mon Sep 17 00:00:00 2001 From: xxDUxx <96152564+xxDUxx@users.noreply.github.com> Date: Thu, 30 Mar 2023 09:11:41 +0200 Subject: [PATCH 4/5] Update app.js --- apps/contourclock/app.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/contourclock/app.js b/apps/contourclock/app.js index 0bf34b0fd..2e1c25469 100644 --- a/apps/contourclock/app.js +++ b/apps/contourclock/app.js @@ -45,6 +45,7 @@ }; let hideExtras = function() { if (extrasTimeout) clearTimeout(extrasTimeout); + delete extrasTimeout; g.clearRect(0, 138, g.getWidth() - 1, 176); require("widget_utils").hide(); extrasShown = false; @@ -83,6 +84,8 @@ Bangle.removeListener('twist', showExtras); if (drawTimeout) clearTimeout(drawTimeout); if (extrasTimeout) clearTimeout(extrasTimeout); + delete drawTimeout; + delete extrasTimeout; if (settings.hideWhenLocked) require("widget_utils").show(); g.reset(); g.clear(); From 030a38df0e532c0eab7b112fcffba17ae451e3c0 Mon Sep 17 00:00:00 2001 From: xxDUxx <96152564+xxDUxx@users.noreply.github.com> Date: Wed, 25 Sep 2024 10:53:35 +0200 Subject: [PATCH 5/5] Update widalt.wid.js --- apps/widalt/widalt.wid.js | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/widalt/widalt.wid.js b/apps/widalt/widalt.wid.js index 2080a4197..8b4854833 100644 --- a/apps/widalt/widalt.wid.js +++ b/apps/widalt/widalt.wid.js @@ -11,7 +11,6 @@ //some other app is using the barometer - ignore new readings until our interval is up if (Math.floor(p.altitude) != lastAlt) { lastAlt = Math.floor(p.altitude); - nextUpdate = Date.now() + settings.interval; alt = p.altitude.toFixed(0); WIDGETS.widalt.draw(); }