From ec7e58a14d38742e2eb8aca202d9c91f1715f8d8 Mon Sep 17 00:00:00 2001
From: Aaron Rolls <aaronrolls@Aarons-MacBook-Pro.local>
Date: Tue, 23 Aug 2022 08:49:10 +1200
Subject: [PATCH 01/44] Added first version of Chimer app

---
 apps/chimer/icon.txt      |   2 ++
 apps/chimer/metadata.json |  15 +++++++++++
 apps/chimer/settings.js   |  54 ++++++++++++++++++++++++++++++++++++++
 apps/chimer/widget.js     |  49 ++++++++++++++++++++++++++++++++++
 apps/chimer/widget.png    | Bin 0 -> 1704 bytes
 5 files changed, 120 insertions(+)
 create mode 100644 apps/chimer/icon.txt
 create mode 100644 apps/chimer/metadata.json
 create mode 100644 apps/chimer/settings.js
 create mode 100644 apps/chimer/widget.js
 create mode 100644 apps/chimer/widget.png

diff --git a/apps/chimer/icon.txt b/apps/chimer/icon.txt
new file mode 100644
index 000000000..c1750ff20
--- /dev/null
+++ b/apps/chimer/icon.txt
@@ -0,0 +1,2 @@
+
+widget.png: https://icons8.com/icon/15715/plus-1-hour
\ No newline at end of file
diff --git a/apps/chimer/metadata.json b/apps/chimer/metadata.json
new file mode 100644
index 000000000..4f021c866
--- /dev/null
+++ b/apps/chimer/metadata.json
@@ -0,0 +1,15 @@
+{
+  "id": "chimer",
+  "name": "Chimer",
+  "version": "0.01",
+  "description": "A fork of Hour Chime. Buzz or beep on every 60, 30 or 15 minutes.",
+  "icon": "widget.png",
+  "type": "widget",
+  "tags": "widget",
+  "supports": ["BANGLEJS","BANGLEJS2"],
+  "storage": [
+    {"name":"widchime.wid.js","url":"widget.js"},
+    {"name":"widchime.settings.js","url":"settings.js"}
+  ],
+  "data": [{"name":"widchime.json"}]
+}
\ No newline at end of file
diff --git a/apps/chimer/settings.js b/apps/chimer/settings.js
new file mode 100644
index 000000000..586b9d7ca
--- /dev/null
+++ b/apps/chimer/settings.js
@@ -0,0 +1,54 @@
+/**
+ * @param {function} back Use back() to return to settings menu
+ */
+
+
+
+(function(back) {
+  // default to buzzing
+  var FILE = "chimer.json"
+  var settings = {}
+  const chimes = ["Off", "Buzz", "Beep", "Both"]
+  const frequency = ["60 min", "30 min", "15 min"]
+
+
+
+  const menu = {
+    "": {"title": "Hour Chime"},
+    "< Back": back,
+    "Chime Type": {
+      value: settings.type,
+      min: 0, max: 2, // both is just silly
+      format: v => chimes[v],
+      onchange: function(v) {
+        settings.type = v
+        writeSettings(settings)
+      },
+    },
+    "Frequency": {
+      value: settings.freq,
+      min: 0, max: 2,
+      format: v => frequency[v],
+      onchange : function(v) {
+        settings.freq = v
+        writeSettings(settings)
+      }
+    }
+  }
+
+
+  var readSettings = () => {
+    var settings = require("Storage").readJSON(FILE, 1) || {
+      type: 1,
+      freq: 0,
+    };
+    return settings;
+  };
+
+  var writeSettings = (settings) => {
+    require("Storage").writeJSON(FILE, settings);
+  };
+  settings = readSettings()
+  E.showMenu(menu)
+})
+
diff --git a/apps/chimer/widget.js b/apps/chimer/widget.js
new file mode 100644
index 000000000..faf913a20
--- /dev/null
+++ b/apps/chimer/widget.js
@@ -0,0 +1,49 @@
+(function() {
+  // 0: off, 1: buzz, 2: beep, 3: both
+  var readSettings = () => {
+    var settings = require("Storage").readJSON(FILE, 1) || {
+      type: 1,
+      freq: 0,
+    };
+    return settings;
+  };
+
+  var settings = readSettings()
+
+  function chime() {
+    if (settings.type == 0) return;
+    if (settings.type&1) Bangle.buzz(100);
+    if (settings.type&2) Bangle.beep();
+  }
+
+  let lastHour = (new Date()).getHours(); // don't chime when (re)loaded at a whole hour
+  function check() {
+    const now = new Date(),
+      h = now.getHours(), m = now.getMinutes(),
+      s = now.getSeconds(), ms = now.getMilliseconds();
+    if (settings.freq == 1){
+    if (h!==lastHour && m===30) chime();
+    lastHour = h;
+    // check again in 30 minutes
+    const mLeft = 30-m, sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;
+    setTimeout(check, msLeft);
+  }else if (settings.freq == 2){
+    if (h!==lastHour && m===15) chime();
+    lastHour = h;
+    // check again in 15 minutes
+    const mLeft = 15-m, sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;
+    setTimeout(check, msLeft);
+  }else{
+    if (h!==lastHour && m===0) chime();
+    lastHour = h;
+    // check again in 60 minutes
+    const mLeft = 60-m, sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;
+    setTimeout(check, msLeft);
+  }
+
+
+  }
+
+  check();
+})
+();
\ No newline at end of file
diff --git a/apps/chimer/widget.png b/apps/chimer/widget.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c3d7eebd3439ff27290c923cb494376f59ca970
GIT binary patch
literal 1704
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

literal 0
HcmV?d00001


From cf18ecc312c5947f3febeff909e4fdc6110bac67 Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Tue, 23 Aug 2022 09:32:17 +1200
Subject: [PATCH 02/44] Tried to fix bug in settings

---
 apps/chimer/settings.js | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/apps/chimer/settings.js b/apps/chimer/settings.js
index 586b9d7ca..339d7ef2b 100644
--- a/apps/chimer/settings.js
+++ b/apps/chimer/settings.js
@@ -6,32 +6,32 @@
 
 (function(back) {
   // default to buzzing
-  var FILE = "chimer.json"
-  var settings = {}
-  const chimes = ["Off", "Buzz", "Beep", "Both"]
-  const frequency = ["60 min", "30 min", "15 min"]
+  var FILE = "chimer.json";
+  var settings = {};
+  const chimes = ["Off", "Buzz", "Beep", "Both"];
+  const frequency = ["60 min", "30 min", "15 min"];
 
 
 
   const menu = {
-    "": {"title": "Hour Chime"},
-    "< Back": back,
+    "": {"title": "Chimer"},
+    "< Back": () => back(),
     "Chime Type": {
       value: settings.type,
-      min: 0, max: 2, // both is just silly
-      format: v => chimes[v],
-      onchange: function(v) {
-        settings.type = v
-        writeSettings(settings)
+      min: 0, max: 2,step: 1, // both is just silly
+      format: (value) => chimes[value],
+      onchange: (value) => {
+        settings.type = value;
+        writeSettings(settings);
       },
     },
     "Frequency": {
       value: settings.freq,
-      min: 0, max: 2,
-      format: v => frequency[v],
-      onchange : function(v) {
-        settings.freq = v
-        writeSettings(settings)
+      min: 0, max: 2, step: 1,
+      format: (value) => frequency[value],
+      onchange : (value) => {
+        settings.freq = value;
+        writeSettings(settings);
       }
     }
   }
@@ -48,7 +48,7 @@
   var writeSettings = (settings) => {
     require("Storage").writeJSON(FILE, settings);
   };
-  settings = readSettings()
-  E.showMenu(menu)
+  settings = readSettings();
+  E.showMenu(menu);
 })
 

From ae581d3aff93e98fe7461212969add9fd083b913 Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Tue, 23 Aug 2022 09:40:36 +1200
Subject: [PATCH 03/44] Tried to fix bugs again

---
 apps/chimer/metadata.json | 6 +++---
 apps/chimer/settings.js   | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/chimer/metadata.json b/apps/chimer/metadata.json
index 4f021c866..4532d3420 100644
--- a/apps/chimer/metadata.json
+++ b/apps/chimer/metadata.json
@@ -8,8 +8,8 @@
   "tags": "widget",
   "supports": ["BANGLEJS","BANGLEJS2"],
   "storage": [
-    {"name":"widchime.wid.js","url":"widget.js"},
-    {"name":"widchime.settings.js","url":"settings.js"}
+    {"name":"chimer.wid.js","url":"widget.js"},
+    {"name":"chimer.settings.js","url":"settings.js"}
   ],
-  "data": [{"name":"widchime.json"}]
+  "data": [{"name":"chimer.json"}]
 }
\ No newline at end of file
diff --git a/apps/chimer/settings.js b/apps/chimer/settings.js
index 339d7ef2b..a1814c06c 100644
--- a/apps/chimer/settings.js
+++ b/apps/chimer/settings.js
@@ -19,8 +19,8 @@
     "Chime Type": {
       value: settings.type,
       min: 0, max: 2,step: 1, // both is just silly
-      format: (value) => chimes[value],
-      onchange: (value) => {
+      format: value => chimes[value],
+      onchange: value => {
         settings.type = value;
         writeSettings(settings);
       },
@@ -28,8 +28,8 @@
     "Frequency": {
       value: settings.freq,
       min: 0, max: 2, step: 1,
-      format: (value) => frequency[value],
-      onchange : (value) => {
+      format: value => frequency[value],
+      onchange : value => {
         settings.freq = value;
         writeSettings(settings);
       }

From 0931f44a58cc8c3a65f3a08c189fba396c4fdd71 Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Tue, 23 Aug 2022 09:57:12 +1200
Subject: [PATCH 04/44] Tried to fix the settings page

---
 apps/chimer/settings.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/chimer/settings.js b/apps/chimer/settings.js
index a1814c06c..a43157795 100644
--- a/apps/chimer/settings.js
+++ b/apps/chimer/settings.js
@@ -18,7 +18,7 @@
     "< Back": () => back(),
     "Chime Type": {
       value: settings.type,
-      min: 0, max: 2,step: 1, // both is just silly
+      min: 0, max: 2, // both is just silly
       format: value => chimes[value],
       onchange: value => {
         settings.type = value;
@@ -27,7 +27,7 @@
     },
     "Frequency": {
       value: settings.freq,
-      min: 0, max: 2, step: 1,
+      min: 0, max: 2,
       format: value => frequency[value],
       onchange : value => {
         settings.freq = value;

From 7bffac0206a33e473a6c494012e28fb781815266 Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Tue, 23 Aug 2022 10:06:02 +1200
Subject: [PATCH 05/44] Changed the frequnecy const

---
 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 a43157795..2b3dcd25a 100644
--- a/apps/chimer/settings.js
+++ b/apps/chimer/settings.js
@@ -9,7 +9,7 @@
   var FILE = "chimer.json";
   var settings = {};
   const chimes = ["Off", "Buzz", "Beep", "Both"];
-  const frequency = ["60 min", "30 min", "15 min"];
+  const frequency = ["60", "30", "15"];
 
 
 

From e6a861b52dc606d8c7ef19f5dec6fa7ea37abe9f Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Tue, 23 Aug 2022 10:09:14 +1200
Subject: [PATCH 06/44] changed value to v

---
 apps/chimer/settings.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/chimer/settings.js b/apps/chimer/settings.js
index 2b3dcd25a..151264bf8 100644
--- a/apps/chimer/settings.js
+++ b/apps/chimer/settings.js
@@ -19,18 +19,18 @@
     "Chime Type": {
       value: settings.type,
       min: 0, max: 2, // both is just silly
-      format: value => chimes[value],
-      onchange: value => {
-        settings.type = value;
+      format: v => chimes[v],
+      onchange: v => {
+        settings.type = v;
         writeSettings(settings);
       },
     },
     "Frequency": {
       value: settings.freq,
       min: 0, max: 2,
-      format: value => frequency[value],
-      onchange : value => {
-        settings.freq = value;
+      format: v => frequency[v],
+      onchange : v => {
+        settings.freq = v;
         writeSettings(settings);
       }
     }

From 8036f6435fa9fa121f26bec43b25063469a064ed Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Tue, 23 Aug 2022 10:11:27 +1200
Subject: [PATCH 07/44] updated version to 0.02

---
 apps/chimer/metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/chimer/metadata.json b/apps/chimer/metadata.json
index 4532d3420..948acedbf 100644
--- a/apps/chimer/metadata.json
+++ b/apps/chimer/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "chimer",
   "name": "Chimer",
-  "version": "0.01",
+  "version": "0.02",
   "description": "A fork of Hour Chime. Buzz or beep on every 60, 30 or 15 minutes.",
   "icon": "widget.png",
   "type": "widget",

From 9ae6b7c8213e6559fc399eb5c2da3327dc3a244f Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Tue, 23 Aug 2022 10:15:45 +1200
Subject: [PATCH 08/44] changed the location of some vars

---
 apps/chimer/settings.js | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/apps/chimer/settings.js b/apps/chimer/settings.js
index 151264bf8..7dc364dc2 100644
--- a/apps/chimer/settings.js
+++ b/apps/chimer/settings.js
@@ -13,6 +13,21 @@
 
 
 
+
+
+  var readSettings = () => {
+    var settings = require("Storage").readJSON(FILE, 1) || {
+      type: 1,
+      freq: 0,
+    };
+    return settings;
+  };
+
+  var writeSettings = (settings) => {
+    require("Storage").writeJSON(FILE, settings);
+  };
+
+  settings = readSettings();
   const menu = {
     "": {"title": "Chimer"},
     "< Back": () => back(),
@@ -36,19 +51,6 @@
     }
   }
 
-
-  var readSettings = () => {
-    var settings = require("Storage").readJSON(FILE, 1) || {
-      type: 1,
-      freq: 0,
-    };
-    return settings;
-  };
-
-  var writeSettings = (settings) => {
-    require("Storage").writeJSON(FILE, settings);
-  };
-  settings = readSettings();
   E.showMenu(menu);
 })
 

From 3eb269eee0183f73e4e6941b6f20552da24ee9a2 Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Tue, 23 Aug 2022 10:18:57 +1200
Subject: [PATCH 09/44] fixed typo

---
 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 7dc364dc2..e29190409 100644
--- a/apps/chimer/settings.js
+++ b/apps/chimer/settings.js
@@ -44,7 +44,7 @@
       value: settings.freq,
       min: 0, max: 2,
       format: v => frequency[v],
-      onchange : v => {
+      onchange: v => {
         settings.freq = v;
         writeSettings(settings);
       }

From ecdf4fbeedf90d12ef6121daa0352068f8417d4d Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Tue, 23 Aug 2022 11:09:32 +1200
Subject: [PATCH 10/44] added function showMainMenu

---
 apps/chimer/settings.js | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/apps/chimer/settings.js b/apps/chimer/settings.js
index e29190409..81c9c69a5 100644
--- a/apps/chimer/settings.js
+++ b/apps/chimer/settings.js
@@ -12,23 +12,8 @@
   const frequency = ["60", "30", "15"];
 
 
-
-
-
-  var readSettings = () => {
-    var settings = require("Storage").readJSON(FILE, 1) || {
-      type: 1,
-      freq: 0,
-    };
-    return settings;
-  };
-
-  var writeSettings = (settings) => {
-    require("Storage").writeJSON(FILE, settings);
-  };
-
-  settings = readSettings();
-  const menu = {
+var showMainMenu = () => {
+  E.showMenu({
     "": {"title": "Chimer"},
     "< Back": () => back(),
     "Chime Type": {
@@ -49,8 +34,23 @@
         writeSettings(settings);
       }
     }
-  }
+  })
+}
 
-  E.showMenu(menu);
+
+  var readSettings = () => {
+    var settings = require("Storage").readJSON(FILE, 1) || {
+      type: 1,
+      freq: 0,
+    };
+    return settings;
+  };
+
+  var writeSettings = (settings) => {
+    require("Storage").writeJSON(FILE, settings);
+  };
+
+  settings = readSettings();
+  showMainMenu();
 })
 

From f75ee4df72f0426d991991f0a469b47033ebd911 Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Tue, 23 Aug 2022 11:20:53 +1200
Subject: [PATCH 11/44] fixed 30 and 15 minute chimes

---
 apps/chimer/widget.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/apps/chimer/widget.js b/apps/chimer/widget.js
index faf913a20..a8e535fcb 100644
--- a/apps/chimer/widget.js
+++ b/apps/chimer/widget.js
@@ -22,26 +22,30 @@
       h = now.getHours(), m = now.getMinutes(),
       s = now.getSeconds(), ms = now.getMilliseconds();
     if (settings.freq == 1){
-    if (h!==lastHour && m===30) chime();
+    if (h!==lastHour && m===0 || m===30) chime();
     lastHour = h;
     // check again in 30 minutes
-    const mLeft = 30-m, sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;
+    const mLeft = 30, sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;
     setTimeout(check, msLeft);
+
   }else if (settings.freq == 2){
-    if (h!==lastHour && m===15) chime();
+    if (h!==lastHour && m===0 || m===15 || m===30 || m===45) chime();
     lastHour = h;
     // check again in 15 minutes
-    const mLeft = 15-m, sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;
+    const mLeft = 15, sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;
     setTimeout(check, msLeft);
+
   }else{
     if (h!==lastHour && m===0) chime();
     lastHour = h;
     // check again in 60 minutes
     const mLeft = 60-m, sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;
     setTimeout(check, msLeft);
+
   }
 
 
+
   }
 
   check();

From 6dc96580fc608ad2f8234eb82aae116c49aa21fb Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Tue, 23 Aug 2022 12:32:07 +1200
Subject: [PATCH 12/44] removed the last hour feature and tried to fix app

---
 apps/chimer/widget.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/chimer/widget.js b/apps/chimer/widget.js
index a8e535fcb..a7375103d 100644
--- a/apps/chimer/widget.js
+++ b/apps/chimer/widget.js
@@ -16,27 +16,27 @@
     if (settings.type&2) Bangle.beep();
   }
 
-  let lastHour = (new Date()).getHours(); // don't chime when (re)loaded at a whole hour
+  //let lastHour = (new Date()).getHours(); // don't chime when (re)loaded at a whole hour h!==lastHour
   function check() {
     const now = new Date(),
       h = now.getHours(), m = now.getMinutes(),
       s = now.getSeconds(), ms = now.getMilliseconds();
     if (settings.freq == 1){
-    if (h!==lastHour && m===0 || m===30) chime();
+    if (m===0 || m===30) chime();
     lastHour = h;
     // check again in 30 minutes
     const mLeft = 30, sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;
     setTimeout(check, msLeft);
 
   }else if (settings.freq == 2){
-    if (h!==lastHour && m===0 || m===15 || m===30 || m===45) chime();
+    if (m===0 || m===15 || m===30 || m===45) chime();
     lastHour = h;
     // check again in 15 minutes
     const mLeft = 15, sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;
     setTimeout(check, msLeft);
 
   }else{
-    if (h!==lastHour && m===0) chime();
+    if (m===0) chime();
     lastHour = h;
     // check again in 60 minutes
     const mLeft = 60-m, sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;

From 36d58a715c1b159f6c07109fcb2bc7d95cb4ec61 Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Tue, 23 Aug 2022 00:57:22 +0000
Subject: [PATCH 13/44] Add ability for more than one vibration

---
 apps/chimer/settings.js |  9 +++++++++
 apps/chimer/widget.js   | 12 +++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/apps/chimer/settings.js b/apps/chimer/settings.js
index 81c9c69a5..541a1dcc8 100644
--- a/apps/chimer/settings.js
+++ b/apps/chimer/settings.js
@@ -33,6 +33,15 @@ var showMainMenu = () => {
         settings.freq = v;
         writeSettings(settings);
       }
+    },
+    "Repetition": {
+      value: settings.repeat,
+      min: 1, max: 3,
+      format: v => frequency[v],
+      onchange: v => {
+        settings.repeat = v;
+        writeSettings(settings);
+      }
     }
   })
 }
diff --git a/apps/chimer/widget.js b/apps/chimer/widget.js
index a7375103d..ea05071ac 100644
--- a/apps/chimer/widget.js
+++ b/apps/chimer/widget.js
@@ -11,9 +11,15 @@
   var settings = readSettings()
 
   function chime() {
-    if (settings.type == 0) return;
-    if (settings.type&1) Bangle.buzz(100);
-    if (settings.type&2) Bangle.beep();
+    for(let i = 0; i < settings.repeat; i++){
+    if (settings.type == 1){
+      Bangle.buzz(100);
+    } else if(settings.type == 2){
+      Bangle.beep();
+    } else {
+      return;
+    }
+  }
   }
 
   //let lastHour = (new Date()).getHours(); // don't chime when (re)loaded at a whole hour h!==lastHour

From c2b93e33254b0c0680de81cbf2d19389e21a0ad3 Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Tue, 23 Aug 2022 00:58:13 +0000
Subject: [PATCH 14/44] Fixed a bug

---
 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 541a1dcc8..e8d8615f1 100644
--- a/apps/chimer/settings.js
+++ b/apps/chimer/settings.js
@@ -28,7 +28,7 @@ var showMainMenu = () => {
     "Frequency": {
       value: settings.freq,
       min: 0, max: 2,
-      format: v => frequency[v],
+      format: v => v,
       onchange: v => {
         settings.freq = v;
         writeSettings(settings);

From e81b6a2dacbc7db4ab8a69731c2778c4f6de5ec0 Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Tue, 23 Aug 2022 00:59:15 +0000
Subject: [PATCH 15/44] Fixed another bug

---
 apps/chimer/metadata.json | 2 +-
 apps/chimer/settings.js   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/chimer/metadata.json b/apps/chimer/metadata.json
index 948acedbf..4532d3420 100644
--- a/apps/chimer/metadata.json
+++ b/apps/chimer/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "chimer",
   "name": "Chimer",
-  "version": "0.02",
+  "version": "0.01",
   "description": "A fork of Hour Chime. Buzz or beep on every 60, 30 or 15 minutes.",
   "icon": "widget.png",
   "type": "widget",
diff --git a/apps/chimer/settings.js b/apps/chimer/settings.js
index e8d8615f1..293c9da17 100644
--- a/apps/chimer/settings.js
+++ b/apps/chimer/settings.js
@@ -28,7 +28,7 @@ var showMainMenu = () => {
     "Frequency": {
       value: settings.freq,
       min: 0, max: 2,
-      format: v => v,
+      format: v => frequency[v],
       onchange: v => {
         settings.freq = v;
         writeSettings(settings);
@@ -37,7 +37,7 @@ var showMainMenu = () => {
     "Repetition": {
       value: settings.repeat,
       min: 1, max: 3,
-      format: v => frequency[v],
+      format: v => v,
       onchange: v => {
         settings.repeat = v;
         writeSettings(settings);

From 0f04ba8f675328cf975e66d828823519c7683902 Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Tue, 23 Aug 2022 01:04:51 +0000
Subject: [PATCH 16/44] Fixed another bug

---
 apps/chimer/settings.js | 1 +
 apps/chimer/widget.js   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/apps/chimer/settings.js b/apps/chimer/settings.js
index 293c9da17..b8fbf7880 100644
--- a/apps/chimer/settings.js
+++ b/apps/chimer/settings.js
@@ -51,6 +51,7 @@ var showMainMenu = () => {
     var settings = require("Storage").readJSON(FILE, 1) || {
       type: 1,
       freq: 0,
+      repeat: 1,
     };
     return settings;
   };
diff --git a/apps/chimer/widget.js b/apps/chimer/widget.js
index ea05071ac..d98d466cf 100644
--- a/apps/chimer/widget.js
+++ b/apps/chimer/widget.js
@@ -4,6 +4,7 @@
     var settings = require("Storage").readJSON(FILE, 1) || {
       type: 1,
       freq: 0,
+      repeat: 1,
     };
     return settings;
   };

From beeb053db770f5f7526a8d2af688ec95120ef2aa Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Tue, 23 Aug 2022 01:33:44 +0000
Subject: [PATCH 17/44] Tried to fix timing of buzz

---
 apps/chimer/metadata.json |  2 +-
 apps/chimer/widget.js     | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/apps/chimer/metadata.json b/apps/chimer/metadata.json
index 4532d3420..c8574d5cf 100644
--- a/apps/chimer/metadata.json
+++ b/apps/chimer/metadata.json
@@ -2,7 +2,7 @@
   "id": "chimer",
   "name": "Chimer",
   "version": "0.01",
-  "description": "A fork of Hour Chime. Buzz or beep on every 60, 30 or 15 minutes.",
+  "description": "A fork of Hour Chime. Buzz or beep on every 60, 30 or 15 minutes. 2",
   "icon": "widget.png",
   "type": "widget",
   "tags": "widget",
diff --git a/apps/chimer/widget.js b/apps/chimer/widget.js
index d98d466cf..1e3a7fed9 100644
--- a/apps/chimer/widget.js
+++ b/apps/chimer/widget.js
@@ -11,12 +11,22 @@
 
   var settings = readSettings()
 
+function sleep(milliseconds) {
+    const date = Date.now();
+    let currentDate = null;
+    do {
+      currentDate = Date.now();
+    } while (currentDate - date < milliseconds);
+  }
+
   function chime() {
     for(let i = 0; i < settings.repeat; i++){
     if (settings.type == 1){
       Bangle.buzz(100);
+      sleep(100);
     } else if(settings.type == 2){
       Bangle.beep();
+      sleep(100);
     } else {
       return;
     }

From b4d586ad6f6e7a3296198ed9386757496f62139a Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Tue, 23 Aug 2022 02:03:40 +0000
Subject: [PATCH 18/44] trying to fix lack of buzz

---
 apps/chimer/settings.js | 4 ++--
 apps/chimer/widget.js   | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/apps/chimer/settings.js b/apps/chimer/settings.js
index b8fbf7880..8e2fccb61 100644
--- a/apps/chimer/settings.js
+++ b/apps/chimer/settings.js
@@ -43,8 +43,8 @@ var showMainMenu = () => {
         writeSettings(settings);
       }
     }
-  })
-}
+  });
+};
 
 
   var readSettings = () => {
diff --git a/apps/chimer/widget.js b/apps/chimer/widget.js
index 1e3a7fed9..2df7512f2 100644
--- a/apps/chimer/widget.js
+++ b/apps/chimer/widget.js
@@ -9,7 +9,7 @@
     return settings;
   };
 
-  var settings = readSettings()
+  var settings = {};
 
 function sleep(milliseconds) {
     const date = Date.now();
@@ -23,18 +23,17 @@ function sleep(milliseconds) {
     for(let i = 0; i < settings.repeat; i++){
     if (settings.type == 1){
       Bangle.buzz(100);
-      sleep(100);
     } else if(settings.type == 2){
       Bangle.beep();
-      sleep(100);
     } else {
       return;
     }
   }
-  }
+  };
 
   //let lastHour = (new Date()).getHours(); // don't chime when (re)loaded at a whole hour h!==lastHour
   function check() {
+    settings = readSettings();
     const now = new Date(),
       h = now.getHours(), m = now.getMinutes(),
       s = now.getSeconds(), ms = now.getMilliseconds();
@@ -63,7 +62,7 @@ function sleep(milliseconds) {
 
 
 
-  }
+  };
 
   check();
 })

From 3584071381157c69373ff01bf84e69cd8a6dcd06 Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Tue, 23 Aug 2022 02:11:24 +0000
Subject: [PATCH 19/44] Changed desc version to 3

---
 apps/chimer/metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/chimer/metadata.json b/apps/chimer/metadata.json
index c8574d5cf..d29c1463b 100644
--- a/apps/chimer/metadata.json
+++ b/apps/chimer/metadata.json
@@ -2,7 +2,7 @@
   "id": "chimer",
   "name": "Chimer",
   "version": "0.01",
-  "description": "A fork of Hour Chime. Buzz or beep on every 60, 30 or 15 minutes. 2",
+  "description": "A fork of Hour Chime. Buzz or beep on every 60, 30 or 15 minutes. 3",
   "icon": "widget.png",
   "type": "widget",
   "tags": "widget",

From 0aafb0202b7f3a40cbab1cc109877b1bd2cfaf25 Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Tue, 23 Aug 2022 03:12:00 +0000
Subject: [PATCH 20/44] Fixes

---
 apps/chimer/metadata.json |  2 +-
 apps/chimer/widget.js     | 32 ++++++++++++++++++++++++++------
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/apps/chimer/metadata.json b/apps/chimer/metadata.json
index d29c1463b..ffb0b2a52 100644
--- a/apps/chimer/metadata.json
+++ b/apps/chimer/metadata.json
@@ -2,7 +2,7 @@
   "id": "chimer",
   "name": "Chimer",
   "version": "0.01",
-  "description": "A fork of Hour Chime. Buzz or beep on every 60, 30 or 15 minutes. 3",
+  "description": "A fork of Hour Chime. Buzz or beep on every 60, 30 or 15 minutes. 4",
   "icon": "widget.png",
   "type": "widget",
   "tags": "widget",
diff --git a/apps/chimer/widget.js b/apps/chimer/widget.js
index 2df7512f2..d7a98ecdb 100644
--- a/apps/chimer/widget.js
+++ b/apps/chimer/widget.js
@@ -38,24 +38,44 @@ function sleep(milliseconds) {
       h = now.getHours(), m = now.getMinutes(),
       s = now.getSeconds(), ms = now.getMilliseconds();
     if (settings.freq == 1){
-    if (m===0 || m===30) chime();
+    if (m==0 || m==30) chime();
     lastHour = h;
     // check again in 30 minutes
-    const mLeft = 30, sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;
+    switch (true){
+      case (m/30 >= 1):
+        var mLeft = 30-(m-30), sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;
+        break;
+      case (m/30 < 1):
+        var mLeft = 30-m, sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;
+        break;
+    }
     setTimeout(check, msLeft);
 
   }else if (settings.freq == 2){
-    if (m===0 || m===15 || m===30 || m===45) chime();
+    if (m==0 || m==15 || m==30 || m==45) chime();
     lastHour = h;
     // check again in 15 minutes
-    const mLeft = 15, sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;
+    switch (true){
+      case (m/15 >= 3):
+        var mLeft = 15-(m-45), sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;
+        break;
+      case (m/15 >= 2):
+        var mLeft = 15-(m-30), sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;
+        break;
+      case (m/15 >= 1):
+        var mLeft = 15-(m-15), sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;
+        break;
+      case (m/15 < 1):
+        var mLeft = 15-m, sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;
+        break;
+    }
     setTimeout(check, msLeft);
 
   }else{
-    if (m===0) chime();
+    if (m==0) chime();
     lastHour = h;
     // check again in 60 minutes
-    const mLeft = 60-m, sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;
+    var mLeft = 60-m, sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;
     setTimeout(check, msLeft);
 
   }

From a8bcd16f6db48e9e670904ea0198d59ab5ef76e3 Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Tue, 23 Aug 2022 04:12:34 +0000
Subject: [PATCH 21/44] added 1 min frequency

---
 apps/chimer/settings.js |  4 ++--
 apps/chimer/widget.js   | 26 ++++++++++++++++----------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/apps/chimer/settings.js b/apps/chimer/settings.js
index 8e2fccb61..5631b4332 100644
--- a/apps/chimer/settings.js
+++ b/apps/chimer/settings.js
@@ -9,7 +9,7 @@
   var FILE = "chimer.json";
   var settings = {};
   const chimes = ["Off", "Buzz", "Beep", "Both"];
-  const frequency = ["60", "30", "15"];
+  const frequency = ["60", "30", "15", "1"];
 
 
 var showMainMenu = () => {
@@ -27,7 +27,7 @@ var showMainMenu = () => {
     },
     "Frequency": {
       value: settings.freq,
-      min: 0, max: 2,
+      min: 0, max: 3,
       format: v => frequency[v],
       onchange: v => {
         settings.freq = v;
diff --git a/apps/chimer/widget.js b/apps/chimer/widget.js
index d7a98ecdb..046b0f4e8 100644
--- a/apps/chimer/widget.js
+++ b/apps/chimer/widget.js
@@ -3,13 +3,13 @@
   var readSettings = () => {
     var settings = require("Storage").readJSON(FILE, 1) || {
       type: 1,
-      freq: 0,
+      freq: 2,
       repeat: 1,
     };
     return settings;
   };
 
-  var settings = {};
+  var settings = readSettings();
 
 function sleep(milliseconds) {
     const date = Date.now();
@@ -21,9 +21,9 @@ function sleep(milliseconds) {
 
   function chime() {
     for(let i = 0; i < settings.repeat; i++){
-    if (settings.type == 1){
+    if (settings.type === 1){
       Bangle.buzz(100);
-    } else if(settings.type == 2){
+    } else if(settings.type === 2){
       Bangle.beep();
     } else {
       return;
@@ -33,12 +33,11 @@ function sleep(milliseconds) {
 
   //let lastHour = (new Date()).getHours(); // don't chime when (re)loaded at a whole hour h!==lastHour
   function check() {
-    settings = readSettings();
     const now = new Date(),
       h = now.getHours(), m = now.getMinutes(),
       s = now.getSeconds(), ms = now.getMilliseconds();
-    if (settings.freq == 1){
-    if (m==0 || m==30) chime();
+    if (settings.freq === 1){
+    if (m===0 || m===30) chime();
     lastHour = h;
     // check again in 30 minutes
     switch (true){
@@ -51,8 +50,8 @@ function sleep(milliseconds) {
     }
     setTimeout(check, msLeft);
 
-  }else if (settings.freq == 2){
-    if (m==0 || m==15 || m==30 || m==45) chime();
+  }else if (settings.freq === 2){
+    if (m===0 || m===15 || m===30 || m===45) chime();
     lastHour = h;
     // check again in 15 minutes
     switch (true){
@@ -70,9 +69,16 @@ function sleep(milliseconds) {
         break;
     }
     setTimeout(check, msLeft);
+    }else if (settings.freq === 3){
+    chime();
+    lastHour = h;
+    // check again in 1 minute
+
+    var mLeft = 1, sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;
+    setTimeout(check, msLeft);
 
   }else{
-    if (m==0) chime();
+    if (m===0) chime();
     lastHour = h;
     // check again in 60 minutes
     var mLeft = 60-m, sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;

From 719142e4e53576d2aaf6230e60568caeadd9afbe Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Tue, 23 Aug 2022 04:12:48 +0000
Subject: [PATCH 22/44] added min

---
 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 5631b4332..76685ac6b 100644
--- a/apps/chimer/settings.js
+++ b/apps/chimer/settings.js
@@ -9,7 +9,7 @@
   var FILE = "chimer.json";
   var settings = {};
   const chimes = ["Off", "Buzz", "Beep", "Both"];
-  const frequency = ["60", "30", "15", "1"];
+  const frequency = ["60 min", "30 min", "15 min", "1 min"];
 
 
 var showMainMenu = () => {

From 4b5384911fdf4f08fa84b0b8055aa006d9caf8fc Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Tue, 23 Aug 2022 04:13:37 +0000
Subject: [PATCH 23/44] changed version to 5

---
 apps/chimer/metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/chimer/metadata.json b/apps/chimer/metadata.json
index ffb0b2a52..9ea161fad 100644
--- a/apps/chimer/metadata.json
+++ b/apps/chimer/metadata.json
@@ -2,7 +2,7 @@
   "id": "chimer",
   "name": "Chimer",
   "version": "0.01",
-  "description": "A fork of Hour Chime. Buzz or beep on every 60, 30 or 15 minutes. 4",
+  "description": "A fork of Hour Chime. Buzz or beep on every 60, 30 or 15 minutes. 5",
   "icon": "widget.png",
   "type": "widget",
   "tags": "widget",

From 71bf57cee5354a20dc6bd1024be4fc93018cb49d Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Tue, 23 Aug 2022 04:18:32 +0000
Subject: [PATCH 24/44] bug fix

---
 apps/chimer/metadata.json | 2 +-
 apps/chimer/widget.js     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/chimer/metadata.json b/apps/chimer/metadata.json
index 9ea161fad..b279148a8 100644
--- a/apps/chimer/metadata.json
+++ b/apps/chimer/metadata.json
@@ -2,7 +2,7 @@
   "id": "chimer",
   "name": "Chimer",
   "version": "0.01",
-  "description": "A fork of Hour Chime. Buzz or beep on every 60, 30 or 15 minutes. 5",
+  "description": "A fork of Hour Chime. Buzz or beep on every 60, 30 or 15 minutes. 6",
   "icon": "widget.png",
   "type": "widget",
   "tags": "widget",
diff --git a/apps/chimer/widget.js b/apps/chimer/widget.js
index 046b0f4e8..225632f31 100644
--- a/apps/chimer/widget.js
+++ b/apps/chimer/widget.js
@@ -20,7 +20,8 @@ function sleep(milliseconds) {
   }
 
   function chime() {
-    for(let i = 0; i < settings.repeat; i++){
+    Bangle.buzz(100);
+    for(var i = 0; i < settings.repeat; i++){
     if (settings.type === 1){
       Bangle.buzz(100);
     } else if(settings.type === 2){

From 8193b665b53077268abda4721a074182e21b4e45 Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Tue, 23 Aug 2022 05:26:42 +0000
Subject: [PATCH 25/44] Changed Buzz

---
 apps/chimer/widget.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/apps/chimer/widget.js b/apps/chimer/widget.js
index 225632f31..40138d166 100644
--- a/apps/chimer/widget.js
+++ b/apps/chimer/widget.js
@@ -21,15 +21,15 @@ function sleep(milliseconds) {
 
   function chime() {
     Bangle.buzz(100);
-    for(var i = 0; i < settings.repeat; i++){
-    if (settings.type === 1){
-      Bangle.buzz(100);
-    } else if(settings.type === 2){
-      Bangle.beep();
-    } else {
-      return;
-    }
-  }
+//    for(var i = 0; i < settings.repeat; i++){
+//    if (settings.type === 1){
+//      Bangle.buzz(100);
+//    } else if(settings.type === 2){
+//      Bangle.beep();
+//    } else {
+//      return;
+//    }
+//  }
   };
 
   //let lastHour = (new Date()).getHours(); // don't chime when (re)loaded at a whole hour h!==lastHour

From 9270cc9fcdfde1a1346806d936041f1582fc6db5 Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Tue, 23 Aug 2022 05:27:07 +0000
Subject: [PATCH 26/44] Changed to version 7

---
 apps/chimer/metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/chimer/metadata.json b/apps/chimer/metadata.json
index b279148a8..2c79c9173 100644
--- a/apps/chimer/metadata.json
+++ b/apps/chimer/metadata.json
@@ -2,7 +2,7 @@
   "id": "chimer",
   "name": "Chimer",
   "version": "0.01",
-  "description": "A fork of Hour Chime. Buzz or beep on every 60, 30 or 15 minutes. 6",
+  "description": "A fork of Hour Chime. Buzz or beep on every 60, 30 or 15 minutes. 7",
   "icon": "widget.png",
   "type": "widget",
   "tags": "widget",

From 1e9f862b84e9f7a0fd4033dd1bcfbed211cfad07 Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Tue, 23 Aug 2022 05:29:04 +0000
Subject: [PATCH 27/44] Added FILE var

---
 apps/chimer/widget.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/chimer/widget.js b/apps/chimer/widget.js
index 40138d166..0029c7b64 100644
--- a/apps/chimer/widget.js
+++ b/apps/chimer/widget.js
@@ -1,5 +1,7 @@
 (function() {
   // 0: off, 1: buzz, 2: beep, 3: both
+  var FILE = "chimer.json";
+
   var readSettings = () => {
     var settings = require("Storage").readJSON(FILE, 1) || {
       type: 1,

From d423bd8886d3a2ef6a548874a61a928fbe7e174b Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Tue, 23 Aug 2022 05:29:53 +0000
Subject: [PATCH 28/44] Changed version to 8

---
 apps/chimer/metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/chimer/metadata.json b/apps/chimer/metadata.json
index 2c79c9173..0c218df4b 100644
--- a/apps/chimer/metadata.json
+++ b/apps/chimer/metadata.json
@@ -2,7 +2,7 @@
   "id": "chimer",
   "name": "Chimer",
   "version": "0.01",
-  "description": "A fork of Hour Chime. Buzz or beep on every 60, 30 or 15 minutes. 7",
+  "description": "A fork of Hour Chime. Buzz or beep on every 60, 30 or 15 minutes. 8",
   "icon": "widget.png",
   "type": "widget",
   "tags": "widget",

From a14ce9434ad635c589a723f4b9f4ceda870bc697 Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Tue, 23 Aug 2022 05:36:07 +0000
Subject: [PATCH 29/44] Add features back

---
 apps/chimer/metadata.json |  2 +-
 apps/chimer/widget.js     | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/apps/chimer/metadata.json b/apps/chimer/metadata.json
index 0c218df4b..6fdb64b73 100644
--- a/apps/chimer/metadata.json
+++ b/apps/chimer/metadata.json
@@ -2,7 +2,7 @@
   "id": "chimer",
   "name": "Chimer",
   "version": "0.01",
-  "description": "A fork of Hour Chime. Buzz or beep on every 60, 30 or 15 minutes. 8",
+  "description": "A fork of Hour Chime. Buzz or beep on every 60, 30 or 15 minutes. 9",
   "icon": "widget.png",
   "type": "widget",
   "tags": "widget",
diff --git a/apps/chimer/widget.js b/apps/chimer/widget.js
index 0029c7b64..5d9917f56 100644
--- a/apps/chimer/widget.js
+++ b/apps/chimer/widget.js
@@ -22,16 +22,15 @@ function sleep(milliseconds) {
   }
 
   function chime() {
-    Bangle.buzz(100);
-//    for(var i = 0; i < settings.repeat; i++){
-//    if (settings.type === 1){
-//      Bangle.buzz(100);
-//    } else if(settings.type === 2){
-//      Bangle.beep();
-//    } else {
-//      return;
-//    }
-//  }
+    for(var i = 0; i < settings.repeat; i++){
+    if (settings.type === 1){
+      Bangle.buzz(100);
+    } else if(settings.type === 2){
+      Bangle.beep();
+    } else {
+      return;
+    }
+  }
   };
 
   //let lastHour = (new Date()).getHours(); // don't chime when (re)loaded at a whole hour h!==lastHour

From 10b470193ba8877883f4dc18d55c74065ebe3db5 Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Tue, 23 Aug 2022 05:40:42 +0000
Subject: [PATCH 30/44] Added sleep timer

---
 apps/chimer/widget.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/chimer/widget.js b/apps/chimer/widget.js
index 5d9917f56..3e9c7aa04 100644
--- a/apps/chimer/widget.js
+++ b/apps/chimer/widget.js
@@ -30,6 +30,7 @@ function sleep(milliseconds) {
     } else {
       return;
     }
+    sleep(100);
   }
   };
 

From 4632b990a7f70dd7ae59adfb00a69e0b875fb8c8 Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Tue, 23 Aug 2022 05:48:45 +0000
Subject: [PATCH 31/44] Added a feature to enable diabling chime at certain
 times

---
 apps/chimer/metadata.json |  2 +-
 apps/chimer/settings.js   | 20 ++++++++++++++++++++
 apps/chimer/widget.js     |  7 +++++++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/apps/chimer/metadata.json b/apps/chimer/metadata.json
index 6fdb64b73..d4a3e0169 100644
--- a/apps/chimer/metadata.json
+++ b/apps/chimer/metadata.json
@@ -2,7 +2,7 @@
   "id": "chimer",
   "name": "Chimer",
   "version": "0.01",
-  "description": "A fork of Hour Chime. Buzz or beep on every 60, 30 or 15 minutes. 9",
+  "description": "A fork of Hour Chime. Buzz or beep on every 60, 30 or 15 minutes. 11",
   "icon": "widget.png",
   "type": "widget",
   "tags": "widget",
diff --git a/apps/chimer/settings.js b/apps/chimer/settings.js
index 76685ac6b..ea0be10af 100644
--- a/apps/chimer/settings.js
+++ b/apps/chimer/settings.js
@@ -42,6 +42,24 @@ var showMainMenu = () => {
         settings.repeat = v;
         writeSettings(settings);
       }
+    },
+    "Start Hour": {
+      value: settings.repeat,
+      min: 1, max: 24,
+      format: v => v,
+      onchange: v => {
+        settings.start = v;
+        writeSettings(settings);
+      }
+    },
+    "End Hour": {
+      value: settings.repeat,
+      min: 1, max: 24,
+      format: v => v,
+      onchange: v => {
+        settings.end = v;
+        writeSettings(settings);
+      }
     }
   });
 };
@@ -52,6 +70,8 @@ var showMainMenu = () => {
       type: 1,
       freq: 0,
       repeat: 1,
+      start: 6,
+      end: 22,
     };
     return settings;
   };
diff --git a/apps/chimer/widget.js b/apps/chimer/widget.js
index 3e9c7aa04..9cd03a483 100644
--- a/apps/chimer/widget.js
+++ b/apps/chimer/widget.js
@@ -7,6 +7,8 @@
       type: 1,
       freq: 2,
       repeat: 1,
+      start: 6,
+      end: 22,
     };
     return settings;
   };
@@ -39,6 +41,11 @@ function sleep(milliseconds) {
     const now = new Date(),
       h = now.getHours(), m = now.getMinutes(),
       s = now.getSeconds(), ms = now.getMilliseconds();
+      if (h > settings.end || h < settings.start){
+        var mLeft = 60-m, sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;
+        setTimeout(check, msLeft);
+        return;
+      }
     if (settings.freq === 1){
     if (m===0 || m===30) chime();
     lastHour = h;

From 0ae3a550adbaaf26131cde6de8aad3e74fbd4144 Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Tue, 23 Aug 2022 05:55:38 +0000
Subject: [PATCH 32/44] Fixed start and end not loading properly

---
 apps/chimer/metadata.json | 2 +-
 apps/chimer/settings.js   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/chimer/metadata.json b/apps/chimer/metadata.json
index d4a3e0169..19218c2a1 100644
--- a/apps/chimer/metadata.json
+++ b/apps/chimer/metadata.json
@@ -2,7 +2,7 @@
   "id": "chimer",
   "name": "Chimer",
   "version": "0.01",
-  "description": "A fork of Hour Chime. Buzz or beep on every 60, 30 or 15 minutes. 11",
+  "description": "A fork of Hour Chime. Buzz or beep on every 60, 30 or 15 minutes. 12",
   "icon": "widget.png",
   "type": "widget",
   "tags": "widget",
diff --git a/apps/chimer/settings.js b/apps/chimer/settings.js
index ea0be10af..e1901e127 100644
--- a/apps/chimer/settings.js
+++ b/apps/chimer/settings.js
@@ -44,7 +44,7 @@ var showMainMenu = () => {
       }
     },
     "Start Hour": {
-      value: settings.repeat,
+      value: settings.start,
       min: 1, max: 24,
       format: v => v,
       onchange: v => {
@@ -53,7 +53,7 @@ var showMainMenu = () => {
       }
     },
     "End Hour": {
-      value: settings.repeat,
+      value: settings.end,
       min: 1, max: 24,
       format: v => v,
       onchange: v => {

From b8895a028b860b572dac1b0a1d44654748f0d8d5 Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Tue, 23 Aug 2022 21:06:52 +0000
Subject: [PATCH 33/44] Fixed bug where watch would chime on reload if minute
 matched one of its parameters

---
 apps/chimer/metadata.json |  2 +-
 apps/chimer/widget.js     | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/apps/chimer/metadata.json b/apps/chimer/metadata.json
index 19218c2a1..03622efaa 100644
--- a/apps/chimer/metadata.json
+++ b/apps/chimer/metadata.json
@@ -2,7 +2,7 @@
   "id": "chimer",
   "name": "Chimer",
   "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",
   "type": "widget",
   "tags": "widget",
diff --git a/apps/chimer/widget.js b/apps/chimer/widget.js
index 9cd03a483..eb2875cfe 100644
--- a/apps/chimer/widget.js
+++ b/apps/chimer/widget.js
@@ -5,7 +5,7 @@
   var readSettings = () => {
     var settings = require("Storage").readJSON(FILE, 1) || {
       type: 1,
-      freq: 2,
+      freq: 0,
       repeat: 1,
       start: 6,
       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() {
     const now = new Date(),
       h = now.getHours(), m = now.getMinutes(),
@@ -47,8 +48,9 @@ function sleep(milliseconds) {
         return;
       }
     if (settings.freq === 1){
-    if (m===0 || m===30) chime();
+    if (m !== lastMinute && m===0 || m===30) chime();
     lastHour = h;
+    lastMinute = m;
     // check again in 30 minutes
     switch (true){
       case (m/30 >= 1):
@@ -61,8 +63,9 @@ function sleep(milliseconds) {
     setTimeout(check, msLeft);
 
   }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;
+    lastMinute = m;
     // check again in 15 minutes
     switch (true){
       case (m/15 >= 3):
@@ -88,7 +91,7 @@ function sleep(milliseconds) {
     setTimeout(check, msLeft);
 
   }else{
-    if (m===0) chime();
+    if (h!==lastHour && m===0) chime();
     lastHour = h;
     // check again in 60 minutes
     var mLeft = 60-m, sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;

From e9eef512a680b2e61a2643cb696062fedb0369bc Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Tue, 23 Aug 2022 21:54:26 +0000
Subject: [PATCH 34/44] Bug Fixes

---
 apps/chimer/widget.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/chimer/widget.js b/apps/chimer/widget.js
index eb2875cfe..fd11653af 100644
--- a/apps/chimer/widget.js
+++ b/apps/chimer/widget.js
@@ -83,8 +83,9 @@ function sleep(milliseconds) {
     }
     setTimeout(check, msLeft);
     }else if (settings.freq === 3){
-    chime();
+    if (m !== lastMinute) chime();
     lastHour = h;
+    lastMinute = m;
     // check again in 1 minute
 
     var mLeft = 1, sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;

From 0751accf08cf3c290baef3b8ef921ece34eb5595 Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Tue, 23 Aug 2022 21:54:51 +0000
Subject: [PATCH 35/44] Changed version to 14

---
 apps/chimer/metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/chimer/metadata.json b/apps/chimer/metadata.json
index 03622efaa..08918084d 100644
--- a/apps/chimer/metadata.json
+++ b/apps/chimer/metadata.json
@@ -2,7 +2,7 @@
   "id": "chimer",
   "name": "Chimer",
   "version": "0.01",
-  "description": "A fork of Hour Chime. Buzz or beep on every 60, 30 or 15 minutes. 13",
+  "description": "A fork of Hour Chime. Buzz or beep on every 60, 30 or 15 minutes. 14",
   "icon": "widget.png",
   "type": "widget",
   "tags": "widget",

From 04819fcfe1e0c3b96d54805bbf558bdbf79c82ca Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Wed, 24 Aug 2022 04:42:16 +0000
Subject: [PATCH 36/44] Removed 1 minute frequency option

---
 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 e1901e127..99c10b518 100644
--- a/apps/chimer/settings.js
+++ b/apps/chimer/settings.js
@@ -27,7 +27,7 @@ var showMainMenu = () => {
     },
     "Frequency": {
       value: settings.freq,
-      min: 0, max: 3,
+      min: 0, max: 2,
       format: v => frequency[v],
       onchange: v => {
         settings.freq = v;

From 86b5c1093717c7373eb0d0df15a012a8342e14d4 Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Wed, 24 Aug 2022 09:15:18 +0000
Subject: [PATCH 37/44] Updated formatting

---
 apps/chimer/metadata.json |  10 +--
 apps/chimer/settings.js   | 114 +++++++++++++-------------
 apps/chimer/widget.js     | 168 +++++++++++++++++++++-----------------
 3 files changed, 153 insertions(+), 139 deletions(-)

diff --git a/apps/chimer/metadata.json b/apps/chimer/metadata.json
index 08918084d..3e89a7885 100644
--- a/apps/chimer/metadata.json
+++ b/apps/chimer/metadata.json
@@ -6,10 +6,10 @@
   "icon": "widget.png",
   "type": "widget",
   "tags": "widget",
-  "supports": ["BANGLEJS","BANGLEJS2"],
+  "supports": ["BANGLEJS", "BANGLEJS2"],
   "storage": [
-    {"name":"chimer.wid.js","url":"widget.js"},
-    {"name":"chimer.settings.js","url":"settings.js"}
+    { "name": "chimer.wid.js", "url": "widget.js" },
+    { "name": "chimer.settings.js", "url": "settings.js" }
   ],
-  "data": [{"name":"chimer.json"}]
-}
\ No newline at end of file
+  "data": [{ "name": "chimer.json" }]
+}
diff --git a/apps/chimer/settings.js b/apps/chimer/settings.js
index 99c10b518..7af140dd4 100644
--- a/apps/chimer/settings.js
+++ b/apps/chimer/settings.js
@@ -2,68 +2,69 @@
  * @param {function} back Use back() to return to settings menu
  */
 
-
-
-(function(back) {
+(function (back) {
   // default to buzzing
   var FILE = "chimer.json";
   var settings = {};
   const chimes = ["Off", "Buzz", "Beep", "Both"];
   const frequency = ["60 min", "30 min", "15 min", "1 min"];
 
-
-var showMainMenu = () => {
-  E.showMenu({
-    "": {"title": "Chimer"},
-    "< Back": () => back(),
-    "Chime Type": {
-      value: settings.type,
-      min: 0, max: 2, // both is just silly
-      format: v => chimes[v],
-      onchange: v => {
-        settings.type = v;
-        writeSettings(settings);
+  var showMainMenu = () => {
+    E.showMenu({
+      "": { title: "Chimer" },
+      "< Back": () => back(),
+      "Chime Type": {
+        value: settings.type,
+        min: 0,
+        max: 2, // both is just silly
+        format: (v) => chimes[v],
+        onchange: (v) => {
+          settings.type = v;
+          writeSettings(settings);
+        },
       },
-    },
-    "Frequency": {
-      value: settings.freq,
-      min: 0, max: 2,
-      format: v => frequency[v],
-      onchange: v => {
-        settings.freq = v;
-        writeSettings(settings);
-      }
-    },
-    "Repetition": {
-      value: settings.repeat,
-      min: 1, max: 3,
-      format: v => v,
-      onchange: v => {
-        settings.repeat = v;
-        writeSettings(settings);
-      }
-    },
-    "Start Hour": {
-      value: settings.start,
-      min: 1, max: 24,
-      format: v => v,
-      onchange: v => {
-        settings.start = v;
-        writeSettings(settings);
-      }
-    },
-    "End Hour": {
-      value: settings.end,
-      min: 1, max: 24,
-      format: v => v,
-      onchange: v => {
-        settings.end = v;
-        writeSettings(settings);
-      }
-    }
-  });
-};
-
+      Frequency: {
+        value: settings.freq,
+        min: 0,
+        max: 2,
+        format: (v) => frequency[v],
+        onchange: (v) => {
+          settings.freq = v;
+          writeSettings(settings);
+        },
+      },
+      Repetition: {
+        value: settings.repeat,
+        min: 1,
+        max: 3,
+        format: (v) => v,
+        onchange: (v) => {
+          settings.repeat = v;
+          writeSettings(settings);
+        },
+      },
+      "Start Hour": {
+        value: settings.start,
+        min: 1,
+        max: 24,
+        format: (v) => v,
+        onchange: (v) => {
+          settings.start = v;
+          writeSettings(settings);
+        },
+      },
+      "End Hour": {
+        value: settings.end,
+        min: 1,
+        max: 24,
+        format: (v) => v,
+        onchange: (v) => {
+          settings.end = v;
+          writeSettings(settings);
+        },
+      },
+    });
+  };
 
   var readSettings = () => {
     var settings = require("Storage").readJSON(FILE, 1) || {
@@ -82,5 +83,4 @@ var showMainMenu = () => {
 
   settings = readSettings();
   showMainMenu();
-})
-
+});
diff --git a/apps/chimer/widget.js b/apps/chimer/widget.js
index fd11653af..9029511f8 100644
--- a/apps/chimer/widget.js
+++ b/apps/chimer/widget.js
@@ -1,4 +1,4 @@
-(function() {
+(function () {
   // 0: off, 1: buzz, 2: beep, 3: both
   var FILE = "chimer.json";
 
@@ -15,7 +15,7 @@
 
   var settings = readSettings();
 
-function sleep(milliseconds) {
+  function sleep(milliseconds) {
     const date = Date.now();
     let currentDate = null;
     do {
@@ -24,86 +24,100 @@ function sleep(milliseconds) {
   }
 
   function chime() {
-    for(var i = 0; i < settings.repeat; i++){
-    if (settings.type === 1){
-      Bangle.buzz(100);
-    } else if(settings.type === 2){
-      Bangle.beep();
-    } else {
-      return;
-    }
-    sleep(100);
-  }
-  };
-
-  let lastHour = (new Date()).getHours();
-  let lastMinute = (new Date()).getMinutes(); // don't chime when (re)loaded at a whole hour
-  function check() {
-    const now = new Date(),
-      h = now.getHours(), m = now.getMinutes(),
-      s = now.getSeconds(), ms = now.getMilliseconds();
-      if (h > settings.end || h < settings.start){
-        var mLeft = 60-m, sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;
-        setTimeout(check, msLeft);
+    for (var i = 0; i < settings.repeat; i++) {
+      if (settings.type === 1) {
+        Bangle.buzz(100);
+      } else if (settings.type === 2) {
+        Bangle.beep();
+      } else {
         return;
       }
-    if (settings.freq === 1){
-    if (m !== lastMinute && m===0 || m===30) chime();
-    lastHour = h;
-    lastMinute = m;
-    // check again in 30 minutes
-    switch (true){
-      case (m/30 >= 1):
-        var mLeft = 30-(m-30), sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;
-        break;
-      case (m/30 < 1):
-        var mLeft = 30-m, sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;
-        break;
+      sleep(100);
     }
-    setTimeout(check, msLeft);
-
-  }else if (settings.freq === 2){
-    if (m !== lastMinute && m===0 || m===15 || m===30 || m===45) chime();
-    lastHour = h;
-    lastMinute = m;
-    // check again in 15 minutes
-    switch (true){
-      case (m/15 >= 3):
-        var mLeft = 15-(m-45), sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;
-        break;
-      case (m/15 >= 2):
-        var mLeft = 15-(m-30), sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;
-        break;
-      case (m/15 >= 1):
-        var mLeft = 15-(m-15), sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;
-        break;
-      case (m/15 < 1):
-        var mLeft = 15-m, sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;
-        break;
-    }
-    setTimeout(check, msLeft);
-    }else if (settings.freq === 3){
-    if (m !== lastMinute) chime();
-    lastHour = h;
-    lastMinute = m;
-    // check again in 1 minute
-
-    var mLeft = 1, sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;
-    setTimeout(check, msLeft);
-
-  }else{
-    if (h!==lastHour && m===0) chime();
-    lastHour = h;
-    // check again in 60 minutes
-    var mLeft = 60-m, sLeft = (mLeft*60)-s, msLeft = (sLeft*1000)-ms;
-    setTimeout(check, msLeft);
-
   }
 
+  let lastHour = new Date().getHours();
+  let lastMinute = new Date().getMinutes(); // don't chime when (re)loaded at a whole hour
+  function check() {
+    const now = new Date(),
+      h = now.getHours(),
+      m = now.getMinutes(),
+      s = now.getSeconds(),
+      ms = now.getMilliseconds();
+    if (h > settings.end || h < settings.start) {
+      var mLeft = 60 - m,
+        sLeft = mLeft * 60 - s,
+        msLeft = sLeft * 1000 - ms;
+      setTimeout(check, msLeft);
+      return;
+    }
+    if (settings.freq === 1) {
+      if ((m !== lastMinute && m === 0) || m === 30) chime();
+      lastHour = h;
+      lastMinute = m;
+      // check again in 30 minutes
+      switch (true) {
+        case m / 30 >= 1:
+          var mLeft = 30 - (m - 30),
+            sLeft = mLeft * 60 - s,
+            msLeft = sLeft * 1000 - ms;
+          break;
+        case m / 30 < 1:
+          var mLeft = 30 - m,
+            sLeft = mLeft * 60 - s,
+            msLeft = sLeft * 1000 - ms;
+          break;
+      }
+      setTimeout(check, msLeft);
+    } else if (settings.freq === 2) {
+      if ((m !== lastMinute && m === 0) || m === 15 || m === 30 || m === 45)
+        chime();
+      lastHour = h;
+      lastMinute = m;
+      // check again in 15 minutes
+      switch (true) {
+        case m / 15 >= 3:
+          var mLeft = 15 - (m - 45),
+            sLeft = mLeft * 60 - s,
+            msLeft = sLeft * 1000 - ms;
+          break;
+        case m / 15 >= 2:
+          var mLeft = 15 - (m - 30),
+            sLeft = mLeft * 60 - s,
+            msLeft = sLeft * 1000 - ms;
+          break;
+        case m / 15 >= 1:
+          var mLeft = 15 - (m - 15),
+            sLeft = mLeft * 60 - s,
+            msLeft = sLeft * 1000 - ms;
+          break;
+        case m / 15 < 1:
+          var mLeft = 15 - m,
+            sLeft = mLeft * 60 - s,
+            msLeft = sLeft * 1000 - ms;
+          break;
+      }
+      setTimeout(check, msLeft);
+    } else if (settings.freq === 3) {
+      if (m !== lastMinute) chime();
+      lastHour = h;
+      lastMinute = m;
+      // check again in 1 minute
 
-
-  };
+      var mLeft = 1,
+        sLeft = mLeft * 60 - s,
+        msLeft = sLeft * 1000 - ms;
+      setTimeout(check, msLeft);
+    } else {
+      if (h !== lastHour && m === 0) chime();
+      lastHour = h;
+      // check again in 60 minutes
+      var mLeft = 60 - m,
+        sLeft = mLeft * 60 - s,
+        msLeft = sLeft * 1000 - ms;
+      setTimeout(check, msLeft);
+    }
+  }
 
   check();
-})
-();
\ No newline at end of file
+})();

From ec29905238470cb0ea9dc2d2fdd51b8c2d5c41be Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Wed, 24 Aug 2022 09:15:40 +0000
Subject: [PATCH 38/44] Removed version number

---
 apps/chimer/metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/chimer/metadata.json b/apps/chimer/metadata.json
index 3e89a7885..91867fec9 100644
--- a/apps/chimer/metadata.json
+++ b/apps/chimer/metadata.json
@@ -2,7 +2,7 @@
   "id": "chimer",
   "name": "Chimer",
   "version": "0.01",
-  "description": "A fork of Hour Chime. Buzz or beep on every 60, 30 or 15 minutes. 14",
+  "description": "A fork of Hour Chime. Buzz or beep on every 60, 30 or 15 minutes.",
   "icon": "widget.png",
   "type": "widget",
   "tags": "widget",

From 984fcf812fae95db664fe81f1d9babc87b2e7d06 Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Wed, 24 Aug 2022 09:17:56 +0000
Subject: [PATCH 39/44] Updated description

---
 apps/chimer/metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/chimer/metadata.json b/apps/chimer/metadata.json
index 91867fec9..fab277f15 100644
--- a/apps/chimer/metadata.json
+++ b/apps/chimer/metadata.json
@@ -2,7 +2,7 @@
   "id": "chimer",
   "name": "Chimer",
   "version": "0.01",
-  "description": "A fork of Hour Chime. Buzz or beep on every 60, 30 or 15 minutes.",
+  "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",

From 63434a6efbed258a46d4a4ad4cc20b55aec03f48 Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Wed, 24 Aug 2022 09:25:45 +0000
Subject: [PATCH 40/44] Changed Icon

---
 apps/chimer/widget.png | Bin 1704 -> 1531 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/apps/chimer/widget.png b/apps/chimer/widget.png
index 7c3d7eebd3439ff27290c923cb494376f59ca970..14edf415069c0df4b92316a58719ad356affa395 100644
GIT binary patch
delta 1496
zcmV;}1t<Eb4f_j_HGc)LNkl<ZXo2mSTWl0%6vuyOX1lv=xwW7oED;P;u8KquLEAvR
zMAXCxuEK+f32IE#kocg{NZ`R|eIN!yj6R{P#Sn>6Q7GjWZox!A1Rp?w2m<BOux)o|
z=J+tv?ap*}yGw@$lKzt~`|Y{@&wSrEXLc3_F^ECj){t8j_<!WbiDv};98f`CpY&no
z$6JxdxD`PG1YHM=1Cr_%a!XLO09_qQVabB|_<;s1#i`F0(lpb6udqqUGEP^WXh-Y`
zAeHT8MI`RZtZs-VSdT4fS=jY!)iF1b#O52|O-XU2P}jFA;cbLDM0l&JB)eh_+7@d=
z*ov?sngGLaM}Kq(puC2mzi3-*hqlEgS5<+-N`wUnZv<7o0yK>Yq`X4DteAXTyb(wC
z0gV-yH-YTe9r4F1jgQS2-fWq+5-C*qSHNTeP!AlFr5wu>OcT`&j4n!kSF8cp3|dz)
zA+!!*v$n=271eHFw5Eyne3zFwj&K~P=OXh;7vQkSn}2Qf$xRjz<*;t@J9|Fssw1DL
zS&xywvc1wx%p=NS?_w4x_}QB+DijCLz)a70f57=^l<_z$_KDpCyRdrlc{J+Icyl1v
zvtF*J0`h|Zh{w@`zW`yXCp{i;e#DdS4A{SPv&?&AYs&ZCq0O7k_sJvqEj_JJ>@PsQ
zeQt0rkbh<@09j51>>sU?ZZY@|zR5{%c6Y$;U+>d*7K2-8H~<zM0r_2C@Jl|aFs=%s
zrI7S}i*nJM`3s11&6|xV6j$1D6@Vdq8sE?g{ma20<4Qh<Q;Bo1fa?HQ-b(a9xBx(B
z@mp!AsNoK8cHSrN%3t|wh2r2LcDG2>+w(n8Z-4)pG=xO6G$Q#N{sOE#C*L*>_JKbD
zQ2$8>_ImoJP)L@Cn?u+WkoRypRwxXvK+l8HT>Mr)A)LYBhp<?dguxbsGf1GB3UdHZ
zj{430*zSEk>66;*A<Jx8!oD7n?oRl(*#MxewPW%;m#~j4v#|p!AYNlL*;XhH_JO@X
zJAW`;TbQ2rO_7!5fm^6;y%G+6KytoVvYbnjBAci69Wzj-0`1tn7qL$PlEOyV=z8&L
zseHOEeh<h8VQ_a7%PQR!zqh2`$#eNyQrLy6zJ0)9Ey_VG))tGUiV)HDz_6QV+y}Kd
z`k88p-{`_8D0?tj*H=}H<Z29AUA&R#&VTqCR96j%Zb|5BY09pthEr8<CA2O20!T}>
ze$}J^T_#Q0jg>l7Ohj92W?>k+f!dp*RyjIxoJLugJ5-5rMFnW<u+bRV1Hi-qQL7yP
zkc-Tf$8TKd&#>PD^w4t&;^qlDeoK-)-=BFnh>n4w51yslzE2+7k|}2zDW?P=F@It=
ziH0OYXG7N+==>8hC&9WJ8ef;mNEp%pwNoLM1W00@+zrew=T>$Fv@PC<S-XSb^Mzse
zgT#83RtIFyLGBXdE`xIetPE%doE$h^{$NHNj2bW!U?#w<g~%wV8SN4_3!bXA8#;c6
z>wCez(JW0}+bMy53Wyy6X1D~R5PzQxLngYz9A3_~df3;Y^OQTf{sJf8h>uEB_smjm
z<+qSx_x`-dLgtt|03!7ey%QpJP%{$DI*26PRgwsZ*}G!e4Qhj0?%c|NeFbt?!MXz3
z|G;W5#lk8_v3vnmw3$e5Eut?1reD`yE@>FBK+@!D-hu9tMit&h;}bA+DSxmSco;~8
z!?6!;00)2{u%tzryZ-Laq3VvRX-vjOr{FLXn25>*APHKJN}X*n5s|1Nig;_LHaIE>
z+HIJeMzkHI9XJPi3OI#ug!9=G!H2cb3+NBqS0)^%#6y`O=%P<Eq5db)e;=q4hJm7p
zDyaJ|0}*!^;=SDn5uq0_Zc&te4?JH&-4b@b(Ennx9p`=EN)gp%BD@=RzR(Mp@=^B*
yQ650}7Ua4+NE2b!<o7zyhMjK^gBZkZj{gCtbG^&#Oq>7!0000<MNUMnLSTaNQO&LZ

delta 1670
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
QLI3~&07*qoM6N<$f_INcbN~PV


From bd52aad34dd738b63279fc24b9e8357afc88ee8e Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Wed, 24 Aug 2022 09:34:48 +0000
Subject: [PATCH 41/44] Changed icon link to match new icon

---
 apps/chimer/icon.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/chimer/icon.txt b/apps/chimer/icon.txt
index c1750ff20..cc969bc81 100644
--- a/apps/chimer/icon.txt
+++ b/apps/chimer/icon.txt
@@ -1,2 +1,2 @@
 
-widget.png: https://icons8.com/icon/15715/plus-1-hour
\ No newline at end of file
+widget.png: "https://icons8.com/icon/114436/alarm"
\ No newline at end of file

From da784d05f51a7808b9717c6991a011866719b163 Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Wed, 24 Aug 2022 09:34:56 +0000
Subject: [PATCH 42/44] Added Readme

---
 apps/chimer/README.MD | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 apps/chimer/README.MD

diff --git a/apps/chimer/README.MD b/apps/chimer/README.MD
new file mode 100644
index 000000000..a78c677f2
--- /dev/null
+++ b/apps/chimer/README.MD
@@ -0,0 +1,11 @@
+# Chimer - For the BangleJS
+
+A fork of [Hour Chime](https://github.com/espruino/BangleApps/tree/master/apps/widchime) that adds extra features such as:
+
+- Buzz or beep on every 60, 30 or 15 minutes.
+- Repeat Chime up to 3 times
+- Set hours to disable chime
+
+Setting the hours you don't want your watch to chime for is done by setting the hour you want it to stop, and the hour you want it to start.
+
+Hours range from 0 - 23.

From 6689c9adcef9317f3bce7d319c0bc82c4bb6367c Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Wed, 24 Aug 2022 09:35:31 +0000
Subject: [PATCH 43/44] Updated start and end hours to 0 - 23

---
 apps/chimer/settings.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/chimer/settings.js b/apps/chimer/settings.js
index 7af140dd4..f455bb3dc 100644
--- a/apps/chimer/settings.js
+++ b/apps/chimer/settings.js
@@ -45,8 +45,8 @@
       },
       "Start Hour": {
         value: settings.start,
-        min: 1,
-        max: 24,
+        min: 0,
+        max: 23,
         format: (v) => v,
         onchange: (v) => {
           settings.start = v;

From c4f6ccd4d10a7060587006e90e16f04f6e903cf7 Mon Sep 17 00:00:00 2001
From: aaronrolls <public@aaronrolls.nz>
Date: Wed, 24 Aug 2022 09:38:26 +0000
Subject: [PATCH 44/44] bug fix

---
 apps/chimer/settings.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/chimer/settings.js b/apps/chimer/settings.js
index f455bb3dc..1174246bd 100644
--- a/apps/chimer/settings.js
+++ b/apps/chimer/settings.js
@@ -55,8 +55,8 @@
       },
       "End Hour": {
         value: settings.end,
-        min: 1,
-        max: 24,
+        min: 0,
+        max: 23,
         format: (v) => v,
         onchange: (v) => {
           settings.end = v;