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

really try and fix csc - it was so broken!

master
Gordon Williams 2024-05-17 13:16:45 +01:00
parent 799da73129
commit 9841aeddeb
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
apps/cscsensor/cscsensor.app.js
View File

@ -161,17 +161,7 @@ class CSCSensor {
var qChanged = false; var qChanged = false;
if (event.target.uuid == "0x2a5b") { if (event.target.uuid == "0x2a5b") {
let flags = event.target.value.getUint8(0); let flags = event.target.value.getUint8(0);
if (flags & 2) { let offs = 0;
// crank revolution - if enabled
const crankRevs = event.target.value.getUint16(1, true);
const crankTime = event.target.value.getUint16(3, true);
if (crankTime > this.lastCrankTime) {
this.cadence = (crankRevs-this.lastCrankRevs)/(crankTime-this.lastCrankTime)*(60*1024);
qChanged = true;
}
this.lastCrankRevs = crankRevs;
this.lastCrankTime = crankTime;
}
if (flags & 1) { if (flags & 1) {
// wheel revolution // wheel revolution
var wheelRevs = event.target.value.getUint32(1, true); var wheelRevs = event.target.value.getUint32(1, true);
@ -208,8 +198,21 @@ class CSCSensor {
} }
this.lastSpeed = this.speed; this.lastSpeed = this.speed;
if (this.speed>this.maxSpeed && (this.movingTime>3 || this.speed<20) && this.speed<50) this.maxSpeed = this.speed; if (this.speed>this.maxSpeed && (this.movingTime>3 || this.speed<20) && this.speed<50) this.maxSpeed = this.speed;
offs += 6;
}
if (flags & 2) {
// crank revolution - if enabled
const crankRevs = event.target.value.getUint16(offs + 1, true);
const crankTime = event.target.value.getUint16(offs + 3, true);
if (crankTime > this.lastCrankTime) {
this.cadence = (crankRevs-this.lastCrankRevs)/(crankTime-this.lastCrankTime)*(60*1024);
qChanged = true;
}
this.lastCrankRevs = crankRevs;
this.lastCrankTime = crankTime;
} }
} }
if (qChanged) this.updateScreen(); if (qChanged) this.updateScreen();
} }
} }