From e3777d6ca93945130b0e212486a631c1afc9ebe1 Mon Sep 17 00:00:00 2001 From: hughbarney Date: Mon, 25 Jan 2021 12:55:26 +0000 Subject: [PATCH 1/5] Added step count from wpedom widget --- apps/verticalface/app.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/apps/verticalface/app.js b/apps/verticalface/app.js index f9138335f..cc3493876 100644 --- a/apps/verticalface/app.js +++ b/apps/verticalface/app.js @@ -40,6 +40,7 @@ function drawTimeDate() { //We will create custom "Widgets" for our face. function drawSteps() { + var steps = "-"; //Reset to defaults. g.reset(); // draw the date (2x size 7 segment) @@ -48,7 +49,10 @@ function drawSteps() { g.setFontAlign(-1,0); // align right bottom g.drawString("STEPS", 145, 40, true /*clear background*/); g.setColor('#bdc3c7'); - g.drawString("-", 145, 65, true /*clear background*/); + if (WIDGETS.wpedom !== undefined) { + steps = WIDGETS.wpedom.getSteps(); + } + g.drawString(steps, 145, 65, true /*clear background*/); } function drawBPM(on) { @@ -114,6 +118,7 @@ Bangle.on('lcdPower',on=>{ //Screen on drawBPM(HRMstate); drawTimeDate(); + drawSteps(); drawBattery(); } else { //Screen off @@ -124,6 +129,7 @@ Bangle.on('lcdPower',on=>{ // Show launcher when middle button pressed setWatch(Bangle.showLauncher, BTN2, { repeat: false, edge: "falling" }); +// this can be annoying as you loose the watch face, middle button is enough Bangle.on('touch', function(button) { if(button == 1 || button == 2){ Bangle.showLauncher(); @@ -133,14 +139,14 @@ Bangle.on('touch', function(button) { //HRM Controller. setWatch(function(){ if(!HRMstate){ - console.log("Toggled HRM"); + //console.log("Toggled HRM"); //Turn on. Bangle.buzz(); Bangle.setHRMPower(1); currentHRM = "CALC"; HRMstate = true; } else if(HRMstate){ - console.log("Toggled HRM"); + //console.log("Toggled HRM"); //Turn off. Bangle.buzz(); Bangle.setHRMPower(0); @@ -153,7 +159,7 @@ setWatch(function(){ Bangle.on('HRM', function(hrm) { if(hrm.confidence > 90){ /*Do more research to determine effect algorithm for heartrate average.*/ - console.log(hrm.bpm); + //console.log(hrm.bpm); currentHRM = hrm.bpm; drawBPM(HRMstate); } From 75189ac3ef77de4888ac26b0095fbbd2ee172e17 Mon Sep 17 00:00:00 2001 From: hughbarney Date: Mon, 25 Jan 2021 12:57:08 +0000 Subject: [PATCH 2/5] added getSteps() to retrieve step count by other apps --- apps/widpedom/widget.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/widpedom/widget.js b/apps/widpedom/widget.js index e7c3961b4..427a25e33 100644 --- a/apps/widpedom/widget.js +++ b/apps/widpedom/widget.js @@ -112,7 +112,11 @@ }); // add your widget - WIDGETS["wpedom"]={area:"tl",width:26,draw:draw,reload:reload}; + WIDGETS["wpedom"]={area:"tl",width:26, + draw:draw, + reload:reload, + getSteps:()=>stp_today, + }; // Load data at startup let pedomData = require("Storage").readJSON(PEDOMFILE,1); if (pedomData) { From 1b3289783e5d4b32a82ca9c8c494fdf4b2993641 Mon Sep 17 00:00:00 2001 From: hughbarney Date: Mon, 25 Jan 2021 21:25:50 +0000 Subject: [PATCH 3/5] removed redundant comment --- apps/verticalface/app.js | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/verticalface/app.js b/apps/verticalface/app.js index cc3493876..c6222d870 100644 --- a/apps/verticalface/app.js +++ b/apps/verticalface/app.js @@ -129,7 +129,6 @@ Bangle.on('lcdPower',on=>{ // Show launcher when middle button pressed setWatch(Bangle.showLauncher, BTN2, { repeat: false, edge: "falling" }); -// this can be annoying as you loose the watch face, middle button is enough Bangle.on('touch', function(button) { if(button == 1 || button == 2){ Bangle.showLauncher(); From 0979cc1d5f75017f171bd5c0aca8399c419e7add Mon Sep 17 00:00:00 2001 From: hughbarney Date: Tue, 26 Jan 2021 20:12:12 +0000 Subject: [PATCH 4/5] removed tabs, Emacs config needs a check --- apps/widpedom/widget.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/widpedom/widget.js b/apps/widpedom/widget.js index 427a25e33..58853265c 100644 --- a/apps/widpedom/widget.js +++ b/apps/widpedom/widget.js @@ -113,10 +113,10 @@ // add your widget WIDGETS["wpedom"]={area:"tl",width:26, - draw:draw, - reload:reload, - getSteps:()=>stp_today, - }; + draw:draw, + reload:reload, + getSteps:()=>stp_today + }; // Load data at startup let pedomData = require("Storage").readJSON(PEDOMFILE,1); if (pedomData) { From b8c181209c3156f7552e47d646210b94860a9ca5 Mon Sep 17 00:00:00 2001 From: hughbarney Date: Tue, 26 Jan 2021 22:10:29 +0000 Subject: [PATCH 5/5] bumped versions and Changelogs for apps using wpedom and activepedom .getSteps() --- apps.json | 4 ++-- apps/multiclock/ChangeLog | 1 + apps/multiclock/ped.js | 32 +++++++++++++++----------------- apps/verticalface/ChangeLog | 1 + apps/verticalface/app.js | 4 +++- apps/widpedom/ChangeLog | 1 + 6 files changed, 23 insertions(+), 20 deletions(-) diff --git a/apps.json b/apps.json index 91262762b..a374c74ef 100644 --- a/apps.json +++ b/apps.json @@ -1007,7 +1007,7 @@ { "id": "widpedom", "name": "Pedometer widget", "icon": "widget.png", - "version":"0.10", + "version":"0.11", "description": "Daily pedometer widget", "tags": "widget", "type":"widget", @@ -2139,7 +2139,7 @@ { "id": "multiclock", "name": "Multi Clock", "icon": "multiclock.png", - "version":"0.10", + "version":"0.11", "description": "Clock with multiple faces - Big, Analogue, Digital, Text, Time-Date.\n Switch between faces with BTN1 & BTN3", "readme": "README.md", "tags": "clock", diff --git a/apps/multiclock/ChangeLog b/apps/multiclock/ChangeLog index ff26b5716..3ed2ed6b4 100644 --- a/apps/multiclock/ChangeLog +++ b/apps/multiclock/ChangeLog @@ -8,3 +8,4 @@ 0.08: Add pinned clock face 0.09: Added Pedometer clock 0.10: Added GPS and Grid Ref clock faces +0.11: Updated Pedometer clock to retrieve steps from either wpedom or activepedom diff --git a/apps/multiclock/ped.js b/apps/multiclock/ped.js index 31d3719df..a0f81e2e5 100644 --- a/apps/multiclock/ped.js +++ b/apps/multiclock/ped.js @@ -2,38 +2,36 @@ function getFace(){ - function draw() { - let steps = -1; + function draw() { + let steps = "-"; let show_steps = false; // only attempt to get steps if activepedom is loaded if (WIDGETS.activepedom !== undefined) { - steps = WIDGETS.activepedom.getSteps(); - show_steps = true; + steps = WIDGETS.activepedom.getSteps(); + } else if (WIDGETS.wpedom !== undefined) { + steps = WIDGETS.wpedom.getSteps(); } - + var d = new Date(); var da = d.toString().split(" "); var time = da[4].substr(0,5); - + g.reset(); g.clearRect(0,24,239,239); g.setFont("Vector", 80); g.setColor(1,1,1); // white g.setFontAlign(0, -1); g.drawString(time, g.getWidth()/2, 60); + g.setColor(0,255,0); // green + g.setFont("Vector", 60); + g.drawString(steps, g.getWidth()/2, 160); + } - if (show_steps) { - g.setColor(0,255,0); // green - g.setFont("Vector", 60); - g.drawString(steps, g.getWidth()/2, 160); - } - } - - function onSecond(){ - var t = new Date(); - if ((t.getSeconds() % 5) === 0) draw(); - } + function onSecond(){ + var t = new Date(); + if ((t.getSeconds() % 5) === 0) draw(); + } return {init:draw, tick:onSecond}; } diff --git a/apps/verticalface/ChangeLog b/apps/verticalface/ChangeLog index e26120599..c5dc1c7bd 100644 --- a/apps/verticalface/ChangeLog +++ b/apps/verticalface/ChangeLog @@ -2,3 +2,4 @@ 0.05: Stop hours being displayed wrong if moving from 2 digits to 1 (fix #516) 0.06: Tweak sizing to allow widgets at top, and add widgets (fix #567) 0.07: Added leading zero to hours and minutes +0.08: Show step count by calling wpedom.getSteps() or activepedom.getSteps() diff --git a/apps/verticalface/app.js b/apps/verticalface/app.js index c6222d870..e44a522de 100644 --- a/apps/verticalface/app.js +++ b/apps/verticalface/app.js @@ -49,7 +49,9 @@ function drawSteps() { g.setFontAlign(-1,0); // align right bottom g.drawString("STEPS", 145, 40, true /*clear background*/); g.setColor('#bdc3c7'); - if (WIDGETS.wpedom !== undefined) { + if (WIDGETS.activepedom !== undefined) { + steps = WIDGETS.activepedom.getSteps(); + } else if (WIDGETS.wpedom !== undefined) { steps = WIDGETS.wpedom.getSteps(); } g.drawString(steps, 145, 65, true /*clear background*/); diff --git a/apps/widpedom/ChangeLog b/apps/widpedom/ChangeLog index 43fcc8dc9..3c62f3a09 100644 --- a/apps/widpedom/ChangeLog +++ b/apps/widpedom/ChangeLog @@ -7,3 +7,4 @@ 0.08: Ensure redrawing works with variable size widget system 0.09: Add daily goal 0.10: Fix daily goal, don't store settings in separate file +0.11: added getSteps() method for apps to retrieve step count