bTHh0=2^$}M
z>DHHTKM9EfP3kg7I=9Wt;73Ww?htH=_sPNdNG*L5nY9pU`-k2gX>v+{yU^JuW(!_u
z)kY$jy4><~T~l6o1w)UL(z%fj4c}~NtX3P&z_iXE=py}|E2HR=-hP^Cx(=C(&b*e6
ztErpEi8=<|bJVYC#Fo6I_@su~UWc-Q^VxAVHg61!yE>@)-Ni_`@o!~^>t2J3=pkrg
zB1pW=XnImjMaRtISzc&%*5IFJ&21$2t15X25atC9pALXC%6zIV4|T%bXdB-b^;HRv!x&QQG@HEMGwvCn_>@}?r)gpm_T$yVTlVa4bpW=i?ZwSr+AZ@FFmCJVcp>dk2f
zpNCRfKB-+yGdG%)e@tVT_MZ_wMk-Fb?QgHPdDV^Gqg5M}0}K5Mh8f2)kja_={MFg^
z(qF`t{XVVq^k-*9?I!sEcMw;D{FTs)I!g3QF~1@@a6*J_;low7I6GH`}
zQ@!9DVv;mAhoxQX0K2CLN1sD!ij
zQ33{A`QZS7gOh*_QKG3lkW8h~nU09bUvD8mdW0h)XuB82i|s-^NcRwOsC$Lp0Tf|0
z1s8#E+NtFrz$*n9R2~Eh7%@yPUf_uMtczEUmzL28@N)<++7S`#R)`*>2paUl&67NrR`y!#7IU)}7cx*fx&FAw`{B0-}hla-Da5yx^8f|TjR7N1V
zaZDa0Kr*@JOA`OlAX2#$4xP=TvzXwLCPZe%@*EKe(4P-0PvJcvt_z37c0{;AF
Date: Tue, 19 Apr 2022 15:10:51 +0100
Subject: [PATCH 22/63] Update metadata.json
---
apps/widstep/metadata.json | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/apps/widstep/metadata.json b/apps/widstep/metadata.json
index 09e0efac9..ea108e0f1 100644
--- a/apps/widstep/metadata.json
+++ b/apps/widstep/metadata.json
@@ -3,12 +3,14 @@
"name": "Step counter widget",
"version": "0.01",
"description": "Step counter widget, narrow but clearly readable",
+ "readme": "README.md",
"icon": "icons8-winter-boots-48.png",
+ "screenshots": [{"url":"widstep-light.png"},{"url":"widstep-dark.png"}],
"type": "widget",
"tags": "widget,health",
"supports": ["BANGLEJS","BANGLEJS2"],
"dependencies" : {"health":"app"},
- "allow_emulator":true,
+ "allow_emulator":false,
"storage": [
{"name":"widstep.wid.js","url":"widstep.wid.js"}
]
From 207dfadc58deb18c16061bd14a41874b53e54107 Mon Sep 17 00:00:00 2001
From: sir-indy <53864146+sir-indy@users.noreply.github.com>
Date: Tue, 19 Apr 2022 15:14:38 +0100
Subject: [PATCH 23/63] Update README.md
---
apps/widstep/README.md | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/apps/widstep/README.md b/apps/widstep/README.md
index 3441755e3..498f2ebd9 100644
--- a/apps/widstep/README.md
+++ b/apps/widstep/README.md
@@ -2,3 +2,7 @@
This is my step counter widget. There are many like it, but this one is mine.
Designed to be as narrow as possible, but still easy to read, by sacrificing accuracy and only showing to the nearest 100 steps (0.1k).
Shows a subtle fill colour in the background for progress to the goal. The goal is picked up from the health tracker settings.
+
+
+
+
From beb81356bc1598499fe6cc9ffc94ef321be4d9cb Mon Sep 17 00:00:00 2001
From: sir-indy <53864146+sir-indy@users.noreply.github.com>
Date: Tue, 19 Apr 2022 15:24:32 +0100
Subject: [PATCH 24/63] Update app.js
---
apps/health/app.js | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/apps/health/app.js b/apps/health/app.js
index 64640603e..415edb7c5 100644
--- a/apps/health/app.js
+++ b/apps/health/app.js
@@ -31,6 +31,11 @@ function menuSettings() {
min : 0, max : 3,
format : v=>["Off","3 mins","10 mins","Always"][v],
onchange : v => { s.hrm=v;setSettings(s); }
+ },
+ "Daily Step Goal":{
+ value : 0|s.stepGoal,
+ min : 0, max : 20000, step : 100,
+ onchange : v => { s.stepGoal=v;setSettings(s); }
}
});
}
From 08045075cc7c61c04a2b799f16a4fa5e074cadd1 Mon Sep 17 00:00:00 2001
From: sir-indy <53864146+sir-indy@users.noreply.github.com>
Date: Tue, 19 Apr 2022 15:25:08 +0100
Subject: [PATCH 25/63] Update metadata.json
---
apps/health/metadata.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/health/metadata.json b/apps/health/metadata.json
index 8bb986c57..5d096dc07 100644
--- a/apps/health/metadata.json
+++ b/apps/health/metadata.json
@@ -1,7 +1,7 @@
{
"id": "health",
"name": "Health Tracking",
- "version": "0.11",
+ "version": "0.12",
"description": "Logs health data and provides an app to view it",
"icon": "app.png",
"tags": "tool,system,health",
From f318fb005d1af5617849a434e8a7221cd4dab9ba Mon Sep 17 00:00:00 2001
From: sir-indy <53864146+sir-indy@users.noreply.github.com>
Date: Tue, 19 Apr 2022 15:25:35 +0100
Subject: [PATCH 26/63] Update ChangeLog
---
apps/health/ChangeLog | 1 +
1 file changed, 1 insertion(+)
diff --git a/apps/health/ChangeLog b/apps/health/ChangeLog
index 1e4864af8..7dbb9c458 100644
--- a/apps/health/ChangeLog
+++ b/apps/health/ChangeLog
@@ -10,3 +10,4 @@
0.09: Fix file naming so months are 1-based (not 0) (fix #1119)
0.10: Adds additional 3 minute setting for HRM
0.11: Pre-minified boot&lib - folds constants and saves RAM
+0.12: Add setting for Daily Step Goal
From c74cd9bf367817905531b1a8059c6bcd7c6cfa6b Mon Sep 17 00:00:00 2001
From: sir-indy <53864146+sir-indy@users.noreply.github.com>
Date: Tue, 19 Apr 2022 15:25:58 +0100
Subject: [PATCH 27/63] Update app.js
---
apps/health/app.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/health/app.js b/apps/health/app.js
index 415edb7c5..ae5a313f6 100644
--- a/apps/health/app.js
+++ b/apps/health/app.js
@@ -33,7 +33,7 @@ function menuSettings() {
onchange : v => { s.hrm=v;setSettings(s); }
},
"Daily Step Goal":{
- value : 0|s.stepGoal,
+ value : 10000|s.stepGoal,
min : 0, max : 20000, step : 100,
onchange : v => { s.stepGoal=v;setSettings(s); }
}
From e04f574f928569fc1bf60b6cf26bef6194aed26e Mon Sep 17 00:00:00 2001
From: sir-indy <53864146+sir-indy@users.noreply.github.com>
Date: Tue, 19 Apr 2022 15:28:04 +0100
Subject: [PATCH 28/63] Update README.md
---
apps/health/README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/apps/health/README.md b/apps/health/README.md
index f44854e3e..c6b379c0a 100644
--- a/apps/health/README.md
+++ b/apps/health/README.md
@@ -24,6 +24,7 @@ Stores:
* **Off** - Don't turn HRM on, but record heart rate if the HRM was turned on by another app/widget
* **10 Min** - Turn HRM on every 10 minutes (for each heath entry) and turn it off after 2 minutes, or when a good reading is found
* **Always** - Keep HRM on all the time (more accurate recording, but reduces battery life to ~36 hours)
+* **Daily Step Goal** - Default 10000, daily step goal for pedometer apps to use
## Technical Info
From 702cd09f793e600e62205564c085c2d20123f547 Mon Sep 17 00:00:00 2001
From: sir-indy <53864146+sir-indy@users.noreply.github.com>
Date: Tue, 19 Apr 2022 16:19:05 +0100
Subject: [PATCH 29/63] Update widstep.wid.js
---
apps/widstep/widstep.wid.js | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/apps/widstep/widstep.wid.js b/apps/widstep/widstep.wid.js
index 84c7bf843..0499384d7 100644
--- a/apps/widstep/widstep.wid.js
+++ b/apps/widstep/widstep.wid.js
@@ -1,9 +1,9 @@
-let settings;
+let wsSettings;
function loadSettings() {
- settings = require('Storage').readJSON("health.json", 1) || {};
- if( settings.stepGoal === undefined ) {
- settings.stepGoal = 10000;
+ wsSettings = require('Storage').readJSON("health.json", 1) || {};
+ if( wsSettings.stepGoal === undefined ) {
+ wsSettings.stepGoal = 10000;
}
}
@@ -20,7 +20,7 @@ WIDGETS["widstep"]={area:"tl", sortorder:-1, width:28,
g.setColor(g.theme.bg);
g.fillRect(this.x, this.y, this.x + this.width, this.y + 23);
g.setColor(g.theme.dark ? '#00f' : '#0ff');
- var progress = this.width * Math.min(steps/settings.stepGoal, 1);
+ var progress = this.width * Math.min(steps/wsSettings.stepGoal, 1);
g.fillRect(this.x+1, this.y+1, this.x + progress -1, this.y + 23);
g.setColor(g.theme.fg);
g.setFontAlign(0, -1);
From ea95dbfbf43366d83cd0336f460d896f6fad7c8d Mon Sep 17 00:00:00 2001
From: sir-indy <53864146+sir-indy@users.noreply.github.com>
Date: Tue, 19 Apr 2022 16:20:01 +0100
Subject: [PATCH 30/63] Update widstep.wid.js
---
apps/widstep/widstep.wid.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/apps/widstep/widstep.wid.js b/apps/widstep/widstep.wid.js
index 0499384d7..79e3fe766 100644
--- a/apps/widstep/widstep.wid.js
+++ b/apps/widstep/widstep.wid.js
@@ -14,8 +14,8 @@ Bangle.on('lcdPower', function(on) {
WIDGETS["widstep"]={area:"tl", sortorder:-1, width:28,
draw:function() {
if (!Bangle.isLCDOn()) return; // dont redraw if LCD is off
- //var steps = Bangle.getHealthStatus("day").steps;
- var steps = 5285;
+ var steps = Bangle.getHealthStatus("day").steps;
+ //var steps = 5285;
g.reset();
g.setColor(g.theme.bg);
g.fillRect(this.x, this.y, this.x + this.width, this.y + 23);
From 20f9f2ad86c27a88076b3c2215353fec7e1715f1 Mon Sep 17 00:00:00 2001
From: sir-indy <53864146+sir-indy@users.noreply.github.com>
Date: Tue, 19 Apr 2022 16:26:56 +0100
Subject: [PATCH 31/63] Update README.md
---
apps/widstep/README.md | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/apps/widstep/README.md b/apps/widstep/README.md
index 498f2ebd9..c41b025cd 100644
--- a/apps/widstep/README.md
+++ b/apps/widstep/README.md
@@ -1,6 +1,7 @@
# Step counter widget
-This is my step counter widget. There are many like it, but this one is mine.
-Designed to be as narrow as possible, but still easy to read, by sacrificing accuracy and only showing to the nearest 100 steps (0.1k).
+This is my step counter. There are many like it, but this one is mine.
+
+A pedometer widget designed to be as narrow as possible, but still easy to read, by sacrificing accuracy and only showing to the nearest 100 steps (0.1k).
Shows a subtle fill colour in the background for progress to the goal. The goal is picked up from the health tracker settings.
From aedb3a0b2600be62a2e254cbd24dd3d3aceec43a Mon Sep 17 00:00:00 2001
From: sir-indy <53864146+sir-indy@users.noreply.github.com>
Date: Tue, 19 Apr 2022 16:36:17 +0100
Subject: [PATCH 32/63] Update app.js
---
apps/health/app.js | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/apps/health/app.js b/apps/health/app.js
index ae5a313f6..7b52216b0 100644
--- a/apps/health/app.js
+++ b/apps/health/app.js
@@ -31,11 +31,6 @@ function menuSettings() {
min : 0, max : 3,
format : v=>["Off","3 mins","10 mins","Always"][v],
onchange : v => { s.hrm=v;setSettings(s); }
- },
- "Daily Step Goal":{
- value : 10000|s.stepGoal,
- min : 0, max : 20000, step : 100,
- onchange : v => { s.stepGoal=v;setSettings(s); }
}
});
}
@@ -43,11 +38,17 @@ function menuSettings() {
function menuStepCount() {
swipe_enabled = false;
clearButton();
+ var s=getSettings();
E.showMenu({
"":{title:"Step Counting"},
"< Back":()=>menuMain(),
"per hour":()=>stepsPerHour(),
- "per day":()=>stepsPerDay()
+ "per day":()=>stepsPerDay(),
+ "Daily Step Goal":{
+ value : 10000|s.stepGoal,
+ min : 0, max : 20000, step : 100,
+ onchange : v => { s.stepGoal=v;setSettings(s); }
+ }
});
}
From 4a960430487c1f710309b9b1b6d0fc2a2f4d4aef Mon Sep 17 00:00:00 2001
From: sir-indy <53864146+sir-indy@users.noreply.github.com>
Date: Tue, 19 Apr 2022 17:04:56 +0100
Subject: [PATCH 33/63] Update app.js
---
apps/health/app.js | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/apps/health/app.js b/apps/health/app.js
index 7b52216b0..75e46a1e8 100644
--- a/apps/health/app.js
+++ b/apps/health/app.js
@@ -2,8 +2,8 @@ function getSettings() {
return require("Storage").readJSON("health.json",1)||{};
}
-function setSettings(s) {
- require("Storage").writeJSON("health.json",s);
+function setSettings(healthSettings) {
+ require("Storage").writeJSON("health.json",healthSettings);
}
function menuMain() {
@@ -22,15 +22,15 @@ function menuMain() {
function menuSettings() {
swipe_enabled = false;
clearButton();
- var s=getSettings();
+ var healthSettings=getSettings();
E.showMenu({
"":{title:"Health Tracking"},
"< Back":()=>menuMain(),
"Heart Rt":{
- value : 0|s.hrm,
+ value : 0|healthSettings.hrm,
min : 0, max : 3,
format : v=>["Off","3 mins","10 mins","Always"][v],
- onchange : v => { s.hrm=v;setSettings(s); }
+ onchange : v => { healthSettings.hrm=v;setSettings(healthSettings); }
}
});
}
@@ -38,16 +38,16 @@ function menuSettings() {
function menuStepCount() {
swipe_enabled = false;
clearButton();
- var s=getSettings();
+ var healthSettings=getSettings();
E.showMenu({
"":{title:"Step Counting"},
"< Back":()=>menuMain(),
"per hour":()=>stepsPerHour(),
"per day":()=>stepsPerDay(),
"Daily Step Goal":{
- value : 10000|s.stepGoal,
+ value : 10000|healthSettings.stepGoal,
min : 0, max : 20000, step : 100,
- onchange : v => { s.stepGoal=v;setSettings(s); }
+ onchange : v => { healthSettings.stepGoal=v;setSettings(healthSettings); }
}
});
}
From f0ba8ac6eaf6988177d3b7d9025fb7d831712f82 Mon Sep 17 00:00:00 2001
From: sir-indy <53864146+sir-indy@users.noreply.github.com>
Date: Tue, 19 Apr 2022 20:35:04 +0100
Subject: [PATCH 34/63] Update app.js
---
apps/health/app.js | 34 ++++++++++++----------------------
1 file changed, 12 insertions(+), 22 deletions(-)
diff --git a/apps/health/app.js b/apps/health/app.js
index 75e46a1e8..20c7f9fd7 100644
--- a/apps/health/app.js
+++ b/apps/health/app.js
@@ -2,8 +2,8 @@ function getSettings() {
return require("Storage").readJSON("health.json",1)||{};
}
-function setSettings(healthSettings) {
- require("Storage").writeJSON("health.json",healthSettings);
+function setSettings(s) {
+ require("Storage").writeJSON("health.json",s);
}
function menuMain() {
@@ -15,39 +15,22 @@ function menuMain() {
"Step Counting":()=>menuStepCount(),
"Movement":()=>menuMovement(),
"Heart Rate":()=>menuHRM(),
- "Settings":()=>menuSettings()
- });
-}
-
-function menuSettings() {
- swipe_enabled = false;
- clearButton();
- var healthSettings=getSettings();
- E.showMenu({
- "":{title:"Health Tracking"},
- "< Back":()=>menuMain(),
- "Heart Rt":{
- value : 0|healthSettings.hrm,
- min : 0, max : 3,
- format : v=>["Off","3 mins","10 mins","Always"][v],
- onchange : v => { healthSettings.hrm=v;setSettings(healthSettings); }
- }
});
}
function menuStepCount() {
swipe_enabled = false;
clearButton();
- var healthSettings=getSettings();
+ var s=getSettings();
E.showMenu({
"":{title:"Step Counting"},
"< Back":()=>menuMain(),
"per hour":()=>stepsPerHour(),
"per day":()=>stepsPerDay(),
"Daily Step Goal":{
- value : 10000|healthSettings.stepGoal,
+ value : (s.stepGoal ? s.stepGoal : 10000),
min : 0, max : 20000, step : 100,
- onchange : v => { healthSettings.stepGoal=v;setSettings(healthSettings); }
+ onchange : v => { s.stepGoal=v;setSettings(s); }
}
});
}
@@ -66,11 +49,18 @@ function menuMovement() {
function menuHRM() {
swipe_enabled = false;
clearButton();
+ var s=getSettings();
E.showMenu({
"":{title:"Heart Rate"},
"< Back":()=>menuMain(),
"per hour":()=>hrmPerHour(),
"per day":()=>hrmPerDay(),
+ "Log interval":{
+ value : 0|s.hrm,
+ min : 0, max : 3,
+ format : v=>["Off","3 mins","10 mins","Always"][v],
+ onchange : v => { s.hrm=v;setSettings(s); }
+ }
});
}
From 2db18d66785e9fb73408924db378636995c481c6 Mon Sep 17 00:00:00 2001
From: Ronin0000 <89286474+Ronin0000@users.noreply.github.com>
Date: Tue, 19 Apr 2022 16:37:24 -0700
Subject: [PATCH 35/63] Update appb2.js
---
apps/choozi/appb2.js | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/apps/choozi/appb2.js b/apps/choozi/appb2.js
index d5c542be3..5f217f638 100644
--- a/apps/choozi/appb2.js
+++ b/apps/choozi/appb2.js
@@ -1,6 +1,3 @@
-//g.setTheme({fg : 0xFFFF, fg2 : 0xFFFF,bg2 : 0x0007,fgH : 0xFFFF,bgH : 0x02F7,dark : true});
-
-
/* Choozi - Choose people or things at random using Bangle.js.
* Inspired by the "Chwazi" Android app
*
@@ -77,7 +74,7 @@ function arc(minR, maxR, minAngle, maxAngle) {
inside.push(centreY+s*minR);
outside.unshift(centreY+s*maxR);
outside.unshift(centreX+c*maxR);
-
+
var vertices = inside.concat(outside);
g.fillPoly(vertices, true);
}
@@ -133,6 +130,7 @@ function animateChoice(target) {
g.fillCircle(x, y, ballSize);
oldx=x;
oldy=y;
+ g.flip();
}
}
@@ -154,7 +152,7 @@ function choose() {
// draw the current value of N in the middle of the screen, with
// up/down arrows
function drawN() {
- g.setColor('#000000');
+ g.setColor(g.theme.fg);
g.setFont("Vector",fontSize);
g.drawString(N,centreX-g.stringWidth(N)/2+4,centreY-fontSize/2);
if (N < maxN)
From fd7d0db7e98a642576a7484614a8905a4bb1f4b6 Mon Sep 17 00:00:00 2001
From: Ronin0000 <89286474+Ronin0000@users.noreply.github.com>
Date: Tue, 19 Apr 2022 16:37:54 -0700
Subject: [PATCH 36/63] Update ChangeLog
---
apps/choozi/ChangeLog | 1 +
1 file changed, 1 insertion(+)
diff --git a/apps/choozi/ChangeLog b/apps/choozi/ChangeLog
index 7aabe5c89..03f7ef832 100644
--- a/apps/choozi/ChangeLog
+++ b/apps/choozi/ChangeLog
@@ -1,2 +1,3 @@
0.01: New App!
0.02: Support Bangle.js 2
+0.03: Fix bug for Bangle.js 2 where g.flip was not being called.
From beff9975fc516e3721a49282ffc9872c7e49106a Mon Sep 17 00:00:00 2001
From: Ronin0000 <89286474+Ronin0000@users.noreply.github.com>
Date: Tue, 19 Apr 2022 16:38:03 -0700
Subject: [PATCH 37/63] Update metadata.json
---
apps/choozi/metadata.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/choozi/metadata.json b/apps/choozi/metadata.json
index a10448ed5..79af76fa2 100644
--- a/apps/choozi/metadata.json
+++ b/apps/choozi/metadata.json
@@ -1,7 +1,7 @@
{
"id": "choozi",
"name": "Choozi",
- "version": "0.02",
+ "version": "0.03",
"description": "Choose people or things at random using Bangle.js.",
"icon": "app.png",
"tags": "tool",
From 5a86b8e4d09454ac951136aad1333ad64cdb45c7 Mon Sep 17 00:00:00 2001
From: Ronin0000 <89286474+Ronin0000@users.noreply.github.com>
Date: Tue, 19 Apr 2022 16:46:04 -0700
Subject: [PATCH 38/63] Update lcars.settings.js
---
apps/lcars/lcars.settings.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/lcars/lcars.settings.js b/apps/lcars/lcars.settings.js
index 830907fc5..2656a54ab 100644
--- a/apps/lcars/lcars.settings.js
+++ b/apps/lcars/lcars.settings.js
@@ -27,7 +27,7 @@
var dataOptions = ["Steps", "Battery", "VREF", "HRM", "Temp", "Humidity", "Wind", "Altitude", "CoreT"];
var speedOptions = ["kph", "mph"];
var color_options = ['Green','Orange','Cyan','Purple','Red','Blue','Yellow','White'];
- var bg_code = ['#0f0','#FF9900','#0094FF','#FF00DC','#f00','#00f','#ffef00','#FFFFFF'];
+ var bg_code = ['#00ff00','#FF9900','#0094FF','#FF00DC','#ff0000','#0000ff','#ffef00','#FFFFFF'];
E.showMenu({
'': { 'title': 'LCARS Clock' },
From 28546c15d14d3e090693e3fd997486df8efd7eb3 Mon Sep 17 00:00:00 2001
From: Gordon Williams
Date: Wed, 20 Apr 2022 09:58:41 +0100
Subject: [PATCH 39/63] Revert "main.css: Force line break for smaller
resolutions"
---
css/main.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/css/main.css b/css/main.css
index a986df22e..f4850babe 100644
--- a/css/main.css
+++ b/css/main.css
@@ -81,7 +81,7 @@ a.btn.btn-link.dropdown-toggle {
min-height: 8em;
}
-.tile-content { position: relative; word-break: break-all; }
+.tile-content { position: relative; }
.link-github {
position:absolute;
top: 36px;
From 51c285b39cf9adc6fb8010f94ee7438d816648d4 Mon Sep 17 00:00:00 2001
From: sir-indy <53864146+sir-indy@users.noreply.github.com>
Date: Wed, 20 Apr 2022 12:38:09 +0100
Subject: [PATCH 40/63] Update widstep.wid.js
---
apps/widstep/widstep.wid.js | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/apps/widstep/widstep.wid.js b/apps/widstep/widstep.wid.js
index 79e3fe766..39c825521 100644
--- a/apps/widstep/widstep.wid.js
+++ b/apps/widstep/widstep.wid.js
@@ -1,11 +1,4 @@
-let wsSettings;
-
-function loadSettings() {
- wsSettings = require('Storage').readJSON("health.json", 1) || {};
- if( wsSettings.stepGoal === undefined ) {
- wsSettings.stepGoal = 10000;
- }
-}
+let wsSettingsGoal;
Bangle.on('step', function(s) { WIDGETS["widstep"].draw(); });
Bangle.on('lcdPower', function(on) {
@@ -15,12 +8,11 @@ WIDGETS["widstep"]={area:"tl", sortorder:-1, width:28,
draw:function() {
if (!Bangle.isLCDOn()) return; // dont redraw if LCD is off
var steps = Bangle.getHealthStatus("day").steps;
- //var steps = 5285;
g.reset();
g.setColor(g.theme.bg);
g.fillRect(this.x, this.y, this.x + this.width, this.y + 23);
g.setColor(g.theme.dark ? '#00f' : '#0ff');
- var progress = this.width * Math.min(steps/wsSettings.stepGoal, 1);
+ var progress = this.width * Math.min(steps/wsSettingsGoal, 1);
g.fillRect(this.x+1, this.y+1, this.x + progress -1, this.y + 23);
g.setColor(g.theme.fg);
g.setFontAlign(0, -1);
@@ -29,7 +21,7 @@ WIDGETS["widstep"]={area:"tl", sortorder:-1, width:28,
g.setFont('4x6').drawString('steps', this.x+this.width/2, this.y + 2);
//g.drawRect(this.x, this.y, this.x + this.width, this.y + 23);
}, reload:function() {
- loadSettings();
+ wsSettingsGoal = (require('Storage').readJSON("health.json", 1) || {}).stepGoal || 10000;
WIDGETS["widstep"].draw();
}
};
From 7621776a833a18057feb5ed53d702bc3ff9adb5a Mon Sep 17 00:00:00 2001
From: sir-indy <53864146+sir-indy@users.noreply.github.com>
Date: Wed, 20 Apr 2022 12:39:41 +0100
Subject: [PATCH 41/63] Update app.js
---
apps/health/app.js | 37 +++++++++++++++++++++++--------------
1 file changed, 23 insertions(+), 14 deletions(-)
diff --git a/apps/health/app.js b/apps/health/app.js
index 20c7f9fd7..efd18c4e1 100644
--- a/apps/health/app.js
+++ b/apps/health/app.js
@@ -15,23 +15,39 @@ function menuMain() {
"Step Counting":()=>menuStepCount(),
"Movement":()=>menuMovement(),
"Heart Rate":()=>menuHRM(),
+ "Settings":()=>menuSettings()
+ });
+}
+
+function menuSettings() {
+ swipe_enabled = false;
+ clearButton();
+ var s=getSettings();
+ E.showMenu({
+ "":{title:"Health Tracking"},
+ "< Back":()=>menuMain(),
+ "Heart Rt":{
+ value : 0|s.hrm,
+ min : 0, max : 3,
+ format : v=>["Off","3 mins","10 mins","Always"][v],
+ onchange : v => { s.hrm=v;setSettings(s); }
+ },
+ "Daily Step Goal":{
+ value : (s.stepGoal ? s.stepGoal : 10000),
+ min : 0, max : 20000, step : 100,
+ onchange : v => { s.stepGoal=v;setSettings(s); }
+ }
});
}
function menuStepCount() {
swipe_enabled = false;
clearButton();
- var s=getSettings();
E.showMenu({
"":{title:"Step Counting"},
"< Back":()=>menuMain(),
"per hour":()=>stepsPerHour(),
- "per day":()=>stepsPerDay(),
- "Daily Step Goal":{
- value : (s.stepGoal ? s.stepGoal : 10000),
- min : 0, max : 20000, step : 100,
- onchange : v => { s.stepGoal=v;setSettings(s); }
- }
+ "per day":()=>stepsPerDay()
});
}
@@ -49,18 +65,11 @@ function menuMovement() {
function menuHRM() {
swipe_enabled = false;
clearButton();
- var s=getSettings();
E.showMenu({
"":{title:"Heart Rate"},
"< Back":()=>menuMain(),
"per hour":()=>hrmPerHour(),
"per day":()=>hrmPerDay(),
- "Log interval":{
- value : 0|s.hrm,
- min : 0, max : 3,
- format : v=>["Off","3 mins","10 mins","Always"][v],
- onchange : v => { s.hrm=v;setSettings(s); }
- }
});
}
From 7bfe23d809627ca5d690419f133477977bcf4330 Mon Sep 17 00:00:00 2001
From: sir-indy <53864146+sir-indy@users.noreply.github.com>
Date: Wed, 20 Apr 2022 12:48:28 +0100
Subject: [PATCH 42/63] Update widstep.wid.js
---
apps/widstep/widstep.wid.js | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/apps/widstep/widstep.wid.js b/apps/widstep/widstep.wid.js
index 39c825521..1defcb146 100644
--- a/apps/widstep/widstep.wid.js
+++ b/apps/widstep/widstep.wid.js
@@ -1,4 +1,4 @@
-let wsSettingsGoal;
+let wsSettingsGoal = 10000;
Bangle.on('step', function(s) { WIDGETS["widstep"].draw(); });
Bangle.on('lcdPower', function(on) {
@@ -25,4 +25,3 @@ WIDGETS["widstep"]={area:"tl", sortorder:-1, width:28,
WIDGETS["widstep"].draw();
}
};
-loadSettings();
From b0a43413c8d828acc5376d8f21795aae4db224fb Mon Sep 17 00:00:00 2001
From: Alessandro Cocco
Date: Wed, 20 Apr 2022 14:12:46 +0200
Subject: [PATCH 43/63] [Scheduler] Export new functions
- newDefaultAlarm
- newDefaultTimer
- get/setSettings
---
apps/sched/README.md | 25 +++++++++++++-------
apps/sched/lib.js | 55 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 72 insertions(+), 8 deletions(-)
diff --git a/apps/sched/README.md b/apps/sched/README.md
index ed08139eb..319778067 100644
--- a/apps/sched/README.md
+++ b/apps/sched/README.md
@@ -53,21 +53,27 @@ use too much RAM.
It can be used as follows:
```
-// add/update an existing alarm
+// Get a new alarm with default values
+let alarm = require("sched").newDefaultAlarm();
+
+// Get a new timer with default values
+let timer = require("sched").newDefaultTimer();
+
+// Add/update an existing alarm
require("sched").setAlarm("mytimer", {
msg : "Wake up",
- timer : 10*60*1000, // 10 Minutes
+ timer : 10 * 60 * 1000 // 10 minutes
});
// Ensure the widget and alarm timer updates to schedule the new alarm properly
require("sched").reload();
// Get the time to the next alarm for us
-var timeToNext = require("sched").getTimeToAlarm(require("sched").getAlarm("mytimer"));
-// timeToNext===undefined if no alarm or alarm disabled
+let timeToNext = require("sched").getTimeToAlarm(require("sched").getAlarm("mytimer"));
+// timeToNext === undefined if no alarm or alarm disabled
-// delete an alarm
+// Delete an alarm
require("sched").setAlarm("mytimer", undefined);
-// reload after deleting...
+// Reload after deleting
require("sched").reload();
// Or add an alarm that runs your own code - in this case
@@ -76,12 +82,15 @@ require("sched").reload();
require("sched").setAlarm("customrunner", {
appid : "myapp",
js : "load('setting.app.js')",
- timer : 1*60*1000, // 1 Minute
+ timer : 1 * 60 * 1000 // 1 minute
});
// If you have been specifying `appid` you can also find any alarms that
// your app has created with the following:
-require("sched").getAlarms().filter(a=>a.appid=="myapp");
+require("sched").getAlarms().filter(a => a.appid == "myapp");
+
+// Get the scheduler settings
+let settings = require("sched").getSettings();
```
If your app requires alarms, you can specify that the alarms app needs to
diff --git a/apps/sched/lib.js b/apps/sched/lib.js
index 48094c86f..bfad1ac2d 100644
--- a/apps/sched/lib.js
+++ b/apps/sched/lib.js
@@ -52,3 +52,58 @@ exports.reload = function() {
Bangle.drawWidgets();
}
};
+// Factory that creates a new alarm with default values
+exports.newDefaultAlarm = function () {
+ const settings = exports.getSettings();
+
+ let alarm = {
+ t: 12 * 3600000, // Default to 12:00
+ on: true,
+ rp: false, // repeat not the default
+ as: settings.defaultAutoSnooze || false,
+ dow: 0b1111111,
+ last: 0,
+ vibrate: settings.defaultAlarmPattern,
+ };
+
+ delete settings;
+
+ return alarm;
+}
+// Factory that creates a new timer with default values
+exports.newDefaultTimer = function () {
+ const settings = exports.getSettings();
+
+ let timer = {
+ timer: 5 * 60 * 1000, // 5 minutes
+ on: true,
+ rp: false,
+ as: false,
+ dow: 0b1111111,
+ last: 0,
+ vibrate: settings.defaultTimerPattern
+ }
+
+ delete settings;
+
+ return timer;
+};
+// Return the scheduler settings
+exports.getSettings = function () {
+ return Object.assign(
+ {
+ unlockAtBuzz: false,
+ defaultSnoozeMillis: 600000, // 10 minutes
+ defaultAutoSnooze: false,
+ buzzCount: 10,
+ buzzIntervalMillis: 3000, // 3 seconds
+ defaultAlarmPattern: "..",
+ defaultTimerPattern: ".."
+ },
+ require("Storage").readJSON("sched.settings.json", true) || {}
+ );
+}
+// Write the updated settings back to storage
+exports.setSettings = function(settings) {
+ require("Storage").writeJSON("sched.settings.json", settings);
+};
\ No newline at end of file
From a84c1d4f771a5f405b921d7783fc4b4671635922 Mon Sep 17 00:00:00 2001
From: Alessandro Cocco
Date: Wed, 20 Apr 2022 14:13:33 +0200
Subject: [PATCH 44/63] [Scheduler] Add Settings page
---
apps/sched/README.md | 11 ++++++-
apps/sched/settings.js | 72 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 82 insertions(+), 1 deletion(-)
create mode 100644 apps/sched/settings.js
diff --git a/apps/sched/README.md b/apps/sched/README.md
index 319778067..47507fc14 100644
--- a/apps/sched/README.md
+++ b/apps/sched/README.md
@@ -8,8 +8,17 @@ Other apps can use this to provide alarm functionality.
App
---
-The Alarm app allows you to add/modify any running timers.
+The **Alarms & Timers** app allows you to add/modify any running alarms and timers.
+Global Settings
+---------------
+
+- `Unlock at Buzz` - If `Yes` the alarm/timer will unlock the watch
+- `Default Auto Snooze` - Default _Auto Snooze_ value for newly created alarms (_Alarms_ only)
+- `Default Snooze` - Default _Snooze_ value for newly created alarms/timers
+- `Buzz Count` - The number of buzzes before the watch goes silent
+- `Buzz Interval` - The interval between one buzz and the next
+- `Default Alarm/Timer Pattern` - Default vibration pattern for newly created alarms/timers
Internals / Library
-------------------
diff --git a/apps/sched/settings.js b/apps/sched/settings.js
new file mode 100644
index 000000000..642e43b43
--- /dev/null
+++ b/apps/sched/settings.js
@@ -0,0 +1,72 @@
+(function (back) {
+ let settings = require("sched").getSettings();
+
+ E.showMenu({
+ "": { "title": /*LANG*/"Scheduler" },
+
+ /*LANG*/"< Back": () => back(),
+
+ /*LANG*/"Unlock at Buzz": {
+ value: settings.unlockAtBuzz,
+ format: v => v ? /*LANG*/"Yes" : /*LANG*/"No",
+ onchange: v => {
+ settings.unlockAtBuzz = v;
+ require("sched").setSettings(settings);
+ }
+ },
+
+ /*LANG*/"Default Auto Snooze": {
+ value: settings.defaultAutoSnooze,
+ format: v => v ? /*LANG*/"Yes" : /*LANG*/"No",
+ onchange: v => {
+ settings.defaultAutoSnooze = v;
+ require("sched").setSettings(settings);
+ }
+ },
+
+ /*LANG*/"Default Snooze": {
+ value: settings.defaultSnoozeMillis / 60000,
+ min: 5,
+ max: 30,
+ step: 5,
+ format: v => v + /*LANG*/" min",
+ onchange: v => {
+ settings.defaultSnoozeMillis = v * 60000;
+ require("sched").setSettings(settings);
+ }
+ },
+
+ /*LANG*/"Buzz Count": {
+ value: settings.buzzCount,
+ min: 5,
+ max: 15,
+ step: 1,
+ onchange: v => {
+ settings.buzzCount = v;
+ require("sched").setSettings(settings);
+ }
+ },
+
+ /*LANG*/"Buzz Interval": {
+ value: settings.buzzIntervalMillis / 1000,
+ min: 1,
+ max: 5,
+ step: 1,
+ format: v => v + /*LANG*/"s",
+ onchange: v => {
+ settings.buzzIntervalMillis = v * 1000;
+ require("sched").setSettings(settings);
+ }
+ },
+
+ /*LANG*/"Default Alarm Pattern": require("buzz_menu").pattern(settings.defaultAlarmPattern, v => {
+ settings.defaultAlarmPattern = v;
+ require("sched").setSettings(settings);
+ }),
+
+ /*LANG*/"Default Timer Pattern": require("buzz_menu").pattern(settings.defaultTimerPattern, v => {
+ settings.defaultTimerPattern = v;
+ require("sched").setSettings(settings);
+ })
+ });
+});
From 9c9b48ce39df58bd7c5df43283d3233a432a956a Mon Sep 17 00:00:00 2001
From: Alessandro Cocco
Date: Wed, 20 Apr 2022 14:14:35 +0200
Subject: [PATCH 45/63] [Scheduler] Integrate the new settings into the code
---
apps/sched/sched.js | 44 ++++++++++++++++++++++++++++++--------------
1 file changed, 30 insertions(+), 14 deletions(-)
diff --git a/apps/sched/sched.js b/apps/sched/sched.js
index 9096fe4bf..83f03ac01 100644
--- a/apps/sched/sched.js
+++ b/apps/sched/sched.js
@@ -18,7 +18,9 @@ function formatTime(t) {
}
function showAlarm(alarm) {
- var msg = "";
+ const settings = require("sched").getSettings();
+
+ let msg = "";
msg += alarm.timer ? formatTime(alarm.timer) : formatTime(alarm.t);
if (alarm.msg) {
msg += "\n"+alarm.msg;
@@ -28,9 +30,12 @@ function showAlarm(alarm) {
else
msg = atob("AC0swgF97///RcEpMlVVVVVVf9VVVVVVVVX/9VVf9VVf/1VVV///1Vf9VX///VVX///VWqqlV///1Vf//9aqqqqpf//9V///2qqqqqqn///V///6qqqqqqr///X//+qqoAAKqqv//3//6qoAAAAKqr//3//qqAAAAAAqq//3/+qoAADwAAKqv/3/+qgAADwAACqv/3/aqAAADwAAAqp/19qoAAADwAAAKqfV1qgAAADwAAACqXVWqgAAADwAAACqlVWqAAAADwAAAAqlVWqAAAADwAAAAqlVWqAAAADwAAAAqlVaoAAAADwAAAAKpVaoAAAADwAAAAKpVaoAAAADwAAAAKpVaoAAAAOsAAAAKpVaoAAAAOsAAAAKpVaoAAAAL/AAAAKpVaoAAAAgPwAAAKpVaoAAACAD8AAAKpVWqAAAIAA/AAAqlVWqAAAgAAPwAAqlVWqAACAAADwAAqlVWqgAIAAAAAACqlVVqgAgAAAAAACqVVVqoAAAAAAAAKqVVVaqAAAAAAAAqpVVVWqgAAAAAACqlVVVWqoAAAAAAKqlVVVVqqAAAAAAqqVVVVVaqoAAAAKqpVVVVVeqqoAAKqqtVVVVV/6qqqqqqr/VVVVX/2qqqqqqn/1VVVf/VaqqqqpV/9VVVf9VVWqqlVVf9VVVf1VVVVVVVVX9VQ==")+" "+msg;
}
+
Bangle.loadWidgets();
Bangle.drawWidgets();
- var buzzCount = 10;
+
+ let buzzCount = settings.buzzCount;
+
E.showPrompt(msg,{
title:alarm.timer ? /*LANG*/"TIMER!" : /*LANG*/"ALARM!",
buttons : {/*LANG*/"Snooze":true,/*LANG*/"Ok":false} // default is sleep so it'll come back in 10 mins
@@ -38,7 +43,7 @@ function showAlarm(alarm) {
buzzCount = 0;
if (sleep) {
if(alarm.ot===undefined) alarm.ot = alarm.t;
- alarm.t += 10*60*1000; // 10 minutes
+ alarm.t += settings.defaultSnoozeMillis;
} else {
if (!alarm.timer) alarm.last = (new Date()).getDate();
if (alarm.ot!==undefined) {
@@ -51,24 +56,35 @@ function showAlarm(alarm) {
require("sched").setAlarms(alarms);
load();
});
+
function buzz() {
- require("buzz").pattern(alarm.vibrate===undefined?"..":alarm.vibrate).then(function() {
- if (buzzCount--)
- setTimeout(buzz, 3000);
- else if(alarm.as) { // auto-snooze
- buzzCount = 10;
- setTimeout(buzz, 600000);
+ if (settings.unlockAtBuzz) {
+ Bangle.setLocked(false);
+ }
+
+ require("buzz").pattern(alarm.vibrate === undefined ? ".." : alarm.vibrate).then(() => {
+ if (buzzCount--) {
+ setTimeout(buzz, settings.buzzIntervalMillis);
+ } else if (alarm.as) { // auto-snooze
+ buzzCount = settings.buzzCount;
+ setTimeout(buzz, settings.defaultSnoozeMillis);
}
});
}
- if ((require('Storage').readJSON('setting.json',1)||{}).quiet>1) return;
+
+ if ((require("Storage").readJSON("setting.json", 1) || {}).quiet > 1)
+ return;
+
buzz();
}
// Check for alarms
-var alarms = require("sched").getAlarms();
-var active = require("sched").getActiveAlarms(alarms);
-if (active.length) // if there's an alarm, show it
+let alarms = require("sched").getAlarms();
+let active = require("sched").getActiveAlarms(alarms);
+if (active.length) {
+ // if there's an alarm, show it
showAlarm(active[0]);
-else // otherwise just go back to default app
+} else {
+ // otherwise just go back to default app
setTimeout(load, 100);
+}
From cb0913468f0793d4ef62fa4596279b14545bfaf1 Mon Sep 17 00:00:00 2001
From: Alessandro Cocco
Date: Wed, 20 Apr 2022 14:15:23 +0200
Subject: [PATCH 46/63] [Scheduler] Update metadata & changelog
---
apps/sched/ChangeLog | 1 +
apps/sched/metadata.json | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/apps/sched/ChangeLog b/apps/sched/ChangeLog
index a2d6c370f..0f935caf8 100644
--- a/apps/sched/ChangeLog
+++ b/apps/sched/ChangeLog
@@ -2,3 +2,4 @@
0.02: Fix scheduling of other alarms if there is a pending alarm from the past (fix #1667)
0.03: Fix `getTimeToAlarm` for a timer already used at same day, don't set `last` for timers.
0.04: Fix `getTimeToAlarm` to check for next dow if alarm.t lower currentTime.
+0.05: Export new functions (`newDefaultAlarm/Timer`), add Settings page
diff --git a/apps/sched/metadata.json b/apps/sched/metadata.json
index ffa346a44..3454d2397 100644
--- a/apps/sched/metadata.json
+++ b/apps/sched/metadata.json
@@ -1,7 +1,7 @@
{
"id": "sched",
"name": "Scheduler",
- "version": "0.04",
+ "version": "0.05",
"description": "Scheduling library for alarms and timers",
"icon": "app.png",
"type": "scheduler",
@@ -12,7 +12,8 @@
{"name":"sched.boot.js","url":"boot.js"},
{"name":"sched.js","url":"sched.js"},
{"name":"sched.img","url":"app-icon.js","evaluate":true},
- {"name":"sched","url":"lib.js"}
+ {"name":"sched","url":"lib.js"},
+ {"name":"sched.settings.js","url":"settings.js"}
],
- "data": [{"name":"sched.json"}]
+ "data": [{"name":"sched.json"}, {"name":"sched.settings.json"}]
}
From bcae05d257aaf016cc5a101dbb19d0096aa6d90e Mon Sep 17 00:00:00 2001
From: Alessandro Cocco
Date: Wed, 20 Apr 2022 14:18:11 +0200
Subject: [PATCH 47/63] [Alarms & Timers] Update labels and add LANG
placeholders
---
apps/alarm/app.js | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/apps/alarm/app.js b/apps/alarm/app.js
index b9404358e..ccf1d7bf0 100644
--- a/apps/alarm/app.js
+++ b/apps/alarm/app.js
@@ -39,7 +39,7 @@ function showMainMenu() {
// Timer img "\0"+atob("DhKBAP////MDDAwwMGGBzgPwB4AeAPwHOBhgwMMzDez////w")
// Alarm img "\0"+atob("FBSBAABgA4YcMPDGP8Zn/mx/48//PP/zD/8A//AP/wD/8A//AP/wH/+D//w//8AAAADwAAYA")
const menu = {
- '': { 'title': 'Alarm/Timer' },
+ '': { 'title': /*LANG*/'Alarms&Timers' },
/*LANG*/'< Back' : ()=>{load();},
/*LANG*/'New Alarm': ()=>editAlarm(-1),
/*LANG*/'New Timer': ()=>editTimer(-1)
@@ -76,13 +76,13 @@ function showMainMenu() {
function editDOW(dow, onchange) {
const menu = {
'': { 'title': /*LANG*/'Days of Week' },
- '< Back' : () => onchange(dow)
+ /*LANG*/'< Back' : () => onchange(dow)
};
for (var i = 0; i < 7; i++) (i => {
var dayOfWeek = require("locale").dow({ getDay: () => i });
menu[dayOfWeek] = {
value: !!(dow&(1< v ? "Yes" : "No",
+ format: v => v ? /*LANG*/"Yes" : /*LANG*/"No",
onchange: v => v ? dow |= 1< showMainMenu(),
+ /*LANG*/'< Back' : () => showMainMenu(),
/*LANG*/'Hours': {
value: t.hrs, min : 0, max : 23, wrap : true,
onchange: v => t.hrs=v
@@ -117,23 +117,23 @@ function editAlarm(alarmIndex, alarm) {
},
/*LANG*/'Enabled': {
value: a.on,
- format: v=>v?"On":"Off",
+ format: v => v ? /*LANG*/"On" : /*LANG*/"Off",
onchange: v=>a.on=v
},
/*LANG*/'Repeat': {
value: a.rp,
- format: v=>v?"Yes":"No",
- onchange: v=>a.rp=v
+ format: v => v ? /*LANG*/"Yes" : /*LANG*/"No",
+ onchange: v => a.rp = v
},
/*LANG*/'Days': {
value: "SMTWTFS".split("").map((d,n)=>a.dow&(1< editDOW(a.dow, d=>{a.dow=d;editAlarm(alarmIndex,a)})
},
/*LANG*/'Vibrate': require("buzz_menu").pattern(a.vibrate, v => a.vibrate=v ),
- /*LANG*/'Auto snooze': {
+ /*LANG*/'Auto Snooze': {
value: a.as,
- format: v=>v?"Yes":"No",
- onchange: v=>a.as=v
+ format: v => v ? /*LANG*/"Yes" : /*LANG*/"No",
+ onchange: v => a.as = v
}
};
menu[/*LANG*/"Save"] = function() {
@@ -171,7 +171,7 @@ function editTimer(alarmIndex, alarm) {
const menu = {
'': { 'title': /*LANG*/'Timer' },
- '< Back' : () => showMainMenu(),
+ /*LANG*/'< Back' : () => showMainMenu(),
/*LANG*/'Hours': {
value: t.hrs, min : 0, max : 23, wrap : true,
onchange: v => t.hrs=v
@@ -182,8 +182,8 @@ function editTimer(alarmIndex, alarm) {
},
/*LANG*/'Enabled': {
value: a.on,
- format: v=>v?"On":"Off",
- onchange: v=>a.on=v
+ format: v => v ? /*LANG*/"On" : /*LANG*/"Off",
+ onchange: v => a.on = v
},
/*LANG*/'Vibrate': require("buzz_menu").pattern(a.vibrate, v => a.vibrate=v ),
};
From c5e28b96eca668350057bf91a737bafce8dc1542 Mon Sep 17 00:00:00 2001
From: Alessandro Cocco
Date: Wed, 20 Apr 2022 14:23:13 +0200
Subject: [PATCH 48/63] [Alarms & Timers] Integrate with new 'sched' factories
Minor code clean up (let instead of var, whitespaces between operators, etc.)
---
apps/alarm/app.js | 48 ++++++++++++++++-------------------------------
1 file changed, 16 insertions(+), 32 deletions(-)
diff --git a/apps/alarm/app.js b/apps/alarm/app.js
index ccf1d7bf0..1fc32ecb9 100644
--- a/apps/alarm/app.js
+++ b/apps/alarm/app.js
@@ -1,28 +1,28 @@
Bangle.loadWidgets();
Bangle.drawWidgets();
-var alarms = require("sched").getAlarms();
// An array of alarm objects (see sched/README.md)
+let alarms = require("sched").getAlarms();
// time in ms -> { hrs, mins }
function decodeTime(t) {
- t = 0|t; // sanitise
- var hrs = 0|(t/3600000);
- return { hrs : hrs, mins : Math.round((t-hrs*3600000)/60000) };
+ t = 0 | t; // sanitise
+ let hrs = 0 | (t / 3600000);
+ return { hrs: hrs, mins: Math.round((t - hrs * 3600000) / 60000) };
}
// time in { hrs, mins } -> ms
function encodeTime(o) {
- return o.hrs*3600000 + o.mins*60000;
+ return o.hrs * 3600000 + o.mins * 60000;
}
function formatTime(t) {
- var o = decodeTime(t);
- return o.hrs+":"+("0"+o.mins).substr(-2);
+ let o = decodeTime(t);
+ return o.hrs + ":" + ("0" + o.mins).substr(-2);
}
function getCurrentTime() {
- var time = new Date();
+ let time = new Date();
return (
time.getHours() * 3600000 +
time.getMinutes() * 60000 +
@@ -78,8 +78,8 @@ function editDOW(dow, onchange) {
'': { 'title': /*LANG*/'Days of Week' },
/*LANG*/'< Back' : () => onchange(dow)
};
- for (var i = 0; i < 7; i++) (i => {
- var dayOfWeek = require("locale").dow({ getDay: () => i });
+ for (let i = 0; i < 7; i++) (i => {
+ let dayOfWeek = require("locale").dow({ getDay: () => i });
menu[dayOfWeek] = {
value: !!(dow&(1< v ? /*LANG*/"Yes" : /*LANG*/"No",
@@ -90,19 +90,11 @@ function editDOW(dow, onchange) {
}
function editAlarm(alarmIndex, alarm) {
- var newAlarm = alarmIndex<0;
- var a = {
- t : 12*3600000, // 12 o clock default
- on : true,
- rp : false, // repeat not the default
- as : false,
- dow : 0b1111111,
- last : 0,
- vibrate : ".."
- }
+ let newAlarm = alarmIndex < 0;
+ let a = require("sched").newDefaultAlarm();
if (!newAlarm) Object.assign(a, alarms[alarmIndex]);
if (alarm) Object.assign(a,alarm);
- var t = decodeTime(a.t);
+ let t = decodeTime(a.t);
const menu = {
'': { 'title': /*LANG*/'Alarm' },
@@ -155,19 +147,11 @@ function editAlarm(alarmIndex, alarm) {
}
function editTimer(alarmIndex, alarm) {
- var newAlarm = alarmIndex<0;
- var a = {
- timer : 5*60*1000, // 5 minutes
- on : true,
- rp : false,
- as : false,
- dow : 0b1111111,
- last : 0,
- vibrate : ".."
- }
+ let newAlarm = alarmIndex < 0;
+ let a = require("sched").newDefaultTimer();
if (!newAlarm) Object.assign(a, alarms[alarmIndex]);
if (alarm) Object.assign(a,alarm);
- var t = decodeTime(a.timer);
+ let t = decodeTime(a.timer);
const menu = {
'': { 'title': /*LANG*/'Timer' },
From cfff375e566c2529c6ed48593e8ec5540a485f01 Mon Sep 17 00:00:00 2001
From: Alessandro Cocco
Date: Wed, 20 Apr 2022 14:23:45 +0200
Subject: [PATCH 49/63] [Alarms & Timers] Update metadata & changelog
---
apps/alarm/ChangeLog | 1 +
apps/alarm/metadata.json | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/apps/alarm/ChangeLog b/apps/alarm/ChangeLog
index fcafc386f..3f56f4c20 100644
--- a/apps/alarm/ChangeLog
+++ b/apps/alarm/ChangeLog
@@ -18,3 +18,4 @@
0.17: Moving alarm internals to 'sched' library
0.18: Cope with >1 identical alarm at once (#1667)
0.19: Ensure rescheduled alarms that already fired have 'last' reset
+0.20: Use the new 'sched' factories to initialize new alarms/timers
diff --git a/apps/alarm/metadata.json b/apps/alarm/metadata.json
index 9636257ca..db36b3ca9 100644
--- a/apps/alarm/metadata.json
+++ b/apps/alarm/metadata.json
@@ -1,8 +1,8 @@
{
"id": "alarm",
- "name": "Alarm & Timer",
+ "name": "Alarms & Timers",
"shortName": "Alarms",
- "version": "0.19",
+ "version": "0.20",
"description": "Set alarms and timers on your Bangle",
"icon": "app.png",
"tags": "tool,alarm,widget",
From 2e5f198d666379ae7dac0efbedcba7861ee0da77 Mon Sep 17 00:00:00 2001
From: Alessandro Cocco
Date: Mon, 18 Apr 2022 22:03:37 +0200
Subject: [PATCH 50/63] [Launcher] Update labels
- Shorten settings title
- Change menu items to Camel Case
---
apps/launch/settings.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/apps/launch/settings.js b/apps/launch/settings.js
index 60422e75c..3364864bd 100644
--- a/apps/launch/settings.js
+++ b/apps/launch/settings.js
@@ -8,7 +8,7 @@
require("Storage").write("launch.json",settings);
}
const appMenu = {
- "": {"title": /*LANG*/"Launcher Settings"},
+ "": { "title": /*LANG*/"Launcher" },
/*LANG*/"< Back": back,
/*LANG*/"Font": {
value: fonts.includes(settings.font)? fonts.indexOf(settings.font) : fonts.indexOf("12x20"),
@@ -16,12 +16,12 @@
onchange: (m) => {save("font", fonts[m])},
format: v => fonts[v]
},
- /*LANG*/"Vector font size": {
+ /*LANG*/"Vector Font Size": {
value: settings.vectorsize || 10,
min:10, max: 20,step:1,wrap:true,
onchange: (m) => {save("vectorsize", m)}
},
- /*LANG*/"Show clocks": {
+ /*LANG*/"Show Clocks": {
value: settings.showClocks == true,
format: v => v ? /*LANG*/"Yes" : /*LANG*/"No",
onchange: (m) => {save("showClocks", m)}
From 7afa90710fafd9546df2d5eca4465144be25e7b7 Mon Sep 17 00:00:00 2001
From: Alessandro Cocco
Date: Mon, 18 Apr 2022 22:05:07 +0200
Subject: [PATCH 51/63] [Launcher] Add new "fullscreen" option
---
apps/launch/settings.js | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/apps/launch/settings.js b/apps/launch/settings.js
index 3364864bd..5d37e1c1b 100644
--- a/apps/launch/settings.js
+++ b/apps/launch/settings.js
@@ -1,6 +1,9 @@
// make sure to enclose the function in parentheses
(function(back) {
- let settings = Object.assign({ showClocks: true }, require("Storage").readJSON("launch.json", true) || {});
+ let settings = Object.assign({
+ showClocks: true,
+ fullscreen: false
+ }, require("Storage").readJSON("launch.json", true) || {});
let fonts = g.getFonts();
function save(key, value) {
@@ -24,7 +27,12 @@
/*LANG*/"Show Clocks": {
value: settings.showClocks == true,
format: v => v ? /*LANG*/"Yes" : /*LANG*/"No",
- onchange: (m) => {save("showClocks", m)}
+ onchange: (m) => { save("showClocks", m) }
+ },
+ /*LANG*/"Fullscreen": {
+ value: settings.fullscreen == true,
+ format: v => v ? /*LANG*/"Yes" : /*LANG*/"No",
+ onchange: (m) => { save("fullscreen", m) }
}
};
E.showMenu(appMenu);
From c2a5d13bd63a741c790b51db83166db6eb0eec1d Mon Sep 17 00:00:00 2001
From: Alessandro Cocco
Date: Mon, 18 Apr 2022 22:05:59 +0200
Subject: [PATCH 52/63] [Launcher] Load & draw widgets iff not in fullscreen
mode
---
apps/launch/app.js | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/apps/launch/app.js b/apps/launch/app.js
index 4ceabe751..556e61bfd 100644
--- a/apps/launch/app.js
+++ b/apps/launch/app.js
@@ -2,7 +2,10 @@ var s = require("Storage");
var scaleval = 1;
var vectorval = 20;
var font = g.getFonts().includes("12x20") ? "12x20" : "6x8:2";
-let settings = Object.assign({ showClocks: true }, s.readJSON("launch.json", true) || {});
+let settings = Object.assign({
+ showClocks: true,
+ fullscreen: false
+}, s.readJSON("launch.json", true) || {});
if ("vectorsize" in settings) {
vectorval = parseInt(settings.vectorsize);
@@ -44,8 +47,11 @@ function drawApp(i, r) {
}
g.clear();
-Bangle.loadWidgets();
-Bangle.drawWidgets();
+
+if (!settings.fullscreen) {
+ Bangle.loadWidgets();
+ Bangle.drawWidgets();
+}
E.showScroller({
h : 64*scaleval, c : apps.length,
From 7c96e04d050ba1b4c31c18fe33fba9a361a68cde Mon Sep 17 00:00:00 2001
From: Alessandro Cocco
Date: Mon, 18 Apr 2022 22:06:45 +0200
Subject: [PATCH 53/63] [Launcher] Update metadata & changelog
---
apps/launch/ChangeLog | 1 +
apps/launch/metadata.json | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/apps/launch/ChangeLog b/apps/launch/ChangeLog
index b8c198d50..7248f69c3 100644
--- a/apps/launch/ChangeLog
+++ b/apps/launch/ChangeLog
@@ -12,3 +12,4 @@
0.11: Merge Bangle.js 1 and 2 launchers, again
0.12: Add an option to hide clocks from the app list (fix #1015)
Add /*LANG*/ tags for internationalisation
+0.13: Add fullscreen mode
diff --git a/apps/launch/metadata.json b/apps/launch/metadata.json
index 96bbf104b..ab218412d 100644
--- a/apps/launch/metadata.json
+++ b/apps/launch/metadata.json
@@ -2,7 +2,7 @@
"id": "launch",
"name": "Launcher",
"shortName": "Launcher",
- "version": "0.12",
+ "version": "0.13",
"description": "This is needed to display a menu allowing you to choose your own applications. You can replace this with a customised launcher.",
"icon": "app.png",
"type": "launch",
From c377a4f194670f65e8e1b61c1616f6fa97b51973 Mon Sep 17 00:00:00 2001
From: sir-indy <53864146+sir-indy@users.noreply.github.com>
Date: Wed, 20 Apr 2022 14:32:23 +0100
Subject: [PATCH 54/63] Update app.js
---
apps/health/app.js | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/apps/health/app.js b/apps/health/app.js
index efd18c4e1..e39590e2d 100644
--- a/apps/health/app.js
+++ b/apps/health/app.js
@@ -2,8 +2,8 @@ function getSettings() {
return require("Storage").readJSON("health.json",1)||{};
}
-function setSettings(s) {
- require("Storage").writeJSON("health.json",s);
+function setSettings(healthSettings) {
+ require("Storage").writeJSON("health.json",healthSettings);
}
function menuMain() {
@@ -22,20 +22,21 @@ function menuMain() {
function menuSettings() {
swipe_enabled = false;
clearButton();
- var s=getSettings();
+ var healthSettings=getSettings();
+ //print(healthSettings);
E.showMenu({
"":{title:"Health Tracking"},
"< Back":()=>menuMain(),
"Heart Rt":{
- value : 0|s.hrm,
+ value : 0|healthSettings.hrm,
min : 0, max : 3,
format : v=>["Off","3 mins","10 mins","Always"][v],
- onchange : v => { s.hrm=v;setSettings(s); }
+ onchange : v => { healthSettings.hrm=v;setSettings(healthSettings); }
},
"Daily Step Goal":{
- value : (s.stepGoal ? s.stepGoal : 10000),
+ value : (healthSettings.stepGoal ? healthSettings.stepGoal : 10000),
min : 0, max : 20000, step : 100,
- onchange : v => { s.stepGoal=v;setSettings(s); }
+ onchange : v => { healthSettings.stepGoal=v;setSettings(healthSettings); }
}
});
}
@@ -204,7 +205,7 @@ function drawBarChart() {
for (bar = 1; bar < 10; bar++) {
if (bar == 5) {
g.setFont('6x8', 2);
- g.setFontAlign(0,-1)
+ g.setFontAlign(0,-1);
g.setColor(g.theme.fg);
g.drawString(chart_label + " " + (chart_index + bar -1) + " " + chart_data[chart_index + bar - 1], g.getWidth()/2, 150);
g.setColor("#00f");
From a7bab80dc3108f416b9fb1bf769d844c062a1049 Mon Sep 17 00:00:00 2001
From: Eskild Hustvedt
Date: Wed, 20 Apr 2022 15:39:11 +0200
Subject: [PATCH 55/63] Allow timeouts to run on the message list screen
Stops the app from displaying a message that then gets removed and after that
permanently "hanging" on the message screen.
---
apps/messages/ChangeLog | 1 +
apps/messages/app.js | 2 --
apps/messages/metadata.json | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/apps/messages/ChangeLog b/apps/messages/ChangeLog
index 75b171579..a96f125d3 100644
--- a/apps/messages/ChangeLog
+++ b/apps/messages/ChangeLog
@@ -45,3 +45,4 @@
0.30: Add new Icons (Youtube, Twitch, MS TODO, Teams, Snapchat, Signal, Post & DHL, Nina, Lieferando, Kalender, Discord, Corona Warn, Bibel)
0.31: Option to disable icon flashing
0.32: Added an option to allow quiet mode to override message auto-open
+0.33: Timeout from the message list screen if the message being displayed is removed and there is a timer going
diff --git a/apps/messages/app.js b/apps/messages/app.js
index 821813108..617801f61 100644
--- a/apps/messages/app.js
+++ b/apps/messages/app.js
@@ -470,8 +470,6 @@ function checkMessages(options) {
// no new messages - go to clock?
if (options.clockIfAllRead && newMessages.length==0)
return load();
- // we don't have to time out of this screen...
- cancelReloadTimeout();
active = "main";
// Otherwise show a menu
E.showScroller({
diff --git a/apps/messages/metadata.json b/apps/messages/metadata.json
index 7886a7b30..228e44d35 100644
--- a/apps/messages/metadata.json
+++ b/apps/messages/metadata.json
@@ -1,7 +1,7 @@
{
"id": "messages",
"name": "Messages",
- "version": "0.32",
+ "version": "0.33",
"description": "App to display notifications from iOS and Gadgetbridge/Android",
"icon": "app.png",
"type": "app",
From 09bd9bb252ace4c8aed40993d38ba06f2dbd33c2 Mon Sep 17 00:00:00 2001
From: sir-indy <53864146+sir-indy@users.noreply.github.com>
Date: Wed, 20 Apr 2022 15:15:55 +0100
Subject: [PATCH 56/63] Update widstep.wid.js
Looks like reload was never being called, so just read in the important setting at the top of the file.
---
apps/widstep/widstep.wid.js | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/apps/widstep/widstep.wid.js b/apps/widstep/widstep.wid.js
index 1defcb146..74c5a59ea 100644
--- a/apps/widstep/widstep.wid.js
+++ b/apps/widstep/widstep.wid.js
@@ -1,4 +1,4 @@
-let wsSettingsGoal = 10000;
+let wsSettingsGoal = (require('Storage').readJSON("health.json", 1) || {}).stepGoal || 10000;
Bangle.on('step', function(s) { WIDGETS["widstep"].draw(); });
Bangle.on('lcdPower', function(on) {
@@ -8,6 +8,7 @@ WIDGETS["widstep"]={area:"tl", sortorder:-1, width:28,
draw:function() {
if (!Bangle.isLCDOn()) return; // dont redraw if LCD is off
var steps = Bangle.getHealthStatus("day").steps;
+ print('draw', wsSettingsGoal, steps);
g.reset();
g.setColor(g.theme.bg);
g.fillRect(this.x, this.y, this.x + this.width, this.y + 23);
@@ -19,9 +20,5 @@ WIDGETS["widstep"]={area:"tl", sortorder:-1, width:28,
var steps_k = (steps/1000).toFixed(1) + 'k';
g.setFont('6x15').drawString(steps_k, this.x+this.width/2, this.y + 10);
g.setFont('4x6').drawString('steps', this.x+this.width/2, this.y + 2);
- //g.drawRect(this.x, this.y, this.x + this.width, this.y + 23);
- }, reload:function() {
- wsSettingsGoal = (require('Storage').readJSON("health.json", 1) || {}).stepGoal || 10000;
- WIDGETS["widstep"].draw();
}
};
From f59f2872e6b2d7beb85b97d7f9f74f903109e898 Mon Sep 17 00:00:00 2001
From: sir-indy <53864146+sir-indy@users.noreply.github.com>
Date: Wed, 20 Apr 2022 15:16:19 +0100
Subject: [PATCH 57/63] Update widstep.wid.js
Remove stray print statement!
---
apps/widstep/widstep.wid.js | 1 -
1 file changed, 1 deletion(-)
diff --git a/apps/widstep/widstep.wid.js b/apps/widstep/widstep.wid.js
index 74c5a59ea..6ad971af7 100644
--- a/apps/widstep/widstep.wid.js
+++ b/apps/widstep/widstep.wid.js
@@ -8,7 +8,6 @@ WIDGETS["widstep"]={area:"tl", sortorder:-1, width:28,
draw:function() {
if (!Bangle.isLCDOn()) return; // dont redraw if LCD is off
var steps = Bangle.getHealthStatus("day").steps;
- print('draw', wsSettingsGoal, steps);
g.reset();
g.setColor(g.theme.bg);
g.fillRect(this.x, this.y, this.x + this.width, this.y + 23);
From d8bfad06ae46a018c3a7ede4779c52e1345f7782 Mon Sep 17 00:00:00 2001
From: David Peer
Date: Wed, 20 Apr 2022 17:03:15 +0200
Subject: [PATCH 58/63] LCARS V0.22 - Fixed alarm and use build in steps
function as fallback.
---
apps/lcars/ChangeLog | 1 +
apps/lcars/README.md | 3 +--
apps/lcars/lcars.app.js | 22 +++++++++++++---------
apps/lcars/metadata.json | 2 +-
4 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/apps/lcars/ChangeLog b/apps/lcars/ChangeLog
index 9c17376bb..e622feb1f 100644
--- a/apps/lcars/ChangeLog
+++ b/apps/lcars/ChangeLog
@@ -19,3 +19,4 @@
0.19: Alarms can not go bigger than 100.
0.20: Use alarm for alarm functionality instead of own implementation.
0.21: Add custom theming.
+0.22: Fix alarm and add build in function for step counting.
\ No newline at end of file
diff --git a/apps/lcars/README.md b/apps/lcars/README.md
index 65e31b3cc..6d4b18b9a 100644
--- a/apps/lcars/README.md
+++ b/apps/lcars/README.md
@@ -1,8 +1,7 @@
# LCARS clock
A simple LCARS inspired clock.
-Note: To display the steps, the wpedom app is required. To show weather data
-such as temperature, humidity or window you BangleJS must be connected
+To show weather data such as temperature, humidity or window you BangleJS must be connected
with Gadgetbride and the weather app must be installed. To use the timer
the "sched" app must be installed on your device.
diff --git a/apps/lcars/lcars.app.js b/apps/lcars/lcars.app.js
index 3210d6832..aa50fb348 100644
--- a/apps/lcars/lcars.app.js
+++ b/apps/lcars/lcars.app.js
@@ -1,3 +1,4 @@
+const TIMER_IDX = "lcars";
const SETTINGS_FILE = "lcars.setting.json";
const locale = require('locale');
const storage = require('Storage')
@@ -35,7 +36,7 @@ let lcarsViewPos = 0;
var plotMonth = false;
-function convert24to16(input)
+function convert24to16(input)
{
let RGB888 = parseInt(input.replace(/^#/, ''), 16);
let r = (RGB888 & 0xFF0000) >> 16;
@@ -171,7 +172,7 @@ Graphics.prototype.setFontAntonioLarge = function(scale) {
*/
var drawTimeout;
function queueDraw() {
-
+
// Faster updates during alarm to ensure that it is
// shown correctly...
var timeout = isAlarmEnabled() ? 10000 : 60000;
@@ -556,17 +557,20 @@ function draw(){
* Step counter via widget
*/
function getSteps() {
+ var steps = 0;
try{
if (WIDGETS.wpedom !== undefined) {
- return WIDGETS.wpedom.getSteps();
+ steps = WIDGETS.wpedom.getSteps();
} else if (WIDGETS.activepedom !== undefined) {
- return WIDGETS.activepedom.getSteps();
+ steps = WIDGETS.activepedom.getSteps();
+ } else {
+ steps = Bangle.getHealthStatus("day").steps;
}
} catch(ex) {
// In case we failed, we can only show 0 steps.
}
- return 0;
+ return steps;
}
@@ -639,7 +643,7 @@ function increaseAlarm(){
var minutes = isAlarmEnabled() ? getAlarmMinutes() : 0;
var alarm = require('sched')
alarm.setAlarm(TIMER_IDX, {
- timer : (minutes+5)*60*1000,
+ timer : (minutes+5)*60*1000,
});
alarm.reload();
} catch(ex){ }
@@ -654,9 +658,9 @@ function decreaseAlarm(){
alarm.setAlarm(TIMER_IDX, undefined);
if(minutes > 0){
- alarm.setAlarm(TIMER_IDX, {
- timer : minutes*60*1000,
- });
+ alarm.setAlarm(TIMER_IDX, {
+ timer : minutes*60*1000,
+ });
}
alarm.reload();
diff --git a/apps/lcars/metadata.json b/apps/lcars/metadata.json
index 5f3eaa971..40da1b37f 100644
--- a/apps/lcars/metadata.json
+++ b/apps/lcars/metadata.json
@@ -3,7 +3,7 @@
"name": "LCARS Clock",
"shortName":"LCARS",
"icon": "lcars.png",
- "version":"0.21",
+ "version":"0.22",
"readme": "README.md",
"supports": ["BANGLEJS2"],
"description": "Library Computer Access Retrieval System (LCARS) clock.",
From a02e6d79c4af51639f255d1b5ea79b8de148145e Mon Sep 17 00:00:00 2001
From: David Peer
Date: Wed, 20 Apr 2022 17:05:05 +0200
Subject: [PATCH 59/63] Use same data for settings otherwise settings change
after first save.
---
apps/lcars/lcars.settings.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/apps/lcars/lcars.settings.js b/apps/lcars/lcars.settings.js
index 2656a54ab..c948c7763 100644
--- a/apps/lcars/lcars.settings.js
+++ b/apps/lcars/lcars.settings.js
@@ -5,9 +5,9 @@
const storage = require('Storage')
let settings = {
alarm: -1,
- dataRow1: "Battery",
- dataRow2: "Steps",
- dataRow3: "Temp",
+ dataRow1: "Steps",
+ dataRow2: "Temp",
+ dataRow3: "Battery",
speed: "kph",
fullscreen: false,
themeColor1BG: "#FF9900",
@@ -23,7 +23,7 @@
storage.write(SETTINGS_FILE, settings)
}
-
+
var dataOptions = ["Steps", "Battery", "VREF", "HRM", "Temp", "Humidity", "Wind", "Altitude", "CoreT"];
var speedOptions = ["kph", "mph"];
var color_options = ['Green','Orange','Cyan','Purple','Red','Blue','Yellow','White'];
From 058beeae94fb397e7bfecdc11a5a4d29351b9082 Mon Sep 17 00:00:00 2001
From: David Peer
Date: Wed, 20 Apr 2022 17:09:33 +0200
Subject: [PATCH 60/63] Better stability for weather
---
apps/lcars/lcars.app.js | 49 +++++++++++++++++++----------------------
1 file changed, 23 insertions(+), 26 deletions(-)
diff --git a/apps/lcars/lcars.app.js b/apps/lcars/lcars.app.js
index aa50fb348..590ae56bb 100644
--- a/apps/lcars/lcars.app.js
+++ b/apps/lcars/lcars.app.js
@@ -579,38 +579,35 @@ function getWeather(){
try {
weatherJson = storage.readJSON('weather.json');
+ var weather = weatherJson.weather;
+
+ // Temperature
+ weather.temp = locale.temp(weather.temp-273.15);
+
+ // Humidity
+ weather.hum = weather.hum + "%";
+
+ // Wind
+ const wind = locale.speed(weather.wind).match(/^(\D*\d*)(.*)$/);
+ var speedFactor = settings.speed == "kph" ? 1.0 : 1.0 / 1.60934;
+ weather.wind = Math.round(wind[1] * speedFactor);
+
+ return weather
+
} catch(ex) {
// Return default
}
- if(weatherJson === undefined){
- return {
- temp: "-",
- hum: "-",
- txt: "-",
- wind: "-",
- wdir: "-",
- wrose: "-"
- };
- }
-
- var weather = weatherJson.weather;
-
- // Temperature
- weather.temp = locale.temp(weather.temp-273.15);
-
- // Humidity
- weather.hum = weather.hum + "%";
-
- // Wind
- const wind = locale.speed(weather.wind).match(/^(\D*\d*)(.*)$/);
- var speedFactor = settings.speed == "kph" ? 1.0 : 1.0 / 1.60934;
- weather.wind = Math.round(wind[1] * speedFactor);
-
- return weather
+ return {
+ temp: " ? ",
+ hum: " ? ",
+ txt: " ? ",
+ wind: " ? ",
+ wdir: " ? ",
+ wrose: " ? "
+ };
}
-
/*
* Handle alarm
*/
From 945bc31b366b4693c1c1e07cd2e5aafb412c0637 Mon Sep 17 00:00:00 2001
From: David Peer
Date: Wed, 20 Apr 2022 17:15:10 +0200
Subject: [PATCH 61/63] Fix info alignment
---
apps/lcars/lcars.app.js | 3 +++
1 file changed, 3 insertions(+)
diff --git a/apps/lcars/lcars.app.js b/apps/lcars/lcars.app.js
index 590ae56bb..072eead54 100644
--- a/apps/lcars/lcars.app.js
+++ b/apps/lcars/lcars.app.js
@@ -291,6 +291,9 @@ function drawInfo(){
return;
}
+ // Draw Infor is called from different sources so
+ // we have to ensure that the alignment is always the same.
+ g.setFontAlign(-1, -1, 0);
g.setFontAntonioMedium();
g.setColor(color2);
g.clearRect(120, 10, g.getWidth(), 75);
From f8a2c280fe6c1f8bb42bf4151423ce09606fc1e9 Mon Sep 17 00:00:00 2001
From: David Peer
Date: Wed, 20 Apr 2022 17:24:11 +0200
Subject: [PATCH 62/63] Show last healt status for HRM
---
apps/lcars/lcars.app.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/lcars/lcars.app.js b/apps/lcars/lcars.app.js
index 072eead54..92c4e8e7c 100644
--- a/apps/lcars/lcars.app.js
+++ b/apps/lcars/lcars.app.js
@@ -238,7 +238,7 @@ function _drawData(key, y, c){
value = E.getAnalogVRef().toFixed(2) + "V";
} else if(key == "HRM"){
- value = Math.round(Bangle.getHealthStatus("day").bpm);
+ value = Math.round(Bangle.getHealthStatus("last").bpm);
} else if (key == "TEMP"){
var weather = getWeather();
From 088453d8ce5ffbd0ae8f30d0f3af76ca691d2bf4 Mon Sep 17 00:00:00 2001
From: David Peer
Date: Wed, 20 Apr 2022 17:24:50 +0200
Subject: [PATCH 63/63] HRM as default
---
apps/lcars/lcars.app.js | 2 +-
apps/lcars/lcars.settings.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/apps/lcars/lcars.app.js b/apps/lcars/lcars.app.js
index 92c4e8e7c..07ca51fd9 100644
--- a/apps/lcars/lcars.app.js
+++ b/apps/lcars/lcars.app.js
@@ -5,7 +5,7 @@ const storage = require('Storage')
let settings = {
alarm: -1,
dataRow1: "Steps",
- dataRow2: "Temp",
+ dataRow2: "HRM",
dataRow3: "Battery",
speed: "kph",
fullscreen: false,
diff --git a/apps/lcars/lcars.settings.js b/apps/lcars/lcars.settings.js
index c948c7763..b64feb30e 100644
--- a/apps/lcars/lcars.settings.js
+++ b/apps/lcars/lcars.settings.js
@@ -6,7 +6,7 @@
let settings = {
alarm: -1,
dataRow1: "Steps",
- dataRow2: "Temp",
+ dataRow2: "HRM",
dataRow3: "Battery",
speed: "kph",
fullscreen: false,