Merge pull request #4322 from RKBoss6/Bluewatch-Updates

[BlueWatch] Update for app version 1.4

Author: bobrippling

apps/bluewatch/ChangeLog

@@ -1,3 +1,4 @@
 0.01: New App!
 0.02: Use new device handshake method for more reliable connections (Requires BlueWatch on iOS version 1.1)
 0.03: Fix data intervals firing randomly, pairing issues, increased time between battery pushing, and queued data sending (Requires BlueWatch on iOS version 1.2)
+0.04: Add sending of calories (if installed), fix myLocation not saving if file doesn't exist, and emit BlueWatchMessage event upon message received

apps/bluewatch/README.md

@@ -14,6 +14,12 @@ Bangle.js 1 support coming soon!
 - Automatic weather updates without any additional setup
 - Find my phone support
 - Use of the phone's GPS for Bangle.js GPS.
+- Sending and storing of heart rate, steps, battery, and active/resting calories (if installed) to Apple Health/BlueWatch app
+
+Additionally, the iOS app provides shortcuts actions to create your own workflows and automations. By hooking into when BlueWatch receives a message (see developer info), you can send messages through shortcuts that your watch receives and handles. This allows you to create complex workflows such as: 
+- When you reach home, alert your watch to change the clock to an inexact clock face to relax
+- When CarPlay is connected to your car, send a message to your watch to turn on quiet mode for driving
+- When you receive a message from a specific person, vibrate continuously so you never miss the message
 
 **Note:** This app still uses the `iOS Integration app` to handle pushing notifications from the phone to the watch.
 
@@ -36,6 +42,13 @@ To send a string or a JSON, you can use the following:
 require("bluewatch").sendData("string or object", true);
 ```
 with an optional second parameter `forceSend`. When true, it sends even if BlueWatch is not connected at the time. By default it doesn't send info unless the device handshake is completed and BlueWatch is connected
+
+In the iOS app version 1.4, you can also use the Shortcuts app to send custom messages to the watch, as well as checking connection, and pushing weather/location via shortcuts. In the Bangle app version v0.04, the watch will emit the `BlueWatchMessage` event when a new message is received, allowing you to create your own workflows and automations using shortcuts and a receiving script:
+```
+Bangle.on("BlueWatchMessage", (message) => {
+    // your receiving code here
+});
+```
 ## Author and Creator of the iOS App
 RKBoss6
 

apps/bluewatch/boot.js

@@ -99,7 +99,9 @@ function setMyLocation(d) {
   numFields.forEach((field) => {
     if (locationJson[field] != null) locationJson[field] = +locationJson[field];
   });
-
+  let myLocationSaved = require("Storage").readJSON("mylocation.json", true) || {}
+  
+  
   //load mylocation file
   let myLocationJson = Object.assign(
     {
@@ -110,12 +112,14 @@ function setMyLocation(d) {
     require("Storage").readJSON("mylocation.json", true) || {}
   );
   //remove notification from phone
-  if (
-    Math.abs(myLocationJson.lat - locationJson.lat) < 0.0001 &&
-    Math.abs(myLocationJson.lon - locationJson.lon) < 0.0001
-  ) {
-    //same location, do not write
-    return;
+  if(myLocationSaved.lat){
+    if (
+      Math.abs(myLocationJson.lat - locationJson.lat) < 0.0001 &&
+      Math.abs(myLocationJson.lon - locationJson.lon) < 0.0001
+    ) {
+      //same location, do not write
+      return;
+    }
   }
 
   myLocationJson.lon = locationJson.lon;
@@ -131,6 +135,5 @@ function saveData() {
 }
 
 E.on("kill", function () {
-  //save cals counted
   saveData();
 });

apps/bluewatch/lib.js

@@ -93,6 +93,10 @@ function sendRawHealthData(data) {
     sendableData.movement = data.movement;
     sendableData.state = data.movement <= 150 ? "sedentary" : "moving";
   }
+  if (global.calories) {
+    sendableData.activeCalories = global.calories.activeCaloriesBurned || 0;
+    sendableData.bmrCalories = global.calories.bmrCaloriesBurned || 0;
+  }
   if (data.bpmConfidence && data.bpm) {
     if (data.bpmConfidence > 75 && data.bpm != 0) sendableData.hr = data.bpm;
     sendableData.confidence = data.bpmConfidence;
@@ -118,7 +122,7 @@ function onConnect() {
 function processMessage(raw) {
   raw = raw.trim();
   print("Processing complete message:", raw.length, "chars");
-
+  Bangle.emit("BlueWatchMessage", raw);
   let obj;
   try {
     obj = JSON.parse(raw);

apps/bluewatch/metadata.json

@@ -2,7 +2,7 @@
   "id": "bluewatch",
   "name": "BlueWatch iOS Integration",
   "shortName": "BlueWatch",
-  "version": "0.03",
+  "version": "0.04",
   "description": "Uses the native iOS app 'BlueWatch' to fetch weather, location, use phone GPS, find phone/watch, and more.",
   "icon": "app.png",
   "tags": "tool,bluetooth,apple,ios,system",