Merge remote-tracking branch 'upstream/master' into app-loader

Author: thyttan

apps/coretemp/ChangeLog

@@ -3,3 +3,4 @@
 0.03: Move code for recording to this app
 0.04: Use default Bangle formatter for booleans
 0.05: Minor code improvements
+0.06: Added advanced settings, adapted code to mirror bthrm funcitonality, and will work with latest firmware CORE Sensor Firmware (V0.87)

apps/coretemp/README.md

@@ -1,19 +1,43 @@
 # CoreTemp display
 
-Basic example of connecting to a bluetooth [CoreTemp](https://corebodytemp.com/) device and displaying the current skin and body core temperature readings.
+Application to connect to the [CORE](https://corebodytemp.com/) or [calera](https://info.greenteg.com/calera-research) devices from greenteg and display the current skin and body core temperature readings. 
+
+This also includes a module (heavily influenced by the BTHRM app) so you can integrate the core sensor into your own apps/widgets. You can also pair an ANT+ heart rate strap to the CORE/calera sensor as well in the App Settings so that you can leverage the exertional algorthim for estimating core temperature.
 
 ## Usage
 
-Background task connects to any CoreTemp device (2100/2101) and emits a CoreTemp signal value for each reading.
-Application contains three components, one is a background task that monitors the sensor and emits a 'CoreTemp' signal on activity if activated in settings.
-The widget shows when the sensor is enabled with a mini value and blinks on use.
-The app listens for 'CoreTemp' signals and shows the current skin and core temperatures in large numbers.
+Background task connects to a paired and emits a CORESensor signal value for each reading.
+Application contains three components, one is a background task that monitors the sensor and emits a 'CORESensor' signal on activity if activated in settings.
+The widget shows when the sensor is enabled and connected (green) or disconnected (grey).
+The app listens for 'CORESensor' signals and shows the current data.
+
+## CORESensor Module
+
+With the module, you can add the CORE Sensor to your own app. Simply power on the module and listen to CORESensor:
+
+```
+Bangle.setCORESensorPower(1,appName);
+Bangle.on('CORESensor', (x) =>{ ... });
+```
+
+The CORESensor emits an object with following keys:
+
+* **core**: Estimated/Predicted core temperature
+* **skin**: Measured skin temperature
+* **unit**: "F" or "C"
+* **hr**: Heart Rate (only when ANT+ heart rate monitor is paired)
+* **heatflux**: (calera device only - needs encryption level b released by greenteg)
+* **hsi**: Heat Strain Index ([read more here](https://help.corebodytemp.com/en/articles/10447107-heat-strain-index), exertional algorithm only)
+* **battery**: battery level
+* **quality**: Used to indicate the quality or trust level of the current measurement values
 
 ## TODO
 
 * Integrate with other tracking/sports apps to log data.
-* Add specific device selection
+* Emit Bangle.js heart rate to device as a heart rate for internal algorthim
 
-## Creator
+## Creators/Contributors
 
 Ivor Hewitt
+
+[Nicholas Ravanelli](https://github.com/nravanelli)

apps/coretemp/app-settings.json

@@ -1,3 +1,4 @@
 {
-  "enabled":false
+  "enabled":false,
+  "debuglog": false
 }

apps/coretemp/boot.js

@@ -1,5 +1,5 @@
+var settings = require("Storage").readJSON("coretemp.json", 1) || {};
 // Simply listen for core events and show data
-
 //var btm = g.getHeight() - 1;
 var px = g.getWidth() / 2;
 
@@ -21,25 +21,14 @@ var corelogo = {
 function onCore(c) {
   // Large or small font
   var sz = ((process.env.HWVERSION == 1) ? 3 : 2);
-
   g.setFontAlign(0, 0);
   g.clearRect(0, 32 + 48, g.getWidth(), 32 + 48 + 24 * 4);
   g.setColor(g.theme.dark ? "#CCC" : "#333");  // gray
-  g.setFont("6x8", sz).drawString(
-      "Core: " + ((c.core < 327) ? (c.core + c.unit) : 'n/a'), px, 48 + 48);
-  g.setFont("6x8", sz).drawString("Skin: " + c.skin + c.unit, px, 48 + 48 + 24);
-}
-
-// Background task will activate once settings are enabled.
-function enableSensor() {
-  settings = require("Storage").readJSON("coretemp.json", 1) || {};
-
-  if (!settings.enabled) {
-    settings.enabled = true;
-    require("Storage").write("coretemp.json", settings);
-
-    drawBackground("Waiting for\ndata...");
-  }
+  g.setFont("6x8", sz).drawString("Core: " + ((c.core < 327) ? (c.core + c.unit) : 'n/a'), px, 48 + 48);
+  g.setFont("6x8", sz).drawString("Skin: " + c.skin + c.unit, px, 48 + 48 + 14);
+  g.setFont("6x8", sz).drawString("HR: " + c.hr + " BPM", px, 48 + 48 + 28);
+  g.setFont("6x8", sz).drawString("HSI: " + c.hsi+ "/10", px, 48 + 48 + 42);
+  g.setFont("6x8", sz).drawString("BATT: " + c.battery+ "%", px, 48 + 48 + 56);
 }
 
 function drawBackground(message) {
@@ -51,16 +40,11 @@ function drawBackground(message) {
   g.drawString(message, g.getWidth() / 2, g.getHeight() / 2 + 16);
 }
 
-Bangle.on('CoreTemp', onCore);
-
-settings = require("Storage").readJSON("coretemp.json", 1) || {};
 
 if (!settings.enabled) {
-  drawBackground("Sensor off\nBTN" +
-                 ((process.env.HWVERSION == 1) ? '2' : '1') + " to enable");
+  drawBackground("Sensor off\nEnable in Settings");
 } else {
+  Bangle.setCORESensorPower(1,"COREAPP");
+  Bangle.on('CORESensor', onCore);
   drawBackground("Waiting for\ndata...");
 }
-
-setWatch(() => { enableSensor(); }, (process.env.HWVERSION == 1) ? BTN2 : BTN1,
-         {repeat : false});