Merge pull request #3503 from bobrippling/feat/battpwr-charging

widbattpwr: show percentage if charging
espruino · Jul 13, 2024 · e9059c7 · e9059c7
2 parents 1e82772 + 35bc00e
commit e9059c7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/apps/widbattpwr/ChangeLog b/apps/widbattpwr/ChangeLog
@@ -1 +1,2 @@
 0.01: Initial fork from hwid_a_battery_widget
+0.02: Show battery percentage (instead of power) if charging
diff --git a/apps/widbattpwr/README.md b/apps/widbattpwr/README.md
@@ -2,6 +2,10 @@
 
 Show the time remaining at the current power consumption, and battery percentage via shading of the text and a percentage bar.
 
+Battery percentage can be seen:
+- Temporarily by tapping the widget
+- By charging the watch
+
 Requires firmware 2v23 or above.
 
 This is a copy of `hwid_a_battery_widget` (that being a copy of `wid_a_battery_widget`).

diff --git a/apps/widbattpwr/metadata.json b/apps/widbattpwr/metadata.json
@@ -3,7 +3,7 @@
   "name": "Battery power and percentage widget",
   "shortName": "Batt Pwr",
   "icon": "widget.png",
-  "version": "0.01",
+  "version": "0.02",
   "type": "widget",
   "supports": ["BANGLEJS2"],
   "readme": "README.md",

diff --git a/apps/widbattpwr/widget.js b/apps/widbattpwr/widget.js
@@ -39,7 +39,7 @@
         g.setFont("Vector", 16);
         {
             var txt = void 0;
-            if (showPct) {
+            if (showPct || Bangle.isCharging()) {
                 txt = "".concat(batt, "%");
             }
             else {

diff --git a/apps/widbattpwr/widget.ts b/apps/widbattpwr/widget.ts
@@ -44,7 +44,7 @@
 		g.setFont("Vector", 16);
 		{
 			let txt;
-			if(showPct){
+			if(showPct || Bangle.isCharging()){
 				txt = `${batt}%`;
 			}else{
 				// 175mAh, scaled based on battery (batt/100), scaled down based on usage