FOSS
/
BangleApps
mirror of https://github.com/espruino/BangleApps
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

health/interface: replace moving average with average

pull/3106/head
Erik Andresen 2023-11-20 07:47:53 +01:00
parent 12dcefedf5
commit 69dbc18eee
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/health/interface.html
View File

@ -139,6 +139,7 @@ function getDailyData(data) {
var idx = DB_HEADER_LEN; var idx = DB_HEADER_LEN;
for (var day = 0; day < 31; day++) { for (var day = 0; day < 31; day++) {
var dayData = {steps: 0, bpm: 0, movement: 0}; var dayData = {steps: 0, bpm: 0, movement: 0};
let bpmCnt = 0;
for (var hr = 0; hr < 24; hr++) { // actually 25, see below for (var hr = 0; hr < 24; hr++) { // actually 25, see below
for (var m = 0; m < DB_RECORDS_PER_HR; m++) { for (var m = 0; m < DB_RECORDS_PER_HR; m++) {
var h = data.substr(idx, DB_RECORD_LEN); var h = data.substr(idx, DB_RECORD_LEN);
@ -153,7 +154,8 @@ function getDailyData(data) {
}; };
dayData.steps += h.steps; // sum dayData.steps += h.steps; // sum
if (h.bpm > 0) { if (h.bpm > 0) {
dayData.bpm = dayData.bpm > 0 ? (dayData.bpm + h.bpm) / 2 : h.bpm; // average dayData.bpm = dayData.bpm + h.bpm;
bpmCnt++;
} }
dayData.movement += h.movement; // sum dayData.movement += h.movement; // sum
} }
@ -162,7 +164,9 @@ function getDailyData(data) {
} }
idx += DB_RECORD_LEN; // +1 because we have an extra record with totals idx += DB_RECORD_LEN; // +1 because we have an extra record with totals
// for the end of the day // for the end of the day
if (bpmCnt > 0) {
dayData.bpm = Math.round(dayData.bpm/bpmCnt); // average
}
dailyData[day + 1] = dayData; dailyData[day + 1] = dayData;
} }
return dailyData; return dailyData;