From f9be0db3c80d4411cf448fa38c15a98dc78aba65 Mon Sep 17 00:00:00 2001
From: storm64 <github@storm64.de>
Date: Mon, 14 Feb 2022 08:18:16 +0100
Subject: [PATCH] sleeplog: remove logging always, minimized workaround in
 settings menu

Update boot.js
 - remove logging always for testing
Update settings.js
 - minimized workaround in settings menu to [espruino/Espruino issue 2149](https://github.com/espruino/Espruino/issues/2149)
---
 apps/sleeplog/boot.js     | 8 ++++----
 apps/sleeplog/settings.js | 9 ++-------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/apps/sleeplog/boot.js b/apps/sleeplog/boot.js
index 254d7671b..b7df51c2d 100644
--- a/apps/sleeplog/boot.js
+++ b/apps/sleeplog/boot.js
@@ -84,21 +84,21 @@ if (sleeplog.enabled) {
         // check for non-movement according to the threshold
         if (data.movement <= gObj.maxmove) {
           // check resting state
-          if (true || gObj.resting !== true) { // log always for testing
+          if (gObj.resting !== true) {
             // change resting state
             gObj.resting = true;
             // set status to sleeping or worn
             gObj.status = E.getTemperature() > gObj.tempthresh ? 3 : 1;
             // write status to log, 
-            require("sleeplog").writeLog(0, [timestamp, gObj.status, E.getTemperature(), data.movement]);
+            require("sleeplog").writeLog(0, [timestamp, gObj.status, E.getTemperature()]);
           }
         } else {
           // check resting state
-          if (true || gObj.resting !== false) { // log always for testing
+          if (gObj.resting !== false) {
             // change resting state, set status and write status to log
             gObj.resting = false;
             gObj.status = 2;
-            require("sleeplog").writeLog(0, [timestamp, 2, E.getTemperature(), data.movement]);
+            require("sleeplog").writeLog(0, [timestamp, 2]);
           }
         }
       }
diff --git a/apps/sleeplog/settings.js b/apps/sleeplog/settings.js
index 6363dfd8d..c41980d00 100644
--- a/apps/sleeplog/settings.js
+++ b/apps/sleeplog/settings.js
@@ -144,13 +144,8 @@
     (settings.powersaving ? ["NoMoThresh", "MinDuration"] : ["MaxMove"]).forEach(property => delete mainMenu[property]);
     var menu = E.showMenu(mainMenu);
     // workaround to display changed entries correct
-    if (selected) setTimeout(_ => {
-      menu.move(1);
-      menu.move(1);
-      menu.move(-1);
-      menu.move(-1);
-      menu.move(-1);
-    }, 100);
+    // https://github.com/espruino/Espruino/issues/2149
+    if (selected) setTimeout(m => m.draw(), 1, menu);
   }
 
   // draw main menu