Merge pull request #2984 from pavelmachek/m_9_widbat

widbat: Use flash, not fork to indicate charging
espruino · Sep 13, 2023 · a427a21 · a427a21
2 parents 2fae5a2 + 337bf47
commit a427a21
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 21 deletions.
diff --git a/apps/widbat/ChangeLog b/apps/widbat/ChangeLog
@@ -8,3 +8,4 @@
 0.09: Misc speed/memory tweaks
 0.10: Color changes due to the battery level
 0.11: Change level for medium charge (50% -> 40%), and darken color on light themes as yellow was almost invisible
+0.12: Use black flash instead of green fork to indicate charging
diff --git a/apps/widbat/metadata.json b/apps/widbat/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "widbat",
   "name": "Battery Level Widget",
-  "version": "0.11",
+  "version": "0.12",
   "description": "Show the current battery level and charging status in the top right of the clock",
   "icon": "widget.png",
   "type": "widget",

diff --git a/apps/widbat/widget.js b/apps/widbat/widget.js
@@ -1,14 +1,10 @@
-(function(){
-  function setWidth() {
-    WIDGETS["bat"].width = 40 + (Bangle.isCharging()?16:0);
-  }
+{
   Bangle.on('charging',function(charging) {
     if(charging) Bangle.buzz();
-    setWidth();
-    Bangle.drawWidgets(); // re-layout widgets
+    WIDGETS["bat"].draw();
     g.flip();
   });
-  var batteryInterval = Bangle.isLCDOn() ? setInterval(()=>WIDGETS["bat"].draw(), 60000) : undefined;
+  let batteryInterval = Bangle.isLCDOn() ? setInterval(()=>WIDGETS["bat"].draw(), 60000) : undefined;
   Bangle.on('lcdPower', function(on) {
     if (on) {
       WIDGETS["bat"].draw();
@@ -23,19 +19,14 @@
     }
   });
   WIDGETS["bat"]={area:"tr",width:40,draw:function() {
-    var s = 39;
     var x = this.x, y = this.y;
-    g.reset();
-    if (Bangle.isCharging()) {
-      g.setColor("#0f0").drawImage(atob("DhgBHOBzgc4HOP////////////////////3/4HgB4AeAHgB4AeAHgB4AeAHg"),x,y);
-      x+=16;
-    }
-    g.setColor(g.theme.fg).fillRect(x,y+2,x+s-4,y+21).clearRect(x+2,y+4,x+s-6,y+19).fillRect(x+s-3,y+10,x+s,y+14);
+    g.reset().setColor(g.theme.fg).fillRect(x,y+2,x+35,y+21).clearRect(x+2,y+4,x+33,y+19).fillRect(x+36,y+10,x+39,y+14);
     var battery = E.getBattery();
-    if(battery < 20) {g.setColor("#f00");}
-    else if (battery < 40) {g.setColor(g.theme.dark ? "#ff0" : "#f80");}
-    else {g.setColor("#0f0");}
-    g.fillRect(x+4,y+6,x+4+battery*(s-12)/100,y+17);
+    if(battery < 20) g.setColor("#f00");
+    else if (battery < 40) g.setColor(g.theme.dark ? "#ff0" : "#f80");
+    else g.setColor("#0f0");
+    g.fillRect(x+4,y+6,x+4+battery*27/100,y+17);
+    if (Bangle.isCharging()) 
+      g.reset().drawImage(atob("FAqBAAHAAA8AAPwAB/D4f8P+Hw/gAD8AAPAAA4A="),x+8,y+7);
   }};
-  setWidth();
-})()
+}