From 063929f75094dc77ca12810cefe43b757f9d68c7 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Wed, 23 Sep 2020 11:18:20 +0100
Subject: [PATCH] Handle 'RAM' as filename to allow direct uploads Add ability
 to upload assisted GPS data

---
 README.md                    |   3 +-
 apps.json                    |  11 ++++
 apps/assistedgps/ChangeLog   |   1 +
 apps/assistedgps/app.png     | Bin 0 -> 1549 bytes
 apps/assistedgps/custom.html | 113 +++++++++++++++++++++++++++++++++++
 core                         |   2 +-
 testing/GPS-comms.js         |   4 +-
 7 files changed, 130 insertions(+), 4 deletions(-)
 create mode 100644 apps/assistedgps/ChangeLog
 create mode 100644 apps/assistedgps/app.png
 create mode 100644 apps/assistedgps/custom.html

diff --git a/README.md b/README.md
index 22a12bd5b..326599d14 100644
--- a/README.md
+++ b/README.md
@@ -241,7 +241,8 @@ and which gives information about the app for the Launcher.
                               // add an icon to allow your app to be tested
 
   "storage": [                // list of files to add to storage
-    {"name":"appid.js",         // filename to use in storage
+    {"name":"appid.js",       // filename to use in storage.
+                              // If name=='RAM', the code is sent directly to Bangle.js and is not saved to a file
      "url":"",                // URL of file to load (currently relative to apps/)
      "content":"..."          // if supplied, this content is loaded directly
      "evaluate":true          // if supplied, data isn't quoted into a String before upload
diff --git a/apps.json b/apps.json
index 7f97b6f84..284116c5e 100644
--- a/apps.json
+++ b/apps.json
@@ -895,6 +895,17 @@
       {"name":"gpsinfo.img","url": "gps-info-icon.js","evaluate": true}
     ]
   },
+  { "id": "assistedgps",
+    "name": "Assisted GPS Update",
+    "icon": "app.png",
+    "version":"0.01",
+    "description": "Downloads assisted GPS data to Bangle.js for faster GPS startup and more accurate fixes",
+    "custom": "custom.html",
+    "tags": "tool,outdoors",
+    "readme": "README.md",
+    "storage": [
+    ]
+  },
   {
     "id": "pomodo",
     "name":"Pomodoro",
diff --git a/apps/assistedgps/ChangeLog b/apps/assistedgps/ChangeLog
new file mode 100644
index 000000000..5560f00bc
--- /dev/null
+++ b/apps/assistedgps/ChangeLog
@@ -0,0 +1 @@
+0.01: New App!
diff --git a/apps/assistedgps/app.png b/apps/assistedgps/app.png
new file mode 100644
index 0000000000000000000000000000000000000000..970e851397d87a1e47af18285c6fbc7cc256d634
GIT binary patch
literal 1549
zcmV+o2J-odP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0RI60
z0RN!9r;`8x1;R;0K~!jg?U-9^R8<s)|FzGV>CE&t({iyuEG@K=f~Lq#3qg<uq|(x&
zAsW1)r92Q4h=vDaA}@vz4Kb2vBo!W1zz7tn1+f)OB%lHbAc8H>S_q|Fdp|SnnX{J<
zy;wT8a|S3p^n04wd#$zqHEZp2_H1B?A%+;@L9t->l9c?ti`Ry;5rZYhDhqZmNwF!$
zA!ge2Vp-wpP<HBIiZV;V4+SF)DXYNr1c1{*HFkuur9sqXif-}Z5CK^LPLpcnmgkq>
z3T6MuwUCsev`73Y8`HdS;(<pn0U_i{FzvE2<(4feyB*2?k!Yc!Jw?fW!Cw%`HTxFt
zYp~+`&^K|>o}y%(xC)GHX5j>oZ^hqq0;>*bGkjj`Bp?ysMlc-&lr5!;V$NGu-9uqn
zp}PzG69L%(YJ`w0t;R6bLWiq)*l#yFcU^9k&kdMjCX_RYbz2uYs;w+sSXSuPfl30V
zqFel2tL+1r+{AvnvC*MYT#zXuMuCv>%!&$a<6DQ>VRm61c)dq_wJyb+Xv70168NQ-
zQ^EYk2p4(7nAsUvXVbKkD=ONv%`99|w0AR@-qod;d+?<_*GwxOK*ScRs?*moW20a4
zrQOy3aVBDRf@xLhBIj2CfH~V7aWS-kK(7E`5bbR98SmrQ<-TY|_a|Znm@yjwR6*lL
z#f!g9#Eb!PY4LvVmnA3I)+2rmfX4u&fO&0vjQHptb@vf@4=~btKTb~(y4k=ijgqcQ
z|5gczSA)zhGaDxoVIQN+OjULMvAy486v|HbC?{*1j41%Xx)0LZ1nF&tp*2BjO<->`
z46PaLYXP&IZMS90PJLjfk})U=5D{0_>bCx46XQEZojI^W8XdO;`#VEB3kAaI!RX;q
z)HWys0%LphlJCaMi>w8}u--4O*!YypjEuT-C$6TE%>m)`Ksen{TpkFQ2jp}^ak)W`
zL=Xu)?Kgn(eYo1FbC)h|FyuFF)cV2wN+9A>sIpeC0g%yujG1w~!FQsrRh?>Pk@i2o
zhQFyE&aAw%zNDE`zF$gRQR)pK@+Kzy6);4EX``JJlALtW%p%g;3;<9QModbK)3#U@
z84fc~p<}^@35d;2RUI)3!XJ610omEs?c+!SnBFY@QCky*)}WZE03QiCMHrJePQ9iG
zbcC{zz7~KbNVP-6xOyD%@!RFvvr*^`AYuZ!V{Lx`xDaaIuF#}{@wOU8P|!DPZ~F+R
zyZ^8%1ioFipA)Rf4J2X$M8sfh4QFFlFnM9Raz+pWo~u&pO~5m7D$OB%pIFcu6jP^B
zB6S;p_HZ__HkzKFp`No5+WL?8RlwyA@FC)NN-DG&rqu?)R06r_be(|>k?b4_P0r7>
zU2&>(vv=(O77C~U00@I|PgOAer`|^DCV*-q+6iRkXQ=uxSNFj$LINPdtb5terW2T(
zMm{O!QUF>cTLMPSOI6Y)B#R@4)&u}hg0xVdz2FkFItF6tT4lj_`^mG7#^+#D=B}qk
zD6=MI&!~rDXL2TnG$f+=R&?CuYt<p^)9WocX^w=KC%T}ROuwc1&ds{c#G2|mGAGoU
zrFl*PB6B}YKP*+CV0+7J-Yz5I=kx9O>}V_6!W>5Xlju$wo;^~TS(K@semq_|4g}Qj
zax~%rixnuY(2liwjb~2Px5KAPIBWt-v*VGIYKKjj4`ncF8r%6wL%Xya%-$QV{Nd(2
z*YB3q!$JbZ2RiZ~sR97H{EUCDX=rTjK2#>T6ugiXi|Jz=UGa9<&BkP)QiZYl`E+Yn
zGW{{1K!tW3-Pa&}+-}!#vC)SXufH!?PMWJ``Lwt#f-#eco+NNG10Dc=fUgp$o(V@8
z{N4OC`>AM!N0UIv9&OV6xN^G_H(Pb6f^gxzlz_PFnZ<e{8LiMz+?Tsik4uHer9v{J
zMKgk){2qjO;67ik3nF-8ANqaq5JL<x#31q?Ywi=SWS89500000NkvXXu0mjfFe2QK

literal 0
HcmV?d00001

diff --git a/apps/assistedgps/custom.html b/apps/assistedgps/custom.html
new file mode 100644
index 000000000..e86c660b9
--- /dev/null
+++ b/apps/assistedgps/custom.html
@@ -0,0 +1,113 @@
+<html>
+  <head>
+    <link rel="stylesheet" href="../../css/spectre.min.css">
+  </head>
+  <body>
+
+    <h2>Assisted GPS</h2>
+    <p>GPS can take a long time (~5 minutes) to get an accurate position the first time it is used.
+    AGPS uploads a few hints to the GPS receiver about satellite positions that allow it
+    to get a faster, more accurate fix - however they are only valid for a short period of time.</p>
+    <p>You can upload data that covers a longer period of time, but the upload will take longer.</p>
+    <div class="form-group">
+      <label class="form-label">AGPS Validity time</label>
+      <label class="form-radio">
+        <input type="radio" name="agpsperiod" value="1d" checked><i class="form-icon"></i> 1 day (8kB)
+      </label>
+      <label class="form-radio">
+        <input type="radio" name="agpsperiod" value="2d"><i class="form-icon"></i> 2 days (14kB)
+      </label>
+      <label class="form-radio">
+        <input type="radio" name="agpsperiod" value="3d"><i class="form-icon"></i> 3 days (20kB)
+      </label>
+      <label class="form-radio">
+        <input type="radio" name="agpsperiod" value="1wk"><i class="form-icon"></i> 1 week (46kB)
+      </label>
+    </div>
+    <p>Click <button id="upload" class="btn btn-primary">Upload</button></p>
+
+    <script src="../../core/lib/customize.js"></script>
+
+    <script>
+      // When the 'upload' button is clicked...
+      document.getElementById("upload").addEventListener("click", function() {
+        var radios = document.getElementsByName('agpsperiod');
+        var url = "https://www.espruino.com/agps/assistnow_1d.base64";
+        for (var i=0; i<radios.length; i++)
+          if (radios[i].checked)
+            url = "https://www.espruino.com/agps/assistnow_"+radios[i].value+".base64";
+        console.log("Sending...");
+        //var text = document.getElementById("agpsperiod").value;
+        get(url, function(b64) {
+          var js = jsFromBase64(b64);
+          sendCustomizedApp({
+            storage:[
+              {name:"RAM", content:js},
+            ]
+          });
+        });
+      });
+
+      function UBX_CMD(cmd) {
+        var d = [0xB5,0x62]; // sync chars
+        d = d.concat(cmd);
+        var a=0,b=0;
+        for (var i=2;i<d.length;i++) {
+          a += d[i];
+          b += a;
+        }
+        d.push(a&255,b&255);
+        return d;
+      }
+      function UBX_MGA_INI_TIME_UTC() {
+        var a = new Uint8Array(4+24);
+        a.set([0x13,0x40,24,0]);
+        a.set([ 0x10, // 0: type
+                0,  // 1: version
+                0, // 2: ref - none
+                0x80] ); // 3: leapsecs - unknown
+        var d = new Date();
+        d.setTime(d.getTime()+d.getTimezoneOffset()*60000); // get as UTC
+        var dv = new DataView(a.buffer, 4);
+        dv.setUint16(4, d.getFullYear());
+        dv.setUint8(6, d.getMonth()+1);
+        dv.setUint8(7, d.getDate());
+        dv.setUint8(8, d.getHours());
+        dv.setUint8(9, d.getMinutes());
+        dv.setUint8(10, d.getSeconds());
+        dv.setUint16(16, 10*60); // seconds part of accuracy - 10 minutes
+        return UBX_CMD([].slice.call(a));
+      }
+
+      function jsFromBase64(b64) {
+        var bin = atob(b64);
+        var chunkSize = 128;
+        var js = "\x10Bangle.setGPSPower(1);\n"; // turn GPS on
+        //js += `\x10Bangle.on('GPS-raw',function (d) { if (d.startsWith("\\xB5\\x62\\x05\\x01")) Terminal.println("GPS ACK"); else if (d.startsWith("\\xB5\\x62\\x05\\x00")) Terminal.println("GPS NACK"); })\n`;
+        js += "\x10E.showMessage('Uploading...','AGPS');function p(n) {g.fillRect(0,g.getHeight()-80,g.getWidth()*n,g.getHeight()-60);}";
+        //js += "\x10var t=getTime()+1;while(t>getTime());\n"; // wait 1 sec
+        js += `\x10Serial1.write(atob("${btoa(String.fromCharCode.apply(null,UBX_MGA_INI_TIME_UTC()))}"))\n`; // set GPS time
+        
+        for (var i=0;i<bin.length;i+=chunkSize) {
+          var chunk = bin.substr(i,chunkSize);
+          js += `\x10p(${Math.round(100*i/bin.length)/100});Serial1.write(atob("${btoa(chunk)}"))\n`;
+        }
+        js += "\x10p(1);\n"; // finish progress bar
+        return js;
+      }
+
+      function get(url,callback) {
+        console.log("Loading "+url);
+        var oReq = new XMLHttpRequest();
+        oReq.addEventListener("load", function() {
+          var b64 = this.responseText;
+          console.log("Response received...");
+          callback(b64);
+        });
+        oReq.open("GET", url);
+        oReq.send();
+      }
+
+    </script>
+  </body>
+</html>
diff --git a/core b/core
index c99967381..1b66c4ce1 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit c99967381280f483877c3f11ae7b0d4dc8c53e0e
+Subproject commit 1b66c4ce1ba71036bcb612a2f16bbd7fbc2c66de
diff --git a/testing/GPS-comms.js b/testing/GPS-comms.js
index 38d4c9dde..ca0db16b6 100644
--- a/testing/GPS-comms.js
+++ b/testing/GPS-comms.js
@@ -16,7 +16,7 @@ function writeGPScmd(cmd) {
     a += d[i];
     b += a;
   }
-  d.push(a,b);
+  d.push(a&255,b&255);
   Serial1.write(d);
 }
 function readGPScmd(cmd, callback) {
@@ -131,7 +131,7 @@ function setUBX_MGA_INI_TIME_UTC() {
   dv.setUint8(9, d.getMinutes());
   dv.setUint8(10, d.getSeconds());
   dv.setUint16(16, 10*60); // seconds part of accuracy - 10 minutes
-  writeGPScmd(a.slice());
+  writeGPScmd([].slice.call(a));
 }
 
 setUBX_MGA_INI_TIME_UTC();