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

pushups: new bounds, better messages

master
frederic wagner 2024-07-25 13:49:55 +02:00
parent 03aba8b95e
commit 120a47fed7
1 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
apps/pushups/app.js
View File

@ -49,7 +49,13 @@ function default_routine() {
const DETECTORS = [ const DETECTORS = [
(xyz) => { (xyz) => {
return xyz.y > 0.3 ? 1 : 0; if (xyz.y > 0.3) {
return 1;
} else if (xyz.y < 0.2) {
return 0;
} else {
return null;
}
}, },
(xyz) => { (xyz) => {
if (xyz.x > 0.15) { if (xyz.x > 0.15) {
@ -62,9 +68,9 @@ const DETECTORS = [
// return xyz.x > 0 ? 1 : 0; // return xyz.x > 0 ? 1 : 0;
}, },
(xyz) => { (xyz) => {
if (xyz.z > -1) { if (xyz.z > -0.4) {
return 0; return 0;
} else if (xyz.z < -1.1) { } else if (xyz.z < -0.6) {
return 1; return 1;
} else { } else {
return null; return null;
@ -233,14 +239,15 @@ class FitnessStatus {
let status = new FitnessStatus(10 * 60); let status = new FitnessStatus(10 * 60);
// status.display(); // status.display();
Bangle.accelWr(0x18,0b01110100); // off, +-8g // NOTE: this code is taken from 'accelrec' app // Bangle.accelWr(0x18,0b01110100); // off, +-8g // NOTE: this code is taken from 'accelrec' app
Bangle.accelWr(0x1B,0x03 | 0x40); // 100hz output, ODR/2 filter // Bangle.accelWr(0x1B,0x03 | 0x40); // 100hz output, ODR/2 filter
Bangle.accelWr(0x18,0b11110100); // +-8g // Bangle.accelWr(0x18,0b11110100); // +-8g
Bangle.setPollInterval(10); Bangle.setPollInterval(10);
function start_routine() { function start_routine() {
status.remaining = status.routine[status.routine_step][1];
Bangle.loadWidgets(); Bangle.loadWidgets();
Bangle.on("swipe", function (directionLR, directionUD) { Bangle.on("swipe", function (directionLR, directionUD) {
@ -331,10 +338,22 @@ function set_counter(index) {
let w = g.getWidth(); let w = g.getWidth();
let h = g.getHeight(); let h = g.getHeight();
let counter = status.routine[index][1]; let counter = status.routine[index][1];
g.setFont("Vector:64") function display() {
.setFontAlign(0, 0);
g.clear(); g.clear();
g.drawString(""+counter, w/2, h/2); g.setFont("6x8:2")
.setFontAlign(1, 0)
.drawString("+1", w, h/2);
g.setFontAlign(-1, 0)
.drawString("-1", 0, h/2);
g.setFontAlign(0, -1)
.drawString("+5", w/2, 0);
g.setFontAlign(0, 1)
.drawString("-5", w/2, h);
g.setFont("Vector:64")
.setFontAlign(0, 0)
.drawString(""+counter, w/2, h/2);
}
display();
Bangle.on("swipe", function (directionLR, directionUD) { Bangle.on("swipe", function (directionLR, directionUD) {
if (directionUD == -1) { if (directionUD == -1) {
counter += 5; counter += 5;
@ -348,8 +367,7 @@ function set_counter(index) {
if (counter < 0) { if (counter < 0) {
counter = 0; counter = 0;
} }
g.clear(); display();
g.drawString(""+counter, w/2, h/2);
}); });
Bangle.on("touch", function(button, xy) { Bangle.on("touch", function(button, xy) {
if (counter == 0) { if (counter == 0) {