Update app.js

* Use settings to toggle visibility of elements
* If heart rate should be hidden we do not enable HRM power
* Show battery value in red if value below threshold
pull/1057/head
Marco H 2021-12-11 13:21:45 +01:00 committed by GitHub
parent 2a918b6c13
commit dfc46898c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 81 additions and 34 deletions

View File

@ -12,22 +12,49 @@ const marginLeftData = font12 ? 64 : 75; // margin of data values
const topicColor = g.theme.dark ? "#fff" : "#000";
const textColor = g.theme.dark ? "#0f0" : "#080";
const textColorRed = g.theme.dark ? "#FF0000" : "#FF0000";
let hrtValue;
let hrtValueIsOld = false;
let localTempValue;
let weatherTempString;
let lastHeartRateRowIndex;
let lastStepsRowIndex;
let i = 2;
let settings;
function loadSettings() {
settings = storage.readJSON('weather.json', 1) || {};
}
function setting(key) {
if (!settings) { loadSettings(); }
const DEFAULTS = {
'battery': true,
'batteryLvl': 30,
'weather': true,
'steps': true,
'heartrate': true
};
return (key in settings) ? settings[key] : DEFAULTS[key];
}
let showBattery = setting('battery');
let batteryWarnLevel = setting('batteryLvl');
let showWeather = setting('weather');
let showSteps = setting('steps');
let showHeartRate = setting('heartrate');
// timeout used to update every minute
var drawTimeout;
// schedule a draw for the next minute
function queueDraw() {
if (drawTimeout) clearTimeout(drawTimeout);
drawTimeout = setTimeout(function() {
drawTimeout = undefined;
drawAll(false);
drawAll(true);
}, 60000 - (Date.now() % 60000));
}
@ -44,15 +71,13 @@ function updateTime(now){
if (!Bangle.isLCDOn()) return;
writeLineTopic("TIME", 1);
writeLine(locale.time(now,1),1);
if(now.getMinutes() == 0)
drawInfo(now);
}
function drawInfo(now) {
if (now == undefined)
if (now == undefined)
now = new Date();
let i = 2;
i = 2;
writeLineTopic("DOWK", i);
writeLine(locale.dow(now),i);
@ -62,12 +87,28 @@ function drawInfo(now) {
writeLine(locale.date(now,1),i);
i++;
writeLineTopic("BATT", i);
const b = E.getBattery();
writeLine(b + "%", i);
i++;
if (showBattery) {
writeLineTopic("BATT", i);
const b = E.getBattery();
writeLine(b + "%", i, b > batteryWarnLevel ? textColor : textColorRed);
i++;
}
// weather
if (showWeather) {
drawWeather();
}
if (showSteps) {
drawSteps(i);
i++;
}
if (showHeartRate) {
drawHeartRate(i);
}
}
function drawWeather() {
const weatherJson = getWeather();
if(weatherJson && weatherJson.weather){
const currentWeather = weatherJson.weather;
@ -82,13 +123,10 @@ function drawInfo(now) {
writeLine(weatherTempValue,i);
i++;
}
drawSteps(i);
drawHeartRate(i);
}
function drawSteps(i) {
if (!showSteps) return;
if (i == undefined)
i = lastStepsRowIndex;
const steps = getSteps();
@ -100,6 +138,7 @@ function drawSteps(i) {
}
function drawHeartRate(i) {
if (!showHeartRate) return;
if (i == undefined)
i = lastHeartRateRowIndex;
writeLineTopic("HRTM", i);
@ -160,14 +199,18 @@ function getWeather() {
// turn on HRM when the LCD is unlocked
Bangle.on('lock', function(isLocked) {
if (!isLocked) {
Bangle.setHRMPower(1,"clicompleteclk");
if (hrtValue == undefined)
hrtValue = "...";
else
hrtValueIsOld = true;
if (showHeartRate) {
Bangle.setHRMPower(1,"clicompleteclk");
if (hrtValue == undefined)
hrtValue = "...";
else
hrtValueIsOld = true;
}
} else {
hrtValueIsOld = true;
Bangle.setHRMPower(0,"clicompleteclk");
if (showHeartRate) {
hrtValueIsOld = true;
Bangle.setHRMPower(0,"clicompleteclk");
}
}
// Update steps and heart rate
drawSteps();
@ -178,22 +221,26 @@ Bangle.on('lcdPower',function(on) {
if (on) {
drawAll(true);
} else {
hrtValueIsOld = true;
if (showHeartRate) {
hrtValueIsOld = true;
}
if (drawTimeout) clearTimeout(drawTimeout);
drawTimeout = undefined;
}
});
Bangle.on('HRM', function(hrm) {
//if(hrm.confidence > 90){
hrtValueIsOld = false;
hrtValue = hrm.bpm;
if (Bangle.isLCDOn())
drawHeartRate();
//} else {
// hrtValue = undefined;
//}
});
if (showHeartRate) {
Bangle.on('HRM', function(hrm) {
//if(hrm.confidence > 90){
hrtValueIsOld = false;
hrtValue = hrm.bpm;
if (Bangle.isLCDOn())
drawHeartRate();
//} else {
// hrtValue = undefined;
//}
});
}
g.clear();
Bangle.setUI("clock");