Merge branch 'espruino:master' into score

Author: AleixDev

apps/android/ChangeLog

@@ -38,4 +38,5 @@
 0.36: Move from wrapper function to {} and let - faster execution at boot
       Allow `calendar-` to take an array of items to remove
 0.37: Support Gadgetbridge canned responses
-0.38: Don't rewrite settings file on every boot!
+0.38: Don't rewrite settings file on every boot!
+0.39: Move GB message handling into a library to reduce boot time from 40ms->13ms

apps/android/boot.js

@@ -2,7 +2,7 @@
   "id": "android",
   "name": "Android Integration",
   "shortName": "Android",
-  "version": "0.38",
+  "version": "0.39",
   "description": "Display notifications/music/etc sent from the Gadgetbridge app on Android. This replaces the old 'Gadgetbridge' Bangle.js widget.",
   "icon": "app.png",
   "tags": "tool,system,messages,notifications,gadgetbridge",
@@ -13,7 +13,8 @@
     {"name":"android.app.js","url":"app.js"},
     {"name":"android.settings.js","url":"settings.js"},
     {"name":"android.img","url":"app-icon.js","evaluate":true},
-    {"name":"android.boot.js","url":"boot.js"}
+    {"name":"android.boot.js","url":"boot.js"},
+    {"name":"android","url":"lib.js"}
   ],
   "data": [{"name":"android.settings.json"}, {"name":"android.calendar.json"}, {"name":"android.cards.json"}],
   "sortorder": -8

apps/android/lib.js

@@ -3,4 +3,5 @@
 0.03: Select GNSS systems to use for Bangle.js 2
 0.04: Now turns GPS off after upload
 0.05: Fix regression in 0.04 that caused AGPS data not to get loaded
-0.06: Auto-set GPS output sentences - newer Bangle.js 2 don't include RMC (GPS direction + time) by default
+0.06: Auto-set GPS output sentences - newer Bangle.js 2 don't include RMC (GPS direction + time) by default
+0.07: Bangle.js 2 now gets estimated time + lat/lon from the browser (~3x faster fix)

apps/android/metadata.json

@@ -60,6 +60,7 @@ <h2>Assisted GPS</h2>
     <script>
       var isB1; // is Bangle.js 1?
       var isB2; // is Bangle.js 2?
+      var currentPosition;
 
       // When the 'upload' button is clicked...
       document.getElementById("upload").addEventListener("click", function() {
@@ -120,6 +121,7 @@ <h2>Assisted GPS</h2>
       }
 
 // =================================================== Bangle.js 2 CASIC
+// https://www.espruino.com/Bangle.js2+Technical#gps
 
     function CASIC_CHECKSUM(cmd) {
       var cs = 0;
@@ -128,6 +130,61 @@ <h2>Assisted GPS</h2>
       return cmd+"*"+cs.toString(16).toUpperCase().padStart(2, '0');
     }
 
+    // Send a binary CASIC packet, eg: {classId:6, messageId:0, payload:[]}
+    function CASIC_PKT(pkt) {
+      pkt.payload = pkt.payload || [];
+      var plen = pkt.payload.length;
+      var msg = new Uint8Array(10+pkt.payload.length);
+      msg.set([0xBA,0xCE,
+              plen, // LENGTH
+              0x00,
+              pkt.classId, // CLASS	ID
+              pkt.messageId]); // MESSAGE	ID
+      msg.set(pkt.payload, 6);
+      var dv = new DataView(msg.buffer);
+      // checksum
+      var ckSum = 0;
+      for (i = -4; i < plen; i+=4)
+        ckSum = 0|(ckSum+dv.getUint32(6+i, true));
+      dv.setUint32(6+plen, ckSum, true);
+      return msg;
+    }
+
+    // Send AID_INI message, {lat,lon,alt}
+    function AID_INI(pos) {
+      var msg = new Uint8Array(56);
+      var dv = new DataView(msg.buffer);
+      /*
+      double							xOrLat, yOrLon, zOrAlt;
+      double							tow; // 24
+      float							df; // 32
+      float							posAcc; // 36
+      float							tAcc; // 40
+      float							fAcc; // 44
+      unsigned int					res; // 48
+      unsigned short int				wn; // 52
+      unsigned char					timeSource; // 54
+      unsigned char					flags; // 55
+    */
+      var ms = Date.now();
+      var wk = (ms-new Date("1980-01-06T00:00:00Z")) / 604800000;
+      var wn = Math.floor(wk); // week number
+      var tow = (wk-wn) * 604800; // seconds in week
+      dv.setFloat64(0, pos.lat, true); // xOrLat
+      dv.setFloat64(8, pos.lon, true); // yOrLon
+      dv.setFloat64(16, pos.alt, true); // zOrAlt
+      dv.setFloat64(24, tow, true); // tow
+      dv.setFloat32(32, 0, true); // df
+      dv.setFloat32(36, 0, true); // posAcc
+      dv.setFloat32(40, 0, true); // tAcc
+      dv.setFloat32(44, 0, true); // fAcc
+      dv.setUint32(48, 0, true); // res
+      dv.setUint16(52, wn, true); // wn
+      dv.setUint8(54,0); // timeSource
+      dv.setUint8(55, 0x23); // flags ( lat/lon and clock valid, no drift data )
+      return CASIC_PKT({classId:0x0B, messageId:0x01, payload:msg});
+    }
+
 // ===================================================
 
       function jsFromBase64(b64) {
@@ -140,7 +197,6 @@ <h2>Assisted GPS</h2>
           js += `\x10Serial1.write(atob("${btoa(String.fromCharCode.apply(null,UBX_MGA_INI_TIME_UTC()))}"))\n`; // set GPS time
         }
         if (isB2) { // CASIC
-
           // Select what GNSS System to use for decreased fix time.
           var radios = document.getElementsByName('gnss_select');
           var gnss_select="1";
@@ -150,11 +206,11 @@ <h2>Assisted GPS</h2>
           js += `\x10var t=getTime()+0.5;while (getTime()<t);\n`; // This is nasty - but we just wait here until the GPS has had time to boot
           js += `\x10Serial1.println("${CASIC_CHECKSUM("$PCAS04,"+gnss_select)}")\n`; // set GNSS mode
           js += `\x10Serial1.println("${CASIC_CHECKSUM("$PCAS03,1,0,0,1,1,0,0,0")}")\n`; // enable GGA,GSV,RMC packets (new Bangle.js 2 GPS firmwares don't include RMC by default!)
+          // If the browser let us have the current location, give it to the GPS chip to get a faster fix
+          if (currentPosition) {
+            js += `\x10Serial1.write([${AID_INI(currentPosition).join(",")}])\n`;
+          }
           // Serial1.println("$PCAS06,0*1B") gets the current firmware version
-          // What about:
-          // NAV-TIMEUTC (0x01 0x10)
-          // NAV-PV (0x01 0x03)
-          // or AGPS.zip uses AID-INI (0x0B 0x01)
         }
 
         for (var i=0;i<bin.length;i+=chunkSize) {
@@ -184,8 +240,20 @@ <h2>Assisted GPS</h2>
         document.getElementById("banglejs1-info").style = isB1?"":"display:none";
         document.getElementById("banglejs2-info").style = isB2?"":"display:none";
         document.getElementById("upload-wrap").style = "";
+
+        if (isB2) {
+          // get current position for AGPS improvement
+          navigator.geolocation.getCurrentPosition(function(position) {
+            currentPosition = {
+              lat : position.coords.latitude,
+              lon : position.coords.longitude,
+              alt : 0|position.coords.altitude
+            };
+          });
+        }
       }
 
+
     </script>
   </body>
 </html>

apps/assistedgps/ChangeLog

@@ -2,7 +2,7 @@
   "id": "assistedgps",
   "name": "Assisted GPS Updater (AGPS)",
   "shortName": "AGPS",
-  "version": "0.06",
+  "version": "0.07",
   "description": "Downloads assisted GPS (AGPS) data to Bangle.js for faster GPS startup and more accurate fixes. **No app will be installed**, this just uploads new data to the GPS chip.",
   "sortorder": -1,
   "icon": "app.png",

apps/assistedgps/custom.html

@@ -1,2 +1,3 @@
 0.01: New app!
 0.02: Minor code improvements
+0.03: Remove clearing of the screen (will break running apps) and fix lint errors

apps/assistedgps/metadata.json

@@ -2,8 +2,8 @@
   "id": "banglebridge",
   "name": "BangleBridge",
   "shortName": "BangleBridge",
-  "version": "0.02",
-  "description": "Widget that allows Bangle Js to record pair and end data using Bluetooth Low Energy in combination with the BangleBridge Android App",
+  "version": "0.03",
+  "description": "Widget that allows Bangle.js to record pair and end data using Bluetooth Low Energy in combination with the BangleBridge Android App (**Note:** this has nothing to do with Gadgetbridge)",
   "icon": "widget.png",
   "type": "widget",
   "tags": "widget",

apps/banglebridge/ChangeLog

@@ -1,10 +1,10 @@
 (() => {
     /**
      * Widget measurements
-     * Description: 
+     * Description:
      * name: connection.wid.js
      *icon: conectionIcon.icon
-     * 
+     *
      */
 
     //Font
@@ -24,7 +24,7 @@
 
     //Sensors code
     /**
-     * 
+     *
      * @author Jorge
      */
     function accel() {
@@ -35,8 +35,7 @@
         });
 
         setInterval(function () {
-
-            acclS = accelN.x + "##" + accelN.y + "##" + accelN.z + "\n" + accelN.diff + "##" + accelN.mag;
+            //acclS = accelN.x + "##" + accelN.y + "##" + accelN.z + "\n" + accelN.diff + "##" + accelN.mag;
             data[3] = accelN;
         }, 2 * 1000);
 
@@ -45,8 +44,7 @@
     function btt() {
 
         setInterval(function () {
-
-            bttS = E.getBattery(); //return String
+            //bttS = E.getBattery(); //return String
             data[2] = E.getBattery();
         }, 15 * 1000);
 
@@ -65,9 +63,9 @@
 
         setInterval(function () {
 
-            compssS = "A: " + compssN.x + " ## " + compssN.y + " ## " + compssN.z + "\n" +
+            /*compssS = "A: " + compssN.x + " ## " + compssN.y + " ## " + compssN.z + "\n" +
                 "B: " + compssN.dx + " ## " + compssN.dy + " ## " + compssN.dz + " ## " + "\n" +
-                "C: " + compssN.heading; //return String
+                "C: " + compssN.heading; *///return String
             data[4] = compssN;
         }, 2 * 1000);
 
@@ -86,8 +84,8 @@
 
         setInterval(function () {
 
-            gpsS = "A: " + gpsN.lat + " ## " + gpsN.lon + " ## " + gpsN.alt + "\n" + "B: " + gpsN.speed + " ## " + gpsN.course + " ## " + gpsN.time + "\n" +
-                "C: " + gpsN.satellites + " ## " + gpsN.fix; //return String
+            /*gpsS = "A: " + gpsN.lat + " ## " + gpsN.lon + " ## " + gpsN.alt + "\n" + "B: " + gpsN.speed + " ## " + gpsN.course + " ## " + gpsN.time + "\n" +
+                "C: " + gpsN.satellites + " ## " + gpsN.fix; *///return String
             // work out how to display the current time
             var d = new Date();
             var year = d.getFullYear();
@@ -150,7 +148,7 @@
             //console.log("Index ==> "+ index);
             msr[indexFinal] = nueva;
 
-            item = nueva;
+            //item = nueva;
             lastInsert = indexFinal;
 
         }
@@ -180,7 +178,7 @@
 
                 hrmN = normalize(hrmN);
                 var roundedRate = parseFloat(hrmN).toFixed(2);
-                hrmS = String.valueOf(roundedRate); //return String
+                //hrmS = String.valueOf(roundedRate); //return String
                 //console.log("array----->" + msr);
                 data[0] = roundedRate;
 
@@ -205,7 +203,7 @@
 
         setInterval(function () {
 
-            stepS = String.valueOf(stepN); //return String
+            //stepS = String.valueOf(stepN); //return String
             data[1] = stepN;
         }, 2 * 1000);
 
@@ -240,12 +238,11 @@
          g.setFont("Vector", 45);
          g.drawString(prueba,100,200);*/
         if (flip == 1) { //when off
-           
+
             flip = 0;
             //Bangle.buzz(1000);
-            g.clear();
         } else { //when on
-           
+
             flip = 1;
             g.setFont("Vector", 30);
             g.drawString(data[0], 65, 180);
@@ -283,7 +280,7 @@
             com: data[4],
             gps: data[5]
         };
-        /* g.clear();
+        /*
             g.drawString(compssS,100,200);
           */
 
@@ -293,7 +290,7 @@
         //draw();
 
     }, 5 * 1000);
-  
+
       WIDGETS["banglebridge"]={
         area: "tl",
         width: 10,