From decc3dcfaf0240ed7f471c32bf33c082070e1bd3 Mon Sep 17 00:00:00 2001
From: Paul Cockrell <paulcockrell@gmail.com>
Date: Sat, 2 May 2020 21:43:16 +0100
Subject: [PATCH 01/13] Create dotmatrix clock

---
 apps.json                                     |  14 +
 apps/dotmatrixclock/ChangeLog                 |   1 +
 apps/dotmatrixclock/README.md                 |  16 ++
 apps/dotmatrixclock/app.js                    | 245 ++++++++++++++++++
 .../dotmatrix-clock-screen-shot.png           | Bin 0 -> 1855 bytes
 apps/dotmatrixclock/dotmatrixclock-icon.js    |   1 +
 apps/dotmatrixclock/dotmatrixclock.png        | Bin 0 -> 10067 bytes
 7 files changed, 277 insertions(+)
 create mode 100644 apps/dotmatrixclock/ChangeLog
 create mode 100644 apps/dotmatrixclock/README.md
 create mode 100755 apps/dotmatrixclock/app.js
 create mode 100755 apps/dotmatrixclock/dotmatrix-clock-screen-shot.png
 create mode 100644 apps/dotmatrixclock/dotmatrixclock-icon.js
 create mode 100755 apps/dotmatrixclock/dotmatrixclock.png

diff --git a/apps.json b/apps.json
index 906331f65..34cd4fe2e 100644
--- a/apps.json
+++ b/apps.json
@@ -1732,5 +1732,19 @@
     "storage": [
       {"name":"rndmclk.wid.js","url":"widget.js"}
     ]
+  },
+  { "id": "dotmatricsclock",
+    "name": "Dotmatrix Clock",
+    "icon": "dotmatrixclock.png",
+    "version":"0.01",
+    "description": "A clear white-on-blue dotmatrix simulated clock",
+    "tags": "clock,dotmatrix,retro",
+    "type": "clock",
+    "allow_emulator":true,
+    "readme": "README.md",
+    "storage": [
+      {"name":"dotmatrixclock.app.js","url":"app.js"},
+      {"name":"dotmatrixclock.img","url":"dotmatrixclock-icon.js","evaluate":true}
+    ]
   }
 ]
diff --git a/apps/dotmatrixclock/ChangeLog b/apps/dotmatrixclock/ChangeLog
new file mode 100644
index 000000000..7ab9e14a9
--- /dev/null
+++ b/apps/dotmatrixclock/ChangeLog
@@ -0,0 +1 @@
+0.01: Create dotmatrix clock app
diff --git a/apps/dotmatrixclock/README.md b/apps/dotmatrixclock/README.md
new file mode 100644
index 000000000..5c67c8dfe
--- /dev/null
+++ b/apps/dotmatrixclock/README.md
@@ -0,0 +1,16 @@
+# Dotmatrix clock
+
+A clock face simulating the classic dotmatrix displays. Shows time, date, compass, and heart rate.
+
+![](dotmatrix-clock-screen-shot.png)
+
+## Features
+
+* Easy to read digits
+* Simulated white-on-blue dotmatrix display
+* Compass
+* Heart rate monitor
+
+## Requests
+
+If you have any feature requests, please send an email to the author paulcockrell@gmail.com`
diff --git a/apps/dotmatrixclock/app.js b/apps/dotmatrixclock/app.js
new file mode 100755
index 000000000..9661f54cf
--- /dev/null
+++ b/apps/dotmatrixclock/app.js
@@ -0,0 +1,245 @@
+/**
+ * BangleJS DotMatrixCLOCK
+ *
+ * + Original Author: Paul Cockrell https://github.com/paulcockrell
+ * + Created: May 2020
+ */
+const storage = require('Storage');
+const settings = (storage.readJSON('setting.json', 1) || {});
+const is12Hour = settings["12hour"] || false;
+
+const font7x7 = {
+  "empty": "00000000000000",
+  "0": "3E61514945433E",
+  "1": "1808080808081C",
+  "2": "7E01013E40407F",
+  "3": "7E01013E01017E",
+  "4": "4141417F010101",
+  "5": "7F40407E01017E",
+  "6": "3E40407E41413E",
+  "7": "3F010202040408",
+  "8": "3E41413E41413E",
+  "9": "3E41413F01013E",
+};
+
+const font5x5 = {
+  "empty": "0000000000",
+  "0": "0E1915130E",
+  "1": "0C0404040E",
+  "2": "1E010E101F",
+  "3": "1E010E011E",
+  "4": "11111F0101",
+  "5": "1F101E011E",
+  "6": "0E101E110E",
+  "7": "1F01020408",
+  "8": "0E110E110E",
+  "9": "0E110F010E",
+  "A": "040A0E1111",
+  "B": "1E111E111E",
+  "C": "0F1010100F",
+  "D": "1E1111111E",
+  "E": "1F101E101F",
+  "F": "1F101E1010",
+  "G": "0F1013110E",
+  "H": "11111F1111",
+  "I": "0E0404040E",
+  "J": "1F0404140C",
+  "L": "101010101F",
+  "M": "111B151111",
+  "N": "1119151311",
+  "O": "0E1111110E",
+  "P": "1E111E1010",
+  "R": "1E111E1111",
+  "S": "0F100E011E",
+  "T": "1F04040404",
+  "U": "111111110E",
+  "V": "1111110A04",
+  "W": "111115150A",
+  "Y": "110A040404",
+};
+
+// Char renderer
+const COLORS = {
+  BG: "#0297fe",
+  DARK: "#3b3ce8",
+  LIGHT: "#E9ffff",
+};
+
+// Example
+// binToHex(["0111110", "1000000", "1000000", "1111110", "1000001", "1000001", "0111110"])
+function binToHex(bins /* array of binary strings */) {
+  return bins.map(bin => ("00" + (parseInt(bin, 2).toString(16))).substr(-2).toUpperCase()).join("");
+}
+
+// Example
+// hexToBin("3E40407E41413E")
+function hexToBin(hexStr) {
+  return (
+    hexStr
+      .replace(/../g, el => el + '_')
+      .slice(0, -1)
+      .split('_')
+      .map(hex => ("00000000" + (parseInt(hex, 16)).toString(2)).substr(-8))
+  );
+}
+
+function drawPixel(opts) {
+  g.setColor(opts.color);
+  g.fillRect(opts.x, opts.y, opts.x + opts.w, opts.y + opts.h);
+}
+
+function drawGrid(pos /* {x:int, y:int} */, dims /* {rows:int, cols:int} */, charAsBin, opts /* {pxlW:int, pxlH:int, gap:int} */) {
+  const defaultOpts = {
+    pxlW: 5, pxlH: 5,
+    gap: 1,
+    offColor: COLORS.DARK, onColor: COLORS.LIGHT
+  };
+  const pxl = Object.assign({}, defaultOpts, opts);
+
+  for (let r = 0; r < dims.rows; r++) {
+    const y = pos.y + ((pxl.pxlH + pxl.gap) * r);
+    for (let c = 7; c > (7 - dims.cols); c--) {
+      const x = pos.x + ((pxl.pxlW + pxl.gap) * c);
+      const color = (charAsBin && parseInt(charAsBin[r][c])) ? pxl.onColor : pxl.offColor;
+
+      drawPixel({
+        x: x, y: y,
+        w: pxl.pxlW, h: pxl.pxlH,
+        color: color,
+      });
+    }
+  }
+}
+
+function drawFont(str, font, x, y) {
+  let fontMap, rows, cols;
+
+  switch(font) {
+    case "7x7":
+      fontMap = font7x7;
+      rows = cols = 7;
+      break;
+    case "5x5":
+      fontMap = font5x5;
+      rows = cols = 5;
+      break;
+    default:
+      throw "Unknown font type: " + font;
+  }
+
+  const pxlW = 2;
+  const pxlH = 2;
+  const gap = 2;
+  const gutter = 3;
+  const charArr = str.split("");
+  const gridWidthTotal = (rows * (pxlW + gap)) + gutter;
+  for (let i = 0; i < charArr.length; i++) {
+    const charAsBin = fontMap.hasOwnProperty(charArr[i])?
+                      hexToBin(fontMap[charArr[i]]):
+                      fontMap.empty;
+
+    drawGrid(
+      {x: x + (i * gridWidthTotal), y: y},
+      {rows: rows, cols: cols},
+      charAsBin || fontMap.empty,
+      {pxlW: pxlW, pxlH: pxlH, gap: gap}
+    );
+  }
+}
+
+function drawTitles() {
+  g.setColor("#ffffff");
+  g.setFont("6x8");
+  g.drawString("COMPASS", 52, 43);
+  g.drawString("HEART", 122, 43);
+  g.drawString("TIME", 52, 85);
+  g.drawString("DATE", 52, 135);
+}
+
+function drawCompass(lastHeading) {
+  const directions = [
+    'N',
+    'NE',
+    'E',
+    'SE',
+    'S',
+    'SW',
+    'W',
+    'NW'
+  ];
+  const cps = Bangle.getCompass();
+  let angle = cps.heading;
+  const heading = angle?
+                  directions[Math.round(((angle %= 360) < 0 ? angle + 360 : angle) / 45) % 8]:
+                  "NE ";
+
+  if (lastHeading != heading) drawFont(heading, "5x5", 40, 58);
+  setTimeout(drawCompass.bind(null, heading), 1000 * 2);
+}
+
+function drawHeart(hrm) {
+  drawFont(("   " + (hrm ? hrm.bpm : '')).slice(-3), "5x5", 109, 58);
+}
+
+function drawTime(lastHrs, lastMns, toggle) {
+  const date = new Date();
+  const h = date.getHours();
+  const hrs = ("00" + ((is12Hour && h > 12) ? h - 12 : h)).substr(-2);
+  const mns = ("00" + date.getMinutes()).substr(-2);
+
+  if (lastHrs != hrs) {
+    drawFont(hrs, "7x7", 48, 100);
+  }
+  if (lastMns != mns) {
+    drawFont(mns, "7x7", 124, 100);
+  }
+
+  const color = toggle? COLORS.LIGHT : COLORS.DARK;
+
+  // This should toggle on/off per second
+  drawPixel({
+    color: color,
+    x: 118, y: 109,
+    w: 2, h: 2,
+  });
+  drawPixel({
+    color: color,
+    x: 118, y: 116,
+    w: 2, h: 2,
+  });
+
+  setTimeout(drawTime.bind(null, hrs, mns, !toggle), 1000);
+}
+
+function drawDate(lastDate) {
+  const locale = require('locale');
+  const date = new Date();
+
+  if (lastDate != date.toISOString().split('T')[0]) {
+    const dow = locale.dow(date, 1).toUpperCase();
+    const dayNum = ("00" + date.getDate()).slice(-2);
+    const mon = locale.month(date).toUpperCase();
+    const yr = date.getFullYear().toString().slice(-2);
+    drawFont(dow + " " + dayNum, "5x5", 40, 150);
+    drawFont(mon + " " + yr, "5x5", 40, 180);
+  }
+
+  setTimeout(drawDate.bind(null, date.toISOString().split('T')), 1000 * 60);
+}
+
+g.setBgColor(COLORS.BG);
+g.clear();
+
+Bangle.loadWidgets();
+Bangle.drawWidgets();
+
+drawTitles();
+drawTime();
+drawDate();
+drawCompass();
+drawHeart();
+
+Bangle.on('HRM', drawHeart);
+Bangle.setHRMPower(1);
+
+Bangle.setCompassPower(1);
diff --git a/apps/dotmatrixclock/dotmatrix-clock-screen-shot.png b/apps/dotmatrixclock/dotmatrix-clock-screen-shot.png
new file mode 100755
index 0000000000000000000000000000000000000000..e6218f4c9f43b9bbb7ac342f5b88915aa640e285
GIT binary patch
literal 1855
zcmd5-drVVT7{3&1ZNYQ|NYH8P#-tIJfv`AU1!NE?!73;fpDixh8JT8aEp4go-5(M&
z<v9WYO6S~$uF#S(AXq5Z$0ndqKr0kzX&eZ&#nwVwu(aJRY>Ar$v%j`K?mb`5IXUP1
zzTe|q*-uX1gxP`t0ALd-B{2gYjjnIw2KXPFIa>w*s12mVJqPn^=Tv*kwj}#{(6&AF
z#6K=v@IHNgBZt2C>XJx5Tz*h@wBWrv@ug2nVxEAS2gO~n4!7NzSYT4?#y>^`N<=6i
z*9^pqaX`1i9cX6*+YkNMixGDo$f<P#o-T|UVl#)eiQCxHYed%6CAD<C(Pm=cg>#z;
zH&OnU8IWyQ=J0r@RGfODz$vzwv}TGGEPvwe#c4^Q;vuV}gJDmuWKE+B&L+rALB9`v
z&t*6xNkpjW7pSd2E~A@S)7|57Vu_G!bJ$z8ZkKl?ai^AN%@YjjkWDG$bv3g2J`HL8
zw@?=C+-}RH+TLLudR4(q*ZjPGr})`C=knA8D&D#La(cqanpzmv#T~KD%*rWwvC*m{
z90nHG$i2YBH*z<dfqTALpkMxHm<9;rrN54&jcA)qrRWabH?_xX0_)_U!4wAPwzCNl
zZ2Zl&)qmtuxCFXSwt2evX<bYZy8>PCye<O6g{MQ26dF=pg$Qm!xN}@x(jU$@AGUXo
z8p3vT<sl?u#i-#SJpUsEU-#|-8oZr`g;S8_y}y-cSBib|&3=8orO(2xwl^<bmoHFL
zvCzrX(S>pw+fLU(V>eL|J)L(|LHgmL*xRuk6>NTagYTkR7#MP1g428;LOR$-zEma<
zA(C&^gljnGH?Zf!kLuUwB5h=Wj+PV@z0}glc)OQQWfif;D$}u{X`odZg2e5AEppNP
z@?IWxpqEM5c3iXzWR6OD#$;F7{OoArcE2nTD?<6VK6cLl{T7>65Dm?#zj6{$0~IRV
zy~bwUSf@d1r=D#40m3X(uqjB2=APCq;@4EAGRuX4{4QN4ofZTdi)>SZED%1{u)se^
zL&hG5SDEbipeBTHRa#!rQHr9pJIrcGa-y}J+P9j73-OL!F2pui;JhDssOep48aEds
z@`d({zeli0;o7CFI)NjH@k}f$pNS4MGG82;Zw<MDqg5dc%~VXxx35KSm9&>_ap_^F
za6-B~ty4wg)v0jS@+4{I?TV9a2G5vGY^XlnJ8s|bAu-)#vcRn*1{*sws-c`)a3-CV
z19Hqyf5tm&YA?R?b=zCKBUC>_-?i`3i}_Lm`c?mU`2>ow&@3TX?=u6wNCAiQV0ycF
zZe*WBs<T$i$-gxUNvQAB%JGfFNR_-65*;uq?bVO$pU<sD;yR)yJ~DSnaMln77RyqX
z#P$`e|Iuds%mvoR-jsSx>6yF=bVpPY!8+!lE^$fbd>RO|0wlr~a+H|So;x|@;ZO(6
zC-W+cE&o;ze~IPZMQ&GaxV6-pAY4+<hfmN~C7(}hL!57L!6lidXs)feFF#u(?+tbq
zUSK>UlWTff2n6F`3vSM;HRPUJv*04KIKXGIJAF`b#w0jk>JBap;N(7E+b<NP7E=TF
z`KXkvxxoo*w=|#Ok>2#4D)hJjO5PXO+j;xxjqz1o!7ce@#V;V-|Lxhh??5Wb+Q+tj
SrxL;sBS1<bCyEnjU;P2r0$M=;

literal 0
HcmV?d00001

diff --git a/apps/dotmatrixclock/dotmatrixclock-icon.js b/apps/dotmatrixclock/dotmatrixclock-icon.js
new file mode 100644
index 000000000..8773839e1
--- /dev/null
+++ b/apps/dotmatrixclock/dotmatrixclock-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwxH+AAmBAEgrFAAZelFo+s1krAEcAE4IuFHIIJBAEXXE4KSEF84nCF4WBgErBYoAfEoaTBF42zF8PXF5QNBi4AgMIYv/F9nX64CDAw4ACl8vBIgGGF/4AOEgKPfI4xfoF96P/R/6PdACAv/F/4v/F/4v/F8HX68Xl8vAwIDCBIQADBIQQDBoQQDF/4AOGQqPbLAxmGL5gGDF/4AfF/6PRBIQQDSwwv/ABwoCR7xYGMwxfhF94AeF/4vr1nXBoIAf64mCF4gJEF8IkCF4YABFYQLDAEItBwIuCF9InBF4iSBwMrAEgnBFwgACXsIADFo4ABqwAkFQg="))
diff --git a/apps/dotmatrixclock/dotmatrixclock.png b/apps/dotmatrixclock/dotmatrixclock.png
new file mode 100755
index 0000000000000000000000000000000000000000..ab2637520faae8e908f2caf3a130c39a90020a68
GIT binary patch
literal 10067
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
MB^4zq#S8=g8@Jw9ng9R*

literal 0
HcmV?d00001


From 7589712e43ca271aa080d9e7c001b017cfa6808e Mon Sep 17 00:00:00 2001
From: Paul Cockrell <paulcockrell@gmail.com>
Date: Sat, 2 May 2020 21:44:06 +0100
Subject: [PATCH 02/13] Remove debugging

---
 apps/dotmatrixclock/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/dotmatrixclock/app.js b/apps/dotmatrixclock/app.js
index 9661f54cf..e65377c6e 100755
--- a/apps/dotmatrixclock/app.js
+++ b/apps/dotmatrixclock/app.js
@@ -171,7 +171,7 @@ function drawCompass(lastHeading) {
   let angle = cps.heading;
   const heading = angle?
                   directions[Math.round(((angle %= 360) < 0 ? angle + 360 : angle) / 45) % 8]:
-                  "NE ";
+                  "   ";
 
   if (lastHeading != heading) drawFont(heading, "5x5", 40, 58);
   setTimeout(drawCompass.bind(null, heading), 1000 * 2);

From 0106abb80974f422f7b0df44d7973824bab0cbd5 Mon Sep 17 00:00:00 2001
From: Paul Cockrell <paulcockrell@gmail.com>
Date: Thu, 14 May 2020 19:49:20 +0100
Subject: [PATCH 03/13] Fix spelling error

---
 apps.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps.json b/apps.json
index 34cd4fe2e..2be79db83 100644
--- a/apps.json
+++ b/apps.json
@@ -1568,6 +1568,7 @@
       {"name":"hidjoystick.img","url":"app-icon.js","evaluate":true}
     ]
   },
+<<<<<<< HEAD
   {
     "id": "largeclock",
     "name": "Large Clock",
@@ -1733,7 +1734,7 @@
       {"name":"rndmclk.wid.js","url":"widget.js"}
     ]
   },
-  { "id": "dotmatricsclock",
+  { "id": "dotmatrixclock",
     "name": "Dotmatrix Clock",
     "icon": "dotmatrixclock.png",
     "version":"0.01",

From f465e06cdd2fea953c97f7b5993efe6751f61a9a Mon Sep 17 00:00:00 2001
From: Paul Cockrell <paulcockrell@gmail.com>
Date: Thu, 14 May 2020 19:46:34 +0100
Subject: [PATCH 04/13] Finish dotmatrix clock.. turn off sensors when screen
 sleeps, enable menu on BTN2 press

---
 apps/dotmatrixclock/app.js | 103 ++++++++++++++++++++++++-------------
 1 file changed, 68 insertions(+), 35 deletions(-)

diff --git a/apps/dotmatrixclock/app.js b/apps/dotmatrixclock/app.js
index e65377c6e..04091b36a 100755
--- a/apps/dotmatrixclock/app.js
+++ b/apps/dotmatrixclock/app.js
@@ -8,8 +8,9 @@ const storage = require('Storage');
 const settings = (storage.readJSON('setting.json', 1) || {});
 const is12Hour = settings["12hour"] || false;
 
+
 const font7x7 = {
-  "empty": "00000000000000",
+  "empty": "00000000",
   "0": "3E61514945433E",
   "1": "1808080808081C",
   "2": "7E01013E40407F",
@@ -23,7 +24,7 @@ const font7x7 = {
 };
 
 const font5x5 = {
-  "empty": "0000000000",
+  "empty": "00000000",
   "0": "0E1915130E",
   "1": "0C0404040E",
   "2": "1E010E101F",
@@ -74,13 +75,14 @@ function binToHex(bins /* array of binary strings */) {
 // Example
 // hexToBin("3E40407E41413E")
 function hexToBin(hexStr) {
-  return (
-    hexStr
-      .replace(/../g, el => el + '_')
+  const regEx = new RegExp("..", "g");
+  const bin = hexStr
+      .replace(regEx, el => el + '_')
       .slice(0, -1)
       .split('_')
-      .map(hex => ("00000000" + (parseInt(hex, 16)).toString(2)).substr(-8))
-  );
+      .map(hex => ("00000000" + (parseInt(hex, 16)).toString(2)).substr(-8));
+
+  return bin;
 }
 
 function drawPixel(opts) {
@@ -90,22 +92,27 @@ function drawPixel(opts) {
 
 function drawGrid(pos /* {x:int, y:int} */, dims /* {rows:int, cols:int} */, charAsBin, opts /* {pxlW:int, pxlH:int, gap:int} */) {
   const defaultOpts = {
-    pxlW: 5, pxlH: 5,
+    pxlW: 5,
+    pxlH: 5,
     gap: 1,
-    offColor: COLORS.DARK, onColor: COLORS.LIGHT
+    offColor: COLORS.DARK,
+    onColor: COLORS.LIGHT
   };
   const pxl = Object.assign({}, defaultOpts, opts);
 
   for (let r = 0; r < dims.rows; r++) {
     const y = pos.y + ((pxl.pxlH + pxl.gap) * r);
+
     for (let c = 7; c > (7 - dims.cols); c--) {
       const x = pos.x + ((pxl.pxlW + pxl.gap) * c);
       const color = (charAsBin && parseInt(charAsBin[r][c])) ? pxl.onColor : pxl.offColor;
 
       drawPixel({
-        x: x, y: y,
-        w: pxl.pxlW, h: pxl.pxlH,
-        color: color,
+        x: x,
+        y: y,
+        w: pxl.pxlW,
+        h: pxl.pxlH,
+        color: color
       });
     }
   }
@@ -141,7 +148,7 @@ function drawFont(str, font, x, y) {
     drawGrid(
       {x: x + (i * gridWidthTotal), y: y},
       {rows: rows, cols: cols},
-      charAsBin || fontMap.empty,
+      charAsBin,
       {pxlW: pxlW, pxlH: pxlH, gap: gap}
     );
   }
@@ -150,10 +157,10 @@ function drawFont(str, font, x, y) {
 function drawTitles() {
   g.setColor("#ffffff");
   g.setFont("6x8");
-  g.drawString("COMPASS", 52, 43);
-  g.drawString("HEART", 122, 43);
-  g.drawString("TIME", 52, 85);
-  g.drawString("DATE", 52, 135);
+  g.drawString("COMPASS", 52, 49);
+  g.drawString("HEART", 122, 49);
+  g.drawString("TIME", 52, 94);
+  g.drawString("DATE", 52, 144);
 }
 
 function drawCompass(lastHeading) {
@@ -169,16 +176,17 @@ function drawCompass(lastHeading) {
   ];
   const cps = Bangle.getCompass();
   let angle = cps.heading;
-  const heading = angle?
-                  directions[Math.round(((angle %= 360) < 0 ? angle + 360 : angle) / 45) % 8]:
-                  "   ";
+  let heading = angle?
+                directions[Math.round(((angle %= 360) < 0 ? angle + 360 : angle) / 45) % 8]:
+                "   ";
 
-  if (lastHeading != heading) drawFont(heading, "5x5", 40, 58);
+  heading = (heading + "   ").slice(0, 3);
+  if (lastHeading != heading) drawFont(heading, "5x5", 40, 67);
   setTimeout(drawCompass.bind(null, heading), 1000 * 2);
 }
 
 function drawHeart(hrm) {
-  drawFont(("   " + (hrm ? hrm.bpm : '')).slice(-3), "5x5", 109, 58);
+  drawFont(("   " + (hrm ? hrm.bpm : '')).slice(-3), "5x5", 109, 67);
 }
 
 function drawTime(lastHrs, lastMns, toggle) {
@@ -188,10 +196,10 @@ function drawTime(lastHrs, lastMns, toggle) {
   const mns = ("00" + date.getMinutes()).substr(-2);
 
   if (lastHrs != hrs) {
-    drawFont(hrs, "7x7", 48, 100);
+    drawFont(hrs, "7x7", 48, 109);
   }
   if (lastMns != mns) {
-    drawFont(mns, "7x7", 124, 100);
+    drawFont(mns, "7x7", 124, 109);
   }
 
   const color = toggle? COLORS.LIGHT : COLORS.DARK;
@@ -199,12 +207,12 @@ function drawTime(lastHrs, lastMns, toggle) {
   // This should toggle on/off per second
   drawPixel({
     color: color,
-    x: 118, y: 109,
+    x: 118, y: 118,
     w: 2, h: 2,
   });
   drawPixel({
     color: color,
-    x: 118, y: 116,
+    x: 118, y: 125,
     w: 2, h: 2,
   });
 
@@ -218,28 +226,53 @@ function drawDate(lastDate) {
   if (lastDate != date.toISOString().split('T')[0]) {
     const dow = locale.dow(date, 1).toUpperCase();
     const dayNum = ("00" + date.getDate()).slice(-2);
-    const mon = locale.month(date).toUpperCase();
+    const mon = locale.month(date).toUpperCase().slice(-3);
     const yr = date.getFullYear().toString().slice(-2);
-    drawFont(dow + " " + dayNum, "5x5", 40, 150);
-    drawFont(mon + " " + yr, "5x5", 40, 180);
+    drawFont(dow + " " + dayNum, "5x5", 40, 159);
+    drawFont(mon + " " + yr, "5x5", 40, 189);
   }
 
   setTimeout(drawDate.bind(null, date.toISOString().split('T')), 1000 * 60);
 }
 
-g.setBgColor(COLORS.BG);
-g.clear();
+function setSensors(state) {
+  Bangle.setHRMPower(state);
+  Bangle.setCompassPower(state);
+}
 
+// Turn sensors on
+setSensors(1);
+
+// Reset screen
+g.clear();
+g.setBgColor(COLORS.BG);
+g.clearRect(0, 24, g.getWidth(), g.getHeight());
+
+// Load and draw widgets
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 
+// Draw screen
 drawTitles();
-drawTime();
-drawDate();
 drawCompass();
 drawHeart();
+drawTime();
+drawDate();
 
+// Setup callbacks
 Bangle.on('HRM', drawHeart);
-Bangle.setHRMPower(1);
 
-Bangle.setCompassPower(1);
+setWatch(() => {
+  setSensors(0);
+  Bangle.setLCDMode();
+  Bangle.showLauncher();
+}, BTN2, {repeat: false, edge: "falling"});
+
+Bangle.on('lcdPower', (on) => on ? setSensors(1) : setSensors(0));
+
+Bangle.on('faceUp', (up) => {
+  if (up && !Bangle.isLCDOn()) {
+    setSensors(1);
+    Bangle.setLCDPower(true);
+  }
+});
\ No newline at end of file

From 315131c9d8484106e5a344aa9f62074e41a2385f Mon Sep 17 00:00:00 2001
From: Paul Cockrell <paulcockrell@gmail.com>
Date: Thu, 14 May 2020 19:52:49 +0100
Subject: [PATCH 05/13] Fix apps.json

---
 apps.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps.json b/apps.json
index 2be79db83..c46de601d 100644
--- a/apps.json
+++ b/apps.json
@@ -1568,7 +1568,6 @@
       {"name":"hidjoystick.img","url":"app-icon.js","evaluate":true}
     ]
   },
-<<<<<<< HEAD
   {
     "id": "largeclock",
     "name": "Large Clock",

From cc400677a1f8f743cd64fe8ef2e50c0879b6d933 Mon Sep 17 00:00:00 2001
From: Paul Cockrell <paulcockrell@gmail.com>
Date: Thu, 14 May 2020 20:10:49 +0100
Subject: [PATCH 06/13] Fix month string truncation

---
 apps/dotmatrixclock/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/dotmatrixclock/app.js b/apps/dotmatrixclock/app.js
index 04091b36a..878a5aad3 100755
--- a/apps/dotmatrixclock/app.js
+++ b/apps/dotmatrixclock/app.js
@@ -226,7 +226,7 @@ function drawDate(lastDate) {
   if (lastDate != date.toISOString().split('T')[0]) {
     const dow = locale.dow(date, 1).toUpperCase();
     const dayNum = ("00" + date.getDate()).slice(-2);
-    const mon = locale.month(date).toUpperCase().slice(-3);
+    const mon = locale.month(date).toUpperCase().slice(0, 3);
     const yr = date.getFullYear().toString().slice(-2);
     drawFont(dow + " " + dayNum, "5x5", 40, 159);
     drawFont(mon + " " + yr, "5x5", 40, 189);

From 2ed65f3eadcb0802935bc7cc9cd7e80702f55470 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Thu, 14 May 2020 21:32:36 +0100
Subject: [PATCH 07/13] Welcome: Allow welcome to run after a fresh install +  
    More useful app menu +      BTN2 now goes to menu on release

---
 apps.json                | 4 ++--
 apps/ncstart/ChangeLog   | 1 +
 apps/ncstart/boot.js     | 9 +++------
 apps/welcome/ChangeLog   | 3 +++
 apps/welcome/app.js      | 2 +-
 apps/welcome/boot.js     | 9 +++------
 apps/welcome/settings.js | 8 ++++++--
 7 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/apps.json b/apps.json
index 906331f65..7d4bf20cf 100644
--- a/apps.json
+++ b/apps.json
@@ -78,7 +78,7 @@
   { "id": "welcome",
     "name": "Welcome",
     "icon": "app.png",
-    "version":"0.08",
+    "version":"0.09",
     "description": "Appears at first boot and explains how to use Bangle.js",
     "tags": "start,welcome",
     "allow_emulator":true,
@@ -589,7 +589,7 @@
     "id": "ncstart",
     "name": "NCEU Startup",
     "icon": "start.png",
-    "version":"0.05",
+    "version":"0.06",
     "description": "NodeConfEU 2019 'First Start' Sequence",
     "tags": "start,welcome",
     "storage": [
diff --git a/apps/ncstart/ChangeLog b/apps/ncstart/ChangeLog
index 522633f7b..152fdc9d1 100644
--- a/apps/ncstart/ChangeLog
+++ b/apps/ncstart/ChangeLog
@@ -6,3 +6,4 @@
       Don't run again when settings app is updated (or absent)
       Add "Run Now" option to settings
 0.05: Don't overwrite existing settings on app update
+0.06: Allow welcome to run after a fresh install
diff --git a/apps/ncstart/boot.js b/apps/ncstart/boot.js
index 094033094..62ac962f6 100644
--- a/apps/ncstart/boot.js
+++ b/apps/ncstart/boot.js
@@ -1,11 +1,8 @@
 (function() {
-  let s = require('Storage').readJSON('ncstart.json', 1)
-    || require('Storage').readJSON('setting.json', 1)
-    || {welcomed: true} // do NOT run if global settings are also absent
-  if (!s.welcomed && require('Storage').read('ncstart.app.js')) {
+  let s = require('Storage').readJSON('ncstart.json', 1) || {};
+  if (!s.welcomed) {
     setTimeout(() => {
-      s.welcomed = true
-      require('Storage').write('ncstart.json', s)
+      require('Storage').write('ncstart.json', {welcomed: true})
       load('ncstart.app.js')
     })
   }
diff --git a/apps/welcome/ChangeLog b/apps/welcome/ChangeLog
index a377fc81e..9545dbbfa 100644
--- a/apps/welcome/ChangeLog
+++ b/apps/welcome/ChangeLog
@@ -8,3 +8,6 @@
       Don't run again when settings app is updated (or absent)
       Add "Run Now" option to settings
 0.08: Don't overwrite existing settings on app update
+0.09: Allow welcome to run after a fresh install
+      More useful app menu
+      BTN2 now goes to menu on release
diff --git a/apps/welcome/app.js b/apps/welcome/app.js
index a32a6e56f..b4c79ddaa 100644
--- a/apps/welcome/app.js
+++ b/apps/welcome/app.js
@@ -285,7 +285,7 @@ setWatch(()=>{
   if (sceneNumber == scenes.length-1) {
     load();
   }
-}, BTN2, {repeat:true,edge:"rising"});
+}, BTN2, {repeat:true,edge:"falling"});
 setWatch(()=>move(-1), BTN1, {repeat:true});
 
 (function migrateSettings(){
diff --git a/apps/welcome/boot.js b/apps/welcome/boot.js
index f6ba6d2d6..4e3a12231 100644
--- a/apps/welcome/boot.js
+++ b/apps/welcome/boot.js
@@ -1,11 +1,8 @@
 (function() {
-  let s = require('Storage').readJSON('welcome.json', 1)
-    || require('Storage').readJSON('setting.json', 1)
-    || {welcomed: true} // do NOT run if global settings are also absent
-  if (!s.welcomed && require('Storage').read('welcome.app.js')) {
+  let s = require('Storage').readJSON('welcome.json', 1) || {};
+  if (!s.welcomed) {
     setTimeout(() => {
-      s.welcomed = true
-      require('Storage').write('welcome.json', {welcomed: "yes"})
+      require('Storage').write('welcome.json', {welcomed: true})
       load('welcome.app.js')
     })
   }
diff --git a/apps/welcome/settings.js b/apps/welcome/settings.js
index 20c2e9b13..4992e6e7a 100644
--- a/apps/welcome/settings.js
+++ b/apps/welcome/settings.js
@@ -3,12 +3,16 @@
     || require('Storage').readJSON('setting.json', 1) || {}
   E.showMenu({
     '': { 'title': 'Welcome App' },
-    'Run on Next Boot': {
+    'Run next boot': {
       value: !settings.welcomed,
-      format: v => v ? 'OK' : 'No',
+      format: v => v ? 'Yes' : 'No',
       onchange: v => require('Storage').write('welcome.json', {welcomed: !v}),
     },
     'Run Now': () => load('welcome.app.js'),
+    'Turn off, run next boot': () => {
+      require('Storage').write('welcome.json', {welcomed: false});
+      Bangle.off();
+    },
     '< Back': back,
   })
 })

From a13954b6cbfe24a43c6a613cfffff575f1e6f43a Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Thu, 14 May 2020 21:36:33 +0100
Subject: [PATCH 08/13] tweak

---
 apps/welcome/settings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/welcome/settings.js b/apps/welcome/settings.js
index 4992e6e7a..f269f238e 100644
--- a/apps/welcome/settings.js
+++ b/apps/welcome/settings.js
@@ -9,7 +9,7 @@
       onchange: v => require('Storage').write('welcome.json', {welcomed: !v}),
     },
     'Run Now': () => load('welcome.app.js'),
-    'Turn off, run next boot': () => {
+    'Turn off & run next': () => {
       require('Storage').write('welcome.json', {welcomed: false});
       Bangle.off();
     },

From 9178e1b632f265c95b6f1706f29a169d505d8ed3 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Fri, 15 May 2020 07:38:09 +0100
Subject: [PATCH 09/13] Fix Upload failed, TypeError: Espruino.transform is not
 a function (fix #420)

---
 js/espruinotools.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/espruinotools.js b/js/espruinotools.js
index 8e266f267..0e8df02cb 100644
--- a/js/espruinotools.js
+++ b/js/espruinotools.js
@@ -124,7 +124,7 @@ Espruino.Core.Status = {
   hasProgress : function() { return false; },
   incrementProgress : function(amt) {}
 };
-var acorn = (function(){ var exports={};
+var acorn = (function(){ var exports={};var module={};
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :

From 7488970e741f4b96cec1d6dc67a65a417b45b904 Mon Sep 17 00:00:00 2001
From: Paul Cockrell <paulcockrell@gmail.com>
Date: Fri, 15 May 2020 09:33:25 +0100
Subject: [PATCH 10/13] Allow multiple coloured screens

---
 apps/dotmatrixclock/app.js | 47 +++++++++++++++++++++++++++-----------
 1 file changed, 34 insertions(+), 13 deletions(-)

diff --git a/apps/dotmatrixclock/app.js b/apps/dotmatrixclock/app.js
index 878a5aad3..da165572c 100755
--- a/apps/dotmatrixclock/app.js
+++ b/apps/dotmatrixclock/app.js
@@ -61,11 +61,20 @@ const font5x5 = {
 
 // Char renderer
 const COLORS = {
-  BG: "#0297fe",
-  DARK: "#3b3ce8",
-  LIGHT: "#E9ffff",
+  blue: {
+    BG: "#0297fe",
+    DARK: "#3b3ce8",
+    LIGHT: "#E9ffff",
+  },
+  orange: {
+    BG: "#f7b336",
+    DARK: "#ac721e",
+    LIGHT: "#f6fc0f",
+  }
 };
 
+let selectedColor = "blue";
+
 // Example
 // binToHex(["0111110", "1000000", "1000000", "1111110", "1000001", "1000001", "0111110"])
 function binToHex(bins /* array of binary strings */) {
@@ -95,8 +104,8 @@ function drawGrid(pos /* {x:int, y:int} */, dims /* {rows:int, cols:int} */, cha
     pxlW: 5,
     pxlH: 5,
     gap: 1,
-    offColor: COLORS.DARK,
-    onColor: COLORS.LIGHT
+    offColor: COLORS[selectedColor].DARK,
+    onColor: COLORS[selectedColor].LIGHT
   };
   const pxl = Object.assign({}, defaultOpts, opts);
 
@@ -202,7 +211,7 @@ function drawTime(lastHrs, lastMns, toggle) {
     drawFont(mns, "7x7", 124, 109);
   }
 
-  const color = toggle? COLORS.LIGHT : COLORS.DARK;
+  const color = toggle? COLORS[selectedColor].LIGHT : COLORS[selectedColor].DARK;
 
   // This should toggle on/off per second
   drawPixel({
@@ -240,26 +249,38 @@ function setSensors(state) {
   Bangle.setCompassPower(state);
 }
 
+function drawScreen() {
+  g.setBgColor(COLORS[selectedColor].BG);
+  g.clearRect(0, 24, g.getWidth(), g.getHeight());
+
+  // Draw components
+  drawTitles();
+  drawCompass();
+  drawHeart();
+  drawTime();
+  drawDate();
+}
+
 // Turn sensors on
 setSensors(1);
 
 // Reset screen
 g.clear();
-g.setBgColor(COLORS.BG);
-g.clearRect(0, 24, g.getWidth(), g.getHeight());
 
 // Load and draw widgets
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 
 // Draw screen
-drawTitles();
-drawCompass();
-drawHeart();
-drawTime();
-drawDate();
+drawScreen();
 
 // Setup callbacks
+Bangle.on('swipe', (sDir) => {
+  selectedColor = selectedColor === "blue" ? "orange" : "blue";
+  clearTimeout();
+  drawScreen();
+});
+
 Bangle.on('HRM', drawHeart);
 
 setWatch(() => {

From 04e3d3b4552cb1738bb1334edc36d2335d1accb3 Mon Sep 17 00:00:00 2001
From: Paul Cockrell <paulcockrell@gmail.com>
Date: Fri, 15 May 2020 09:37:37 +0100
Subject: [PATCH 11/13] Update README

---
 apps/dotmatrixclock/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/dotmatrixclock/README.md b/apps/dotmatrixclock/README.md
index 5c67c8dfe..e862b4e36 100644
--- a/apps/dotmatrixclock/README.md
+++ b/apps/dotmatrixclock/README.md
@@ -10,6 +10,7 @@ A clock face simulating the classic dotmatrix displays. Shows time, date, compas
 * Simulated white-on-blue dotmatrix display
 * Compass
 * Heart rate monitor
+* Multiple colour palletes, swipe to change
 
 ## Requests
 

From 40c4673db7aa2938d04c6adbc4985fb358a8c0c5 Mon Sep 17 00:00:00 2001
From: Paul Cockrell <paulcockrell@gmail.com>
Date: Fri, 15 May 2020 09:46:21 +0100
Subject: [PATCH 12/13] Remove inline comments, seems to break pretokenisation
 or something!

---
 apps/dotmatrixclock/app.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/dotmatrixclock/app.js b/apps/dotmatrixclock/app.js
index da165572c..847b5d074 100755
--- a/apps/dotmatrixclock/app.js
+++ b/apps/dotmatrixclock/app.js
@@ -77,7 +77,7 @@ let selectedColor = "blue";
 
 // Example
 // binToHex(["0111110", "1000000", "1000000", "1111110", "1000001", "1000001", "0111110"])
-function binToHex(bins /* array of binary strings */) {
+function binToHex(bins) {
   return bins.map(bin => ("00" + (parseInt(bin, 2).toString(16))).substr(-2).toUpperCase()).join("");
 }
 
@@ -99,7 +99,7 @@ function drawPixel(opts) {
   g.fillRect(opts.x, opts.y, opts.x + opts.w, opts.y + opts.h);
 }
 
-function drawGrid(pos /* {x:int, y:int} */, dims /* {rows:int, cols:int} */, charAsBin, opts /* {pxlW:int, pxlH:int, gap:int} */) {
+function drawGrid(pos, dims, charAsBin, opts) {
   const defaultOpts = {
     pxlW: 5,
     pxlH: 5,
@@ -121,7 +121,7 @@ function drawGrid(pos /* {x:int, y:int} */, dims /* {rows:int, cols:int} */, cha
         y: y,
         w: pxl.pxlW,
         h: pxl.pxlH,
-        color: color
+        color: color,
       });
     }
   }

From 5a7216166fe4105d7270df161d513bcb49852122 Mon Sep 17 00:00:00 2001
From: Paul Cockrell <paulcockrell@gmail.com>
Date: Fri, 15 May 2020 11:23:52 +0100
Subject: [PATCH 13/13] Fix sensors activation/deactivation and fix more
 pretokenisation issues (doesn't work well with var names with lenght <= 3

---
 apps/dotmatrixclock/README.md | 11 +++++
 apps/dotmatrixclock/app.js    | 77 ++++++++++++++++++++++++++++++-----
 2 files changed, 77 insertions(+), 11 deletions(-)

diff --git a/apps/dotmatrixclock/README.md b/apps/dotmatrixclock/README.md
index e862b4e36..3af48efc6 100644
--- a/apps/dotmatrixclock/README.md
+++ b/apps/dotmatrixclock/README.md
@@ -12,6 +12,17 @@ A clock face simulating the classic dotmatrix displays. Shows time, date, compas
 * Heart rate monitor
 * Multiple colour palletes, swipe to change
 
+## Usage
+
+### Sensor readings
+
+When the display is activated by 'flipping' the watch up, the compass and heart sensors will be activated automatically, but if 
+you activate the LCD through a button press, then the sensors will remain off until you press button-1.
+
+### Colours
+
+The display defaults to blue, but you can change this to orange by swiping the screen
+
 ## Requests
 
 If you have any feature requests, please send an email to the author paulcockrell@gmail.com`
diff --git a/apps/dotmatrixclock/app.js b/apps/dotmatrixclock/app.js
index 847b5d074..94c628b1b 100755
--- a/apps/dotmatrixclock/app.js
+++ b/apps/dotmatrixclock/app.js
@@ -7,7 +7,7 @@
 const storage = require('Storage');
 const settings = (storage.readJSON('setting.json', 1) || {});
 const is12Hour = settings["12hour"] || false;
-
+const timeout = settings.timeout || 20;
 
 const font7x7 = {
   "empty": "00000000",
@@ -25,6 +25,7 @@ const font7x7 = {
 
 const font5x5 = {
   "empty": "00000000",
+  "-": "0000FF0000",
   "0": "0E1915130E",
   "1": "0C0404040E",
   "2": "1E010E101F",
@@ -74,6 +75,7 @@ const COLORS = {
 };
 
 let selectedColor = "blue";
+let displayTimeoutRef, sensorTimeoutRef;
 
 // Example
 // binToHex(["0111110", "1000000", "1000000", "1111110", "1000001", "1000001", "0111110"])
@@ -109,12 +111,12 @@ function drawGrid(pos, dims, charAsBin, opts) {
   };
   const pxl = Object.assign({}, defaultOpts, opts);
 
-  for (let r = 0; r < dims.rows; r++) {
-    const y = pos.y + ((pxl.pxlH + pxl.gap) * r);
+  for (let rowY = 0; rowY < dims.rows; rowY++) {
+    const y = pos.y + ((pxl.pxlH + pxl.gap) * rowY);
 
-    for (let c = 7; c > (7 - dims.cols); c--) {
-      const x = pos.x + ((pxl.pxlW + pxl.gap) * c);
-      const color = (charAsBin && parseInt(charAsBin[r][c])) ? pxl.onColor : pxl.offColor;
+    for (let colX = 7; colX > (7 - dims.cols); colX--) {
+      const x = pos.x + ((pxl.pxlW + pxl.gap) * colX);
+      const color = (charAsBin && parseInt(charAsBin[rowY][colX])) ? pxl.onColor : pxl.offColor;
 
       drawPixel({
         x: x,
@@ -187,7 +189,7 @@ function drawCompass(lastHeading) {
   let angle = cps.heading;
   let heading = angle?
                 directions[Math.round(((angle %= 360) < 0 ? angle + 360 : angle) / 45) % 8]:
-                "   ";
+                "-- ";
 
   heading = (heading + "   ").slice(0, 3);
   if (lastHeading != heading) drawFont(heading, "5x5", 40, 67);
@@ -195,7 +197,7 @@ function drawCompass(lastHeading) {
 }
 
 function drawHeart(hrm) {
-  drawFont(("   " + (hrm ? hrm.bpm : '')).slice(-3), "5x5", 109, 67);
+  drawFont(("   " + (hrm ? hrm.bpm : "---")).slice(-3), "5x5", 109, 67);
 }
 
 function drawTime(lastHrs, lastMns, toggle) {
@@ -245,6 +247,23 @@ function drawDate(lastDate) {
 }
 
 function setSensors(state) {
+  // Already reading sensors and trying to activate sensors, do nothing
+  if (sensorTimeoutRef && state === 1) return;
+
+  // If we are activating the sensors, turn them off again in one minute
+  if (state === 1) {
+    sensorTimeoutRef = setTimeout(() => { setSensors(0); }, 1000 * 60);
+  } else {
+    if (sensorTimeoutRef) {
+      clearInterval(sensorTimeoutRef);
+      sensorTimeoutRef = null;
+    }
+    // Bit nasty, but we only redraw the heart value on sensor callback
+    // but we want to blank out when sensor is off, but no callback for
+    // that so force redraw here
+    drawHeart();
+  }
+
   Bangle.setHRMPower(state);
   Bangle.setCompassPower(state);
 }
@@ -261,6 +280,28 @@ function drawScreen() {
   drawDate();
 }
 
+function clearTimers(){
+  if (displayTimeoutRef) {
+    clearInterval(displayTimeoutRef);
+    displayTimeoutRef = null;
+  }
+
+  if (sensorTimeoutRef) {
+    clearInterval(sensorTimeoutRef);
+    sensorTimeoutRef = null;
+  }
+}
+
+function resetDisplayTimeout() {
+  if (displayTimeoutRef) clearInterval(displayTimeoutRef);
+  Bangle.setLCDPower(true);
+
+  displayTimeoutRef = setTimeout(() => {
+    if (Bangle.isLCDOn()) Bangle.setLCDPower(false);
+    clearTimers();
+  }, 1000 * timeout);
+}
+
 // Turn sensors on
 setSensors(1);
 
@@ -273,27 +314,41 @@ Bangle.drawWidgets();
 
 // Draw screen
 drawScreen();
+resetDisplayTimeout();
 
 // Setup callbacks
 Bangle.on('swipe', (sDir) => {
   selectedColor = selectedColor === "blue" ? "orange" : "blue";
-  clearTimeout();
+  resetDisplayTimeout();
   drawScreen();
 });
 
 Bangle.on('HRM', drawHeart);
 
+setWatch(() => {
+  setSensors(1);
+  resetDisplayTimeout();
+}, BTN1, {repeat: true, edge: "falling"});
+
 setWatch(() => {
   setSensors(0);
+  clearTimers();
   Bangle.setLCDMode();
   Bangle.showLauncher();
 }, BTN2, {repeat: false, edge: "falling"});
 
-Bangle.on('lcdPower', (on) => on ? setSensors(1) : setSensors(0));
+Bangle.on('lcdPower', (on) => {
+  if(on) {
+    resetDisplayTimeout();
+  } else {
+    clearTimers();
+    setSensors(0);
+  }
+});
 
 Bangle.on('faceUp', (up) => {
   if (up && !Bangle.isLCDOn()) {
     setSensors(1);
-    Bangle.setLCDPower(true);
+    resetDisplayTimeout();
   }
 });
\ No newline at end of file