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

Merge pull request #3626 from bobrippling/fix/drained-restore 

drained: fix not restoring when charge threshold met
master
thyttan 2024-10-29 22:51:47 +01:00 committed by GitHub
parent 93de0b5965 b721023daa
commit ed3bf8cbac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/drained/ChangeLog
View File

@ -5,3 +5,4 @@
0.04: Enhance menu: enable bluetooth, visit settings & visit recovery 0.04: Enhance menu: enable bluetooth, visit settings & visit recovery
0.05: Enhance menu: permit toggling bluetooth 0.05: Enhance menu: permit toggling bluetooth
0.06: Display clock in green when charging, with "charging" text 0.06: Display clock in green when charging, with "charging" text
0.07: Correctly restore full power when the charged threshold is reached

6
apps/drained/app.js
View File

@ -88,7 +88,7 @@ var reload = function () {
}; };
reload(); reload();
Bangle.emit("drained", E.getBattery()); Bangle.emit("drained", E.getBattery());
var _a = require("Storage").readJSON("".concat(app, ".setting.json"), true) || {}, _b = _a.keepStartup, keepStartup = _b === void 0 ? true : _b, _c = _a.restore, restore = _c === void 0 ? 20 : _c, _d = _a.exceptions, exceptions = _d === void 0 ? ["widdst.0"] : _d; var _a = require("Storage").readJSON("".concat(app, ".setting.json"), true) || {}, _b = _a.keepStartup, keepStartup = _b === void 0 ? true : _b, _c = _a.restore, restore = _c === void 0 ? 20 : _c, _d = _a.exceptions, exceptions = _d === void 0 ? ["widdst.0"] : _d, _e = _a.interval, interval = _e === void 0 ? 10 : _e;
function drainedRestore() { function drainedRestore() {
if (!keepStartup) { if (!keepStartup) {
try { try {
@ -110,8 +110,10 @@ var checkCharge = function () {
if (Bangle.isCharging()) if (Bangle.isCharging())
checkCharge(); checkCharge();
Bangle.on("charging", function (charging) { Bangle.on("charging", function (charging) {
if (drainedInterval)
drainedInterval = clearInterval(drainedInterval);
if (charging) if (charging)
checkCharge(); drainedInterval = setInterval(checkCharge, interval * 60 * 1000);
}); });
if (!keepStartup) { if (!keepStartup) {
var storage = require("Storage"); var storage = require("Storage");

7
apps/drained/app.ts
View File

@ -115,7 +115,7 @@ reload();
Bangle.emit("drained", E.getBattery()); Bangle.emit("drained", E.getBattery());
// restore normal boot on charge // restore normal boot on charge
const { keepStartup = true, restore = 20, exceptions = ["widdst.0"] }: DrainedSettings const { keepStartup = true, restore = 20, exceptions = ["widdst.0"], interval = 10 }: DrainedSettings
= require("Storage").readJSON(`${app}.setting.json`, true) || {}; = require("Storage").readJSON(`${app}.setting.json`, true) || {};
// re-enable normal boot code when we're above a threshold: // re-enable normal boot code when we're above a threshold:
@ -142,7 +142,10 @@ if (Bangle.isCharging())
checkCharge(); checkCharge();
Bangle.on("charging", charging => { Bangle.on("charging", charging => {
if(charging) checkCharge(); if(drainedInterval)
drainedInterval = clearInterval(drainedInterval) as undefined;
if(charging)
drainedInterval = setInterval(checkCharge, interval * 60 * 1000);
}); });
if(!keepStartup){ if(!keepStartup){

2
apps/drained/metadata.json
View File

@ -1,7 +1,7 @@
{ {
"id": "drained", "id": "drained",
"name": "Drained", "name": "Drained",
"version": "0.06", "version": "0.07",
"description": "Switches to displaying a simple clock when the battery percentage is low, and disables some peripherals", "description": "Switches to displaying a simple clock when the battery percentage is low, and disables some peripherals",
"readme": "README.md", "readme": "README.md",
"icon": "icon.png", "icon": "icon.png",