From 02e12ffd86fc84988890243de3a16109334911be Mon Sep 17 00:00:00 2001 From: aaronrolls Date: Wed, 24 Aug 2022 10:38:13 +0000 Subject: [PATCH 1/6] Bug Fixes --- apps/chimer/settings.js | 2 +- apps/chimer/widget.js | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/apps/chimer/settings.js b/apps/chimer/settings.js index 1174246bd..594188c00 100644 --- a/apps/chimer/settings.js +++ b/apps/chimer/settings.js @@ -36,7 +36,7 @@ Repetition: { value: settings.repeat, min: 1, - max: 3, + max: 5, format: (v) => v, onchange: (v) => { settings.repeat = v; diff --git a/apps/chimer/widget.js b/apps/chimer/widget.js index 9029511f8..807f2b0cb 100644 --- a/apps/chimer/widget.js +++ b/apps/chimer/widget.js @@ -32,7 +32,7 @@ } else { return; } - sleep(100); + sleep(150); } } @@ -44,7 +44,11 @@ m = now.getMinutes(), s = now.getSeconds(), ms = now.getMilliseconds(); - if (h > settings.end || h < settings.start) { + if ( + h > settings.end || + (h >= settings.end && m !== 0) || + h < settings.start + ) { var mLeft = 60 - m, sLeft = mLeft * 60 - s, msLeft = sLeft * 1000 - ms; @@ -52,7 +56,8 @@ return; } if (settings.freq === 1) { - if ((m !== lastMinute && m === 0) || m === 30) chime(); + if ((m !== lastMinute && m === 0) || (m !== lastMinute && m === 30)) + chime(); lastHour = h; lastMinute = m; // check again in 30 minutes @@ -70,7 +75,12 @@ } setTimeout(check, msLeft); } else if (settings.freq === 2) { - if ((m !== lastMinute && m === 0) || m === 15 || m === 30 || m === 45) + if ( + (m !== lastMinute && m === 0) || + (m !== lastMinute && m === 15) || + (m !== lastMinute && m === 30) || + (m !== lastMinute && m === 45) + ) chime(); lastHour = h; lastMinute = m; From a3de2a946075be9e9bc43d0cb3ffbd58094d0867 Mon Sep 17 00:00:00 2001 From: aaronrolls Date: Thu, 25 Aug 2022 09:15:35 +0000 Subject: [PATCH 2/6] Added readme, change up version to 0.02 --- apps/chimer/metadata.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/chimer/metadata.json b/apps/chimer/metadata.json index fab277f15..d5bc04950 100644 --- a/apps/chimer/metadata.json +++ b/apps/chimer/metadata.json @@ -1,12 +1,13 @@ { "id": "chimer", "name": "Chimer", - "version": "0.01", + "version": "0.02", "description": "A fork of Hour Chime that adds extra features such as: \n - Buzz or beep on every 60, 30 or 15 minutes. \n - Reapeat Chime up to 3 times \n - Set hours to disable chime", "icon": "widget.png", "type": "widget", "tags": "widget", "supports": ["BANGLEJS", "BANGLEJS2"], + "readme": "README.MD", "storage": [ { "name": "chimer.wid.js", "url": "widget.js" }, { "name": "chimer.settings.js", "url": "settings.js" } From 747b21f7fe9d092584567ed63720359b94d4992b Mon Sep 17 00:00:00 2001 From: aaronrolls Date: Thu, 25 Aug 2022 09:15:42 +0000 Subject: [PATCH 3/6] Created --- apps/chimer/ChangeLog | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 apps/chimer/ChangeLog diff --git a/apps/chimer/ChangeLog b/apps/chimer/ChangeLog new file mode 100644 index 000000000..01bd00a0a --- /dev/null +++ b/apps/chimer/ChangeLog @@ -0,0 +1,2 @@ +0.01: Initial Creation +0.02: Fixed some sleep bugs. Added a sleep mode toggle \ No newline at end of file From b3c33855ac94f8f7c63767511c99f7d70abf5e75 Mon Sep 17 00:00:00 2001 From: aaronrolls Date: Thu, 25 Aug 2022 09:15:59 +0000 Subject: [PATCH 4/6] Added setting to toggle sleep mode --- apps/chimer/settings.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/apps/chimer/settings.js b/apps/chimer/settings.js index 594188c00..ea049f493 100644 --- a/apps/chimer/settings.js +++ b/apps/chimer/settings.js @@ -43,7 +43,14 @@ writeSettings(settings); }, }, - "Start Hour": { + "Sleep Mode": { + value: settings.sleep, + onchange: (v) => { + settings.sleep = v; + writeSettings(settings); + }, + }, + "Sleep Start": { value: settings.start, min: 0, max: 23, @@ -53,7 +60,7 @@ writeSettings(settings); }, }, - "End Hour": { + "Sleep End": { value: settings.end, min: 0, max: 23, @@ -71,6 +78,7 @@ type: 1, freq: 0, repeat: 1, + sleep: true, start: 6, end: 22, }; From 478cef2393e63529dc7b0560fc18abc81da878b7 Mon Sep 17 00:00:00 2001 From: aaronrolls Date: Thu, 25 Aug 2022 09:16:51 +0000 Subject: [PATCH 5/6] Added sleep mode feature --- apps/chimer/widget.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/chimer/widget.js b/apps/chimer/widget.js index 807f2b0cb..18358df9e 100644 --- a/apps/chimer/widget.js +++ b/apps/chimer/widget.js @@ -7,6 +7,7 @@ type: 1, freq: 0, repeat: 1, + sleep: true, start: 6, end: 22, }; @@ -45,9 +46,9 @@ s = now.getSeconds(), ms = now.getMilliseconds(); if ( - h > settings.end || - (h >= settings.end && m !== 0) || - h < settings.start + (settings.sleep && h > settings.end) || + (settings.sleep && h >= settings.end && m !== 0) || + (settings.sleep && h < settings.start) ) { var mLeft = 60 - m, sLeft = mLeft * 60 - s, From 8f70e2779a31528d6c661514b14abbb5d44edd77 Mon Sep 17 00:00:00 2001 From: aaronrolls Date: Thu, 25 Aug 2022 09:26:36 +0000 Subject: [PATCH 6/6] Added sleep mode toggle --- apps/chimer/settings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/chimer/settings.js b/apps/chimer/settings.js index ea049f493..55160c9be 100644 --- a/apps/chimer/settings.js +++ b/apps/chimer/settings.js @@ -44,7 +44,7 @@ }, }, "Sleep Mode": { - value: settings.sleep, + value: !!settings.sleep, onchange: (v) => { settings.sleep = v; writeSettings(settings);