Merge pull request #1141 from peerdavid/master

[LCARS Clock] Multiple screens including graphs for health data.

apps.json

@@ -4487,7 +4487,7 @@
     "name": "LCARS Clock",
     "shortName":"LCARS",
     "icon": "lcars.png",
-    "version":"0.07",
+    "version":"0.08",
     "readme": "README.md",
     "supports": ["BANGLEJS2"],
     "description": "Library Computer Access Retrieval System (LCARS) clock.",

apps/lcars/ChangeLog

@@ -5,3 +5,4 @@
 0.05: Additional icons for (1) charging and (2) bat < 30%.
 0.06: Fix - Alarm disabled, if clock was closed.
 0.07: Added settings to adjust data that is shown for each row.
+0.08: Support for multiple screens. 24h graph for steps + HRM. Fullscreen Mode.

apps/lcars/README.md

@@ -1,18 +1,33 @@
 # LCARS clock
 
 A simple LCARS inspired clock.
-Note: To display the steps, its necessary to install
+Note: To display the steps, the health app is required. If this app is not installed, the data will not be shown.
-the [Pedometer widget](https://banglejs.com/apps/#pedometer%20widget).
+To contribute you can open a PR at this [GitHub Repo]( https://github.com/peerdavid/BangleApps)
 
 ## Features
- * LCARS Style watch face
+ * LCARS Style watch face.
- * Shows satate (charging, out of battery etc.)
+ * Full screen mode - widgets are still loaded.
- * SHows data that can be configured (steps, HRM, temperature etc.)
+ * Supports multiple screens with different data.
- * Swipe left/right to activate an alarm
+ * [Screen 1] Date + Time + Lock status.
+ * [Screen 1] Shows randomly images of real planets.
+ * [Screen 1] Shows different states such as (charging, out of battery, GPS on etc.)
+ * [Screen 1] Swipe up/down to activate an alarm.
+ * [Screen 1] Shows 3 customizable datapoints on the first screen.
+ * [Screen 1] The lower orange line indicates the battery level.
+ * [Screen 2] Display month graphs for steps + hrm on the second screen.
+
+
+## Multiple screens support
+Access different screens via swipe left/ right
+
+![](screenshot.png)
+![](screenshot_2.png)
+
 
 ## Icons
 <div>Icons made by <a href="https://www.flaticon.com/authors/smashicons" title="Smashicons">Smashicons</a>, <a href="https://www.freepik.com" title="Freepik">Freepik</a> from <a href="https://www.flaticon.com/" title="Flaticon">www.flaticon.com</a></div>
 
 
-## Creator
+## Contributors
-Made by [David Peer](https://github.com/peerdavid)
+- Creator: [David Peer](https://github.com/peerdavid).
+- Improvements: [Adam Schmalhofer](https://github.com/adamschmalhofer).

apps/lcars/lcars.app.js

@@ -15,85 +15,96 @@ let saved_settings = storage.readJSON(SETTINGS_FILE, 1) || settings;
 for (const key in saved_settings) {
   settings[key] = saved_settings[key]
 }
+
+/*
+ * Colors to use
+ */
+let cBlue = "#0094FF";
+let cOrange = "#FF9900";
+let cPurple = "#FF00DC";
+let cWhite = "#FFFFFF";
+let cBlack = "#000000";
+
+/*
+ * Global lcars variables
+ */
+let lcarsViewPos = 0;
+let drag;
 let hrmValue = 0;
+var connected = NRF.getSecurityStatus().connected;
+var plotWeek = false;
 
 /*
  * Requirements and globals
  */
 const locale = require('locale');
 
-var backgroundImage = {
+var bgLeft =  {
-  width : 176, height : 151, bpp : 3,
+  width : 27, height : 176, bpp : 3,
-  transparent : 2,
+  transparent : 0,
-  buffer : require("heatshrink").decompress(atob("AAdx48cATsAg4daIAX3799ATv2wEFDrUAgNHQDyDghaAeQcJKG86D4gRKGgAA4jxKFuBB5iaDF6BB5ZwyD6QAYCC4CD/Qf6Dzg/gQf8H/iD/n//wCD9gP///wQfpBKQf6D4h5BB/yD8jl/IIIABjiD5n4/DAAWAQe8B//8QYfHj//PAaDzHwICCAAP4gYCBQep6DIIYFBRgKD1j/+gB9BQYYKBn/gQen/+BBFQAUH/iDzGoZBHJoOAQeRBDj5BHj6PB0WKlACDJQIAofYZBFBAZBBAGMHPQZB8QYZAEIIcDIOiDI/hB3QZBBFjlx44CDuBBpg4DCIJEfIIPnz15AQeAQeH8gIDBGoJBCnnz54CDZ1UHPQMHIIUAIIKD3II6MBQYQCCQeI1B+BBC/BKCBASGCQeK5B/xBC4BKEn/gAoKDyj//45BFj/xZYSDzgF/IAP+JQrLCQecAgKDBF4cHQYKJDQecAn6EBAAiJEQeZBB/jICAAMcvwMDQevgQwR0CIIiDzgP/BA1/4CD3nAHGhyD3ABqD0ABiD/Qf4ADjiD/gEnQYuQQf6D7gaDFzxB5gFzQYnz4BB5hyDFATfkEoIdagEBQYoCcgEHDrReBhKDhwEBQbYABjiD/AH4A/AH4AGiFx48cATsAg4daIIWSpMkATuQEbkAgJfbQckJQDyDhZxQA1gRKFpBA4gEQQYtwIPMSQYtAIPKADQfqADAQRA5Qf6D/Qf6D/Qf6D/Qf6D/Qf6D/Qf6D/Qf6D/Qf6D/Qf4A/AH4A/AH4A/AFkcuPHAQdAIPOSpMkAQaD/Qf6D/Qf6D/Qf6D/Qf6D/Qf6D/Qf6D/Qf6D/Qf6D/Qf6D/Qf6D/Qf6D/Qf4A/AH4A/AH4A/AGUcuPHAQdwIPOSpMkAQaD/Qf6D/Qf6D/Qf6D/Qf6D/Qf6D/Qf6D/Qf6D/Qf6D/Qf4AciSDFoCD/QfcCQYtIIPMAQYoC6gEJQYgC6gEBQf7HCQf4ABiiD9"))
+  buffer : require("heatshrink").decompress(atob("AAUM2XLlgCCwAJBBAuy4EAmQIF5cggAIGlmwgYIG2XIF42wF4ImGF4ImHJoQmGJoQdJhZNHNY47CgRNGBIJZHHgRiGBIRQ/KH5QCAFCh/eX5Q/KAwdCAGVbtu27YCCoAJBkuWrNlAQRGCiwRDAQPQBIMJCIYCBsAJBgomEtu0WoQmEy1YBIMBHYttIwQ7FyxQ/KHFlFAQ7F2weCHYplKChRTCCg5TCHw5TMAD0GzVp0wCCBBGaBIMaBAtpwECBA2mwEJBAugDgMmCIwJBF5EABAtoeQQvGCYQdPJoI7LMQzTCLJKAGzAJBO4xQ/KGQA8UP7y/KH5QnAHih/eX5Q/GQ4JCGRJlKCgxTDBAwgCCg5TCHwxTCNA4A=="))
-}
+};
+
+var bgRight =  {
+  width : 27, height : 176, bpp : 3,
+  transparent : 0,
+  buffer : require("heatshrink").decompress(atob("lmy5YCDBIUyBAmy5AJBhYUG2EAhgIFAQMAgQIGCgQABCg4ABEAwUNFI2AKZHAKZEgGRZTGOIUDQxJxGKH5Q/agwAnUP7y/KH4yGeVYAJrdt23bAQVABIMly1ZsoCCMgUWCIYCB6AJBhIRDAQNgBIMFEwlt2i1CEwmWrAJBgI7FtpGCHYuWKH5QxEwpQDlo7F0A7IqBZBEwo7BCIwCBJo53CJoxiCJpIAdgOmzVpAQR/CgAIEAQJ2CBAoCBBIMmCg1oD4QLGFQUCCjQ+CKYw+CKY4JCKYwoCGRMaGREJDoroCgwdFzBlLKH5QvAHih/eX5Q/KE4A8UP7y/KH5QGDpg7HJoxZCCIx3CJowmCF4yACJox/CgAA="))
+};
 
 var iconEarth = {
-  text: "EARTH",
   width : 50, height : 50, bpp : 3,
   buffer : require("heatshrink").decompress(atob("AFtx48ECBsDwU5k/yhARLjgjBjlzAQMQEZcIkOP/fn31IEZgCBnlz58cEpM4geugEgwU/8+WNZJHDuHHvgmBCQ8goEOnVgJoMnyV58mACItHI4X8uAFBuVHnnz4BuGxk4////Egz3IkmWvPgNw8f/prB//BghTC+AjE7848eMjNnzySBwUJkmf/BuGuPDAQIjBiPHhhTCSQnjMo0ITANJn44Dg8MuFBggCCiFBcAJ0Bv5xEh+ITo2OhHkyf/OIQdBWwVHhgjBNwUE+fP/5EEgePMoYLBhMgyVJk/+BQQdC688I4XxOIc8v//NAvr+QEBj/5NwKVBy1/QYUciPBhk1EAJrC+KeC489QYaMBgU/8BNB9+ChEjz1Jkn/QYMBDQIgCcYTCCiP/nlzJQmenMAgV4//uy/9wRaB/1J8iVCcAfHjt9TYYICnhKCgRKBw159/v//r927OIeeoASBDQccvv3791KYVDBYPLJQeCnPnz//AAP6ocEjEkXgMgJQtz79fLAP8KYkccAcJ8Gf/f/xu/cAMQ4eP5MlyQRCMolx40YsOGBAPfnnzU4KVDpKMBvz8Dh0/8me7IICgkxJQXPIgZTD58sEgcJk+eNoONnFBhk4/5uB/pcDg5KD+4mEv4CBXISVDhEn31/8/+mH7x//JQK5CAAMB4JBCnnxJQf/+fJEgkAa4L+CAQOOjMn/1bXIRxDJQXx58f//Hhlz/88EgsChMgz/Zs/+nfkyV/8huDOI6SD498NwoACi1Z8+S/Plz17/+QCI7jC+ZxBmfPnojIAAMDcYWSp//2wRJEwq2GABECjMgNYwAmA="))
-}
+};
 
 var iconSaturn = {
-  text: "SATURN",
   width : 50, height : 50, bpp : 3,
   transparent : 1,
   buffer : require("heatshrink").decompress(atob("AH4A/AEkQuPHCJ0ChEAwARNjAjBjgjOhs06Q2OEYVx4ARMhEggUMkANIDoIgBoEEgEBNxJEC6ZrBAAMwNxAjDNYcHNxIjB7dtEwIHBwRoKj158+cuPEjlwCRAjC23bpu0wRNDAAsHEYWeEwaSJ6YjCAQUNSRQjEzxQBWZMNEYlsmg2JWAIjCz95SoJuJggjDtuw6dMG5JKCz998wFBJRVNEYW0yaVBJRNhJQN9+4pCzhKJmBKC4YpB/fINxIgCzFxSoQ3J4ENm3CAQPb98wbpEcAQMYWwKYBNxMDXgc2/fv3g2IEAOAgAjBjy5CEhEMfYICBgfPnjdLjj+CgMHiC3JknDhhoINw4jCAB0IJQIANR4QjPAH4A/AFA"))
-}
+};
 
 var iconMoon = {
-  text: "MOON",
   width : 50, height : 50, bpp : 3,
   transparent : 1,
   buffer : require("heatshrink").decompress(atob("AH4AQjlx44CCCZsg8eOkHDwAQKEYgmPhEgEQM48AOIgMHEYoCB4ATI8UAmH/x04JoRuJsImHuBKLn37EwZuIgEQOI8cEpXj/yYBhE8+YNGgkYoJxITBUPnAaC///nC+FjBuIOJZEB8YeCh/8AoYACoMEEAnEjhQDPQJKJ/DCDAoi5DoLdHAoMQgLjFWYPOnngh02IwXzwDjEgPGEYS8BI4MBYoSVG4fP/nghkAgZrDkngJQqSG4gvBg4sBQgkImHihEAWwP8ZBMBEYl5/+cSoVAGQIUFh04weJn///0gj/OEw5KEz45BzhuCTYQAEgePB4IACAoJuBnAQEa4XHjxKB//xFgWHJQsCRgMDEonipwjENwUBDQNx8+evvn/hTDLw3igE+EgZxB8UOXIvEJQUfEYOfv53DEQkgga5BJQvzx84cAj+CDoNh8/eEYJKDuCSEcocnEon+/7xEgFBIIcfB4Mf/IICXI2DgDdBAAn758gCIq5Dv4zBvJuIOIfjEgvP/ARHgwdCB4P3AoTdFAAk4EYk8SQgAFTALaDSQwAGh08//vnDmBABYmEEZYAzA=="))
-}
+};
 
 var iconMars = {
-  text: "MARS",
   width : 50, height : 50, bpp : 3,
   transparent : 1,
   buffer : require("heatshrink").decompress(atob("AH4ATjlwCJ+Dh0wwAQMg0cuPHjFhCZkDps0yVJkmQCBMEjFx42atOmzQmLhMkEYQCCCREQoOGEYmmzB0IEY4CBkARGoJKBEYQCEzgSGkGSpAjDyYCCphuGiFhJQgCD8ASFgRHGAQKbB6BuHJRGeOIsINxEk6dNmARDgMEjQjHAQPnVQojIyZKB6YSDNwK5FAQt54BuDXJIjBEwK5EgxKKXgq5BJRdgXIojJAQJKMcAM0EwM2JUApDoCVFExa7FkGCgAmIkAREEwUEjAmHCIgABhEggQmFpACBCIojBEwRQCzVhwkQU4YADgQmBwQCCI4IFBCAojFAQojGJQQjDAQgRGEZICBEo4gFyUIkilFJQUYEAZrBAQMYNw5KDSQSbCNwwABgOGEwgCBsPACQ5xGwdNnARJcAVh48evvnCJK8Chs+/fv33gCRcB48cuPHCBYA/ADAA=="))
-}
+};
 
 var iconSatellite =  {
-  text: "GPS ON",
   width : 50, height : 50, bpp : 3,
   transparent : 2,
   buffer : require("heatshrink").decompress(atob("pMkyQC/ATGXhIRPyNl0gmPjlwCJ9ly1aCJ1c+fHJR1Hy1ZJR1I+fPnlx6QRLpe+/JKBr5KMuYjBJQMdCJce/fvJQW0CJUlEYQCBSpvvJQbXJjl0NwnzNxGQwEOnHhgF78+WqQyIrFx48cAQXz4ShJgAABh0+8cP//9LJEhg4jDuP3//0LhGQgYlBgeAn///5cIy8MuAmDCIP/9I4HkmCEYMOgHfCQWkCI0cuBuDgF/CIP+CI1Ny1IkeAgHANwIAB/QRFrj7BhkxEwQRC/4RFpbXDgSVBg4RCSorXDI4MJAQMfCIP8cwImDn37fwN58+kwHgLgSVFub7CI4NyBAJKDLgkuEYX78+evKtCLg0jEYRKC58JMoRcFkwjDJQTFDl65EkojEAQMdcwn/+gFC3YjEJQLXEpYRDWwQmEdI6SHAQO0CJUkx4jDF4gCIJQgRMXIjCEARIjCCJ2XEYPKCJqJBJQIROcAUpCJ0kybaDARtdCKAC2kAA="))
-}
+};
-
-var iconAlarm = {
-  text: "TIMER",
-  width : 50, height : 50, bpp : 3,
-  transparent : 1,
-  buffer : require("heatshrink").decompress(atob("kmSpICEp//BAwCJn/+CJ8k//5CKAABCJs8uPH//x48EI5YjCAARNKEYUcv//jgFBExEnEYoAC+QmHIgIgC/gpCuPBCI2fIgU4AQXjA4P8CIuTEYZKBAolwHApXBEAWP//jxwpBAALaFDoYCIiQmDDIP4EAT+CEwnJEwYjLAQLaFEYomDKALmDNwoCIOIZuD8AkFgCYDHAQjMAQTdDNwOAEg0Dx0/cYeREZtxQYOTHgJuHOIvkXJy8DNwIACJQ8Ah4NDAAfxEZARHOIIkHg4jQAQb1CQ4KVJgEOnDIBSoIjNAQPBcAaVJcAKVBcDGOcD7OBMQM48BuH8f//JKCnhKNggRBkmfTQJxBEwhuD/gRCyVHJRlyCIVJXgYmB8ZQBAoIKBXIQmCOIt/NxAUCOIImCIgIpCBAJuDAQZEE/huIAQWTDgImBTYQGC8gRFcYpKFCI8kDwQAFCJBfBEAX/+IjBiQRIEw4jJAQc8v//NYwCIOgJrIJpA1OcwbaFAQWQA="))
-}
 
 var iconCharging =   {
-  text: "CHARGE",
   width : 50, height : 50, bpp : 3,
   transparent : 5,
   buffer : require("heatshrink").decompress(atob("23btugAwUBtoICARG0h048eODQYCJ6P/AAUCCJfbo4SDxYRLtEcuPHjlwgoRJ7RnIloUHoYjDAQfAExEAwUIkACEkSAIEYwCBhZKH6EIJI0CJRFHEY0BJRWBSgf//0AJRYSE4BKLj4SE8BKLv4RD/hK/JS2AXY0gXwRKG4cMmACCJQMAg8csEFJQsBAwfasEAm379u0gFbcBfHzgFBz1xMQZKBjY/D0E2+BOChu26yVEEYdww+cgAFCg+cgIfB6RKF4HbgEIkGChEAthfCJQ0eEAIjBBAMxk6GCJQtgtyVBwRKBAQMbHAJKGXIIFCgACBhl54qVG2E+EAJKBJoWAm0WJQ6SCXgdxFgMLJQvYjeAEAUwFIUitEtJQ14NwUHgEwKYZKGwOwNYX7XgWCg3CJQ5rB4MevPnAoPDJRJrCgEG/ECAoNsJRUwoEesIIBiJKI3CVDti/CJRKVDiJHBSo0YsOGjED8AjBcAcIgdhcAXAPIUAcAYIBcA4dBAQUG8BrBgBuCgOwcBEeXIK2BBAIFBgRqBGoYAChq8CcYUE4FbUYOACQsHzgjDgwFBCIImBAQsDtwYD7cAloRI22B86YBw5QBgoRJ7dAgYEDCJaeBJoMcsARMAQNoJIIRE6A"))
-}
+};
 
 var iconNoBattery = {
   text: "NO BAT",
   width : 50, height : 50, bpp : 3,
   transparent : 1,
   buffer : require("heatshrink").decompress(atob("kmSpIC/AWMyoQIFsmECJFJhMmA4QXByVICIwODAQ4RRFIQGD5JVLkIGDzJqMyAGDph8MiRKGyApEAoZKFyYIDQwMkSQNkQZABBhIIOOJRuEL5gRIAUKACVQMhmUSNYNDQYJTBBwYFByGTkOE5FJWYNMknCAQKYCiaSCpmGochDoSYBhMwTAZrChILBhmEzKPBF4ImBTAREBDoMmEwJVDoYjBycJFgWEJQRuLJQ1kmQCCjJlCBYbjCagaDBwyDBmBuBF4TjJAUQKINBChCDQxZBcZIIQF4NIgEAgKSDiQmEVQKMBoARBAAMCSQLLBVoxqKL4gaCChVCNwoRKOIo4CJIgABBoSMHpIRFgDdJOIJUBCAUJRgJuEAQb+DIIgRIAX4C/ASOQA"))
-}
+};
 
 // Font to use:
 // <link href="https://fonts.googleapis.com/css2?family=Antonio:wght@400;700&display=swap" rel="stylesheet">
-Graphics.prototype.setFontAntonioSmall = function(scale) {
+Graphics.prototype.setFontAntonioMedium = function(scale) {
-  // Actual height 18 (17 - 0)
+  // Actual height 20 (19 - 0)
-  g.setFontCustom(atob("AAAAAAAAAAAAAAAf4Mf/sYAMAAAAAAfgAfAAAAAfgAeAAAAAAiAAj8H/4fyEAv8f/gfiAAgAAAAD54H98eOPHn8Hz8AhwAAAP8Af+AYGAYCAf+AP8MAB8AHwA+AD4AfAAcf4A/8AwMAwMA/8Af4AAAAAwGD8f/8f8MY/cfz4PD8AHMAAAfAAeAAAAAAAAP/+f//YADAAAQABYADf//P/+AAAAAANAAPAAfwAfgAPAANAAAAAAEAAEAA/AA/AAEAAEAAAAAAZAAfAAYAAAAIAAIAAIAAIAAAAAAAAAMAAMAAAAAAAAEAB8Af4H+AfwAcAAAAAP/4f/8YAMf/8f/8H/wAAAAAAEAAMAAf/8f/8f/8AAAAAAAAAHgcfh8cH8YPMf8MPwEAAAAAAOB4eB8YYMY4Mf/8Pn4AAAAAgAHwA/wPwwf/8f/8AAwAAgAAAf54f58ZwMZwMY/8Qf4AAAAAAP/4f/8YYMYYMff8HP4AAAQAAYAAYD8Y/8f/AfgAcAAAAAAAAPv4f/8YYMY8Mf/8Pn4AAAAAAP94f98YGMcMMf/8H/wAAAAAABgwBgwAAAAAABgABg/Bg8AAAAEAAOAAbAA7gAxgBwwASAAbAAbAAbAAbAASAAAAAxwA5gAbAAPAAOAAAAPAAfHcYPcf8Af4AHgAAAAAAAB/gH/wOA4Y/MZ/sbAsbBkb/MZ/sOBsH/AAAAAAMAP8f/4fwwf4wH/8AH8AAMAAAf/8f/8YYMYYMf/8P/4ADgAAAP/4f/8YAMYAMfj8Pj4AAAAAAf/8f/8YAMYAMf/8P/4B/AAAAf/8f/8YMMYMMYIMAAAAAAf/8f/8YYAYYAYYAAAAAAAP/4f/8YAMYIMfP8Pv8AAAAAAf/8f/8AMAAMAf/8f/8f/8AAAAAAf/8f/8AAAAAAAD4AB8AAMf/8f/4f/gAAAAAAf/8f/8A+AD/gfj4eA8QAEAAAf/8f/8AAMAAMAAMAAAf/8f/8f8AB/wAB8AP8P/Af/8f/8AAAAAAf/8f/8HwAA+AAPwf/8f/8AAAAAAP/4f/8YAMYAMf/8P/4AAAAAAf/8f/8YGAYGAf8AP8ABAAAAAf/w//4wAYwAc//+f/yAAAAAAf/8f/8YMAYMAf/8f/8DA8CAAPj4fz8Y4MeeMfP8HD4YAAYAAf/8f/8YAAQAAAAAf/4f/8AAMAAMf/8f/4AAAYAAf4AP/4AP8AP8f/4fwAQAAYAAf8AP/8AD8D/8f8Af8AD/8AD8f/8f8AAAAQAEeB8P/4B/AP/4fA8QAEYAAfAAP4AB/8H/8fwAcAAAAMYD8Y/8f/MfwMcAMAAAf/+f//YADYADAAAAAAfAAf8AB/wAH8AAMQACYADf//f//AAAAA"), 32, atob("BAUHCAcTCAQFBQgGBAYFBggICAgICAgICAgEBQYGBggNCAgICAcHCAkECAgGCwkICAgIBwYICAwHBwYGBgY="), 18+(scale<<8)+(1<<16));
+  g.setFontCustom(atob("AAAAAAAAAAAAAAAAAAAA//mP/5gAAAAAAAAAAAAA/gAMAAAAAA/gAPAAAEIIBP+H/8D+IYBP+H/8D+IABCAAwIAfnwP8+PHh448eP3+B4fAAAAAAAH/AD/4AwGAMBgD/4Af8GAAPgAPgAfgAfAAfAA+AAOP/AH/4BgGAYBgH/4A/8AAAAAAAAAQAA/B+f4/+GMPhjv/4/h8Dg/gAcYwAAPwADgAAAAAAAAB//8///sAAaAACAAAMAAb//+f//AAAAAAAbAAGwAA4AA/wADgABsAAbAAAAAAAgAAMAAPwAD8AAMAADAAAAAAAAAAHAAB/AAOAAAAAAAAMAADAAAwAAMAACAAAAAAAAAABgAAYAAAAAAAAA4AD+AP+A/4A/gAOAAAAAAAAAH//j//8wADMAAz//8f/+AAAAAAAMAADAABgAA//+P//gAAAAAAAAAAAAAfgfP4fzAfswfDP/gx/gMAAAHgPj4D8wMDMHAz//8f3+AAEAAAAADwAH8APzA/AwP//j//4AAwAAAD/Hw/x+MwBjOAYz/+Mf/AAAAAAAH//j//8wYDMGAz9/8fP+AAcDAAAwAAMAfjB/4z/wP+AD4AAwAAAAOB/f4///MHAzBwM///H9/gAAAAAAH/Pj/78wGDMBgz//8f/+AAAAAAADhwA4cAAAAAAAAAAAAAADh/A4fgAAAAOAAHwABsAA7gAccAGDAAAAANgADYAA2AANgADYAA2AAAAAAAABgwAccADuAAbAAHwAA4AAAAHwAD8c4/POMHAD/wAfwAAAAAAAAD/wD//B4B4Y/HMf8zMBMyATMwczP+M4BzHwcgf+AA+AAAAAAD4A/+P/8D+DA/4wH/+AB/4AAeAAAAAAA//+P//jBgYwYGP//j//4PH4AAAAAAAf/+P//zgAcwADP4fz+P4Ph8AAAAAAA//+P//jAAYwAGPADj//4P/4AAAAAAA//+P//jBgYwYGMGBgAAAAAAP//j//4wYAMGADBgAAAAAAAA//w///PAHzAQM4MHP7/x+/8AAAAAAD//4//+AGAABgAAYAP//j//4AAAAAAAAAA//+P//gAAAAAAAAAAAHwAB+AABgAAY//+P//AAAAAAAAAAD//4//+APgAf+Afj8PgPjAAYAAAAAAD//4//+AABgAAYAAGAAAAAAA//+P//j/gAD/wAB/gAP4B/4P/AD//4//+AAAAAAAAAAP//j//4P4AAfwAA/g//+P//gAAAAAAAAAA//g//+PAHjAAY4AOP//h//wAAAAAAD//4//+MDADAwA4cAP/AB/gAAAAAAAA//g//+PAHjAAc4APv//5//yAAAAAAD//4//+MGADBgA48AP//h+f4AAAAAAB+Pw/z+MOBjBwY/P+Hx/AAHgwAAMAAD//4//+MAADAAAAAAP//D//4AAOAABgAA4//+P//AAAAwAAP8AD//AA/+AAfgP/4//gPwAAAAA+AAP/4Af/4AD+A//j/wA/wAD/+AA/4B/+P/+D+AAAAAMADj8P4P/4A/4B//w+A+MABgAAA4AAPwAB/gAB/+A//j/gA+AAMAAAAAYwB+MH/jf+Y/8GPwBjAAAAAAP//7//+wABsAAYAAAAAAPAAD/gAH/gAD/gAD4AACAAADAAGwABv//7//+AAAA=="), 32, atob("BQUHCAgVCQQFBQkHBQcFBwgICAgICAgICAgFBQcHBwgPCQkJCQcHCQoFCQkHDQoJCQkJCAYJCQ0ICAcGBwY="), 20+(scale<<8)+(1<<16));
-}
+};
 
 Graphics.prototype.setFontAntonioLarge = function(scale) {
-  // Actual height 34 (34 - 1)
+  // Actual height 39 (39 - 1)
-  g.setFontCustom(atob("AAAAAAAAAAAAAAAAAAAAAAAADwAAAAAeAAAAADwAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAD+AAAAH/wAAAP/+AAAf/+AAA//8AAB//4AAD//wAAD//gAAAf/AAAAD+AAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAB////gA/////AP////8D/////wfAAAA+DwAAADweAAAAeDwAAADwf////+D/////wP////8Af///+AAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAOAAAAADwAAAAAeAAAAAHgAAAAB/////wf////+D/////wf////+D/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/AAPwH/4AP+B//AH/wf/4D/+D4AB/9weAAf4ODwAP8BweAP/AOD///gBwP//wAOA//4ABwB/4AAOAAAAAAAAAAAAAAAAAAAAB8AA/gA/gAH/AP8AA/8D/gAH/wfAHAA+DwA4ADweAHgAeDwB8ADwf7/+H+D/////gP/9//8A//H/+AA/AH/AAAAAAAAAAAAAAAAAABwAAAAD+AAAAD/wAAAH/+AAAH/5wAAH/wOAAP/gBwAP/gAOAD/////wf////+D/////wf////+AAAABwAAAAAOAAAAABwAAAAAAAAAAAAAAAAAAeAD//4D/Af//Af8D//4D/wf//Af+DwPAADweB4AAeDwPAADweB///+DwP///weA///8DwD//+AAAA/8AAAAAAAAAAAAAAAAAAAAAA////AA/////AP////8D/////wfgPAB+DwB4ADweAOAAeDwBwADwf+PAA+D/x///wP+H//8A/wf//AAAA//gAAAAAAAAAAAAADgAAAAAeAAAAADwAAAAAeAAAD+DwAAP/weAA//+DwA///weB///8Dx//8AAf//wAAD//gAAAf/AAAAD/AAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAD/wf/wB//v//AP////8D/////weAPwAeDwA8ADwcAHAAeDwB8ADwf////+D/////wP/9//8A//H//AA/AD/AAAAAAAAAAAAAAAAAAAAAD//gfAA///D/AP//8f8D///j/weAA8A+DwADgDweAAcAeDwAHgDwf////+B/////gP////8Af///+AAP//4AAAAAAAAAAAAAAAAAAAAAAD4AfAAAfAD4AAD4AfAAAfAD4AAD4AfAAAAAAAAAAAAAA=="), 46, atob("Cg4QEBAQEBAQEBAQCQ=="), 39+(scale<<8)+(1<<16));
+  g.setFontCustom(atob("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAAPgAAAAAB8AAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAD8AAAAAH/gAAAAP/8AAAAf//gAAA///AAAB//+AAAD//8AAAH//4AAAP//wAAAB//gAAAAP/AAAAAB+AAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH///AAAf////8AP/////4B//////Af/////8D8AAAAfgeAAAAA8DwAAAAHgeAAAAA8D//////gf/////8B//////AP/////wAf////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAAAHgAAAAAA8AAAAAAPgAAAAAB4AAAAAAf/////gP/////8B//////gP/////8B//////gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/wAAAAD/+AAP8A//wAP/gP/+AH/8D//wD//gfgAA//8DwAAf+HgeAAP/A8DwAH/gHgfgP/wA8D///4AHgP//+AA8A///AAHgB//AAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD4AA/gAD/AAH/gA/4AA/+AP/AAH/4D/4AA//gfgA4AB8DwAPAAHgeAB4AA8DwAPgAHgfAD+AB8D//////gP/////4B//5//+AD/+H//gAH/AH/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP4AAAAAP/AAAAAP/4AAAAP//AAAAP/x4AAAf/wPAAAf/gB4AAf/AAPAAP/AAB4AB//////gP/////8B//////gP/////8AAAAAPAAAAAAB4AAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//wD/AB///Af+AP//4D/4B///Af/gP//4B/8B4D4AAPgPAeAAA8B4DwAAHgPAfAAB8B4D////gPAf///4B4B////APAD///gAAAD//gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB///AAAP////4AH/////wB//////Af/////8D8APAA/geADwAB8DwAeAAHgeADwAA8D4AeAAPgf/j+AH8B/8f///gP/h///4Af8H//+AAPgP//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAPAAAAAAB4AAAABgPAAAA/8B4AAB//gPAAD//8B4AH///gPAH///8B4P//+AAPH//wAAB///gAAAP//AAAAB/+AAAAAP+AAAAAB+AAAAAAOAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/4A/+AAf/w//+AP//v//4B//////Af/////8D4AfwAPgeAB8AA8DwAHAAHgeAB8AA8D4Af4APgf/////8B//////AP//v//4A//4//8AA/4A/+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH/+AAAAD//+D/gB///4f+AP///j/4D///8f/gfAAHgB8DwAA8AHgeAAHgA8DwAA8AHgfgAHgB8D//////gP/////4A/////+AD/////gAD////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAfgAAB+AD8AAAPwAfgAAB+AD8AAAPwAfgAAAAAAAAAAAAAAAAAAAAAAAA=="), 46, atob("DBATExMTExMTExMTCw=="), 45+(scale<<8)+(1<<16));
-}
+};
+
 
 /*
  * Draw watch face
@@ -108,117 +119,299 @@ function queueDraw() {
 }
 
 
-function printData(key, y){
+function printData(key, y, c){
   g.setFontAlign(-1,-1,0);
+  var text = "ERR";
+  var value = "NOT FOUND";
 
   if(key == "Battery"){
-    var bat = E.getBattery();
+    text = "BAT";
-    g.drawString("BAT:", 30, y);
+    value = E.getBattery() + "%";
-    g.drawString(bat+ "%", 68, y);
 
   } else if(key == "Steps"){
-    var steps = getSteps();
+    text = "STEP";
-    g.drawString("STEP:", 30, y);
+    value = getSteps();
-    g.drawString(steps, 68, y);
 
   } else if(key == "Temp."){
-    var temperature = Math.floor(E.getTemperature());
+    text = "TEMP";
-    g.drawString("TEMP:", 30, y);
+    value = Math.floor(E.getTemperature()) + "C";
-    g.drawString(temperature + "C", 69, y);
 
   } else if(key == "HRM"){
-    g.drawString("HRM:", 30, y);
+    text = "HRM";
-    g.drawString(hrmValue, 69, y);
+    value = hrmValue;
 
+  } else if (key == "VREF"){
+    text = "VREF";
+    value = E.getAnalogVRef().toFixed(2) + "V";
+
+  }
+
+  g.setColor(c);
+  g.fillRect(133, y-2, 165 ,y+18);
+  g.fillCircle(161, y+8, 10);
+  g.setColor(cBlack);
+  g.drawString(text, 135, y);
+
+  g.setColor(c);
+  g.setFontAlign(1,-1,0);
+  g.drawString(value, 130, y);
+}
+
+function drawHorizontalBgLine(color, x1, x2, y, h){
+  g.setColor(color);
+
+  for(var i=0; i<h; i++){
+    g.drawLine(x1, y+i, x2,y+i);
+  }
+}
+
+
+function drawLock(){
+  if(lcarsViewPos != 0){
+    return;
+  }
+
+  g.setFontAntonioMedium();
+  g.setColor(cOrange);
+  g.clearRect(120, 10, g.getWidth(), 75);
+  g.drawString("LCARS", 128, 13);
+  if(connected){
+    g.drawString("CONN", 128, 33);
   } else {
-    g.drawString("NOT FOUND", 30, y);
+    g.drawString("NOCON", 128, 33);
+  }
+  if(Bangle.isLocked()){
+    g.setColor(cPurple);
+    g.drawString("LOCK", 128, 53);
+  }
+}
+
+function drawState(){
+  if(lcarsViewPos != 0){
+    return;
+  }
+
+  g.clearRect(20, 93, 77, 170);
+  g.setColor(cWhite);
+  var bat = E.getBattery();
+  var current = new Date();
+  var hours = current.getHours();
+
+  if(!isAlarmEnabled()){
+    var iconImg =
+        Bangle.isCharging() ? iconCharging :
+        bat < 30 ? iconNoBattery :
+        Bangle.isGPSOn() ? iconSatellite :
+        hours % 4 == 0 ? iconSaturn :
+        hours % 4 == 1 ? iconMars :
+        hours % 4 == 2 ? iconMoon :
+        iconEarth;
+    g.drawImage(iconImg, 29, 104);
+  } else {
+    // Alarm within symbol
+    g.setFontAntonioMedium();
+    g.setFontAlign(0, 0, 0);
+    g.setColor(cOrange);
+    g.drawString("ALARM", 29+25, 107);
+    g.setColor(cWhite);
+    g.setFontAntonioLarge();
+    g.drawString(getAlarmMinutes(), 29+25, 107+35);
+  }
+
+  g.setFontAlign(-1, -1, 0);
+}
+
+
+function drawPosition0(){
+  // Draw background image
+  g.drawImage(bgLeft, 0, 0);
+  drawHorizontalBgLine(cBlue, 25, 120, 0, 4);
+  drawHorizontalBgLine(cBlue, 130, 176, 0, 4);
+  drawHorizontalBgLine(cPurple, 20, 70, 80, 4);
+  drawHorizontalBgLine(cPurple, 80, 176, 80, 4);
+  drawHorizontalBgLine(cOrange, 35, 110, 87, 4);
+  drawHorizontalBgLine(cOrange, 120, 176, 87, 4);
+
+  // The last line is a battery indicator too
+  var bat = E.getBattery() / 100.0;
+  var batX2 = parseInt((172 - 35) * bat + 35);
+  drawHorizontalBgLine(cOrange, 35, batX2, 171, 5);
+  drawHorizontalBgLine(cPurple, batX2+10, 172, 171, 5);
+
+  // Draw logo
+  drawLock();
+
+  // Write time
+  g.setFontAlign(-1, -1, 0);
+  g.setColor(cWhite);
+  var currentDate = new Date();
+  var timeStr = locale.time(currentDate,1);
+  g.setFontAntonioLarge();
+  g.drawString(timeStr, 28, 10);
+
+  // Write date
+  g.setColor(cWhite);
+  g.setFontAntonioMedium();
+  var dayStr = locale.dow(currentDate, true).toUpperCase();
+  dayStr += " " + currentDate.getDate();
+  dayStr += " " + currentDate.getFullYear();
+  g.drawString(dayStr, 29, 56);
+
+  // Draw data
+  g.setFontAlign(-1, -1, 0);
+  g.setColor(cWhite);
+  printData(settings.dataRow1, 97, cOrange);
+  printData(settings.dataRow2, 122, cPurple);
+  printData(settings.dataRow3, 147, cBlue);
+
+  // Draw state
+  drawState();
+}
+
+function drawPosition1(){
+  // Draw background image
+  g.drawImage(bgRight, 149, 0);
+  drawHorizontalBgLine(cBlue, 0, 140, 0, 4);
+  drawHorizontalBgLine(cPurple, 0, 80, 80, 4);
+  drawHorizontalBgLine(cPurple, 90, 150, 80, 4);
+  drawHorizontalBgLine(cOrange, 0, 50, 87, 4);
+  drawHorizontalBgLine(cOrange, 60, 140, 87, 4);
+  drawHorizontalBgLine(cOrange, 0, 150, 171, 5);
+
+  // Draw steps bars
+  g.setColor(cWhite);
+  let health;
+
+  try {
+    health = require("health");
+  } catch(ex) {
+    g.setFontAntonioMedium();
+    g.drawString("MODULE HEALTH", 20, 110);
+    g.drawString("REQUIRED.", 20, 130);
+    g.drawString("MODULE HEALTH", 20, 20);
+    g.drawString("REQUIRED.", 20, 40);
+    return;
+  }
+
+  // Plot HRM graph
+  if(plotWeek){
+    var data = new Uint16Array(32);
+    var cnt = new Uint8Array(32);
+    health.readDailySummaries(new Date(), h=>{
+      data[h.day]+=h.bpm;
+      if (h.bpm) cnt[h.day]++;
+    });
+    require("graph").drawBar(g, data, {
+      axes : true,
+      minx: 1,
+      gridx : 5,
+      gridy : 100,
+      width : 140,
+      height : 50,
+      x: 5,
+      y: 25
+    });
+
+    // Plot step graph
+    var data = new Uint16Array(32);
+    health.readDailySummaries(new Date(), h=>data[h.day]+=h.steps/1000);
+    var gridY = parseInt(Math.max.apply(Math, data)/2);
+    gridY = gridY <= 0 ? 1 : gridY;
+    require("graph").drawBar(g, data, {
+      axes : true,
+      minx: 1,
+      gridx : 5,
+      gridy : gridY,
+      width : 140,
+      height : 50,
+      x: 5,
+      y: 115
+    });
+
+    g.setFontAlign(1, 1, 0);
+    g.setFontAntonioMedium();
+    g.setColor(cWhite);
+    g.drawString("WEEK HRM", 154, 27);
+    g.drawString("WEEK STEPS [K]", 154, 115);
+
+  // Plot day
+  } else {
+    var data = new Uint16Array(24);
+    var cnt = new Uint8Array(24);
+    health.readDay(new Date(), h=>{
+      data[h.hr]+=h.bpm;
+      if (h.bpm) cnt[h.hr]++;
+    });
+    require("graph").drawBar(g, data, {
+      axes : true,
+      minx: 1,
+      gridx : 4,
+      gridy : 100,
+      width : 140,
+      height : 50,
+      x: 5,
+      y: 25
+    });
+
+    // Plot step graph
+    var data = new Uint16Array(24);
+    health.readDay(new Date(), h=>data[h.hr]+=h.steps);
+    var gridY = parseInt(Math.max.apply(Math, data)/1000)*1000;
+    gridY = gridY <= 0 ? 1000 : gridY;
+    require("graph").drawBar(g, data, {
+      axes : true,
+      minx: 1,
+      gridx : 4,
+      gridy : gridY,
+      width : 140,
+      height : 50,
+      x: 5,
+      y: 115
+    });
+
+    g.setFontAlign(1, 1, 0);
+    g.setFontAntonioMedium();
+    g.setColor(cWhite);
+    g.drawString("DAY HRM", 154, 27);
+    g.drawString("DAY STEPS", 154, 115);
   }
 }
 
 function draw(){
-
   // First handle alarm to show this correctly afterwards
   handleAlarm();
 
   // Next draw the watch face
   g.reset();
-  g.clearRect(0, 24, g.getWidth(), g.getHeight());
+  g.clearRect(0, 0, g.getWidth(), g.getHeight());
 
-  // Draw background image
+  // Draw current lcars position
-  g.drawImage(backgroundImage, 0, 24);
+  if(lcarsViewPos == 0){
-
+    drawPosition0();
-  // Draw symbol
+  } else if (lcarsViewPos == 1) {
-  var bat = E.getBattery();
+    drawPosition1();
-  var timeInMinutes = getCurrentTimeInMinutes();
-
-  var iconImg =
-      isAlarmEnabled() ? iconAlarm :
-      Bangle.isCharging() ? iconCharging :
-      bat < 30 ? iconNoBattery :
-      Bangle.isGPSOn() ? iconSatellite :
-      timeInMinutes % 4 == 0 ? iconSaturn :
-      timeInMinutes % 4 == 1 ? iconMars :
-      timeInMinutes % 4 == 2 ? iconMoon :
-      iconEarth;
-  g.drawImage(iconImg, 115, 115);
-
-  // Alarm within symbol
-  g.setFontAlign(0,0,0);
-  g.setFontAntonioSmall();
-  g.drawString(iconImg.text, 115+25, 105);
-  if(isAlarmEnabled() > 0){
-    g.drawString(getAlarmMinutes(), 115+25, 115+25);
   }
 
-  // Write time
-  var currentDate = new Date();
-  var timeStr = locale.time(currentDate,1);
-  g.setFontAlign(0,0,0);
-  g.setFontAntonioLarge();
-  g.drawString(timeStr, 60, 55);
-
-  // Write date
-  g.setFontAlign(-1,-1, 0);
-  g.setFontAntonioSmall();
-
-  var dayName = locale.dow(currentDate, true).toUpperCase();
-  var day = currentDate.getDate();
-  g.drawString(day, 100, 35);
-  g.drawString(dayName, 100, 55);
-
-  // Draw battery
-  printData(settings.dataRow1, 98);
-  printData(settings.dataRow2, 121);
-  printData(settings.dataRow3, 144);
-
   // Queue draw in one minute
   queueDraw();
 }
 
+
 /*
  * Step counter via widget
  */
 function getSteps() {
-  if (stepsWidget() !== undefined)
+  var steps = 0
-    return stepsWidget().getSteps();
+  try {
-  return "???";
+    health = require("health");
-}
+  } catch(ex) {
-
+    return steps;
-function stepsWidget() {
-  if (WIDGETS.activepedom !== undefined) {
-    return WIDGETS.activepedom;
-  } else if (WIDGETS.wpedom !== undefined) {
-    return WIDGETS.wpedom;
   }
-  return undefined;
+
+  health.readDay(new Date(), h=>steps+=h.steps);
+  return steps;
 }
 
-/*
- * HRM Listener
- */
-Bangle.on('HRM', function (hrm) {
-  hrmValue = hrm.bpm;
-});
 
 /*
  * Handle alarm
@@ -228,7 +421,7 @@ function getCurrentTimeInMinutes(){
 }
 
 function isAlarmEnabled(){
- return settings.alarm > 0;
+ return settings.alarm >= 0;
 }
 
 function getAlarmMinutes(){
@@ -253,65 +446,130 @@ function handleAlarm(){
   .then(() => new Promise(resolve => setTimeout(resolve, t)))
   .then(() => Bangle.buzz(t, 1))
   .then(() => new Promise(resolve => setTimeout(resolve, t)))
-  .then(() => Bangle.buzz(t, 1));
+  .then(() => Bangle.buzz(t, 1))
-
+  .then(() => new Promise(resolve => setTimeout(resolve, 5E3)))
+  .then(() => {
     // Update alarm state to disabled
     settings.alarm = -1;
     Storage.writeJSON(SETTINGS_FILE, settings);
+  });
 }
 
 
 /*
- * Swipe to set an alarm
+ * Listeners
  */
-Bangle.on('swipe',function(dir) {
+Bangle.on('lcdPower',on=>{
-  // Increase alarm
+  if (on) {
-  if(dir == -1){
+    // Whenever we connect to Gadgetbridge, reading data from
+    // health failed. Therefore, we update and read data from
+    // health iff the connection state did not change.
+    if(connected == NRF.getSecurityStatus().connected) {
+      draw();
+    } else {
+      connected = NRF.getSecurityStatus().connected
+      drawLock();
+    }
+  } else { // stop draw timer
+    if (drawTimeout) clearTimeout(drawTimeout);
+    drawTimeout = undefined;
+  }
+
+  connected = NRF.getSecurityStatus().connected
+});
+
+Bangle.on('lock', function(isLocked) {
+  drawLock();
+});
+
+Bangle.on('charging',function(charging) {
+  drawState();
+});
+
+Bangle.on('HRM', function (hrm) {
+  hrmValue = hrm.bpm;
+});
+
+
+function increaseAlarm(){
   if(isAlarmEnabled()){
     settings.alarm += 5;
   } else {
     settings.alarm = getCurrentTimeInMinutes() + 5;
   }
-  }
 
-  // Decrease alarm
+  Storage.writeJSON(SETTINGS_FILE, settings);
-  if(dir == +1){
+}
+
+
+function decreaseAlarm(){
   if(isAlarmEnabled() && (settings.alarm-5 > getCurrentTimeInMinutes())){
     settings.alarm -= 5;
   } else {
     settings.alarm = -1;
   }
+
+  Storage.writeJSON(SETTINGS_FILE, settings);
+}
+
+
+// Thanks to the app "gbmusic" for this code to detect swipes in all 4 directions.
+Bangle.on("drag", e => {
+  if (!drag) { // start dragging
+    drag = {x: e.x, y: e.y};
+  } else if (!e.b) { // released
+    const dx = e.x-drag.x, dy = e.y-drag.y;
+    drag = null;
+
+    // Horizontal swipe
+    if (Math.abs(dx)>Math.abs(dy)+10) {
+      if(dx > 0){
+        lcarsViewPos = 0;
+      } else {
+        lcarsViewPos = 1;
       }
 
-  // Update UI
+    // Vertical swipe
-  draw();
+    } else if (Math.abs(dy)>Math.abs(dx)+10) {
+      if(lcarsViewPos == 0){
+        if(dy > 0){
+          decreaseAlarm();
+        } else {
+          increaseAlarm();
+        }
 
-  // Update alarm state
+        // Only update the state and return to
-  Storage.writeJSON(SETTINGS_FILE, settings);
+        // avoid a full draw as this is much faster.
+        drawState();
+        return;
+      }
+
+      if(lcarsViewPos == 1){
+        plotWeek = dy < 0 ? true : false;
+      }
+    }
+
+    draw();
+  }
 });
 
 
 /*
- * Stop updates when LCD is off, restart when on
+ * Lets start widgets, listen for btn etc.
  */
-Bangle.on('lcdPower',on=>{
-  if (on) {
-    draw(); // draw immediately, queue redraw
-  } else { // stop draw timer
-    if (drawTimeout) clearTimeout(drawTimeout);
-    drawTimeout = undefined;
-  }
-});
-
 // Show launcher when middle button pressed
 Bangle.setUI("clock");
-
-// Load widgets - needed by draw
 Bangle.loadWidgets();
+/*
+ * we are not drawing the widgets as we are taking over the whole screen
+ * so we will blank out the draw() functions of each widget and change the
+ * area to the top bar doesn't get cleared.
+ */
+for (let wd of WIDGETS) {wd.draw=()=>{};wd.area="";}
 
 // Clear the screen once, at startup and draw clock
 g.setTheme({bg:"#000",fg:"#fff",dark:true}).clear();
 draw();
 
 // After drawing the watch face, we can draw the widgets
-Bangle.drawWidgets();
+// Bangle.drawWidgets();

apps/lcars/lcars.settings.js

@@ -18,14 +18,14 @@
     storage.write(SETTINGS_FILE, settings)
   }
 
-  var data_options = ['Battery', 'Steps', 'Temp.', "HRM"];
+  var data_options = ["Battery", "Steps", "Temp.", "HRM", "VREF"];
 
   E.showMenu({
     '': { 'title': 'LCARS Clock' },
     '< Back': back,
     'Row 1': {
       value: 0 | data_options.indexOf(settings.dataRow1),
-      min: 0, max: 3,
+      min: 0, max: 4,
       format: v => data_options[v],
       onchange: v => {
         settings.dataRow1 = data_options[v];
@@ -34,7 +34,7 @@
     },
     'Row 2': {
       value: 0 | data_options.indexOf(settings.dataRow2),
-      min: 0, max: 3,
+      min: 0, max: 4,
       format: v => data_options[v],
       onchange: v => {
         settings.dataRow2 = data_options[v];
@@ -43,7 +43,7 @@
     },
     'Row 3': {
       value: 0 | data_options.indexOf(settings.dataRow3),
-      min: 0, max: 3,
+      min: 0, max: 4,
       format: v => data_options[v],
       onchange: v => {
         settings.dataRow3 = data_options[v];