From 73aac6feabb7fe06c0f0447370588c8b9f7473ba Mon Sep 17 00:00:00 2001
From: copoer <c@ooper.space>
Date: Sun, 27 Feb 2022 09:36:36 -0400
Subject: [PATCH] Updated Edisons ball app to work on Bangle JS 2

---
 apps/edisonsball/ChangeLog     |  2 ++
 apps/edisonsball/README.md     |  2 +-
 apps/edisonsball/app.js        | 21 +++++++++++++++++----
 apps/edisonsball/metadata.json |  6 +++---
 4 files changed, 23 insertions(+), 8 deletions(-)
 create mode 100644 apps/edisonsball/ChangeLog

diff --git a/apps/edisonsball/ChangeLog b/apps/edisonsball/ChangeLog
new file mode 100644
index 000000000..b71b8bb0d
--- /dev/null
+++ b/apps/edisonsball/ChangeLog
@@ -0,0 +1,2 @@
+0.01: Initial version
+0.02: Added BangleJS Two
diff --git a/apps/edisonsball/README.md b/apps/edisonsball/README.md
index b8e9ec106..a3b013b6d 100644
--- a/apps/edisonsball/README.md
+++ b/apps/edisonsball/README.md
@@ -1,4 +1,4 @@
-The application is based on a technique that Thomas Edison used to prevent falling asleep using a steel ball. Essentially the app starts with a display that shows the current HR value that the watch alarm is set to and this can be adjusted with buttons 1 and 3. This HR settng should be the approximate value you want the alarm to trigger and so you should ideally know both what your HR is currently and what your heartrate normally is during sleep. For your current HR according to the watch, you can simply use the HR monitor available in the Espruino app loader, and then from that you can choose a lower value as the target for the alarm and adjust as required.
+The application is based on a technique that Thomas Edison used to prevent falling asleep using a steel ball. Essentially the app starts with a display that shows the current HR value that the watch alarm is set to and this can be adjusted with buttons 1 and 3 (Mapped to top touch and bottom touch on Bangle 2). This HR settng should be the approximate value you want the alarm to trigger and so you should ideally know both what your HR is currently and what your heartrate normally is during sleep. For your current HR according to the watch, you can simply use the HR monitor available in the Espruino app loader, and then from that you can choose a lower value as the target for the alarm and adjust as required.
 
 When you press the middle button on the side, the HR monitor starts, the alarm will trigger when your heart rate average drops to the limit you’ve set and has a certain level of steadiness that is determined by a assessing the variance over several readings - the sensitivity of this variance can be adjusted in a variable in the app's code under 'ADVANCED SETTINGS' if needed. The code also has a basic logging function which shows, in a CSV file, when you started the HR tracker and when the alarm was triggered.
 
diff --git a/apps/edisonsball/app.js b/apps/edisonsball/app.js
index 557155c9a..ab5def2f6 100644
--- a/apps/edisonsball/app.js
+++ b/apps/edisonsball/app.js
@@ -130,10 +130,23 @@ function checkHR() {
 }
 
 update_target_HR();
-
-setWatch(btn1Pressed, BTN1, {repeat:true});
-setWatch(btn2Pressed, BTN2, {repeat:true});
-setWatch(btn3Pressed, BTN3, {repeat:true});
+if (process.env.HWVERSION==1) {
+  // Bangle 1
+  setWatch(btn1Pressed, BTN1, {repeat:true});
+  setWatch(btn2Pressed, BTN2, {repeat:true});
+  setWatch(btn3Pressed, BTN3, {repeat:true});
+} else {
+  setWatch(btn2Pressed, BTN2, { repeat: true });
+  // Bangle 2
+  Bangle.on('touch', function(zone, e) {
+    if (e.y < g.getHeight() / 2) {
+      btn1Pressed();
+    }
+    if (e.y > g.getHeight() / 2) {
+      btn3Pressed();
+    }
+  });
+}
 
 Bangle.on('HRM',function(hrm) {
 
diff --git a/apps/edisonsball/metadata.json b/apps/edisonsball/metadata.json
index f429c7b67..dfeb4451e 100644
--- a/apps/edisonsball/metadata.json
+++ b/apps/edisonsball/metadata.json
@@ -2,11 +2,11 @@
   "id": "edisonsball",
   "name": "Edison's Ball",
   "shortName": "Edison's Ball",
-  "version": "0.01",
+  "version": "0.02",
   "description": "Hypnagogia/Micro-Sleep alarm for experimental use in exploring sleep transition and combating drowsiness",
   "icon": "app-icon.png",
-  "tags": "",
-  "supports": ["BANGLEJS"],
+  "tags": "sleep,hyponagogia,quick,nap",
+  "supports": ["BANGLEJS", "BANGLEJS2"],
   "readme": "README.md",
   "storage": [
     {"name":"edisonsball.app.js","url":"app.js"},