Fix monotonic percentage
parent
1a84fdfd0d
commit
3b7a89c494
|
|
@ -1,10 +1,9 @@
|
||||||
|
|
||||||
(function() {
|
(function() {
|
||||||
var settings = Object.assign(
|
var settings = Object.assign(
|
||||||
require('Storage').readJSON("powermanager.default.json", true) || {},
|
require('Storage').readJSON("powermanager.default.json", true) || {},
|
||||||
require('Storage').readJSON("powermanager.json", true) || {}
|
require('Storage').readJSON("powermanager.json", true) || {}
|
||||||
);
|
);
|
||||||
|
|
||||||
if (settings.log) {
|
if (settings.log) {
|
||||||
let logFile = require('Storage').open("powermanager.log","a");
|
let logFile = require('Storage').open("powermanager.log","a");
|
||||||
let def = require('Storage').readJSON("powermanager.def.json", true) || {};
|
let def = require('Storage').readJSON("powermanager.def.json", true) || {};
|
||||||
|
|
@ -29,7 +28,9 @@
|
||||||
require('Storage').writeJSON("powermanager.hw.json", hw);
|
require('Storage').writeJSON("powermanager.hw.json", hw);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
setInterval(save, saveEvery);
|
setInterval(save, saveEvery);
|
||||||
|
|
||||||
E.on("kill", ()=>{
|
E.on("kill", ()=>{
|
||||||
|
|
@ -75,7 +76,8 @@
|
||||||
return result;
|
return result;
|
||||||
})(Bangle[functionName]);
|
})(Bangle[functionName]);
|
||||||
}
|
}
|
||||||
/* exported functions */
|
|
||||||
|
let functions = {};
|
||||||
let wrapDeferred = ((o,t) => (a) => {
|
let wrapDeferred = ((o,t) => (a) => {
|
||||||
if (a == eval || typeof a == "string") {
|
if (a == eval || typeof a == "string") {
|
||||||
return o.apply(this, arguments);
|
return o.apply(this, arguments);
|
||||||
|
|
@ -131,15 +133,30 @@
|
||||||
handleCharging(Bangle.isCharging());
|
handleCharging(Bangle.isCharging());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var savedBatPercent=E.getBattery();
|
||||||
if (settings.forceMonoPercentage){
|
if (settings.forceMonoPercentage){
|
||||||
var p = (E.getBattery()+E.getBattery()+E.getBattery()+E.getBattery())/4;
|
var newPercent =Math.round((E.getBattery()+E.getBattery()+E.getBattery()+E.getBattery()+E.getBattery()+E.getBattery())/6);
|
||||||
var op = E.getBattery;
|
|
||||||
E.getBattery = function() {
|
E.getBattery = function() {
|
||||||
var current = Math.round((op()+op()+op()+op())/4);
|
var percentToReturn;
|
||||||
if (Bangle.isCharging() && current > p) p = current;
|
if(Bangle.isCharging()){
|
||||||
if (!Bangle.isCharging() && current < p) p = current;
|
//only go up
|
||||||
return Math.round(p);
|
if(newPercent>savedBatPercent){
|
||||||
};
|
percentToReturn=newPercent;
|
||||||
|
savedBatPercent=newPercent;
|
||||||
|
}else{
|
||||||
|
percentToReturn=savedBatPercent;
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
if(newPercent<savedBatPercent){
|
||||||
|
percentToReturn=newPercent;
|
||||||
|
savedBatPercent=newPercent;
|
||||||
|
}else{
|
||||||
|
percentToReturn=savedBatPercent;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return percentToReturn;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settings.forceMonoVoltage){
|
if (settings.forceMonoVoltage){
|
||||||
|
|
@ -163,4 +180,3 @@
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
})();
|
})();
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue