Merge branch 'espruino:master' into master

Author: RKBoss6

apps/ateatimer/ChangeLog

@@ -3,3 +3,4 @@
 0.03: Flash time in green when starting the timer
 0.04: Buzz when starting and resetting timer. Fix initial draw when timer is
       running.
+0.05: Make fastload-able.

apps/ateatimer/app.js

@@ -1,8 +1,12 @@
+{
 // Tea Timer Application for Bangle.js 2 using sched library
 
+"Bangle.loadWidgets()" // HACK: Trick launch_utils that we load widgets so we get a pass to be fastloaded into. We don't mind widgets here but have no use for them either.
+if (global.WIDGETS) require("widget_utils").hide(); 
+
 const APP_RECT = Bangle.appRect;
-const CENTER_Y = APP_RECT.y+APP_RECT.w/2;
-const CENTER_X = APP_RECT.x+APP_RECT.h/2;
+const CENTER_Y = APP_RECT.y+APP_RECT.h/2;
+const CENTER_X = APP_RECT.x+APP_RECT.w/2;
 
 let timerDuration = (() => {
   let file = require("Storage").open("ateatimer.data", "r");
@@ -12,12 +16,12 @@ let timerDuration = (() => {
 let timeRemaining = timerDuration;
 let timerRunning = false;
 
-function saveDefaultDuration() {
+const saveDefaultDuration = function() {
   let file = require("Storage").open("ateatimer.data", "w");
   file.write(timerDuration.toString());
 }
 
-function drawTime() {
+const drawTime = function() {
   const TIME_RECT = {x:APP_RECT.x, y:CENTER_Y-20, w:APP_RECT.w, h:40}
   g.clearRect(TIME_RECT);
   g.setFont("Vector", 40);
@@ -33,37 +37,39 @@ function drawTime() {
   g.flip();
 }
 
-function drawButtons() {
+const drawButtons = function() {
+
+  const ADJUST_FOR_WIDGETS_Y = APP_RECT.y == 0 ? 0 : APP_RECT.y/4;
   // Draw Increase button (triangle pointing up)
   g.fillPoly([
-    CENTER_X, CENTER_Y - 80, // Top vertex
-    CENTER_X - 20, CENTER_Y - 60, // Bottom-left vertex
-    CENTER_X + 20, CENTER_Y - 60  // Bottom-right vertex
+    CENTER_X, CENTER_Y - 80 + ADJUST_FOR_WIDGETS_Y, // Top vertex
+    CENTER_X - 20, CENTER_Y - 60 + ADJUST_FOR_WIDGETS_Y, // Bottom-left vertex
+    CENTER_X + 20, CENTER_Y - 60 + ADJUST_FOR_WIDGETS_Y  // Bottom-right vertex
   ]);
 
   // Draw Decrease button (triangle pointing down)
   g.fillPoly([
-    CENTER_X, CENTER_Y + 80, // Bottom vertex
-    CENTER_X - 20, CENTER_Y + 60, // Top-left vertex
-    CENTER_X + 20, CENTER_Y + 60  // Top-right vertex
+    CENTER_X, CENTER_Y + 80 - ADJUST_FOR_WIDGETS_Y, // Bottom vertex
+    CENTER_X - 20, CENTER_Y + 60 - ADJUST_FOR_WIDGETS_Y, // Top-left vertex
+    CENTER_X + 20, CENTER_Y + 60 - ADJUST_FOR_WIDGETS_Y // Top-right vertex
   ]);
 
   g.flip();
 }
 
-function drawInit() {
+const drawInit = function() {
   g.clear(true);
   drawButtons();
   drawTime();
 }
 
 let updateIntervalID;
 let clearUpdateInterval = ()=>{
-  clearInterval(updateIntervalID);
+  if (updateIntervalID) clearInterval(updateIntervalID);
   updateIntervalID = undefined;
 }
 
-function startTimer() {
+const startTimer = function() {
   if (timerRunning) return;
   if (timeRemaining == 0) return;
   timerRunning = true;
@@ -85,7 +91,7 @@ function startTimer() {
   updateIntervalID = setInterval(updateDisplay, 1000);
 }
 
-function scheduleTimer() {
+const scheduleTimer = function() {
   // Schedule a new timer using the sched library
   require("sched").setAlarm("ateatimer", {
     msg: "Tea is ready!",
@@ -97,7 +103,7 @@ function scheduleTimer() {
   require("sched").reload();
 }
 
-function resetTimer() {
+const resetTimer = function() {
   // Cancel the existing timer
   require("sched").setAlarm("ateatimer", undefined);
   require("sched").reload();
@@ -109,7 +115,7 @@ function resetTimer() {
   Bangle.buzz(75);
 }
 
-function adjustTime(amount) {
+let adjustTime = function(amount) {
   if (-amount > timeRemaining) {
     // Return if result will be negative
     return;
@@ -122,7 +128,7 @@ function adjustTime(amount) {
     if (alarm) {
       // Cancel the current alarm
       require("sched").setAlarm("ateatimer", undefined);
-      
+
       // Set a new alarm with the updated time
       scheduleTimer();
     }
@@ -131,8 +137,7 @@ function adjustTime(amount) {
   drawTime();
 }
 
-function handleTouch(x, y) {
-
+let handleTouch = (_, xy)=>{((_, y)=>{
   if (y < CENTER_Y - 40) {
     // Increase button area
     adjustTime(60);
@@ -145,15 +150,15 @@ function handleTouch(x, y) {
       startTimer();
     }
   }
-}
+})(_, xy.y)}
 
 let updateTimeRemaining = ()=>{
   let alarm = require("sched").getAlarm("ateatimer");
   timeRemaining = Math.floor(require("sched").getTimeToAlarm(alarm) / 1000);
 }
 
 // Function to update the display every second
-function updateDisplay() {
+const updateDisplay = function() {
   if (timerRunning) {
     updateTimeRemaining();
     drawTime();
@@ -166,7 +171,7 @@ function updateDisplay() {
 }
 
 // Handle physical button press for resetting timer
-setWatch(() => {
+const BTN_HANDLER = setWatch(() => {
   if (timerRunning) {
     resetTimer();
   } else {
@@ -175,9 +180,7 @@ setWatch(() => {
 }, BTN1, { repeat: true, edge: "falling" });
 
 // Handle touch
-Bangle.on("touch", (zone, xy) => {
-  handleTouch(xy.x, xy.y, false);
-});
+Bangle.on("touch", handleTouch);
 
 let isRunning = require("sched").getAlarm("ateatimer");
 if (isRunning) {
@@ -188,3 +191,12 @@ if (isRunning) {
 }
 // Draw the initial timer display
 drawInit();
+global.BACK = Bangle.load; // Compatibility with backswipe app.
+Bangle.uiRemove = ()=>{ // Make it possible to fastload out of the app.
+  Bangle.removeListener("touch", handleTouch);
+  if (BTN_HANDLER) clearWatch(BTN_HANDLER);
+  clearUpdateInterval();
+  delete global.BACK;
+  if (global.WIDGETS) require("widget_utils").show();
+}
+}

apps/ateatimer/metadata.json

@@ -2,7 +2,7 @@
   "name": "A Tea Timer",
   "author": "vovcia-clug",
   "icon": "app.png",
-  "version":"0.04",
+  "version":"0.05",
   "description": "Simple app for setting timers for tea. Touch up and down to change time, and time or button to start counting. When timer is running, button will stop timer and reset counter to last used value.",
   "tags": "timer",
   "supports": ["BANGLEJS2"],

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",

apps/bttfclock/ChangeLog

@@ -1,3 +1,5 @@
 0.01: Back to the future clock first version.
 0.02: Added more icons to the status field. Made it posible to custemize the step goal thrue the Health Tracking app.
-0.03: Added charging screen. 
+0.03: Added charging screen.
+0.04: Optimised performance: cached modules, event-driven status updates, removed debug logging.
+0.05: Made the layout dynamic so the clock scales to any screen size.