Merge pull request #2984 from pavelmachek/m_9_widbat

widbat: Use flash, not fork to indicate charging
master
Gordon Williams 2023-09-13 09:19:42 +01:00 committed by GitHub
commit a427a21a79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 21 deletions

View File

@ -8,3 +8,4 @@
0.09: Misc speed/memory tweaks 0.09: Misc speed/memory tweaks
0.10: Color changes due to the battery level 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.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

View File

@ -1,7 +1,7 @@
{ {
"id": "widbat", "id": "widbat",
"name": "Battery Level Widget", "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", "description": "Show the current battery level and charging status in the top right of the clock",
"icon": "widget.png", "icon": "widget.png",
"type": "widget", "type": "widget",

View File

@ -1,14 +1,10 @@
(function(){ {
function setWidth() {
WIDGETS["bat"].width = 40 + (Bangle.isCharging()?16:0);
}
Bangle.on('charging',function(charging) { Bangle.on('charging',function(charging) {
if(charging) Bangle.buzz(); if(charging) Bangle.buzz();
setWidth(); WIDGETS["bat"].draw();
Bangle.drawWidgets(); // re-layout widgets
g.flip(); 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) { Bangle.on('lcdPower', function(on) {
if (on) { if (on) {
WIDGETS["bat"].draw(); WIDGETS["bat"].draw();
@ -23,19 +19,14 @@
} }
}); });
WIDGETS["bat"]={area:"tr",width:40,draw:function() { WIDGETS["bat"]={area:"tr",width:40,draw:function() {
var s = 39;
var x = this.x, y = this.y; var x = this.x, y = this.y;
g.reset(); 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);
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);
var battery = E.getBattery(); var battery = E.getBattery();
if(battery < 20) {g.setColor("#f00");} if(battery < 20) g.setColor("#f00");
else if (battery < 40) {g.setColor(g.theme.dark ? "#ff0" : "#f80");} else if (battery < 40) g.setColor(g.theme.dark ? "#ff0" : "#f80");
else {g.setColor("#0f0");} else g.setColor("#0f0");
g.fillRect(x+4,y+6,x+4+battery*(s-12)/100,y+17); 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(); }
})()