Merge pull request #3904 from RKBoss6/PowerManager

[Power Manager] Round battery percentage

apps/powermanager/ChangeLog

@@ -13,3 +13,4 @@
 0.10: Use charging state on boot for auto calibration
       Log additional timestamp for trace log
 0.11: Minor code improvements
+0.12: Round monotonic percentage, rename to stable percentage/voltage

apps/powermanager/boot.js

@@ -3,7 +3,7 @@
     require('Storage').readJSON("powermanager.default.json", true) || {},
     require('Storage').readJSON("powermanager.json", true) || {}
   );
-
+  
   if (settings.log) {
     let logFile = require('Storage').open("powermanager.log","a");
     let def = require('Storage').readJSON("powermanager.def.json", true) || {};
@@ -12,7 +12,7 @@
     let hw = require('Storage').readJSON("powermanager.hw.json", true) || {};
     if (!hw.start) hw.start = Date.now();
     if (!hw.power) hw.power = {};
-
+    
     const saveEvery = 1000 * 60 * 5;
     const TO_WRAP = ["GPS","Compass","Barometer","HRM","LCD"];
 
@@ -28,7 +28,9 @@
         require('Storage').writeJSON("powermanager.hw.json", hw);
       }
     }
-
+    
+    
+    
     setInterval(save, saveEvery);
 
     E.on("kill", ()=>{
@@ -75,7 +77,7 @@
       })(Bangle[functionName]);
     }
 
-    let functions = {};
+
     let wrapDeferred = ((o,t) => (a) => {
       if (a == eval || typeof a == "string") {
         return o.apply(this, arguments);
@@ -131,19 +133,25 @@
     handleCharging(Bangle.isCharging());
   }
 
+  var savedBatPercent=E.getBattery();
   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() {
-      var current = Math.round((op()+op()+op()+op())/4);
+
-      if (Bangle.isCharging() && current > p) p = current;
+      if(Bangle.isCharging()){
-      if (!Bangle.isCharging() && current < p) p = current;
+        if(newPercent > savedBatPercent)
-      return p;
+          savedBatPercent = newPercent;
-    };
+      }else{
+        if(newPercent < savedBatPercent)
+          savedBatPercent = newPercent;
+      }
+      return savedBatPercent;
+  };
   }
   
   if (settings.forceMonoVoltage){
-    var v = (NRF.getBattery()+NRF.getBattery()+NRF.getBattery()+NRF.getBattery())/4;
+    var v = (NRF.getBattery()+NRF.getBattery()+NRF.getBattery()+NRF.getBattery()+NRF.getBattery()+NRF.getBattery())/6;
     var ov = NRF.getBattery;
     NRF.getBattery = function() {
       var current = (ov()+ov()+ov()+ov())/4;

apps/powermanager/metadata.json

@@ -2,8 +2,8 @@
   "id": "powermanager",
   "name": "Power Manager",
   "shortName": "Power Manager",
-  "version": "0.11",
+  "version": "0.12",
-  "description": "Allow configuration of warnings and thresholds for battery charging and display.",
+  "description": "Allow configuration of warnings for battery charging, stabilization of voltage, stabilization of battery percentage, and battery logging.",
   "icon": "app.png",
   "type": "bootloader",
   "tags": "tool",

apps/powermanager/settings.js

@@ -27,13 +27,13 @@
     'Widget': function() {
       E.showMenu(submenu_widget);
     },
-    'Monotonic percentage': {
+    'Stable Percentage': {
       value: !!settings.forceMonoPercentage,
       onchange: v => {
         writeSettings("forceMonoPercentage", v);
       }
     },
-    'Monotonic voltage': {
+    'Stable Voltage': {
       value: !!settings.forceMonoVoltage,
       onchange: v => {
         writeSettings("forceMonoVoltage", v);