Merge branch 'espruino:master' into master

Author: RKBoss6

apps/bluewatch/ChangeLog

@@ -1,2 +1,3 @@
 0.01: New App!
-0.02: Use new device handshake method for more reliable connections (Must use the iOS BlueWatch app version 1.1)
+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)

apps/bluewatch/boot.js

@@ -1,4 +1,3 @@
-NRF.setAdvertising({}, { connectable: true });
 
 var blueWatch = require("bluewatch");
 var settings = require("Storage").readJSON("bluewatch.settings.json") || {
@@ -14,19 +13,25 @@ let appsUsingGPS = savedData.appsUsingGPS || [];
 global.phoneConnected = savedData.phoneConnected;
 
 function updateWeatherAndLocation() {
-  blueWatch.sendData("Request Location");
+  blueWatch.sendData("Request Location",true);
   setTimeout(function () {
-    blueWatch.sendData("Request Weather");
+    blueWatch.sendData("Request Weather",true);
   }, 60 * 10);
 }
 function setUpdateIntervals() {
+  if (weatherLocInterval)
+    clearInterval(weatherLocInterval);
+
+  if (systemDataInterval)
+    clearInterval(systemDataInterval);
+
   weatherLocInterval = setInterval(updateWeatherAndLocation, 10 * 60 * 1000);
-  systemDataInterval = setInterval(blueWatch.sendSystemData, 60 * 1000);
+  systemDataInterval = setInterval(blueWatch.sendSystemData, 6 * 60 * 1000); // 6 mins
 }
+
 Bangle.on("BlueWatchConnected", function () {
   blueWatch.sendSystemData();
   updateWeatherAndLocation();
-  blueWatch.sendHealthData();
   setUpdateIntervals();
 });
 if (global.phoneConnected) {

apps/bluewatch/lib.js

@@ -1,7 +1,26 @@
 let interval;
 let rxBuffer = ""; // accumulates incoming chunks
+let queue = [];
+let sending = false;
 
-NRF.setAdvertising({}, { connectable: true });
+function queueSend(msg) {
+  queue.push(msg);
+  sendNext();
+}
+
+function sendNext() {
+  if (sending) return;
+  if (!queue.length) return;
+
+  sending = true;
+
+  Bluetooth.write(queue.shift());
+
+  setTimeout(function() {
+    sending = false;
+    sendNext();
+  },40);
+}
 
 exports.sendSystemData = function () {
   let data = {
@@ -47,9 +66,7 @@ function updateWeatherData(d) {
 
 function sendData(dataString, forceSend) {
   if (global.phoneConnected || forceSend) {
-    setTimeout(function () {
-      Bluetooth.write(dataString + "\n");
-    }, 500);
+      queueSend("bwRX:"+dataString+"\n");
   } else {
     print("Phone not connected");
   }
@@ -146,9 +163,12 @@ function processMessage(raw) {
 
   if (obj) {
     switch (obj.id) {
-      case "WeatherUpdate":
+      case "Weather":
         updateWeatherData(obj);
         break;
+      case "GPS":
+        Bangle.emit("GPS", obj);
+        break;
     }
   } 
 }
@@ -159,7 +179,6 @@ function messageReceived(data) {
     data = String(data);
   }
   rxBuffer += data;
-
   // 2. Check if the delimiter exists
   let idx = rxBuffer.indexOf("|");
 

apps/bluewatch/metadata.json

@@ -2,8 +2,8 @@
   "id": "bluewatch",
   "name": "BlueWatch iOS Integration",
   "shortName": "BlueWatch",
-  "version": "0.02",
-  "description": "Uses the native iOS app 'BlueWatch' to fetch weather, use phone GPS, find phone/watch, and more.",
+  "version": "0.03",
+  "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",
   "supports": ["BANGLEJS2"],

apps/hrm/ChangeLog

@@ -11,3 +11,4 @@
 0.11: Automatic translation of strings.
 0.12: Minor code improvements
 0.13: Minor code improvements
+0.14: Ensure we reset graphics so other apps can't mess up the background color

apps/hrm/heartrate.js

@@ -14,7 +14,7 @@ function onHRM(h) {
     // the first time we're called remove
     // the countdown
     counter = undefined;
-    g.clearRect(0,24,g.getWidth(),g.getHeight());
+    g.reset().clearRect(0,24,g.getWidth(),g.getHeight());
   }
   hrmInfo = h;
   /* On 2v09 and earlier firmwares the only solution for realtime
@@ -35,7 +35,7 @@ Bangle.on('HRM', onHRM);
 
 function updateHrm(){
   var px = g.getWidth()/2;
-  g.setFontAlign(0,-1);
+  g.reset().setFontAlign(0,-1);
   g.clearRect(0,24,g.getWidth(),80);
   g.setFont("6x8").drawString(/*LANG*/"Confidence "+(hrmInfo.confidence || "--")+"%", px, 70);
 
@@ -62,6 +62,7 @@ var scale = 2000;
 HRM events as they happen */
 Bangle.on('HRM-raw', function(v) {
   hrmOffset++;
+  g.reset();
   if (hrmOffset>g.getWidth()) {
     let thousands = Math.round(rawMax / 1000) * 1000;
     if (thousands > scale) scale = thousands;
@@ -91,11 +92,11 @@ Bangle.on('HRM-raw', function(v) {
 var counter = 5;
 function countDown() {
   if (counter) {
-    g.drawString(counter--,g.getWidth()/2,g.getHeight()/2, true);
+    g.reset().drawString(counter--,g.getWidth()/2,g.getHeight()/2, true);
     setTimeout(countDown, 1000);
   }
 }
-g.clear();
+g.clear(1);
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 g.setColor(g.theme.fg);
@@ -111,7 +112,7 @@ var hrmInfo;
 
 function readHRM() {
   if (!hrmInfo) return;
-
+  g.reset();
   if (hrmOffset==0) {
     g.clearRect(0,100,g.getWidth(),g.getHeight());
     lastHrmPt = [-100,0];

apps/hrm/metadata.json

@@ -1,8 +1,8 @@
 {
   "id": "hrm",
   "name": "Heart Rate Monitor",
-  "version": "0.13",
-  "author": "ra100",
+  "version": "0.14",
+  "author": "gfwilliams",
   "description": "Measure your heart rate and see live sensor data",
   "icon": "heartrate.png",
   "screenshots" : [ { "url":"screenshot.png" } ],

apps/iconlaunch/ChangeLog

@@ -27,4 +27,5 @@
 0.20: Use '28' font if installed (2v26+) and put it inside a rounded rect in the current theme
       Ensure 'oneClickExit' is the default
 0.21: Display placeholder icons at start and render line by line to the screen to make loading seem faster
-0.22: Use launcher_utils library for app cacheing  and fast load
+0.22: Use launcher_utils library for app cacheing  and fast load
+0.23: Use Bangle.haptic if available

apps/iconlaunch/app.js

@@ -98,11 +98,14 @@
   let selectItem = function(id, e) {
     const iconN = E.clip(Math.floor((e.x - R.x) / itemSize), 0, appsN - 1);
     const appId = id * appsN + iconN;
-    if( settings.direct && launchCache.apps[appId])
+    if( settings.direct && launchCache.apps[appId]) {
+      if(Bangle.haptic) Bangle.haptic("touch");
       return require("launch_utils").loadApp(launchCache.apps[appId]);
-    if (appId == selectedItem && launchCache.apps[appId])
+    }
+    if (appId == selectedItem && launchCache.apps[appId]) {
+      if(Bangle.haptic) Bangle.haptic("touch");
       return require("launch_utils").loadApp(launchCache.apps[appId]);
-
+    }
     selectedItem = appId;
     if (scroller) scroller.draw();
   };
@@ -155,4 +158,4 @@
   Bangle.on("touch", updateTimeout);
 
   updateTimeout();
-}
+}

apps/iconlaunch/metadata.json

@@ -2,7 +2,7 @@
 	"id": "iconlaunch",
 	"name": "Icon Launcher",
 	"shortName" : "Icon launcher",
-	"version": "0.22",
+	"version": "0.23",
 	"icon": "app.png",
 	"author": "TheGLander",
 	"description": "A launcher inspired by smartphones, with an icon-only scrollable menu.",