From a1e6bae39fd457fd526a3c0bfa3ee56503f14bf0 Mon Sep 17 00:00:00 2001 From: Spencer Churchill Date: Thu, 22 Sep 2022 15:29:59 -0700 Subject: [PATCH 1/3] only vibrate during work hours --- apps/widtwenties/widget.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/apps/widtwenties/widget.js b/apps/widtwenties/widget.js index 58bc622eb..745e50391 100644 --- a/apps/widtwenties/widget.js +++ b/apps/widtwenties/widget.js @@ -7,9 +7,13 @@ they don't interfere with currently-running apps */ const look = 20 * 1000; // 20 seconds buzz = _ => { - Bangle.buzz().then(_ => { - setTimeout(Bangle.buzz, look); - }); + const d = new Date(); + // run from 8 AM - 5 PM + if (d >= 8 && d <= 17) { + Bangle.buzz().then(_ => { + setTimeout(Bangle.buzz, look); + }); + } }; // add widget @@ -21,4 +25,4 @@ they don't interfere with currently-running apps */ setInterval(WIDGETS.twenties.buzz, move); // buzz to stand / sit })(); -// Bangle.drawWidgets(); // <-- for development only \ No newline at end of file +// Bangle.drawWidgets(); // <-- for development only From 9f16ca2183ea039f54c1aa74478e423d685241ab Mon Sep 17 00:00:00 2001 From: Spencer Churchill Date: Thu, 22 Sep 2022 15:35:31 -0700 Subject: [PATCH 2/3] updates app version --- apps/widtwenties/ChangeLog | 3 ++- apps/widtwenties/metadata.json | 2 +- apps/widtwenties/widget.js | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/widtwenties/ChangeLog b/apps/widtwenties/ChangeLog index 87935d810..b1cd84c9e 100644 --- a/apps/widtwenties/ChangeLog +++ b/apps/widtwenties/ChangeLog @@ -1,2 +1,3 @@ 0.01: New Widget! -0.02: Fix calling null on draw \ No newline at end of file +0.02: Fix calling null on draw +0.03: Only vibrate during working hours \ No newline at end of file diff --git a/apps/widtwenties/metadata.json b/apps/widtwenties/metadata.json index 2e51457ac..5695a0ed9 100644 --- a/apps/widtwenties/metadata.json +++ b/apps/widtwenties/metadata.json @@ -2,7 +2,7 @@ "id": "widtwenties", "name": "Twenties", "shortName": "twenties", - "version": "0.02", + "version": "0.03", "description": "Buzzes every 20m to stand / sit and look 20ft away for 20s.", "icon": "widget.png", "type": "widget", diff --git a/apps/widtwenties/widget.js b/apps/widtwenties/widget.js index 745e50391..224cbe5ac 100644 --- a/apps/widtwenties/widget.js +++ b/apps/widtwenties/widget.js @@ -8,8 +8,7 @@ they don't interfere with currently-running apps */ buzz = _ => { const d = new Date(); - // run from 8 AM - 5 PM - if (d >= 8 && d <= 17) { + if (d >= 8 && d <= 17) { // run from 8 AM - 5 PM Bangle.buzz().then(_ => { setTimeout(Bangle.buzz, look); }); From 085b58084c9907ecd5ea7abc2d5bf1565527be8b Mon Sep 17 00:00:00 2001 From: Spencer Churchill Date: Thu, 22 Sep 2022 23:46:27 -0700 Subject: [PATCH 3/3] fix bug and check day of week --- apps/widtwenties/ChangeLog | 2 +- apps/widtwenties/widget.js | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/widtwenties/ChangeLog b/apps/widtwenties/ChangeLog index b1cd84c9e..c2fbd70a2 100644 --- a/apps/widtwenties/ChangeLog +++ b/apps/widtwenties/ChangeLog @@ -1,3 +1,3 @@ 0.01: New Widget! 0.02: Fix calling null on draw -0.03: Only vibrate during working hours \ No newline at end of file +0.03: Only vibrate during work \ No newline at end of file diff --git a/apps/widtwenties/widget.js b/apps/widtwenties/widget.js index 224cbe5ac..f722f8d03 100644 --- a/apps/widtwenties/widget.js +++ b/apps/widtwenties/widget.js @@ -7,8 +7,11 @@ they don't interfere with currently-running apps */ const look = 20 * 1000; // 20 seconds buzz = _ => { - const d = new Date(); - if (d >= 8 && d <= 17) { // run from 8 AM - 5 PM + const date = new Date(); + const day = date.getDay(); + const hour = date.getHours(); + // buzz at work + if (day <= 5 && hour >= 8 && hour <= 17) { Bangle.buzz().then(_ => { setTimeout(Bangle.buzz, look); });