Shift time logging into logEntry() function
parent
3fcd5fe273
commit
0d2cf7b8f4
|
|
@ -15,21 +15,26 @@
|
||||||
|
|
||||||
function logBatterySample(entry) {
|
function logBatterySample(entry) {
|
||||||
let log = storage.readJSON(logFile, 1) || [];
|
let log = storage.readJSON(logFile, 1) || [];
|
||||||
|
//get human-readable time
|
||||||
// Keep it from growing forever (optional: only keep last 100 entries)
|
let d = new Date();
|
||||||
if (log.length > 100) log.shift();
|
entry.time = d.getFullYear() + "-" +
|
||||||
|
("0"+(d.getMonth()+1)).slice(-2) + "-" +
|
||||||
|
("0"+d.getDate()).slice(-2) + " " +
|
||||||
|
("0"+d.getHours()).slice(-2) + ":" +
|
||||||
|
("0"+d.getMinutes()).slice(-2) + ":" +
|
||||||
|
("0"+d.getSeconds()).slice(-2);
|
||||||
|
|
||||||
log.push(entry);
|
log.push(entry);
|
||||||
|
if (log.length > 100) log = log.slice(-100);
|
||||||
|
|
||||||
storage.writeJSON(logFile, log);
|
storage.writeJSON(logFile, log);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Record current battery reading into current average
|
// Record current battery reading into current average
|
||||||
function recordBattery() {
|
function recordBattery() {
|
||||||
let now = Date.now();
|
let now = Date.now();
|
||||||
let data = getData();
|
let data = getData();
|
||||||
let formattedNow=new Date();
|
|
||||||
let batt = E.getBattery();
|
let batt = E.getBattery();
|
||||||
let battChange = data.battLastRecorded - batt;
|
let battChange = data.battLastRecorded - batt;
|
||||||
let deltaHours = (now - data.timeLastRecorded) / (1000 * 60 * 60);
|
let deltaHours = (now - data.timeLastRecorded) / (1000 * 60 * 60);
|
||||||
|
|
@ -71,7 +76,6 @@
|
||||||
if(getSettings().doLogging){
|
if(getSettings().doLogging){
|
||||||
// Always log the sample
|
// Always log the sample
|
||||||
logBatterySample({
|
logBatterySample({
|
||||||
time: formattedNow,
|
|
||||||
battNow: batt,
|
battNow: batt,
|
||||||
battLast: data.battLastRecorded,
|
battLast: data.battLastRecorded,
|
||||||
battChange: battChange,
|
battChange: battChange,
|
||||||
|
|
@ -99,7 +103,6 @@
|
||||||
if(getSettings().doLogging){
|
if(getSettings().doLogging){
|
||||||
// Always log the sample
|
// Always log the sample
|
||||||
logBatterySample({
|
logBatterySample({
|
||||||
time: formattedNow,
|
|
||||||
battNow: batt,
|
battNow: batt,
|
||||||
battLast: data.battLastRecorded,
|
battLast: data.battLastRecorded,
|
||||||
battChange: battChange,
|
battChange: battChange,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue