Merge branch 'espruino:master' into alarm_type_and_settings

apps/assistedgps/custom.html

@@ -31,7 +31,7 @@
       <div class="form-group">
         <label class="form-label">Select which GNSS system you want.</label>
         <label class="form-radio">
-          <input type="radio" name="gnss_select" value="1" checked><i class="form-icon"></i> GPS
+          <input type="radio" name="gnss_select" value="1" checked><i class="form-icon"></i> GPS (fastest to get a fix)
         </label>
         <label class="form-radio">
           <input type="radio" name="gnss_select" value="2"><i class="form-icon"></i> BDS

apps/fastreset/ChangeLog

@@ -1 +1,2 @@
 0.01: New App!
+0.02: Shorten the timeout before executing to 250 ms.

apps/fastreset/README.md

@@ -1,6 +1,6 @@
 # Fast Reset
 
-Reset the watch by holding the hardware button for half a second. If 'Fastload Utils' is installed this will typically be done with fastloading. A buzz acts as indicator.
+Reset the watch by pressing the hardware button just a little bit longer than a click. If 'Fastload Utils' is installed this will typically be done with fastloading. A buzz acts as indicator.
 
 Fast Reset was developed with the app history feature of 'Fastload Utils' in mind. If many apps are in the history stack, the user may want a fast way to exit directly to the clock face without using the firmwares reset function.
 
@@ -12,11 +12,11 @@ Just install and it will run as boot code.
 
 If 'Fastload Utils' is installed fastloading will be used when possible. Otherwise a standard `load(.bootcde)` is used.
 
-If the hardware button is held for longer the standard reset functionality of the firmware is executed as well (total 1.5 seconds). And eventually the watchdog will be kicked.
+If the hardware button is held for longer the standard reset functionality of the firmware is executed as well. And eventually the watchdog will be kicked.
 
 ## Controls
 
-Hold the hardware button for half a second to feel the buzz, loading the clock face.
+Press the hardware button just a little longer than a click to feel the buzz, loading the clock face.
 
 ## Requests
 

apps/fastreset/boot.js

@@ -1,5 +1,5 @@
 {let buzzTimeout;
-setWatch((e)=>{  
-  if (e.state) buzzTimeout = setTimeout(()=>{Bangle.buzz(80,0.40);Bangle.showClock();}, 500);
+setWatch((e)=>{
+  if (e.state) buzzTimeout = setTimeout(()=>{Bangle.buzz(80,0.40);Bangle.showClock();}, 250);
   if (!e.state && buzzTimeout) clearTimeout(buzzTimeout);},
 BTN,{repeat:true, edge:'both' });}

apps/fastreset/metadata.json

@@ -1,12 +1,12 @@
 { "id": "fastreset",
   "name": "Fast Reset",
   "shortName":"Fast Reset",
-  "version":"0.01",
-  "description": "Reset the watch by holding the hardware button for half a second. If 'Fastload Utils' is installed this will typically be done with fastloading. A buzz acts as indicator.",
+  "version":"0.02",
+  "description": "Reset the watch by pressing the hardware button just a little bit longer than a click. If 'Fastload Utils' is installed this will typically be done with fastloading. A buzz acts as indicator.",
   "icon": "app.png",
   "type": "bootloader",
   "tags": "system",
-  "supports" : ["BANGLEJS2"],  
+  "supports" : ["BANGLEJS2"],
   "readme": "README.md",
   "storage": [
     {"name":"fastreset.boot.js","url":"boot.js"}

apps/messages/ChangeLog

@@ -4,3 +4,4 @@
 0.58: show/hide "messages" widget directly, instead of through library stub
 0.59: fixes message timeout by using setinterval, as it was intended. So the buzz is triggered every x seconds until the timeout occours.
 0.60: Bump version to allow new buzz.js module to be loaded - fixes memory/performance hog when buzz called
+0.61: Add repeatCalls option to allow different repeat settings for messages vs calls

apps/messages/lib.js

@@ -204,16 +204,18 @@ exports.buzz = function(msgSrc) {
   if ((require("Storage").readJSON("setting.json", 1) || {}).quiet) return Promise.resolve(); // never buzz during Quiet Mode
   const msgSettings = require("Storage").readJSON("messages.settings.json", true) || {};
   let pattern;
+  let repeat;
   if (msgSrc && msgSrc.toLowerCase()==="phone") {
     // special vibration pattern for incoming calls
     pattern = msgSettings.vibrateCalls;
+    repeat = msgSettings.repeatCalls;
   } else {
     pattern = msgSettings.vibrate;
+    repeat = msgSettings.repeat;
   }
   if (pattern===undefined) { pattern = ":"; } // pattern may be "", so we can't use || ":" here
   if (!pattern) return Promise.resolve();
 
-  let repeat = msgSettings.repeat;
   if (repeat===undefined) repeat = 4; // repeat may be zero
   if (repeat)
   {

apps/messages/metadata.json

@@ -1,7 +1,7 @@
 {
   "id": "messages",
   "name": "Messages",
-  "version": "0.60",
+  "version": "0.61",
   "description": "Library to handle, load and store message events received from Android/iOS",
   "icon": "app.png",
   "type": "module",

apps/messages/settings.js

@@ -6,6 +6,7 @@
     if (settings.vibrate===undefined) settings.vibrate=":";
     if (settings.vibrateCalls===undefined) settings.vibrateCalls=":";
     if (settings.repeat===undefined) settings.repeat=4;
+    if (settings.repeatCalls===undefined) settings.repeatCalls=settings.repeat;
     if (settings.vibrateTimeout===undefined) settings.vibrateTimeout=60;
     if (settings.unreadTimeout===undefined) settings.unreadTimeout=60;
     if (settings.maxMessages===undefined) settings.maxMessages=3;
@@ -33,6 +34,12 @@
       format: v => v?v+"s":/*LANG*/"Off",
       onchange: v => updateSetting("repeat", v)
     },
+    /*LANG*/'Repeat for calls': {
+      value: settings().repeatCalls,
+      min: 0, max: 10,
+      format: v => v?v+"s":/*LANG*/"Off",
+      onchange: v => updateSetting("repeatCalls", v)
+    },
     /*LANG*/'Vibrate timer': {
       value: settings().vibrateTimeout,
       min: 0, max: settings().maxUnreadTimeout, step : 10,

core

@@ -1 +1 @@
-Subproject commit 431a3fb743da5c370729ab748cb2c177e70a345b
+Subproject commit 37a22e0c49666ec3947ad0daaf5f5675101ca485