Merge branch 'master' into patch-1

Author: RKBoss6

apps/deko/ChangeLog

@@ -1 +1,2 @@
-0.01: first release
+0.01: First release
+0.02: Add setting to make widgets optional

apps/deko/README.md

@@ -1,10 +1,14 @@
 # Deko Clock
 
-A simple clock with an Art Deko font
+A simple clock with an Art Deko font.
 
-The font was obtained from https://dafonttop.com/building.font and is free for personal use
+Widgets can be configured to be always on, always off, or only shown when unlocked.
 
+The font was obtained from https://dafonttop.com/building.font and is free for personal use.
 
-![](screenshot.png)
+![](screenshot.png) ![](screenshot-no-widgets.png)
 
-Written by: [Hugh Barney](https://github.com/hughbarney)  For support and discussion please post in the [Bangle JS Forum](http://forum.espruino.com/microcosms/1424/)
+Written by: [Hugh Barney](https://github.com/hughbarney)  
+Optional widgets settings added by [Trippnology](https://github.com/trippnology)
+
+For support and discussion please post in the [Bangle JS Forum](http://forum.espruino.com/microcosms/1424/)

apps/deko/app.js

@@ -1,16 +1,21 @@
 {
   "id": "deko",
   "name": "Deko Clock",
-  "version": "0.01",
+  "version": "0.02",
   "description": "Clock with Art Deko font",
   "readme": "README.md",
   "icon": "app.png",
-  "screenshots": [{"url":"screenshot.png"}],
+  "screenshots": [
+    { "url": "screenshot.png" },
+    { "url": "screenshot-no-widgets.png" }
+  ],
   "type": "clock",
   "tags": "clock",
-  "supports": ["BANGLEJS","BANGLEJS2"],
+  "supports": ["BANGLEJS", "BANGLEJS2"],
   "storage": [
-    {"name":"deko.app.js","url":"app.js"},
-    {"name":"deko.img","url":"app-icon.js","evaluate":true}
-  ]
+    { "name": "deko.app.js", "url": "app.js" },
+    { "name": "deko.settings.js", "url": "settings.js" },
+    { "name": "deko.img", "url": "app-icon.js", "evaluate": true }
+  ],
+  "data": [{ "name": "deko.settings.json" }]
 }

apps/deko/metadata.json

@@ -0,0 +1,32 @@
+(function (back) {
+  const storage = require('Storage');
+  const settingsFile = 'deko.settings.json';
+  const defaultSettings = {
+    loadWidgets: 1,
+  };
+  const settings = Object.assign(
+    defaultSettings,
+    storage.readJSON(settingsFile, 1) || {},
+  );
+  const loadWidgetsChoices = ['No', 'Yes', 'Unlocked'];
+
+  const save = () => storage.write(settingsFile, settings);
+
+  const appMenu = {
+    '': { title: 'Deko Clock' },
+    '< Back': back,
+    'Load widgets?': {
+      value: settings.loadWidgets,
+      min: 0,
+      max: 2,
+      step: 1,
+      format: (v) => loadWidgetsChoices[v],
+      onchange: (v) => {
+        settings.loadWidgets = v;
+        save();
+      },
+    },
+  };
+
+  E.showMenu(appMenu);
+})

apps/deko/screenshot-no-widgets.png

@@ -0,0 +1 @@
+v0.01: New app!

apps/deko/settings.js

@@ -0,0 +1,48 @@
+# Smart Battery Module
+A module for providing a truly accurate battery life in terms of days. The module learns from daily usage and drainage patterns, and extrapolates that. As you use it more, and the battery keeps draining, the predictions should become more accurate.
+
+Because the Bangle.js battery percent fluctuates naturally, it is highly recomended to use the `Power Manager` app and enable monotonic/stable percentage to stabilize the percentage, and reduce fluctuations. This may help provide more accurate readings.
+## Upon Install
+Use an app that needs this module, like `Smart Battery Widget`.
+When this app is installed, <i><b>do not rely on it for the first 24-30 hours.</b></i>
+The module might return different data than expected, or a severely low prediction. Give it time. It will learn from drainage rates, which needs the battery to drain. If your watch normally lasts for a long time on one charge, it will take longer for the module to return an accurate reading.
+
+If you think something is wrong with the predictions after 3 days, try clearing the data, and let it rebuild again from scratch.
+## Clock Infos
+The module provides two clockInfos:
+- Days left
+- Learned drainage rate per hour
+
+## Settings
+### Clear Data - Clears all learned data. 
+Use this when you switch to a new clock or change the battery drainage in a fundamental way. The app averages drainage over time, and so you might just want to restart the learned data to be more accurate for the new configurations you have implemented.
+### Logging - Enables logging for stats that this module uses. 
+To view the log file, go to the [Web IDE](https://www.espruino.com/ide/#), click on the storage icon (4 discs), and scroll to the file named `smartbattlog.json`. From there, you can view the file, copy to editor, or save it to your computer.
+Logs:
+* The time in a human-readable format (hh:mm:ss, mm:dd:yy) when the record event was triggered
+* The current battery percentage
+* The last saved battery percentage
+* The change in hours between the time last recorded and now
+* The average or learned drainage for battery per hour
+* The status of that record event:
+  * Recorded
+  * Skipped due to battery fluctuations or no change
+  * Invalid time between the two periods (first record)
+## Functions
+From any app, you can call `require("smartbatt")` and then one of the functions below:
+* `require("smartbatt").record()` - Attempts to record the battery and push it to the average.
+* `require("smartbatt").get()` - Returns an object that contains:
+
+  
+  * `hrsRemaining` - Hours remaining
+  * `avgDrainage` - Learned battery drainage per hour
+  * `totalCycles` - Total times the battery has been recorded and averaged
+  * `totalHours` - Total hours recorded
+  * `batt` - Current battery level
+
+    
+* `require("smartbatt").deleteData()` - Deletes all learned data. (Automatically re-learns)
+## Creator
+- RKBoss6
+## Contributors
+- RelapsingCertainly

apps/smartbatt/ChangeLog

@@ -0,0 +1,84 @@
+(function() {
+  var batt;
+  //updates values
+
+
+  function getHrsFormatted(hrsLeft){
+
+    var daysLeft = hrsLeft / 24;
+    daysLeft = Math.round(daysLeft);
+    if(daysLeft >= 1) {
+      return daysLeft+"d";
+    }
+
+    else {
+      return Math.round(hrsLeft)+"h";
+    }
+  }
+
+  //draws battery icon and fill bar
+  function drawBatt(){
+    batt =E.getBattery();
+    var s=24,g=Graphics.createArrayBuffer(24,24,1,{msb:true});
+    g.fillRect(0,6,s-3,18).clearRect(2,8,s-5,16).fillRect(s-2,10,s,15).fillRect(3,9,3+batt*(s-9)/100,15);
+    g.transparent=0;
+    return g.asImage("string");
+  }
+
+  //calls both updates for values and icons.
+  //might split in the future since values updates once every five minutes so we dont need to call it in every minute while the battery can be updated once a minute.
+  function updateDisplay(){
+    drawBatt();
+  }
+
+  return {
+    name: "SmartBatt",
+    items: [
+      { name : "BattStatus",
+        get : () => {
+
+          var img = drawBatt();
+          var data=require("smartbatt").get();
+
+          //update clock info according to batt state
+          if (Bangle.isCharging()) {
+            return { text: batt+"%", img };
+          }
+          else{
+            return { text: getHrsFormatted(data.hrsLeft), img };
+          }
+        },
+
+        show : function() {
+            this.interval = setInterval(()=>{
+                updateDisplay();
+                this.emit('redraw');
+              }, 300000);
+          },
+
+        hide : function() {
+          clearInterval(this.interval);
+          this.interval = undefined;
+        }
+      },
+      { name : "AvgDrainage",
+        get : () => {
+          var img = drawBatt()
+          var data=require("smartbatt").get();
+          return { text: data.avgDrainage.toFixed(2)+"/h", img };
+        },
+
+        show : function() {
+            this.interval = setInterval(()=>{
+                this.emit('redraw');
+              }, 300000);
+          },
+
+        hide : function() {
+          clearInterval(this.interval);
+          this.interval = undefined;
+        }
+      }
+    ]
+  };
+})