bryan
/
BangleApps_old
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug where watch would chime on reload if minute matched one of its parameters

master
aaronrolls 2022-08-23 21:06:52 +00:00
parent 0ae3a550ad
commit b8895a028b
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/chimer/metadata.json
View File

@ -2,7 +2,7 @@
"id": "chimer", "id": "chimer",
"name": "Chimer", "name": "Chimer",
"version": "0.01", "version": "0.01",
"description": "A fork of Hour Chime. Buzz or beep on every 60, 30 or 15 minutes. 12", "description": "A fork of Hour Chime. Buzz or beep on every 60, 30 or 15 minutes. 13",
"icon": "widget.png", "icon": "widget.png",
"type": "widget", "type": "widget",
"tags": "widget", "tags": "widget",

13
apps/chimer/widget.js
View File

@ -5,7 +5,7 @@
var readSettings = () => { var readSettings = () => {
var settings = require("Storage").readJSON(FILE, 1) || { var settings = require("Storage").readJSON(FILE, 1) || {
type: 1, type: 1,
freq: 2, freq: 0,
repeat: 1, repeat: 1,
start: 6, start: 6,
end: 22, end: 22,
@ -36,7 +36,8 @@ function sleep(milliseconds) {
} }
}; };
//let lastHour = (new Date()).getHours(); // don't chime when (re)loaded at a whole hour h!==lastHour let lastHour = (new Date()).getHours();
let lastMinute = (new Date()).getMinutes(); // don't chime when (re)loaded at a whole hour
function check() { function check() {
const now = new Date(), const now = new Date(),
h = now.getHours(), m = now.getMinutes(), h = now.getHours(), m = now.getMinutes(),
@ -47,8 +48,9 @@ function sleep(milliseconds) {
return; return;
} }
if (settings.freq === 1){ if (settings.freq === 1){
if (m===0 || m===30) chime(); if (m !== lastMinute && m===0 || m===30) chime();
lastHour = h; lastHour = h;
lastMinute = m;
// check again in 30 minutes // check again in 30 minutes
switch (true){ switch (true){
case (m/30 >= 1): case (m/30 >= 1):
@ -61,8 +63,9 @@ function sleep(milliseconds) {
setTimeout(check, msLeft); setTimeout(check, msLeft);
}else if (settings.freq === 2){ }else if (settings.freq === 2){
if (m===0 || m===15 || m===30 || m===45) chime(); if (m !== lastMinute && m===0 || m===15 || m===30 || m===45) chime();
lastHour = h; lastHour = h;
lastMinute = m;
// check again in 15 minutes // check again in 15 minutes
switch (true){ switch (true){
case (m/15 >= 3): case (m/15 >= 3):
@ -88,7 +91,7 @@ function sleep(milliseconds) {
setTimeout(check, msLeft); setTimeout(check, msLeft);
}else{ }else{
if (m===0) chime(); if (h!==lastHour && m===0) chime();
lastHour = h; lastHour = h;
// check again in 60 minutes // check again in 60 minutes
var mLeft = 60-m, sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms; var mLeft = 60-m, sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;