From a667fc8061886ca56db6b5e8586cb1719da5e30d Mon Sep 17 00:00:00 2001 From: Rob Pilling Date: Mon, 11 Mar 2024 08:24:45 +0000 Subject: [PATCH 01/15] clock_info: factor out focus/defocus --- apps/clock_info/lib.js | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/apps/clock_info/lib.js b/apps/clock_info/lib.js index e6c9eb27f..a35d7074e 100644 --- a/apps/clock_info/lib.js +++ b/apps/clock_info/lib.js @@ -284,38 +284,39 @@ exports.addInteractive = function(menu, options) { E.stopEventPropagation&&E.stopEventPropagation(); } Bangle.on("swipe",swipeHandler); + const unfocus = () => { + options.focus=false; + delete Bangle.CLKINFO_FOCUS; + options.redraw(); + }; + const focus = (redraw) => { + options.focus=true; + Bangle.CLKINFO_FOCUS=true; + if (redraw) options.redraw(); + }; let touchHandler, lockHandler; if (options.x!==undefined && options.y!==undefined && options.w && options.h) { touchHandler = function(_,e) { if (e.x(options.x+options.w) || e.y>(options.y+options.h)) { - if (options.focus) { - options.focus=false; - delete Bangle.CLKINFO_FOCUS; - options.redraw(); - } + if (options.focus) + unfocus(); return; // outside area } if (!options.focus) { - options.focus=true; // if not focussed, set focus - Bangle.CLKINFO_FOCUS=true; - options.redraw(); + focus(true); } else if (menu[options.menuA].items[options.menuB].run) { Bangle.buzz(100, 0.7); menu[options.menuA].items[options.menuB].run(); // allow tap on an item to run it (eg home assistant) } else { - options.focus=true; - Bangle.CLKINFO_FOCUS=true; + focus(); } }; Bangle.on("touch",touchHandler); if (settings.defocusOnLock) { lockHandler = function() { - if(options.focus) { - options.focus=false; - delete Bangle.CLKINFO_FOCUS; - options.redraw(); - } + if(options.focus) + unfocus(); }; Bangle.on("lock", lockHandler); } From 30d1bc7c4c3e0b0241ba7e89c4e7ba82590835ee Mon Sep 17 00:00:00 2001 From: Rob Pilling Date: Mon, 11 Mar 2024 08:31:13 +0000 Subject: [PATCH 02/15] clock_info: pass options through to show(), hide() & run() --- apps/clock_info/lib.js | 6 +++--- typescript/types/clock_info.d.ts | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/clock_info/lib.js b/apps/clock_info/lib.js index a35d7074e..173b44e5d 100644 --- a/apps/clock_info/lib.js +++ b/apps/clock_info/lib.js @@ -234,7 +234,7 @@ exports.addInteractive = function(menu, options) { options.redrawHandler = ()=>drawItem(itm); itm.on('redraw', options.redrawHandler); itm.uses = (0|itm.uses)+1; - if (itm.uses==1) itm.show(); + if (itm.uses==1) itm.show(options); itm.emit("redraw"); } function menuHideItem(itm) { @@ -242,7 +242,7 @@ exports.addInteractive = function(menu, options) { delete options.redrawHandler; itm.uses--; if (!itm.uses) - itm.hide(); + itm.hide(options); } // handling for swipe between menu items function swipeHandler(lr,ud){ @@ -307,7 +307,7 @@ exports.addInteractive = function(menu, options) { focus(true); } else if (menu[options.menuA].items[options.menuB].run) { Bangle.buzz(100, 0.7); - menu[options.menuA].items[options.menuB].run(); // allow tap on an item to run it (eg home assistant) + menu[options.menuA].items[options.menuB].run(options); // allow tap on an item to run it (eg home assistant) } else { focus(); } diff --git a/typescript/types/clock_info.d.ts b/typescript/types/clock_info.d.ts index b12732683..fbdb3354c 100644 --- a/typescript/types/clock_info.d.ts +++ b/typescript/types/clock_info.d.ts @@ -11,10 +11,10 @@ declare module ClockInfo { type MenuItem = { name: string, - show(): void, - hide(): void, + show(options: InteractiveOptions): void, + hide(options: InteractiveOptions): void, on(what: "redraw", cb: () => void): void, // extending from Object - run?(): void, + run?(options: InteractiveOptions): void, } & ( { hasRange: true, From 8f86d9297b1d51c00d57f40514129d1e4cbb4941 Mon Sep 17 00:00:00 2001 From: Rob Pilling Date: Mon, 11 Mar 2024 08:42:45 +0000 Subject: [PATCH 03/15] clock_info: add focus and unfocus to item --- apps/clock_info/lib.js | 10 ++++++++-- typescript/types/clock_info.d.ts | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/apps/clock_info/lib.js b/apps/clock_info/lib.js index 173b44e5d..3799dcb73 100644 --- a/apps/clock_info/lib.js +++ b/apps/clock_info/lib.js @@ -288,10 +288,16 @@ exports.addInteractive = function(menu, options) { options.focus=false; delete Bangle.CLKINFO_FOCUS; options.redraw(); + const itm = menu[options.menuA].items[options.menuB]; + if (itm.unfocus) itm.unfocus(options); }; const focus = (redraw) => { - options.focus=true; - Bangle.CLKINFO_FOCUS=true; + if (!options.focus) { + options.focus=true; + Bangle.CLKINFO_FOCUS=true; + const itm = menu[options.menuA].items[options.menuB]; + if (itm.focus) itm.focus(options); + } if (redraw) options.redraw(); }; let touchHandler, lockHandler; diff --git a/typescript/types/clock_info.d.ts b/typescript/types/clock_info.d.ts index fbdb3354c..ea62e5602 100644 --- a/typescript/types/clock_info.d.ts +++ b/typescript/types/clock_info.d.ts @@ -15,6 +15,8 @@ declare module ClockInfo { hide(options: InteractiveOptions): void, on(what: "redraw", cb: () => void): void, // extending from Object run?(options: InteractiveOptions): void, + focus?(options: InteractiveOptions): void, + unfocus?(options: InteractiveOptions): void, } & ( { hasRange: true, From 2c92c9457416ac0f61e68d957a7d1a277ae57692 Mon Sep 17 00:00:00 2001 From: Rob Pilling Date: Mon, 11 Mar 2024 08:43:20 +0000 Subject: [PATCH 04/15] clock_info: s/unfocus/blur/ --- apps/clock_info/lib.js | 8 ++++---- typescript/types/clock_info.d.ts | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/clock_info/lib.js b/apps/clock_info/lib.js index 3799dcb73..6581a9469 100644 --- a/apps/clock_info/lib.js +++ b/apps/clock_info/lib.js @@ -284,12 +284,12 @@ exports.addInteractive = function(menu, options) { E.stopEventPropagation&&E.stopEventPropagation(); } Bangle.on("swipe",swipeHandler); - const unfocus = () => { + const blur = () => { options.focus=false; delete Bangle.CLKINFO_FOCUS; options.redraw(); const itm = menu[options.menuA].items[options.menuB]; - if (itm.unfocus) itm.unfocus(options); + if (itm.blur) itm.blur(options); }; const focus = (redraw) => { if (!options.focus) { @@ -306,7 +306,7 @@ exports.addInteractive = function(menu, options) { if (e.x(options.x+options.w) || e.y>(options.y+options.h)) { if (options.focus) - unfocus(); + blur(); return; // outside area } if (!options.focus) { @@ -322,7 +322,7 @@ exports.addInteractive = function(menu, options) { if (settings.defocusOnLock) { lockHandler = function() { if(options.focus) - unfocus(); + blur(); }; Bangle.on("lock", lockHandler); } diff --git a/typescript/types/clock_info.d.ts b/typescript/types/clock_info.d.ts index ea62e5602..91b8d5b49 100644 --- a/typescript/types/clock_info.d.ts +++ b/typescript/types/clock_info.d.ts @@ -16,7 +16,7 @@ declare module ClockInfo { on(what: "redraw", cb: () => void): void, // extending from Object run?(options: InteractiveOptions): void, focus?(options: InteractiveOptions): void, - unfocus?(options: InteractiveOptions): void, + blur?(options: InteractiveOptions): void, } & ( { hasRange: true, From 33088c625742ca8f35d31df3693ae5355e171a7b Mon Sep 17 00:00:00 2001 From: Rob Pilling Date: Mon, 11 Mar 2024 08:57:36 +0000 Subject: [PATCH 05/15] clock_info: call focus() after redraw --- apps/clock_info/lib.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/clock_info/lib.js b/apps/clock_info/lib.js index 6581a9469..513d946ac 100644 --- a/apps/clock_info/lib.js +++ b/apps/clock_info/lib.js @@ -292,13 +292,17 @@ exports.addInteractive = function(menu, options) { if (itm.blur) itm.blur(options); }; const focus = (redraw) => { + let shown = false; if (!options.focus) { options.focus=true; Bangle.CLKINFO_FOCUS=true; + shown = true; + } + if (redraw) options.redraw(); + if (shown) { const itm = menu[options.menuA].items[options.menuB]; if (itm.focus) itm.focus(options); } - if (redraw) options.redraw(); }; let touchHandler, lockHandler; if (options.x!==undefined && options.y!==undefined && options.w && options.h) { From 54907714a2cca62ff77013b1c576d6575141a483 Mon Sep 17 00:00:00 2001 From: Rob Pilling Date: Sun, 3 Mar 2024 23:04:36 +0000 Subject: [PATCH 06/15] smpltmr: reset clkinfo to "main" timer on blur --- apps/smpltmr/ChangeLog | 3 ++- apps/smpltmr/clkinfo.js | 8 +++++++- apps/smpltmr/metadata.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/apps/smpltmr/ChangeLog b/apps/smpltmr/ChangeLog index dcc5021b5..2c073ff43 100644 --- a/apps/smpltmr/ChangeLog +++ b/apps/smpltmr/ChangeLog @@ -5,4 +5,5 @@ 0.05: Updated clkinfo icon. 0.06: Ensure Timer supplies an image for clkinfo items 0.07: Update clock_info to avoid a redraw -0.08: Timer ClockInfo now updates once a minute \ No newline at end of file +0.08: Timer ClockInfo now updates once a minute +0.09: Timer ClockInfo resets to timer menu when blurred diff --git a/apps/smpltmr/clkinfo.js b/apps/smpltmr/clkinfo.js index d68372f15..a7a6bf71b 100644 --- a/apps/smpltmr/clkinfo.js +++ b/apps/smpltmr/clkinfo.js @@ -71,13 +71,19 @@ ] }; + const restoreMainItem = function(clkinfo) { + clkinfo.menuB = 0; + // clock info redraws after this + }; + var offsets = [+5,-5]; offsets.forEach((o, i) => { smpltmrItems.items = smpltmrItems.items.concat({ name: null, get: () => ({ text: (o > 0 ? "+" : "") + o + " min.", img: smpltmrItems.img }), show: function() { }, - hide: function () { }, + hide: function() { }, + blur: restoreMainItem, run: function() { if(o > 0) increaseAlarm(o); else decreaseAlarm(Math.abs(o)); diff --git a/apps/smpltmr/metadata.json b/apps/smpltmr/metadata.json index db492b0c1..98affcfe6 100644 --- a/apps/smpltmr/metadata.json +++ b/apps/smpltmr/metadata.json @@ -2,7 +2,7 @@ "id": "smpltmr", "name": "Simple Timer", "shortName": "Simple Timer", - "version": "0.08", + "version": "0.09", "description": "A very simple app to start a timer.", "icon": "app.png", "tags": "tool,alarm,timer,clkinfo", From 9c16fa6c79c90adc6d2298015d5312280a5dc881 Mon Sep 17 00:00:00 2001 From: Rob Pilling Date: Mon, 11 Mar 2024 08:52:14 +0000 Subject: [PATCH 07/15] clock_info: bump version --- apps/clock_info/ChangeLog | 1 + apps/clock_info/metadata.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/clock_info/ChangeLog b/apps/clock_info/ChangeLog index 870808eff..97e62e238 100644 --- a/apps/clock_info/ChangeLog +++ b/apps/clock_info/ChangeLog @@ -6,3 +6,4 @@ 0.05: Reported image for battery is now transparent (2v18+) 0.06: When >1 clockinfo, swiping one back tries to ensure they don't display the same thing 0.07: Developer tweak: clkinfo load errors are emitted +0.08: Pass options to show(), hide() and run(), and add focus() and blur() item methods diff --git a/apps/clock_info/metadata.json b/apps/clock_info/metadata.json index 993f112e7..351425a8f 100644 --- a/apps/clock_info/metadata.json +++ b/apps/clock_info/metadata.json @@ -1,7 +1,7 @@ { "id": "clock_info", "name": "Clock Info Module", "shortName": "Clock Info", - "version":"0.07", + "version":"0.08", "description": "A library used by clocks to provide extra information on the clock face (Altitude, BPM, etc)", "icon": "app.png", "type": "module", From 736b9f0433ad76d2867bd2d37401c1cc382d5b42 Mon Sep 17 00:00:00 2001 From: Rob Pilling Date: Mon, 11 Mar 2024 08:58:41 +0000 Subject: [PATCH 08/15] clock_info: permit focus/blur to cancel a redraw --- apps/clock_info/lib.js | 15 +++++++-------- typescript/types/clock_info.d.ts | 4 ++-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/apps/clock_info/lib.js b/apps/clock_info/lib.js index 513d946ac..ff7340ec0 100644 --- a/apps/clock_info/lib.js +++ b/apps/clock_info/lib.js @@ -287,22 +287,21 @@ exports.addInteractive = function(menu, options) { const blur = () => { options.focus=false; delete Bangle.CLKINFO_FOCUS; - options.redraw(); const itm = menu[options.menuA].items[options.menuB]; - if (itm.blur) itm.blur(options); + let redraw = true; + if (itm.blur && itm.blur(options) === false) + redraw = false; + if (redraw) options.redraw(); }; const focus = (redraw) => { - let shown = false; if (!options.focus) { options.focus=true; Bangle.CLKINFO_FOCUS=true; - shown = true; + const itm = menu[options.menuA].items[options.menuB]; + if (itm.focus && itm.focus(options) === false) + redraw = false; } if (redraw) options.redraw(); - if (shown) { - const itm = menu[options.menuA].items[options.menuB]; - if (itm.focus) itm.focus(options); - } }; let touchHandler, lockHandler; if (options.x!==undefined && options.y!==undefined && options.w && options.h) { diff --git a/typescript/types/clock_info.d.ts b/typescript/types/clock_info.d.ts index 91b8d5b49..7f48cbf0a 100644 --- a/typescript/types/clock_info.d.ts +++ b/typescript/types/clock_info.d.ts @@ -15,8 +15,8 @@ declare module ClockInfo { hide(options: InteractiveOptions): void, on(what: "redraw", cb: () => void): void, // extending from Object run?(options: InteractiveOptions): void, - focus?(options: InteractiveOptions): void, - blur?(options: InteractiveOptions): void, + focus?(options: InteractiveOptions): void | false, + blur?(options: InteractiveOptions): void | false, } & ( { hasRange: true, From 70620c1dabf8c48c99ba8201782d83958d7eb645 Mon Sep 17 00:00:00 2001 From: Rob Pilling Date: Mon, 11 Mar 2024 21:52:32 +0000 Subject: [PATCH 09/15] clock_info: Update README with show/hide arg and focus+blur --- apps/clock_info/README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/clock_info/README.md b/apps/clock_info/README.md index 7e1a3d637..031f89121 100644 --- a/apps/clock_info/README.md +++ b/apps/clock_info/README.md @@ -70,10 +70,12 @@ Note that each item is an object with: } ``` -* `item.show` : called when item should be shown. Enables updates. Call BEFORE 'get' -* `item.hide` : called when item should be hidden. Disables updates. +* `item.show` : called when item should be shown. Enables updates. Call BEFORE 'get'. Passed the clockinfo options (same as what's returned from `addInteractive`). +* `item.hide` : called when item should be hidden. Disables updates. Passed the clockinfo options. * `.on('redraw', ...)` : event that is called when 'get' should be called again (only after 'item.show') * `item.run` : (optional) called if the info screen is tapped - can perform some action. Return true if the caller should feedback the user. +* `item.focus` : called when the item is focussed (the user has tapped on it). Passed the clockinfo options. +* `item.blur` : called when the item is unfocussed (the user has tapped elsewhere, the screen has locked, etc). Passed the clockinfo options. See the bottom of `lib.js` for example usage... From 7005bd89050e451ca741fe0a26958189a8652d87 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 00:40:23 +0000 Subject: [PATCH 10/15] build(deps): bump core from `bd301be` to `0222d3c` Bumps [core](https://github.com/espruino/EspruinoAppLoaderCore) from `bd301be` to `0222d3c`. - [Commits](https://github.com/espruino/EspruinoAppLoaderCore/compare/bd301be3324775a8f464328ba9e34f750d503a2b...0222d3c5ac608a1b842ffc1f1f79e19276d648fe) --- updated-dependencies: - dependency-name: core dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index bd301be33..0222d3c5a 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit bd301be3324775a8f464328ba9e34f750d503a2b +Subproject commit 0222d3c5ac608a1b842ffc1f1f79e19276d648fe From 48478a586eb6a71f33f731476e257c20beccead8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 00:40:25 +0000 Subject: [PATCH 11/15] build(deps): bump webtools from `af870d7` to `8d671ad` Bumps [webtools](https://github.com/espruino/EspruinoWebTools) from `af870d7` to `8d671ad`. - [Commits](https://github.com/espruino/EspruinoWebTools/compare/af870d7b8386bfa824b07b268bce414e4daf3fbb...8d671ad0dfb1d5a36f4ee9952390f4d79019e61d) --- updated-dependencies: - dependency-name: webtools dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- webtools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webtools b/webtools index af870d7b8..8d671ad0d 160000 --- a/webtools +++ b/webtools @@ -1 +1 @@ -Subproject commit af870d7b8386bfa824b07b268bce414e4daf3fbb +Subproject commit 8d671ad0dfb1d5a36f4ee9952390f4d79019e61d From 37013751923e92c9cdd2a8b2b9de57833d36987a Mon Sep 17 00:00:00 2001 From: Kendell R Date: Mon, 11 Mar 2024 17:59:48 -0700 Subject: [PATCH 12/15] Update calculator README --- apps/calculator/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/calculator/README.md b/apps/calculator/README.md index 62f6cef24..29edd433a 100644 --- a/apps/calculator/README.md +++ b/apps/calculator/README.md @@ -20,9 +20,9 @@ Bangle.js 1 - SELECT: BTN2 Bangle.js 2 -- Swipes to change visible buttons -- Click physical button to exit -- Press upper left corner of screen to exit (where the red back button would be) +- Swipe up or down to go back to the number input +- Swipe to the left for operators, swipe to the right for the special functions +- Exit by pressing the physical button or the upper left corner of screen to exit (where the red back button would be) ## Creator From 1d6457ed19765a8011e18e00b813bf0639362166 Mon Sep 17 00:00:00 2001 From: Rob Pilling Date: Tue, 12 Mar 2024 07:38:17 +0000 Subject: [PATCH 13/15] clock_info: set CLKINFO_FOCUS on start --- apps/clock_info/lib.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/clock_info/lib.js b/apps/clock_info/lib.js index ff7340ec0..79fbb849e 100644 --- a/apps/clock_info/lib.js +++ b/apps/clock_info/lib.js @@ -294,9 +294,9 @@ exports.addInteractive = function(menu, options) { if (redraw) options.redraw(); }; const focus = (redraw) => { + Bangle.CLKINFO_FOCUS=true; if (!options.focus) { options.focus=true; - Bangle.CLKINFO_FOCUS=true; const itm = menu[options.menuA].items[options.menuB]; if (itm.focus && itm.focus(options) === false) redraw = false; @@ -362,6 +362,7 @@ exports.addInteractive = function(menu, options) { return true; }; + if (options.focus) focus(); delete settings; // don't keep settings in RAM - save space return options; }; From 0943d20231d663a97442e2530d096aaf1ebf0a4a Mon Sep 17 00:00:00 2001 From: Rob Pilling Date: Tue, 12 Mar 2024 07:39:00 +0000 Subject: [PATCH 14/15] clock_info: remove redundant focus call --- apps/clock_info/lib.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/clock_info/lib.js b/apps/clock_info/lib.js index 79fbb849e..d35ac5cf0 100644 --- a/apps/clock_info/lib.js +++ b/apps/clock_info/lib.js @@ -293,7 +293,8 @@ exports.addInteractive = function(menu, options) { redraw = false; if (redraw) options.redraw(); }; - const focus = (redraw) => { + const focus = () => { + let redraw = true; Bangle.CLKINFO_FOCUS=true; if (!options.focus) { options.focus=true; @@ -313,12 +314,10 @@ exports.addInteractive = function(menu, options) { return; // outside area } if (!options.focus) { - focus(true); + focus(); } else if (menu[options.menuA].items[options.menuB].run) { Bangle.buzz(100, 0.7); menu[options.menuA].items[options.menuB].run(options); // allow tap on an item to run it (eg home assistant) - } else { - focus(); } }; Bangle.on("touch",touchHandler); From 5d5c307b9dcfe3e0a4d022c7e58db1db9d0259da Mon Sep 17 00:00:00 2001 From: Gordon Williams Date: Thu, 14 Mar 2024 09:47:38 +0000 Subject: [PATCH 15/15] 0.04: Fixes after regression in 0.03 (fix #3257) --- apps/widbgjs/ChangeLog | 1 + apps/widbgjs/metadata.json | 2 +- apps/widbgjs/widget.js | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/widbgjs/ChangeLog b/apps/widbgjs/ChangeLog index d328ba3be..b208e3f8c 100644 --- a/apps/widbgjs/ChangeLog +++ b/apps/widbgjs/ChangeLog @@ -1,3 +1,4 @@ 0.01: First release 0.02: Fixed settings changes are actually reflected now and old values are strikethrough 0.03: Minor code improvements +0.04: Fix after regression in 0.03 diff --git a/apps/widbgjs/metadata.json b/apps/widbgjs/metadata.json index 166a35b92..4b37dd9e3 100644 --- a/apps/widbgjs/metadata.json +++ b/apps/widbgjs/metadata.json @@ -4,7 +4,7 @@ "shortName":"BG Widget", "icon": "screenshot.png", "screenshots": [{"url":"screenshot.png"}], - "version": "0.03", + "version": "0.04", "type": "widget", "supports": ["BANGLEJS", "BANGLEJS2"], "readme": "README.md", diff --git a/apps/widbgjs/widget.js b/apps/widbgjs/widget.js index 12af79c8e..c95ecd032 100644 --- a/apps/widbgjs/widget.js +++ b/apps/widbgjs/widget.js @@ -65,8 +65,8 @@ break; } // turn the arrow thanks to (https://forum.espruino.com/conversations/344607/) - /* const p180 = Math.PI / 180; + /* // a is defined above var r = 21; var x = r * Math.sin(a * p180); @@ -116,7 +116,7 @@ console.log(settings.unitIsMmol.toString()); loadVals(); - outpt = getBG(storedData.bg); + let outpt = getBG(storedData.bg); if (outpt === null) { // this means no value has been received yet outpt = "BG";