-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1229 from halemmerich/bthrm
BLE Heart Rate Monitor improvements
- Loading branch information
Showing
6 changed files
with
180 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,4 @@ | ||
| 0.01: New App! | ||
| 0.02: Make overriding the HRM event optional | ||
| Emit BTHRM event for external sensor | ||
| Add recorder app plugin |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| var btm = g.getHeight()-1; | ||
| var eventInt = null; | ||
| var eventBt = null; | ||
| var counterInt = 0; | ||
| var counterBt = 0; | ||
|
|
||
|
|
||
| function draw(y, event, type, counter) { | ||
| var px = g.getWidth()/2; | ||
| g.reset(); | ||
| g.setFontAlign(0,0); | ||
| g.clearRect(0,y,g.getWidth(),y+80); | ||
| if (type == null || event == null || counter == 0) return; | ||
| var str = event.bpm + ""; | ||
| g.setFontVector(40).drawString(str,px,y+20); | ||
| str = "Confidence: " + event.confidence; | ||
| g.setFontVector(12).drawString(str,px,y+50); | ||
| str = "Event: " + type; | ||
| g.setFontVector(12).drawString(str,px,y+60); | ||
| } | ||
|
|
||
| function onBtHrm(e) { | ||
| print("Event for BT " + JSON.stringify(e)); | ||
| counterBt += 5; | ||
| eventBt = e; | ||
| } | ||
|
|
||
| function onHrm(e) { | ||
| print("Event for Int " + JSON.stringify(e)); | ||
| counterInt += 5; | ||
| eventInt = e; | ||
| } | ||
|
|
||
| Bangle.on('BTHRM', onBtHrm); | ||
| Bangle.on('HRM', onHrm); | ||
|
|
||
| Bangle.setHRMPower(1,'bthrm') | ||
| Bangle.setBTHRMPower(1,'bthrm') | ||
|
|
||
| g.clear(); | ||
| Bangle.loadWidgets(); | ||
| Bangle.drawWidgets(); | ||
|
|
||
| g.reset().setFont("6x8",2).setFontAlign(0,0); | ||
| g.drawString("Please wait...",g.getWidth()/2,g.getHeight()/2 - 16); | ||
|
|
||
| function drawInt(){ | ||
| counterInt--; | ||
| if (counterInt < 0) counterInt = 0; | ||
| if (counterInt > 5) counterInt = 5; | ||
| draw(24, eventInt, "HRM", counterInt); | ||
| } | ||
| function drawBt(){ | ||
| counterBt--; | ||
| if (counterBt < 0) counterBt = 0; | ||
| if (counterBt > 5) counterBt = 5; | ||
| draw(100, eventBt, "BTHRM", counterBt); | ||
| } | ||
|
|
||
| var interval = setInterval(drawInt, 1000); | ||
| var interval = setInterval(drawBt, 1000); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| (function(recorders) { | ||
| recorders.bthrm = function() { | ||
| var bpm = 0; | ||
| function onHRM(h) { | ||
| bpm = h.bpm; | ||
| } | ||
| return { | ||
| name : "BTHR", | ||
| fields : ["BT Heartrate"], | ||
| getValues : () => { | ||
| result = [bpm]; | ||
| bpm = 0; | ||
| return result; | ||
| }, | ||
| start : () => { | ||
| Bangle.on('BTHRM', onHRM); | ||
| Bangle.setBTHRMPower(1,"recorder"); | ||
| }, | ||
| stop : () => { | ||
| Bangle.removeListener('BTHRM', onHRM); | ||
| Bangle.setBTHRMPower(0,"recorder"); | ||
| }, | ||
| draw : (x,y) => g.setColor(Bangle.isBTHRMOn()?"#00f":"#88f").drawImage(atob("DAwBAAAAMMeef+f+f+P8H4DwBgAA"),x,y) | ||
| }; | ||
| } | ||
| }) | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| (function(back) { | ||
| var FILE = "bthrm.json"; | ||
|
|
||
| var settings = Object.assign({ | ||
| enabled: true, | ||
| replace: true, | ||
| }, require('Storage').readJSON(FILE, true) || {}); | ||
|
|
||
| function writeSettings() { | ||
| require('Storage').writeJSON(FILE, settings); | ||
| } | ||
|
|
||
| E.showMenu({ | ||
| '': { 'title': 'Bluetooth HRM' }, | ||
| '< Back': back, | ||
| 'Use BT HRM': { | ||
| value: !!settings.enabled, | ||
| format: v => settings.enabled ? "On" : "Off", | ||
| onchange: v => { | ||
| settings.enabled = v; | ||
| writeSettings(); | ||
| } | ||
| }, | ||
| 'Use HRM event': { | ||
| value: !!settings.replace, | ||
| format: v => settings.replace ? "On" : "Off", | ||
| onchange: v => { | ||
| settings.replace = v; | ||
| writeSettings(); | ||
| } | ||
| } | ||
| }); | ||
| }) |