From 1a49342ccf15bc73fb13b643345fc5752a89abba Mon Sep 17 00:00:00 2001
From: Rob Pilling <robpilling@gmail.com>
Date: Sun, 29 Jan 2023 17:00:47 +0000
Subject: [PATCH] chargent: support BangleJS2

---
 apps/chargent/ChangeLog     | 1 +
 apps/chargent/boot.js       | 8 +++++---
 apps/chargent/boot.min.js   | 1 -
 apps/chargent/metadata.json | 6 +++---
 4 files changed, 9 insertions(+), 7 deletions(-)
 delete mode 100644 apps/chargent/boot.min.js

diff --git a/apps/chargent/ChangeLog b/apps/chargent/ChangeLog
index 7f837e50e..ae4aa0e36 100644
--- a/apps/chargent/ChangeLog
+++ b/apps/chargent/ChangeLog
@@ -1 +1,2 @@
 0.01: First version
+0.02: Support BangleJS2
diff --git a/apps/chargent/boot.js b/apps/chargent/boot.js
index 802c3f55a..b02d00a8e 100644
--- a/apps/chargent/boot.js
+++ b/apps/chargent/boot.js
@@ -1,4 +1,6 @@
 (() => {
+  const pin = process.env.HWVERSION === 2 ? D3 : D30;
+
   var id;
   Bangle.on('charging', (charging) => {
     if (charging) {
@@ -6,9 +8,9 @@
         var max = 0;
         var count = 0;
         id = setInterval(() => {
-          var d30 = analogRead(D30);
-          if (max < d30) {
-            max = d30;
+          var battlvl = analogRead(pin);
+          if (max < battlvl) {
+            max = battlvl;
             count = 0;
           } else {
             count++;
diff --git a/apps/chargent/boot.min.js b/apps/chargent/boot.min.js
deleted file mode 100644
index 700198146..000000000
--- a/apps/chargent/boot.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(){var a;Bangle.on("charging",function(e){if(e){if(!a){var c=0,b=0;a=setInterval(function(){var d=analogRead(D30);c<d?(c=d,b=0):(b++,10<=b&&(Bangle.buzz(500),setTimeout(function(){return Bangle.buzz(500)},1E3)))},3E4)}}else a&&(clearInterval(a),a=void 0)})})()
\ No newline at end of file
diff --git a/apps/chargent/metadata.json b/apps/chargent/metadata.json
index 4ec3e437c..e2e6f5a61 100644
--- a/apps/chargent/metadata.json
+++ b/apps/chargent/metadata.json
@@ -1,13 +1,13 @@
 { "id": "chargent",
   "name": "Charge Gently",
-  "version": "0.01",
+  "version": "0.02",
   "description": "When charging, reminds you to disconnect the watch to prolong battery life.",
   "icon": "icon.png",
   "type": "bootloader",
   "tags": "battery",
-  "supports": ["BANGLEJS"],
+  "supports": ["BANGLEJS", "BANGLEJS2"],
   "readme": "README.md",
   "storage": [
-    {"name": "chargent.boot.js", "url": "boot.min.js"}
+    {"name": "chargent.boot.js", "url": "boot.js"}
   ]
 }