From 372f5123f4fe611284d0f6f5fc5a09d30a585ae8 Mon Sep 17 00:00:00 2001
From: Purple-Tentacle <59914607+Purple-Tentacle@users.noreply.github.com>
Date: Fri, 17 Apr 2020 15:55:41 +0200
Subject: [PATCH] chronowid 0.02

---
 apps/chronowid/ChangeLog |  3 ++-
 apps/chronowid/README.md |  9 ++++++---
 apps/chronowid/app.js    | 11 +++++++++--
 apps/chronowid/widget.js | 18 +++++++++---------
 4 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/apps/chronowid/ChangeLog b/apps/chronowid/ChangeLog
index a6f342f01..263145407 100644
--- a/apps/chronowid/ChangeLog
+++ b/apps/chronowid/ChangeLog
@@ -1 +1,2 @@
-0.01: New widget and app!
+0.01: New widget and app!
+0.02: Setting to reset values, timer buzzes at 00:00 and not later (see readme)
\ No newline at end of file
diff --git a/apps/chronowid/README.md b/apps/chronowid/README.md
index f31c24c7b..f422dd956 100644
--- a/apps/chronowid/README.md
+++ b/apps/chronowid/README.md
@@ -5,6 +5,8 @@ The advantage is, that you can still see your normal watchface and other widgets
 The widget is always active, but only shown when the timer is on.
 Hours, minutes, seconds and timer status can be set with an app.
 
+Depending on when you start the timer, it may alert up to 0,999 seconds early. This is because it checks only for full seconds. When there is less than one seconds left, it buzzes. This cannot be avoided without checking more than every second, which I would like to avoid.
+
 ## Screenshots
 
 TBD
@@ -18,18 +20,19 @@ TBD
 
 There are no settings section in the settings app, timer can be set using an app.
 
+* Reset values: Reset hours, minutes, seconds to 0; set timer on to false; write to settings file
 * Hours: Set the hours for the timer
 * Minutes: Set the minutes for the timer
 * Seconds: Set the seconds for the timer
-* Timer on: Starts the timer and displays the widget when set to 'On'. You have to leave the app. The widget is always there, but only visible when timer is on. 
+* Timer on: Starts the timer and displays the widget when set to 'On'. You have to leave the app to load the widget which starts the timer. The widget is always there, but only visible when timer is on. 
 
 
 ## Releases
 
-* Offifical app loader: Not yet published.
+* Offifical app loader: https://github.com/espruino/BangleApps/tree/master/apps/chronowid (https://banglejs.com/apps/)
 * Forked app loader: https://github.com/Purple-Tentacle/BangleApps/tree/master/apps/chronowid (https://purple-tentacle.github.io/BangleApps/index.html#)
 * Development: https://github.com/Purple-Tentacle/BangleAppsDev/tree/master/apps/chronowid
 
 ## Requests
 
-If you have any feature requests, please contact me on the Espruino forum: http://forum.espruino.com/profiles/155005/
\ No newline at end of file
+If you have any feature requests, please write here: http://forum.espruino.com/conversations/345972/
\ No newline at end of file
diff --git a/apps/chronowid/app.js b/apps/chronowid/app.js
index 48401a7bb..dd9531233 100644
--- a/apps/chronowid/app.js
+++ b/apps/chronowid/app.js
@@ -30,7 +30,6 @@ settingsChronowid = storage.readJSON('chronowid.json',1);
 if (!settingsChronowid) resetSettings();
 
 E.on('kill', () => {
-  print("-KILL-");
   updateSettings();
 });
 
@@ -45,6 +44,14 @@ function showMenu() {
         timerMenu.started.value = settingsChronowid.started;
       }
     },
+    'Reset values': function() {
+        settingsChronowid.hours = 0;
+        settingsChronowid.minutes = 0;
+        settingsChronowid.seconds = 0;
+        settingsChronowid.started = false;
+        updateSettings();
+        showMenu();
+    },
     'Hours': {
       value: settingsChronowid.hours,
       min: 0,
@@ -88,4 +95,4 @@ function showMenu() {
   return E.showMenu(timerMenu);
 }
 
-showMenu();
+showMenu();
\ No newline at end of file
diff --git a/apps/chronowid/widget.js b/apps/chronowid/widget.js
index 708bc6345..557104d92 100644
--- a/apps/chronowid/widget.js
+++ b/apps/chronowid/widget.js
@@ -36,19 +36,18 @@
 
     //counts down, calculates and displays
     function countDown() {
-        //printDebug();
         now = new Date();
         diff = settingsChronowid.goal - now; //calculate difference
         WIDGETS["chronowid"].draw();
         //time is up
-        if (settingsChronowid.started && diff <= 0) {
+        if (settingsChronowid.started && diff < 1000) {
             Bangle.buzz(1500);
             //write timer off to file
             settingsChronowid.started = false;
             storage.writeJSON('chronowid.json', settingsChronowid);
             clearInterval(interval); //stop interval
-            //printDebug();
         }
+        //printDebug();
     }
 
     // draw your widget
@@ -72,12 +71,13 @@
                 g.drawString(getTime(diff), this.x+1, this.y+((height/2)-4)); //display hour 00:00:00
             }
         }
-        else {
-            width = 58;
-            g.clearRect(this.x,this.y,this.x+width,this.y+height);
-            g.setFont("6x8", 2);
-            g.drawString("END", this.x+15, this.y+5);
-        }
+        // not needed anymoe, because we check if diff < 1000 now, so 00:00 is displayed.
+        // else {
+        //     width = 58;
+        //     g.clearRect(this.x,this.y,this.x+width,this.y+height);
+        //     g.setFont("6x8", 2);
+        //     g.drawString("END", this.x+15, this.y+5);
+        // }
     }
 
     if (settingsChronowid.started) interval = setInterval(countDown, 1000); //start countdown each second