bryan
/
BangleApps
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1842 from alessandrococco/1366-health 

[Health] Fix #1366
master
Gordon Williams 2022-05-18 08:12:41 +01:00 committed by GitHub
parent 2508fd38ab 774aa169eb
commit a2b91d945f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/health/ChangeLog
View File

@ -13,3 +13,4 @@
0.12: Add setting for Daily Step Goal 0.12: Add setting for Daily Step Goal
0.13: Add support for internationalization 0.13: Add support for internationalization
0.14: Move settings 0.14: Move settings
0.15: Fix charts (fix #1366)

18
apps/health/app.js
View File

@ -46,7 +46,7 @@ function menuHRM() {
function stepsPerHour() { function stepsPerHour() {
E.showMessage(/*LANG*/"Loading..."); E.showMessage(/*LANG*/"Loading...");
let data = new Uint16Array(24); var data = new Uint16Array(24);
require("health").readDay(new Date(), h=>data[h.hr]+=h.steps); require("health").readDay(new Date(), h=>data[h.hr]+=h.steps);
g.clear(1); g.clear(1);
Bangle.drawWidgets(); Bangle.drawWidgets();
@ -57,7 +57,7 @@ function stepsPerHour() {
function stepsPerDay() { function stepsPerDay() {
E.showMessage(/*LANG*/"Loading..."); E.showMessage(/*LANG*/"Loading...");
let data = new Uint16Array(31); var data = new Uint16Array(31);
require("health").readDailySummaries(new Date(), h=>data[h.day]+=h.steps); require("health").readDailySummaries(new Date(), h=>data[h.day]+=h.steps);
g.clear(1); g.clear(1);
Bangle.drawWidgets(); Bangle.drawWidgets();
@ -68,8 +68,8 @@ function stepsPerDay() {
function hrmPerHour() { function hrmPerHour() {
E.showMessage(/*LANG*/"Loading..."); E.showMessage(/*LANG*/"Loading...");
let data = new Uint16Array(24); var data = new Uint16Array(24);
let cnt = new Uint8Array(23); var cnt = new Uint8Array(23);
require("health").readDay(new Date(), h=>{ require("health").readDay(new Date(), h=>{
data[h.hr]+=h.bpm; data[h.hr]+=h.bpm;
if (h.bpm) cnt[h.hr]++; if (h.bpm) cnt[h.hr]++;
@ -84,8 +84,8 @@ function hrmPerHour() {
function hrmPerDay() { function hrmPerDay() {
E.showMessage(/*LANG*/"Loading..."); E.showMessage(/*LANG*/"Loading...");
let data = new Uint16Array(31); var data = new Uint16Array(31);
let cnt = new Uint8Array(31); var cnt = new Uint8Array(31);
require("health").readDailySummaries(new Date(), h=>{ require("health").readDailySummaries(new Date(), h=>{
data[h.day]+=h.bpm; data[h.day]+=h.bpm;
if (h.bpm) cnt[h.day]++; if (h.bpm) cnt[h.day]++;
@ -100,7 +100,7 @@ function hrmPerDay() {
function movementPerHour() { function movementPerHour() {
E.showMessage(/*LANG*/"Loading..."); E.showMessage(/*LANG*/"Loading...");
let data = new Uint16Array(24); var data = new Uint16Array(24);
require("health").readDay(new Date(), h=>data[h.hr]+=h.movement); require("health").readDay(new Date(), h=>data[h.hr]+=h.movement);
g.clear(1); g.clear(1);
Bangle.drawWidgets(); Bangle.drawWidgets();
@ -111,7 +111,7 @@ function movementPerHour() {
function movementPerDay() { function movementPerDay() {
E.showMessage(/*LANG*/"Loading..."); E.showMessage(/*LANG*/"Loading...");
let data = new Uint16Array(31); var data = new Uint16Array(31);
require("health").readDailySummaries(new Date(), h=>data[h.day]+=h.movement); require("health").readDailySummaries(new Date(), h=>data[h.day]+=h.movement);
g.clear(1); g.clear(1);
Bangle.drawWidgets(); Bangle.drawWidgets();
@ -183,7 +183,7 @@ function drawBarChart() {
} }
// draw a fake 0 height bar if chart_index is outside the bounds of the array // draw a fake 0 height bar if chart_index is outside the bounds of the array
if ((chart_index + bar - 1) >= 0 && (chart_index + bar - 1) < data_len) if ((chart_index + bar - 1) >= 0 && (chart_index + bar - 1) < data_len && chart_max_datum > 0)
bar_top = bar_bot - 100 * (chart_data[chart_index + bar - 1]) / chart_max_datum; bar_top = bar_bot - 100 * (chart_data[chart_index + bar - 1]) / chart_max_datum;
else else
bar_top = bar_bot; bar_top = bar_bot;

2
apps/health/metadata.json
View File

@ -1,7 +1,7 @@
{ {
"id": "health", "id": "health",
"name": "Health Tracking", "name": "Health Tracking",
"version": "0.14", "version": "0.15",
"description": "Logs health data and provides an app to view it", "description": "Logs health data and provides an app to view it",
"icon": "app.png", "icon": "app.png",
"tags": "tool,system,health", "tags": "tool,system,health",