diff --git a/apps.json b/apps.json
index 6de44a3b6..d9af3327e 100644
--- a/apps.json
+++ b/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.",
diff --git a/apps/lcars/ChangeLog b/apps/lcars/ChangeLog
index c5f8187b7..c171ec3d4 100644
--- a/apps/lcars/ChangeLog
+++ b/apps/lcars/ChangeLog
@@ -4,4 +4,5 @@
0.04: Inluded LCARS Logo.
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.
\ No newline at end of file
+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.
\ No newline at end of file
diff --git a/apps/lcars/README.md b/apps/lcars/README.md
index 15009e838..97695a408 100644
--- a/apps/lcars/README.md
+++ b/apps/lcars/README.md
@@ -1,18 +1,33 @@
# LCARS clock
A simple LCARS inspired clock.
-Note: To display the steps, its necessary to install
-the [Pedometer widget](https://banglejs.com/apps/#pedometer%20widget).
+Note: To display the steps, the health app is required. If this app is not installed, the data will not be shown.
+To contribute you can open a PR at this [GitHub Repo]( https://github.com/peerdavid/BangleApps)
## Features
- * LCARS Style watch face
- * Shows satate (charging, out of battery etc.)
- * SHows data that can be configured (steps, HRM, temperature etc.)
- * Swipe left/right to activate an alarm
+ * LCARS Style watch face.
+ * Full screen mode - widgets are still loaded.
+ * Supports multiple screens with different data.
+ * [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
+
+
+
+
## Icons
-## Creator
-Made by [David Peer](https://github.com/peerdavid)
\ No newline at end of file
+## Contributors
+- Creator: [David Peer](https://github.com/peerdavid).
+- Improvements: [Adam Schmalhofer](https://github.com/adamschmalhofer).
diff --git a/apps/lcars/bg_large.png b/apps/lcars/bg_large.png
deleted file mode 100644
index 56590e878..000000000
Binary files a/apps/lcars/bg_large.png and /dev/null differ
diff --git a/apps/lcars/bg_left.png b/apps/lcars/bg_left.png
new file mode 100644
index 000000000..91c2bb6f7
Binary files /dev/null and b/apps/lcars/bg_left.png differ
diff --git a/apps/lcars/bg_right.png b/apps/lcars/bg_right.png
new file mode 100644
index 000000000..6e23a5d6e
Binary files /dev/null and b/apps/lcars/bg_right.png differ
diff --git a/apps/lcars/bg_small.png b/apps/lcars/bg_small.png
deleted file mode 100644
index ea3a75688..000000000
Binary files a/apps/lcars/bg_small.png and /dev/null differ
diff --git a/apps/lcars/lcars.app.js b/apps/lcars/lcars.app.js
index 859e999a5..74d0450c0 100644
--- a/apps/lcars/lcars.app.js
+++ b/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 = {
- width : 176, height : 151, bpp : 3,
- transparent : 2,
- 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"))
-}
+var bgLeft = {
+ width : 27, height : 176, bpp : 3,
+ transparent : 0,
+ 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:
// {
+ 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
- g.drawImage(backgroundImage, 0, 24);
-
- // Draw symbol
- var bat = E.getBattery();
- 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);
+ // Draw current lcars position
+ if(lcarsViewPos == 0){
+ drawPosition0();
+ } else if (lcarsViewPos == 1) {
+ drawPosition1();
}
- // 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)
- return stepsWidget().getSteps();
- return "???";
-}
-
-function stepsWidget() {
- if (WIDGETS.activepedom !== undefined) {
- return WIDGETS.activepedom;
- } else if (WIDGETS.wpedom !== undefined) {
- return WIDGETS.wpedom;
+ var steps = 0
+ try {
+ health = require("health");
+ } catch(ex) {
+ return steps;
}
- 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));
-
- // Update alarm state to disabled
- settings.alarm = -1;
- Storage.writeJSON(SETTINGS_FILE, settings);
+ .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
- */
-Bangle.on('swipe',function(dir) {
- // Increase alarm
- if(dir == -1){
- if(isAlarmEnabled()){
- settings.alarm += 5;
- } else {
- settings.alarm = getCurrentTimeInMinutes() + 5;
- }
- }
-
- // Decrease alarm
- if(dir == +1){
- if(isAlarmEnabled() && (settings.alarm-5 > getCurrentTimeInMinutes())){
- settings.alarm -= 5;
- } else {
- settings.alarm = -1;
- }
- }
-
- // Update UI
- draw();
-
- // Update alarm state
- Storage.writeJSON(SETTINGS_FILE, settings);
-});
-
-
-/*
- * Stop updates when LCD is off, restart when on
+ * Listeners
*/
Bangle.on('lcdPower',on=>{
if (on) {
- draw(); // draw immediately, queue redraw
+ // 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;
+ }
+
+ Storage.writeJSON(SETTINGS_FILE, settings);
+}
+
+
+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;
+ }
+
+ // Vertical swipe
+ } else if (Math.abs(dy)>Math.abs(dx)+10) {
+ if(lcarsViewPos == 0){
+ if(dy > 0){
+ decreaseAlarm();
+ } else {
+ increaseAlarm();
+ }
+
+ // Only update the state and return to
+ // avoid a full draw as this is much faster.
+ drawState();
+ return;
+ }
+
+ if(lcarsViewPos == 1){
+ plotWeek = dy < 0 ? true : false;
+ }
+ }
+
+ draw();
+ }
+});
+
+
+/*
+ * Lets start widgets, listen for btn etc.
+ */
// 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();
\ No newline at end of file
+// Bangle.drawWidgets();
diff --git a/apps/lcars/lcars.icon.js b/apps/lcars/lcars.icon.js
index c404728e0..22e98a39a 100644
--- a/apps/lcars/lcars.icon.js
+++ b/apps/lcars/lcars.icon.js
@@ -1 +1 @@
-require("heatshrink").decompress(atob("mEwgeevPnAQsc+fPngCE+/fvoCEvAbIA4/AgFzEZwRBjwjNvBUBEZ3eCIMOEZtwCIMBEZuARYU5EZecTocHEZf0CIcBEbvgaggjKTwIAEbQpoHAAiSEeoYQHJQr1CCBJKEIgcBI4xKFaIdt3AOFgfuAYMeEYLRBj1pLQ4ICuYjBAgPbtoRHhu3AYN5VoMGzVpI49502AgPPVoM27dsK48N23cgE5CgOmzVoCI4LBzCSB8EP2wjJgILBAYMAhIjBsAjJzVwg47C7YRJEYhfBEZXmEZ53CI4q2BEAiVCkwjCNYaMGboQjDkBfDCAbdB04EBgyPDC4YAD/dt2wRCHIM5njXCCAcHboOmCIQ0B5/nfYT6DFIIjBeAcOvM8+EAjitFEYJEBAANzEYOeeowjCFgUDzwjB+YrDgAgBEYWcA4Mc+YjCvAQCgftEANuDIYOBEYXPNwIAIg4OCCgXkCBEOEZDvBEAhEB4AjF/inB8+OJQOOvILBoAjGU4IFDAQYjGbQIdCAQt4EY0DEZACDEYceEZACDC4bLBEZwCO"))
+require("heatshrink").decompress(atob("mEwgeevPnAQsc+fPngCE+/fvoCEvAbIA4/AgFzEZwRBjwjNvBUBEZ3eCIMOEZtwCIMBEZuARYU5EZecTocHEZf0CIcBEbvgaggjKTwIAEbQpoHAAiSEeoYQHJQr1CCBJKEIgcBI4xKFaIdt3AOFgfuAYMeEYLRBj1pLQ4ICuYjBAgPbtoRHhu3AYN5VoMGzVpI49502AgPPVoM27dsK48N23cgE5CgOmzVoCI4LBzCSB8EP2wjJgILBAYMAhIjBsAjJzVwg47C7YRJEYhfBEZXmEZ53CI4q2BEAiVCkwjCNYaMGboQjDkBfDCAbdB04EBgyPDC4YAD/dt2wRCHIM5njXCCAcHboOmCIQ0B5/nfYT6DFIIjBeAcOvM8+EAjitFEYJEBAANzEYOeeowjCFgUDzwjB+YrDgAgBEYWcA4Mc+YjCvAQCgftEANuDIYOBEYXPNwIAIg4OCCgXkCBEOEZDvBEAhEB4AjF/inB8+OJQOOvILBoAjGU4IFDAQYjGbQIdCAQt4EY0DEZACDEYceEZACDC4bLBEZwCO"))
\ No newline at end of file
diff --git a/apps/lcars/lcars.png b/apps/lcars/lcars.png
index 167352ef4..9264f93f2 100644
Binary files a/apps/lcars/lcars.png and b/apps/lcars/lcars.png differ
diff --git a/apps/lcars/lcars.settings.js b/apps/lcars/lcars.settings.js
index 2255caf9b..0d004b002 100644
--- a/apps/lcars/lcars.settings.js
+++ b/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];
diff --git a/apps/lcars/screenshot.png b/apps/lcars/screenshot.png
index d74635f64..b3dfd4200 100644
Binary files a/apps/lcars/screenshot.png and b/apps/lcars/screenshot.png differ
diff --git a/apps/lcars/screenshot_2.png b/apps/lcars/screenshot_2.png
new file mode 100644
index 000000000..52ad295c4
Binary files /dev/null and b/apps/lcars/screenshot_2.png differ