bryan
/
BangleApps
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

widbattpwr: use `power_usage` module

master
Rob Pilling 2024-07-09 08:45:54 +01:00
parent bf3b572b9e
commit b4b4341728
4 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/widbattpwr/ChangeLog
View File

@ -1 +1,2 @@
0.01: Initial fork from hwid_a_battery_widget 0.01: Initial fork from hwid_a_battery_widget
0.02: Use `power_usage` module

2
apps/widbattpwr/metadata.json
View File

@ -3,7 +3,7 @@
"name": "Battery power and percentage widget", "name": "Battery power and percentage widget",
"shortName": "Batt Pwr", "shortName": "Batt Pwr",
"icon": "widget.png", "icon": "widget.png",
"version": "0.01", "version": "0.02",
"type": "widget", "type": "widget",
"supports": ["BANGLEJS2"], "supports": ["BANGLEJS2"],
"readme": "README.md", "readme": "README.md",

13
apps/widbattpwr/widget.js
View File

@ -20,13 +20,7 @@
function draw() { function draw() {
var x = this.x; var x = this.x;
var y = this.y; var y = this.y;
var batt = E.getBattery(); var _a = require("power_usage").get(), usage = _a.usage, hrsLeft = _a.hrsLeft, batt = _a.batt;
var pwr = E.getPowerUsage();
var usage = 0;
for (var key in pwr.device) {
if (!/^(LCD|LED)/.test(key))
usage += pwr.device[key];
}
var pwrColour = powerColour(usage); var pwrColour = powerColour(usage);
g.reset() g.reset()
.setBgColor(g.theme.bg) .setBgColor(g.theme.bg)
@ -43,9 +37,8 @@
txt = "".concat(batt, "%"); txt = "".concat(batt, "%");
} }
else { else {
var hrs = 175000 * batt / (100 * usage); var days = hrsLeft / 24;
var days = hrs / 24; txt = days >= 1 ? "".concat(Math.round(Math.min(days, 99)), "d") : "".concat(Math.round(hrsLeft), "h");
txt = days >= 1 ? "".concat(Math.round(Math.min(days, 99)), "d") : "".concat(Math.round(hrs), "h");
} }
var txth = 14; var txth = 14;
g.setColor(g.theme.fg); g.setColor(g.theme.fg);

14
apps/widbattpwr/widget.ts
View File

@ -22,13 +22,7 @@
let x = this.x!; let x = this.x!;
let y = this.y!; let y = this.y!;
const batt = E.getBattery(); const { usage, hrsLeft, batt } = require("power_usage").get();
const pwr = E.getPowerUsage();
let usage = 0;
for(const key in pwr.device){
if(!/^(LCD|LED)/.test(key))
usage += pwr.device[key];
}
const pwrColour = powerColour(usage); const pwrColour = powerColour(usage);
g.reset() g.reset()
@ -47,10 +41,8 @@
if(showPct){ if(showPct){
txt = `${batt}%`; txt = `${batt}%`;
}else{ }else{
// 175mAh, scaled based on battery (batt/100), scaled down based on usage const days = hrsLeft / 24;
const hrs = 175000 * batt / (100 * usage); txt = days >= 1 ? `${Math.round(Math.min(days, 99))}d` : `${Math.round(hrsLeft)}h`;
const days = hrs / 24;
txt = days >= 1 ? `${Math.round(Math.min(days, 99))}d` : `${Math.round(hrs)}h`;
} }
// draw time remaining, then shade it based on batt % // draw time remaining, then shade it based on batt %