Update app.js
parent
3e66382d2b
commit
2c745e5fff
|
|
@ -30,7 +30,7 @@ var battery = 0;
|
||||||
var heartRate = '';
|
var heartRate = '';
|
||||||
var heartRateEventSeconds = 0;
|
var heartRateEventSeconds = 0;
|
||||||
var HRM = false;
|
var HRM = false;
|
||||||
var lastSteps = stepCountOffset;
|
var lastSteps = STEP_COUNT_OFFSET;
|
||||||
|
|
||||||
function toggleHRM() {
|
function toggleHRM() {
|
||||||
if(HRM) {
|
if(HRM) {
|
||||||
|
|
@ -44,6 +44,7 @@ function toggleHRM() {
|
||||||
}
|
}
|
||||||
|
|
||||||
function getBattery() {
|
function getBattery() {
|
||||||
|
// calculate last 10 moving average %
|
||||||
batteryPercents.push(E.getBattery());
|
batteryPercents.push(E.getBattery());
|
||||||
if(batteryPercents.length > 10) batteryPercents.shift();
|
if(batteryPercents.length > 10) batteryPercents.shift();
|
||||||
return Math.round(batteryPercents.reduce((avg,e,i,arr)=>avg+e/arr.length,0));
|
return Math.round(batteryPercents.reduce((avg,e,i,arr)=>avg+e/arr.length,0));
|
||||||
|
|
@ -55,16 +56,12 @@ function updateHeartRate(h) {
|
||||||
heartRate = h.bpm || 0;
|
heartRate = h.bpm || 0;
|
||||||
if(heartRate >= HEART_RATE_LIMIT) {
|
if(heartRate >= HEART_RATE_LIMIT) {
|
||||||
heartRateEventSeconds++;
|
heartRateEventSeconds++;
|
||||||
if(heartRateEventSeconds==10) {
|
if(heartRateEventSeconds==10)
|
||||||
var timeSig = new Date();
|
addLog((new Date()), over, counter, "Heart Rate", ">" + HEART_RATE_LIMIT);
|
||||||
addLog(timeSig, over, counter, "Heart Rate", ">" + HEART_RATE_LIMIT);
|
|
||||||
}
|
}
|
||||||
}
|
if(heartRateEventSeconds > 10
|
||||||
if(heartRateEventSeconds > 10) {
|
&& heartRate < HEART_RATE_LIMIT)
|
||||||
if(heartRate < HEART_RATE_LIMIT) {
|
|
||||||
heartRateEventSeconds = -10;
|
heartRateEventSeconds = -10;
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// write events to storage (csv, persistent)
|
// write events to storage (csv, persistent)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue