Merge branch 'espruino:master' into smartbatt-module

Author: RKBoss6

apps/backlite/ChangeLog

@@ -0,0 +1,2 @@
+0.01: New app! (settings, boot.js).
+0.02: Fix settings defaulting brightness to 0

apps/backlite/README.md

@@ -0,0 +1,20 @@
+# BackLite
+### This app needs the latest settings app update (v 0.80), to ensure that setting the brightness to `0` does not default to `1`.
+
+BackLite is an app which greatly conserves battery life by only turning the backlight on when you long press the button from a locked state.
+
+Modern watches have a dedicated button to turn the backlight on, so as not to waste battery in an already light environment. This app recreates that functionality for the Bangle.js, which only has one button.
+
+#### Warning: This app overwrites the LCD brightness setting in `Bangle.js LCD settings`. If it is changed, the app will basically lose functionality. It auto-fixes itself every boot, so if you change the brightness, just reboot :)
+# Usage
+When you unlock with a press of the button, or any other way you unlock the watch, the backlight will not turn on, as most of the time you are able to read it, due to the transreflective display on the Bangle.js 2. 
+
+If you press and hold the button to unlock the watch (for around half a second), the backlight will turn on for 5 seconds - just enough to see what you need to see. After that, it will turn off again.
+
+Some apps like `Light Switch Widget` will prevent this app from working properly.
+# Settings
+`Brightness` - The LCD brightness when unlocked with a long press.
+# Creator
+RKBoss6
+
+TODO: Add a setting for long press time, or light duration

apps/backlite/boot.js

@@ -0,0 +1,36 @@
+{
+  let getSettings = function(){
+    return Object.assign({
+      // default values
+      brightness: 0.3,
+
+    }, require('Storage').readJSON("BackLite.settings.json", true) || {});
+  };
+
+  
+  //Set LCD to zero every reboot
+  let s = require("Storage").readJSON("setting.json", 1) || {};
+  s.brightness = 0;
+  require("Storage").writeJSON("setting.json", s);
+  //remove large settings object from memory
+  delete s;
+  const longPressTime=400; //(ms)
+
+  Bangle.on('lock', function(isLocked) {
+    Bangle.setLCDBrightness(0);
+
+    if (!isLocked) {
+      // Just unlocked — give a short delay and check if BTN1 is still pressed
+      setTimeout(() => {
+        if (digitalRead(BTN1)) {
+          //set brightness until. locked.
+          Bangle.setLCDBrightness(getSettings().brightness);
+        } else {
+          Bangle.setLCDBrightness(0);
+        }
+      }, longPressTime); // Slight delay to allow unlock to settle
+    }
+  });
+
+}
+

apps/backlite/icon.png

@@ -0,0 +1,17 @@
+{
+  "id": "backlite",
+  "name": "BackLite",
+  "version": "0.02",
+  "description": "Conserves battery life by turning the backlight on only on a long press of the button from a locked state. **Requires the latest settings update (v0.80)**",
+  "icon": "icon.png",
+  "type": "bootloader",
+  "tags": "system",
+  "readme": "README.md",
+  "supports": ["BANGLEJS2"],
+  "storage": [
+    {"name":"backlite.boot.js","url":"boot.js"},
+    {"name":"backlite.settings.js","url":"settings.js"}
+    
+  ],
+  "data": [{"name":"BackLite.settings.json"}]
+}

apps/backlite/metadata.json

@@ -0,0 +1,25 @@
+(function(back) {
+  var FILE = "BackLite.settings.json";
+
+  var settings = require("Storage").readJSON(FILE, 1) || {};
+  
+  if (!isFinite(settings.brightness)) settings.brightness = 0.3;
+
+  function writeSettings() {
+    require("Storage").writeJSON(FILE, settings);
+  }
+
+  E.showMenu({
+    "" : { "title" : "BackLite" },
+    "< Back": back, // fallback if run standalone
+    "Brightness": {
+      value: settings.brightness,
+      min: 0.1, max: 1,
+      step: 0.1,
+      onchange: v => {
+        settings.brightness = v;
+        writeSettings();
+      }
+    },
+  });
+})

apps/backlite/settings.js

@@ -4,3 +4,4 @@
 0.04: Fix lint warnings
 0.05: Fix on not reading counter defaults in Settings
 0.06: Added ability to display only one counter and fast-scrolling
+0.07: Add option to keep unlocked

apps/counter2/ChangeLog

@@ -7,12 +7,19 @@ var s = Object.assign({
   fullscreen:true,
   buzz: true,
   colortext: true,
+  keepunlocked: false,
 }, require('Storage').readJSON("counter2.json", true) || {});
 
 var sGlob = Object.assign({
   timeout: 10,
 }, require('Storage').readJSON("setting.json", true) || {});
 
+const lockTimeout = s.keepunlocked ? 0 : 1000;
+if (s.keepunlocked) {
+  Bangle.setOptions({lockTimeout});
+  Bangle.setLocked(false);
+}
+
 const f1 = (s.colortext) ? "#f00" : "#fff";
 const f2 = (s.colortext) ? "#00f" : "#fff";
 const b1 = (s.colortext) ? g.theme.bg : "#f00";
@@ -80,7 +87,7 @@ function updateScreen() {
 Bangle.on('lock', e => {
   drag = undefined;
   var timeOutTimer = sGlob.timeout * 1000;
-  Bangle.setOptions({backlightTimeout: timeOutTimer, lockTimeout: timeOutTimer});
+  Bangle.setOptions({backlightTimeout: timeOutTimer, lockTimeout});
   if (dragtimeout) clearTimeout(dragtimeout);
   fastupdateoccurring = false;
 });
@@ -102,7 +109,7 @@ Bangle.on("drag", e => {
     drag = undefined;
     if (dragtimeout) {
       let timeOutTimer = 1000;
-      Bangle.setOptions({backlightTimeout: timeOutTimer, lockTimeout: timeOutTimer});
+      Bangle.setOptions({backlightTimeout: timeOutTimer, lockTimeout});
       clearTimeout(dragtimeout);
     }
     fastupdateoccurring = false;
@@ -134,7 +141,7 @@ function resetcounter(which) {
   fastupdateoccurring = false;
   if (dragtimeout) {
     let timeOutTimer = 1000;
-    Bangle.setOptions({backlightTimeout: timeOutTimer, lockTimeout: timeOutTimer});
+    Bangle.setOptions({backlightTimeout: timeOutTimer, lockTimeout});
     clearTimeout(dragtimeout);
   }
   if (which == null) {
@@ -152,7 +159,6 @@ function resetcounter(which) {
   ignoreonce = true;
 }
 
-
 updateScreen();
 
 setWatch(function() {
@@ -163,6 +169,6 @@ setWatch(function() {
     }
   }
   var timeOutTimer = sGlob.timeout * 1000;
-  Bangle.setOptions({backlightTimeout: timeOutTimer, lockTimeout: timeOutTimer});
+  Bangle.setOptions({backlightTimeout: timeOutTimer, lockTimeout});
   load();
 }, BTN1, {repeat:true, edge:"falling"});

apps/counter2/app.js

@@ -1,7 +1,7 @@
 {
   "id": "counter2",
   "name": "Counter2",
-  "version": "0.06",
+  "version": "0.07",
   "description": "Dual Counter",
   "readme":"README.md",
   "icon": "counter2-icon.png",

apps/counter2/metadata.json

@@ -70,10 +70,17 @@
             onchange: v => {
                 settings.buzz = v;
                 writeSettings();
+            },
+        };
+        appMenu['Keep unlocked'] = {
+            value: settings.keepunlocked,
+            onchange: v => {
+                settings.keepunlocked = v;
+                writeSettings();
         },
       };
       E.showMenu(appMenu);
     }
 
     showMainMenu();
-  })
+  })