Merge branch 'espruino:master' into master

2022-10-23 17:29:03 -04:00 · 2022-10-23 17:29:03 -04:00 · f47a59b2f7
parent 3c121a808f 7f886e79c5
commit f47a59b2f7
1090 changed files with 44228 additions and 5984 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: espruino
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: ['http://www.espruino.com/Donate']# Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@ -1,4 +1,4 @@
-name: Node CI
+name: build

 on: [push, pull_request]

@ -6,29 +6,22 @@ jobs:
  build:
    runs-on: ubuntu-latest

-    strategy:
-      matrix:
-        node-version: [16.x]
-
    steps:
      - name: Checkout repository and submodules
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
        with:
          submodules: recursive
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+      - name: Use Node.js 16.x
+        uses: actions/setup-node@v3
        with:
-          node-version: ${{ matrix.node-version }}
-      - name: install testing dependencies
-        run: npm i
-      - name: test all apps and widgets
-        run: npm run test
-      - name: install typescript dependencies
+          node-version: 16.x
+      - name: Install testing dependencies
+        run: npm ci
+      - name: Test all apps and widgets
+        run: npm test
+      - name: Install typescript dependencies
        working-directory: ./typescript
        run: npm ci
-      - name: build types
-        working-directory: ./typescript
-        run: npm run build:types
-      - name: build all TS apps and widgets
+      - name: Build all TS apps and widgets
        working-directory: ./typescript
        run: npm run build
--- a/.gitignore
+++ b/.gitignore
@ -1,6 +1,5 @@
 .htaccess
 node_modules
-package-lock.json
 .DS_Store
 *.js.bak
 appdates.csv
@ -12,3 +11,6 @@ tests/Layout/testresult.bmp
 apps.local.json
 _site
 .jekyll-cache
+.owncloudsync.log
+Desktop.ini
+.sync_*.db*
--- a/README.md
+++ b/README.md
@ -1,7 +1,7 @@
 Bangle.js App Loader (and Apps)
 ================================

-[![Build Status](https://app.travis-ci.com/espruino/BangleApps.svg?branch=master)](https://app.travis-ci.com/github/espruino/BangleApps)
+[![Build Status](https://github.com/espruino/BangleApps/actions/workflows/nodejs.yml/badge.svg)](https://github.com/espruino/BangleApps/actions/workflows/nodejs.yml)

 * Try the **release version** at [banglejs.com/apps](https://banglejs.com/apps)
 * Try the **development version** at [espruino.github.io](https://espruino.github.io/BangleApps/)
@ -191,7 +191,7 @@ widget bar at the top of the screen they can add themselves to the global

 ```
 WIDGETS["mywidget"]={
-  area:"tl", // tl (top left), tr (top right)
+  area:"tl", // tl (top left), tr (top right), bl (bottom left), br (bottom right)
  sortorder:0, // (Optional) determines order of widgets in the same corner
  width: 24, // how wide is the widget? You can change this and call Bangle.drawWidgets() to re-layout
  draw:draw // called to draw the widget
@ -324,7 +324,7 @@ and which gives information about the app for the Launcher.
 ```

 * name, icon and description present the app in the app loader.
-* tags is used for grouping apps in the library, separate multiple entries by comma. Known tags are `tool`, `system`, `clock`, `game`, `sound`, `gps`, `widget`, `launcher` or empty.
+* tags is used for grouping apps in the library, separate multiple entries by comma. Known tags are `tool`, `system`, `clock`, `game`, `sound`, `gps`, `widget`, `launcher`, `bluetooth` or empty.
 * storage is used to identify the app files and how to handle them
 * data is used to clean up files when the app is uninstalled

--- a/apps/2ofthemclk/ChangeLog
+++ b/apps/2ofthemclk/ChangeLog
@ -0,0 +1 @@
+0.01: New App!
--- a/apps/2ofthemclk/README.md
+++ b/apps/2ofthemclk/README.md
@ -0,0 +1,11 @@
+# two of them clock
+
+You can now wear teh memez on your wrist.
+
+![](screenshot.png)
+
+Also serves as an example of displaying seconds only when unlocked or charging and only refreshing on the minute otherwise.
+Widgets not supported
+
+## Creator
+- [Kilrah](https://github.com/kilrah)
--- a/apps/2ofthemclk/app-icon.js
+++ b/apps/2ofthemclk/app-icon.js
@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwgZC/AH4ADkAPOgVJkgEBAQQAJiQRByEJgmQCJWSpMEAQMkyQJCpASHhAOBpAmBJJgjBCIUJCRg4CCIJxFMQ2SoARCkmACI0EBAJHCCIMLj4RFiUBskAgIXBEAU5A4P34CtCiEJsEJ/AHBCgOBAoQAEi0H////HciQsBwywICIXWzkG4A+BEY0gif46dt6/cgnIgkWnHfLIP/MoUWwHbpvC/kAjEEj0HNYQCCkEfGgP/64RB2EAifHLwMAjg1CCIMD/0H/0B8EAh+HgeAkARCE4IjC/4jBYIMPLIcIAYUPB4OBCIQABhu/AoShCHYIRBx6QBDgUw2//8OHPwcJ39//ILBCIU9LgMBSQgsBJAYRBkE/CIIABgRHD3wRFkk/2zBDAYU//3b/oRB8ARBj6ABgEE7YREEYf+oMkSwINCyClCn//z//+4RBgMkgU3EgUcwFJgEeboOXCIP2EYJCDAAVJkkGWoIuBgf2EYQPDkECCIOGd4ffyEJkgFBAAcSoEkwQCBhw+BwQaByVAkGAKwIFBBANLkEQgAyBCIVIkBpBgmSBYOQoApBgcgiQRCAQIyCCgsSjIFBCIcgRgJNCCgQyBpAgDAQT2BCgIOBBAQUCCIpfBCIwCKP4QRNpCSDCLyJBCIbjBTwYRLboJ0BCI4QD"))
--- a/apps/2ofthemclk/app.js
+++ b/apps/2ofthemclk/app.js
--- a/apps/2ofthemclk/app.png
+++ b/apps/2ofthemclk/app.png
--- a/apps/2ofthemclk/bg.png
+++ b/apps/2ofthemclk/bg.png
--- a/apps/2ofthemclk/metadata.json
+++ b/apps/2ofthemclk/metadata.json
@ -0,0 +1,17 @@
+{
+  "id": "2ofthemclk",
+  "name": "two of them clock",
+  "version": "0.01",
+  "description": "You can now wear teh memez on your wrist.",
+  "readme": "README.md",
+  "icon": "app.png",
+  "screenshots": [{"url":"screenshot.png"}],
+  "type": "clock",
+  "tags": "clock",
+  "supports": ["BANGLEJS2"],
+  "allow_emulator": true,
+  "storage": [
+    {"name":"2ofthemclk.app.js","url":"app.js"},
+    {"name":"2ofthemclk.img","url":"app-icon.js","evaluate":true}
+  ]
+}
--- a/apps/2ofthemclk/screenshot.png
+++ b/apps/2ofthemclk/screenshot.png
--- a/apps/7x7dotsclock/7x7dotsclock.app.js
+++ b/apps/7x7dotsclock/7x7dotsclock.app.js
@ -269,7 +269,7 @@ function actions(v){
 }

 // Get Messages status
-var messages = require("Storage").readJSON("messages.json",1)||[];
+var messages_installed = require("Storage").read("messages") !== undefined;

 //var BTconnected = NRF.getSecurityStatus().connected;
 //NRF.on('connect',BTconnected = NRF.getSecurityStatus().connected);
@ -318,7 +318,7 @@ function drawWidgeds() {
  var x2M = x1M + 25;
  var y2M = y2B;

-  if (messages.some(m=>m.new)) {
+  if (messages_installed && require("messages").status() == "new") {
    g.setColor(g.theme.fg);
    g.fillRect(x1M,y1M,x2M,y2M);
    g.setColor(g.theme.bg);
--- a/apps/7x7dotsclock/ChangeLog
+++ b/apps/7x7dotsclock/ChangeLog
@ -1,2 +1,3 @@
 0.01: Initial version for upload
-0.02: better theme support, configurable colors, small improvements
+0.02: Better theme support, configurable colors, small improvements
+0.03: Use `messages` library to check for new messages
--- a/apps/7x7dotsclock/metadata.json
+++ b/apps/7x7dotsclock/metadata.json
@ -1,7 +1,7 @@
 { "id": "7x7dotsclock",
  "name": "7x7 Dots Clock",
  "shortName":"7x7 Dots Clock",
-  "version":"0.02",
+  "version":"0.03",
  "description": "A clock with a big 7x7 dots Font",
  "icon": "dotsfontclock.png",
  "tags": "clock",
--- a/apps/90sclk/ChangeLog
+++ b/apps/90sclk/ChangeLog
@ -1,2 +1,3 @@
 0.01: New App!
 0.02: Fullscreen settings.
+0.03: Tell clock widgets to hide.
--- a/apps/90sclk/app.js
+++ b/apps/90sclk/app.js
@ -115,6 +115,9 @@ function draw() {
  }
 }

+// Show launcher when middle button pressed
+Bangle.setUI("clock");
+
 Bangle.loadWidgets();

 // Clear the screen once, at startup
@ -140,5 +143,3 @@ Bangle.on('lock', function(isLocked) {
 });


-// Show launcher when middle button pressed
-Bangle.setUI("clock");
--- a/apps/90sclk/metadata.json
+++ b/apps/90sclk/metadata.json
@ -1,7 +1,7 @@
 {
  "id": "90sclk",
  "name": "90s Clock",
-  "version": "0.02",
+  "version": "0.03",
  "description": "A 90s style watch-face",
  "readme": "README.md",
  "icon": "app.png",
--- a/apps/UI4swatch/ChangeLog
+++ b/apps/UI4swatch/ChangeLog
--- a/apps/_example_widget/widget.js
+++ b/apps/_example_widget/widget.js
@ -9,7 +9,7 @@ currently-running apps */

  // add your widget
  WIDGETS["mywidget"]={
-    area:"tl", // tl (top left), tr (top right), bl (bottom left), br (bottom right)
+    area:"tl", // tl (top left), tr (top right), bl (bottom left), br (bottom right), be aware that not all apps support widgets at the bottom of the screen
    width: 28, // how wide is the widget? You can change this and call Bangle.drawWidgets() to re-layout
    draw:draw // called to draw the widget
  };
--- a/apps/a_dndtoggle/ChangeLog
+++ b/apps/a_dndtoggle/ChangeLog
@ -0,0 +1 @@
+0.01: Initial version
--- a/apps/a_dndtoggle/README.md
+++ b/apps/a_dndtoggle/README.md
@ -0,0 +1,13 @@
+# a_dndtoggle - Toggle Quiet Mode of the watch
+
+When Quiet mode is off, just start this app to set quiet mode. Start it again to turn off quiet mode.
+Work in progress.
+
+#ToDo
+Settings page, current status indicator.
+
+## Creator
+
+Hank - contact at http://forum.espruino.com 
+
+
--- a/apps/a_dndtoggle/a_dndtoggle.app.js
+++ b/apps/a_dndtoggle/a_dndtoggle.app.js
@ -0,0 +1,43 @@
+
+const modeNames = [/*LANG*/"Noisy", /*LANG*/"Alarms", /*LANG*/"Silent"];
+let bSettings = require('Storage').readJSON('setting.json',true)||{};
+let current = 0|bSettings.quiet;
+//0 off
+//1 alarms
+//2 silent
+
+console.log("old: " + current);
+
+switch (current) {
+	case 0:
+		bSettings.quiet = 2;
+		Bangle.buzz();
+		setTimeout('Bangle.buzz();',500);
+		break;
+	case 1:
+		bSettings.quiet = 0;  
+		Bangle.buzz();
+		break;
+	case 2:
+		bSettings.quiet = 0;
+		Bangle.buzz();
+		break;
+	default:
+		bSettings.quiet = 0;
+		Bangle.buzz(); 
+}
+	
+console.log("new: " + bSettings.quiet);
+
+E.showMessage(modeNames[current] + " -> " + modeNames[bSettings.quiet]);
+setTimeout('exitApp();', 2000);
+
+
+function exitApp(){
+
+require("Storage").writeJSON("setting.json", bSettings);
+// reload clocks with new theme, otherwise just wait for user to switch apps
+
+load()
+ 
+}
--- a/apps/a_dndtoggle/a_dndtoggle.png
+++ b/apps/a_dndtoggle/a_dndtoggle.png
--- a/apps/a_dndtoggle/app-icon.js
+++ b/apps/a_dndtoggle/app-icon.js
@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwJC/AAl/Agf/AAUAgIFDwEHAofgh/g/0Ag/wj+AnwVB/EegEfEIN4nkAh+AgE8vgVBAoV4Aoce/EAgfADQIFcjwpFHYIFCnxBFJopZBn5ZCMopxFPoqJFSowA/gA="))
--- a/apps/a_dndtoggle/metadata.json
+++ b/apps/a_dndtoggle/metadata.json
@ -0,0 +1,16 @@
+{
+  "id": "a_dndtoggle",
+  "name": "a_dndtoggle - Toggle Quiet Mode of the watch",
+  "shortName": "A_DND Toggle",
+  "version": "0.01",
+  "description": "Toggle Quiet Mode of the watch just by starting this app.",
+  "icon": "a_dndtoggle.png",
+  "type": "app",
+  "tags": "tool",
+  "supports": ["BANGLEJS","BANGLEJS2"],
+  "storage": [
+    {"name":"a_dndtoggle.app.js","url":"a_dndtoggle.app.js"},
+	{"name":"a_dndtoggle.img","url":"app-icon.js","evaluate":true}
+  ],  
+  "readme": "README.md"
+}
--- a/apps/about/ChangeLog
+++ b/apps/about/ChangeLog
@ -10,3 +10,4 @@
 0.10: Added separate Bangle.js 2 file with Bangle.js 2 kickstarter pixels (as of 28 Oct 2021)
 0.11: Bangle.js2: New pixels, btn1 to exit
 0.12: Actual pixels as of 29th Nov 2021
+0.13: Bangle.js 2: Use setUI to add software back button
--- a/apps/about/app-bangle2.js
+++ b/apps/about/app-bangle2.js
@ -10,7 +10,7 @@ var img = atob("sIwDkm2S66DYwA2AAAAAHAHGSRxJEkAAgmGGBxDIADIdAFJIbAHF9HP00kBUC6Dt
 var imgHeight = g.imageMetrics(img).height;
 var imgScroll = Math.floor(Math.random()*imgHeight);

-g.reset().setFont("6x15").setFontAlign(0,0);
+g.clear(1).setFont("6x15").setFontAlign(0,0);
 g.drawString(ENV.VERSION + "  " + NRF.getAddress(), g.getWidth()/2, 171);
 g.drawImage(img,0,24);

@ -69,4 +69,7 @@ function drawImage() {

 // TODO: a nice little animation before
 setTimeout(drawInfo, 1000);
-setWatch(_=>load(), BTN1);
+Bangle.setUI({
+  mode : "custom",
+  back : load
+});
--- a/apps/about/metadata.json
+++ b/apps/about/metadata.json
@ -1,7 +1,7 @@
 {
  "id": "about",
  "name": "About",
-  "version": "0.12",
+  "version": "0.13",
  "description": "Bangle.js About page - showing software version, stats, and a collaborative mural from the Bangle.js KickStarter backers",
  "icon": "app.png",
  "tags": "tool,system",
--- a/apps/accellog/ChangeLog
+++ b/apps/accellog/ChangeLog
@ -2,3 +2,4 @@
 0.02: Use the new multiplatform 'Layout' library
 0.03: Exit as first menu option, dont show decimal places for seconds
 0.04: Localisation, change Exit->Back to allow back-arrow to appear on 2v13 firmware
+0.05: Add max G values during recording, record actual G values and magnitude to CSV
--- a/apps/accellog/app.js
+++ b/apps/accellog/app.js
@ -1,5 +1,6 @@
 var fileNumber = 0;
 var MAXLOGS = 9;
+var logRawData = false;

 function getFileName(n) {
  return "accellog."+n+".csv";
@ -24,6 +25,11 @@ function showMenu() {
    /*LANG*/"View Logs" : function() {
      viewLogs();
    },
+    /*LANG*/"Log raw data" : {
+      value : logRawData,
+      format : v => v?/*LANG*/"Yes":/*LANG*/"No",
+      onchange : v => { logRawData=v; }
+    },
  };
  E.showMenu(menu);
 }
@ -78,6 +84,7 @@ function viewLogs() {
 }

 function startRecord(force) {
+  var stopped = false;
  if (!force) {
    // check for existing file
    var f = require("Storage").open(getFileName(fileNumber), "r");
@ -92,39 +99,101 @@ function startRecord(force) {

  var Layout = require("Layout");
  var layout = new Layout({ type: "v", c: [
-      {type:"txt", font:"6x8", label:/*LANG*/"Samples", pad:2},
-      {type:"txt", id:"samples", font:"6x8:2", label:"  -  ", pad:5, bgCol:g.theme.bg},
-      {type:"txt", font:"6x8", label:/*LANG*/"Time", pad:2},
-      {type:"txt", id:"time", font:"6x8:2", label:"  -  ", pad:5, bgCol:g.theme.bg},
-      {type:"txt", font:"6x8:2", label:/*LANG*/"RECORDING", bgCol:"#f00", pad:5, fillx:1},
-    ]
-  },{btns:[ // Buttons...
-    {label:/*LANG*/"STOP", cb:()=>{
-      Bangle.removeListener('accel', accelHandler);
-      showMenu();
+    { type: "h", c: [
+      { type: "v", c: [
+        {type:"txt", font:"6x8", label:/*LANG*/"Samples", pad:2},
+        {type:"txt", id:"samples", font:"6x8:2", label:"  -  ", pad:5, bgCol:g.theme.bg},
+      ]},
+      { type: "v", c: [
+        {type:"txt", font:"6x8", label:/*LANG*/"Time", pad:2},
+        {type:"txt", id:"time", font:"6x8:2", label:"  -  ", pad:5, bgCol:g.theme.bg},
+      ]},
+    ]},
+    { type: "h", c: [
+      { type: "v", c: [
+        {type:"txt", font:"6x8", label:/*LANG*/"Max X", pad:2},
+        {type:"txt", id:"maxX", font:"6x8", label:"  -  ", pad:5, bgCol:g.theme.bg},
+      ]},
+      { type: "v", c: [
+        {type:"txt", font:"6x8", label:/*LANG*/"Max Y", pad:2},
+        {type:"txt", id:"maxY", font:"6x8", label:"  -  ", pad:5, bgCol:g.theme.bg},
+      ]},
+      { type: "v", c: [
+        {type:"txt", font:"6x8", label:/*LANG*/"Max Z", pad:2},
+        {type:"txt", id:"maxZ", font:"6x8", label:"  -  ", pad:5, bgCol:g.theme.bg},
+      ]},
+    ]},
+    {type:"txt", font:"6x8", label:/*LANG*/"Max G", pad:2},
+    {type:"txt", id:"maxMag", font:"6x8:4", label:"  -  ", pad:5, bgCol:g.theme.bg},
+    {type:"txt", id:"state", font:"6x8:2", label:/*LANG*/"RECORDING", bgCol:"#f00", pad:5, fillx:1},
+  ]},
+  {
+    btns:[ // Buttons...
+    {id: "btnStop", label:/*LANG*/"STOP", cb:()=>{
+      if (stopped) {
+        showMenu();
+      }
+      else {
+        Bangle.removeListener('accel', accelHandler);
+        layout.state.label = /*LANG*/"STOPPED";
+        layout.state.bgCol = /*LANG*/"#0f0";
+        stopped = true;
+        layout.render();
+      }
    }}
  ]});
  layout.render();

  // now start writing
  var f = require("Storage").open(getFileName(fileNumber), "w");
-  f.write("Time (ms),X,Y,Z\n");
+  f.write("Time (ms),X,Y,Z,Total\n");
  var start = getTime();
  var sampleCount = 0;
+  var maxMag = 0;
+  var maxX = 0;
+  var maxY = 0;
+  var maxZ = 0;

  function accelHandler(accel) {
    var t = getTime()-start;
-    f.write([
-      t*1000,
-      accel.x*8192,
-      accel.y*8192,
-      accel.z*8192].map(n=>Math.round(n)).join(",")+"\n");
+    if (logRawData) {
+      f.write([
+        t*1000,
+        accel.x*8192,
+        accel.y*8192,
+        accel.z*8192,
+        accel.mag*8192,
+      ].map(n=>Math.round(n)).join(",")+"\n");
+    } else {
+      f.write([
+        Math.round(t*1000),
+        accel.x,
+        accel.y,
+        accel.z,
+        accel.mag,
+      ].join(",")+"\n");
+    }
+    if (accel.mag > maxMag) {
+      maxMag = accel.mag.toFixed(2);
+    }
+    if (accel.x > maxX) {
+      maxX = accel.x.toFixed(2);
+    }
+    if (accel.y > maxY) {
+      maxY = accel.y.toFixed(2);
+    }
+    if (accel.z > maxZ) {
+      maxZ = accel.z.toFixed(2);
+    }

    sampleCount++;
    layout.samples.label = sampleCount;
    layout.time.label = Math.round(t)+"s";
-    layout.render(layout.samples);
-    layout.render(layout.time);
+    layout.maxX.label = maxX;
+    layout.maxY.label = maxY;
+    layout.maxZ.label = maxZ;
+    layout.maxMag.label = maxMag;
+    layout.render();
  }

  Bangle.setPollInterval(80); // 12.5 Hz - the default
--- a/apps/accellog/metadata.json
+++ b/apps/accellog/metadata.json
@ -2,7 +2,7 @@
  "id": "accellog",
  "name": "Acceleration Logger",
  "shortName": "Accel Log",
-  "version": "0.04",
+  "version": "0.05",
  "description": "Logs XYZ acceleration data to a CSV file that can be downloaded to your PC",
  "icon": "app.png",
  "tags": "outdoor",
--- a/apps/activityreminder/ChangeLog
+++ b/apps/activityreminder/ChangeLog
@ -3,3 +3,8 @@
 0.03: Do not alarm while charging
 0.04: Obey system quiet mode
 0.05: Battery optimisation, add the pause option, bug fixes
+0.06: Add a temperature threshold to detect (and not alert) if the BJS isn't worn. Better support for the peoples using the app at night
+0.07: Fix bug on the cutting edge firmware
+0.08: Use default Bangle formatter for booleans
+0.09: New app screen (instead of showing settings or the alert) and some optimisations
+0.10: Add software back button via setUI
--- a/apps/activityreminder/README.md
+++ b/apps/activityreminder/README.md
@ -11,4 +11,5 @@ Different settings can be personalized:
 - Dismiss delay: Delay added before the next alert if the alert is dismissed. From 5 to 60 min
 - Pause delay: Same as Dismiss delay but longer (usefull for meetings and such). From 30 to 240 min
 - Min steps: Minimal amount of steps to count as an activity
+- Temp Threshold: Temperature threshold to determine if the watch is worn

--- a/apps/activityreminder/alert.js
+++ b/apps/activityreminder/alert.js
@ -0,0 +1,37 @@
+(function () {
+  // load variable before defining functions cause it can trigger a ReferenceError
+  const activityreminder = require("activityreminder");
+  const storage = require("Storage");
+  let activityreminder_data = activityreminder.loadData();
+
+  function run() {
+    E.showPrompt("Inactivity detected", {
+      title: "Activity reminder",
+      buttons: { "Ok": 1, "Dismiss": 2, "Pause": 3 }
+    }).then(function (v) {
+      if (v == 1) {
+        activityreminder_data.okDate = new Date();
+      }
+      if (v == 2) {
+        activityreminder_data.dismissDate = new Date();
+      }
+      if (v == 3) {
+        activityreminder_data.pauseDate = new Date();
+      }
+      activityreminder.saveData(activityreminder_data);
+      load();
+    });
+
+    // Obey system quiet mode:
+    if (!(storage.readJSON('setting.json', 1) || {}).quiet) {
+      Bangle.buzz(400);
+    }
+    setTimeout(load, 20000);
+  }
+
+  g.clear();
+  Bangle.loadWidgets();
+  Bangle.drawWidgets();
+  run();
+
+})();
--- a/apps/activityreminder/app.js
+++ b/apps/activityreminder/app.js
@ -1,42 +1,58 @@
-function drawAlert() {
-  E.showPrompt("Inactivity detected", {
-    title: "Activity reminder",
-    buttons: { "Ok": 1, "Dismiss": 2, "Pause": 3 }
-  }).then(function (v) {
-    if (v == 1) {
-      activityreminder_data.okDate = new Date();
-    }
-    if (v == 2) {
-      activityreminder_data.dismissDate = new Date();
-    }
-    if (v == 3) {
-      activityreminder_data.pauseDate = new Date();
-    }
-    activityreminder.saveData(activityreminder_data);
-    load();
-  });
+(function () {
+  // load variable before defining functions cause it can trigger a ReferenceError
+  const activityreminder = require("activityreminder");
+  let activityreminder_data = activityreminder.loadData();
+  let W = g.getWidth();
+  // let H = g.getHeight();

-  // Obey system quiet mode:
-  if (!(storage.readJSON('setting.json', 1) || {}).quiet) {
-    Bangle.buzz(400);
+  function getHoursMins(date){
+    var h = date.getHours();
+    var m = date.getMinutes();
+    return (""+h).substr(-2) + ":" + ("0"+m).substr(-2);
  }
-  setTimeout(load, 20000);
-}

-function run() {
-  if (activityreminder.mustAlert(activityreminder_data, activityreminder_settings)) {
-    drawAlert();
-  } else {
-    eval(storage.read("activityreminder.settings.js"))(() => load());
+  function drawData(name, value, y){
+    g.drawString(name, 10, y);
+    g.drawString(value, 100, y);
  }
-}
  
+  function drawInfo() {
+    var h=18, y = h;
+    g.setColor(g.theme.fg);
+    g.setFont("Vector",h).setFontAlign(-1,-1);

-const activityreminder = require("activityreminder");
-const storage = require("Storage");
-g.clear();
-Bangle.loadWidgets();
-Bangle.drawWidgets();
-const activityreminder_settings = activityreminder.loadSettings();
-const activityreminder_data = activityreminder.loadData();
-run();
+    // Header
+    g.drawLine(0,25,W,25);
+    g.drawLine(0,26,W,26);
+  
+    g.drawString("Current Cycle", 10, y+=h);
+    drawData("Start", getHoursMins(activityreminder_data.stepsDate), y+=h);
+    drawData("Steps", getCurrentSteps(), y+=h);
+
+    /*
+    g.drawString("Button Press", 10, y+=h*2);
+    drawData("Ok", getHoursMins(activityreminder_data.okDate), y+=h);
+    drawData("Dismiss", getHoursMins(activityreminder_data.dismissDate), y+=h);
+    drawData("Pause", getHoursMins(activityreminder_data.pauseDate), y+=h);
+    */
+  }
+
+  function getCurrentSteps(){
+    let health = Bangle.getHealthStatus("day");
+    return health.steps - activityreminder_data.stepsOnDate;
+  }
+
+  function run() {
+    g.clear();
+    Bangle.loadWidgets();
+    Bangle.drawWidgets();
+    drawInfo();
+    Bangle.setUI({
+      mode : "custom",
+      back : load
+    })
+  }
+
+  run();
+
+})();
--- a/apps/activityreminder/boot.js
+++ b/apps/activityreminder/boot.js
@ -1,45 +1,81 @@
-function run() {
+(function () {
+  // load variable before defining functions cause it can trigger a ReferenceError
+  const activityreminder = require("activityreminder");
+  const activityreminder_settings = activityreminder.loadSettings();
+  let activityreminder_data = activityreminder.loadData();
+
+  if (activityreminder_data.firstLoad) {
+    activityreminder_data.firstLoad = false;
+    activityreminder.saveData(activityreminder_data);
+  }
+
+  function run() {
    if (isNotWorn()) return;
    let now = new Date();
    let h = now.getHours();
-    let health = Bangle.getHealthStatus("day");

-    if (h >= activityreminder_settings.startHour && h < activityreminder_settings.endHour) {
-        if (health.steps - activityreminder_data.stepsOnDate >= activityreminder_settings.minSteps // more steps made than needed
-            || health.steps < activityreminder_data.stepsOnDate) { // new day or reboot of the watch
-            activityreminder_data.stepsOnDate = health.steps;
-            activityreminder_data.stepsDate = now;
-            activityreminder.saveData(activityreminder_data);
-            /* todo in a futur release 
-            add settimer to trigger like 10 secs after the stepsDate + minSteps
-            cancel all other timers of this app
-            */
-        }
-        
-        if(activityreminder.mustAlert(activityreminder_data, activityreminder_settings)){
-            load('activityreminder.app.js');
-        }
-    }
-
-}
-
-function isNotWorn() {
-    // todo in a futur release check temperature and mouvement in a futur release 
-    return Bangle.isCharging();
-}
-
-const activityreminder = require("activityreminder");
-const activityreminder_settings = activityreminder.loadSettings();
-if (activityreminder_settings.enabled) {
-    const activityreminder_data = activityreminder.loadData();
-    if(activityreminder_data.firstLoad){
-        activityreminder_data.firstLoad =false;
+    if (isDuringAlertHours(h)) {
+      let health = Bangle.getHealthStatus("day");
+      if (health.steps - activityreminder_data.stepsOnDate >= activityreminder_settings.minSteps // more steps made than needed
+        || health.steps < activityreminder_data.stepsOnDate) { // new day or reboot of the watch
+        activityreminder_data.stepsOnDate = health.steps;
+        activityreminder_data.stepsDate = now;
        activityreminder.saveData(activityreminder_data);
+        /* todo in a futur release 
+        Add settimer to trigger like 30 secs after going in this part cause the person have been walking 
+        (pass some argument to run() to handle long walks and not triggering so often)
+        */
+      }
+
+      if (mustAlert(now)) {
+        load('activityreminder.alert.js');
+      }
    }
+
+  }
+
+  function isNotWorn() {
+    return (Bangle.isCharging() || activityreminder_settings.tempThreshold >= E.getTemperature());
+  }
+
+  function isDuringAlertHours(h) {
+    if (activityreminder_settings.startHour < activityreminder_settings.endHour) { // not passing through midnight
+      return (h >= activityreminder_settings.startHour && h < activityreminder_settings.endHour);
+    } else { // passing through midnight
+      return (h >= activityreminder_settings.startHour || h < activityreminder_settings.endHour);
+    }
+  }
+
+  function mustAlert(now) {
+    if ((now - activityreminder_data.stepsDate) / 60000 > activityreminder_settings.maxInnactivityMin) { // inactivity detected
+      if ((now - activityreminder_data.okDate) / 60000 > 3 && // last alert anwsered with ok was more than 3 min ago
+        (now - activityreminder_data.dismissDate) / 60000 > activityreminder_settings.dismissDelayMin && // last alert was more than dismissDelayMin ago
+        (now - activityreminder_data.pauseDate) / 60000 > activityreminder_settings.pauseDelayMin) { // last alert was more than pauseDelayMin ago
+        return true;
+      }
+    }
+    return false;
+  }
+
+  Bangle.on('midnight', function () {
+    /*
+    Usefull trick to have the app working smothly for people using it at night 
+    */
+    let now = new Date();
+    let h = now.getHours();
+    if (activityreminder_settings.enabled && isDuringAlertHours(h)) {
+      // updating only the steps and keeping the original stepsDate on purpose 
+      activityreminder_data.stepsOnDate = 0;
+      activityreminder.saveData(activityreminder_data);
+    }
+  });
+
+
+  if (activityreminder_settings.enabled) {
    setInterval(run, 60000);
    /* todo in a futur release 
    increase setInterval time to something that is still sensible (5 mins ?)
-    add settimer to trigger like 10 secs after the stepsDate + minSteps
-    cancel all other timers of this app
+    when we added a settimer
    */
-}
+  }
+})();
--- a/apps/activityreminder/lib.js
+++ b/apps/activityreminder/lib.js
@ -1,57 +1,44 @@
-const storage = require("Storage");
-
 exports.loadSettings = function () {
-    return Object.assign({
-        enabled: true,
-        startHour: 9,
-        endHour: 20,
-        maxInnactivityMin: 30,
-        dismissDelayMin: 15,
-        pauseDelayMin: 120,
-        minSteps: 50
-    }, storage.readJSON("activityreminder.s.json", true) || {});
+  return Object.assign({
+    enabled: true,
+    startHour: 9,
+    endHour: 20,
+    maxInnactivityMin: 30,
+    dismissDelayMin: 15,
+    pauseDelayMin: 120,
+    minSteps: 50,
+    tempThreshold: 27
+  }, require("Storage").readJSON("activityreminder.s.json", true) || {});
 };

 exports.writeSettings = function (settings) {
-    storage.writeJSON("activityreminder.s.json", settings);
+  require("Storage").writeJSON("activityreminder.s.json", settings);
 };

 exports.saveData = function (data) {
-    storage.writeJSON("activityreminder.data.json", data);
+  require("Storage").writeJSON("activityreminder.data.json", data);
 };

 exports.loadData = function () {
-    let health = Bangle.getHealthStatus("day");
-    const data = Object.assign({
-        firstLoad: true,
-        stepsDate: new Date(),
-        stepsOnDate: health.steps,
-        okDate: new Date(1970),
-        dismissDate: new Date(1970),
-        pauseDate: new Date(1970),
-    },
-    storage.readJSON("activityreminder.data.json") || {});
+  let health = Bangle.getHealthStatus("day");
+  let data = Object.assign({
+    firstLoad: true,
+    stepsDate: new Date(),
+    stepsOnDate: health.steps,
+    okDate: new Date(1970),
+    dismissDate: new Date(1970),
+    pauseDate: new Date(1970),
+  },
+    require("Storage").readJSON("activityreminder.data.json") || {});

-    if(typeof(data.stepsDate) == "string")
-        data.stepsDate = new Date(data.stepsDate);
-    if(typeof(data.okDate) == "string")
-        data.okDate = new Date(data.okDate);
-    if(typeof(data.dismissDate) == "string")
-        data.dismissDate = new Date(data.dismissDate);
-    if(typeof(data.pauseDate) == "string")
-        data.pauseDate = new Date(data.pauseDate);
+  if (typeof (data.stepsDate) == "string")
+    data.stepsDate = new Date(data.stepsDate);
+  if (typeof (data.okDate) == "string")
+    data.okDate = new Date(data.okDate);
+  if (typeof (data.dismissDate) == "string")
+    data.dismissDate = new Date(data.dismissDate);
+  if (typeof (data.pauseDate) == "string")
+    data.pauseDate = new Date(data.pauseDate);

-    return data;
+  return data;
 };
-
-exports.mustAlert = function(activityreminder_data, activityreminder_settings) {
-    let now = new Date();
-    if ((now - activityreminder_data.stepsDate) / 60000 > activityreminder_settings.maxInnactivityMin) { // inactivity detected
-        if ((now - activityreminder_data.okDate) / 60000 > 3 && // last alert anwsered with ok was more than 3 min ago
-            (now - activityreminder_data.dismissDate) / 60000 > activityreminder_settings.dismissDelayMin && // last alert was more than dismissDelayMin ago
-            (now - activityreminder_data.pauseDate) / 60000 > activityreminder_settings.pauseDelayMin) { // last alert was more than pauseDelayMin ago
-            return true;
-        }
-    }
-    return false;
-}
--- a/apps/activityreminder/metadata.json
+++ b/apps/activityreminder/metadata.json
@ -3,7 +3,7 @@
  "name": "Activity Reminder",
  "shortName":"Activity Reminder",
  "description": "A reminder to take short walks for the ones with a sedentary lifestyle",
-  "version":"0.05",
+  "version":"0.10",
  "icon": "app.png",
  "type": "app",
  "tags": "tool,activity",
@ -13,11 +13,12 @@
    {"name": "activityreminder.app.js", "url":"app.js"},
    {"name": "activityreminder.boot.js", "url": "boot.js"},
    {"name": "activityreminder.settings.js", "url": "settings.js"},
+    {"name": "activityreminder.alert.js", "url": "alert.js"},
    {"name": "activityreminder", "url": "lib.js"},
    {"name": "activityreminder.img", "url": "app-icon.js", "evaluate": true}
  ],
  "data": [
    {"name": "activityreminder.s.json"},
-    {"name": "activityreminder.data.json"}
+    {"name": "activityreminder.data.json", "storageFile": true}
  ]
 }
--- a/apps/activityreminder/settings.js
+++ b/apps/activityreminder/settings.js
@ -1,76 +1,86 @@
 (function (back) {
  // Load settings
  const activityreminder = require("activityreminder");
-  const settings = activityreminder.loadSettings();
+  let settings = activityreminder.loadSettings();
+
+  function getMainMenu(){
+    var mainMenu = {
+      "": { "title": "Activity Reminder" },
+      "< Back": () => back(),
+      'Enable': {
+        value: settings.enabled,
+        onchange: v => {
+          settings.enabled = v;
+          activityreminder.writeSettings(settings);
+        }
+      },
+      'Start hour': {
+        value: settings.startHour,
+        min: 0, max: 24,
+        onchange: v => {
+          settings.startHour = v;
+          activityreminder.writeSettings(settings);
+        }
+      },
+      'End hour': {
+        value: settings.endHour,
+        min: 0, max: 24,
+        onchange: v => {
+          settings.endHour = v;
+          activityreminder.writeSettings(settings);
+        }
+      },
+      'Max inactivity': {
+        value: settings.maxInnactivityMin,
+        min: 15, max: 120,
+        onchange: v => {
+          settings.maxInnactivityMin = v;
+          activityreminder.writeSettings(settings);
+        },
+        format: x => x + "m"
+      },
+      'Dismiss delay': {
+        value: settings.dismissDelayMin,
+        min: 5, max: 60,
+        onchange: v => {
+          settings.dismissDelayMin = v;
+          activityreminder.writeSettings(settings);
+        },
+        format: x => x + "m"
+      },
+      'Pause delay': {
+        value: settings.pauseDelayMin,
+        min: 30, max: 240, step: 5,
+        onchange: v => {
+          settings.pauseDelayMin = v;
+          activityreminder.writeSettings(settings);
+        },
+        format: x => {
+          return x + "m";
+        }
+      },
+      'Min steps': {
+        value: settings.minSteps,
+        min: 10, max: 500, step: 10,
+        onchange: v => {
+          settings.minSteps = v;
+          activityreminder.writeSettings(settings);
+        }
+      },
+      'Temp Threshold': {
+        value: settings.tempThreshold,
+        min: 20, max: 40, step: 0.5,
+        format: v => v + "°C",
+        onchange: v => {
+          settings.tempThreshold = v;
+          activityreminder.writeSettings(settings);
+        }
+      }
+    };
+
+    return mainMenu;
+  }

  // Show the menu
-  E.showMenu({
-    "": { "title": "Activity Reminder" },
-    "< Back": () => back(),
-    'Enable': {
-      value: settings.enabled,
-      format: v => v ? "Yes" : "No",
-      onchange: v => {
-        settings.enabled = v;
-        activityreminder.writeSettings(settings);
-      }
-    },
-    'Start hour': {
-      value: settings.startHour,
-      min: 0, max: 24,
-      onchange: v => {
-        settings.startHour = v;
-        activityreminder.writeSettings(settings);
-      }
-    },
-    'End hour': {
-      value: settings.endHour,
-      min: 0, max: 24,
-      onchange: v => {
-        settings.endHour = v;
-        activityreminder.writeSettings(settings);
-      }
-    },
-    'Max inactivity': {
-      value: settings.maxInnactivityMin,
-      min: 15, max: 120,
-      onchange: v => {
-        settings.maxInnactivityMin = v;
-        activityreminder.writeSettings(settings);
-      },
-      format: x => {
-        return x + " min";
-      }
-    },
-    'Dismiss delay': {
-      value: settings.dismissDelayMin,
-      min: 5, max: 60,
-      onchange: v => {
-        settings.dismissDelayMin = v;
-        activityreminder.writeSettings(settings);
-      },
-      format: x => {
-        return x + " min";
-      }
-    },
-    'Pause delay': {
-      value: settings.pauseDelayMin,
-      min: 30, max: 240,
-      onchange: v => {
-        settings.pauseDelayMin = v;
-        activityreminder.writeSettings(settings);
-      },
-      format: x => {
-        return x + " min";
-      }
-    },
-    'Min steps': {
-      value: settings.minSteps,
-      min: 10, max: 500,
-      onchange: v => {
-        settings.minSteps = v;
-        activityreminder.writeSettings(settings);
-      }
-    }
-  });
+  E.showMenu(getMainMenu());
 })
--- a/apps/advcasio/ChangeLog
+++ b/apps/advcasio/ChangeLog
@ -0,0 +1,3 @@
+0.01: AdvCasio first version
+0.02: Remove un-needed fonts to improve memory usage
+0.03: Tell clock widgets to hide.
--- a/apps/advcasio/README.md
+++ b/apps/advcasio/README.md
@ -0,0 +1,62 @@
+# Adv Casio Clock
+
+<img src="https://user-images.githubusercontent.com/2981891/175355586-1dfc0d66-6555-4385-b124-1605fdb71a11.jpg" width="250" />
+
+An over-engineered clock inspired by Casio watches.<br/>
+It has a dedicated timer, a scratchpad and can display the weather condition 4 days ahead.<br/>
+It uses a <a target="_blank" href="https://dotgreg.github.io/advCasioBangleClock/">custom web app</a> to update its content.<br/>
+Forked from the awesome Cassio Watch.<br/>
+
+## Todo
+
+- Improving quality of the background images, right now it is quite blurry.
+- Improving screenshots quality.
+- Improving web app look.
+- Improving bangle app performances (using functions for images and specialized array).
+
+## Functionalities
+
+- Current time
+- Current day and month
+- Footsteps
+- Battery
+- Simple Timer embedded  
+- Weather forecast (7 days)
+- Scratchpad 
+
+## Screenshots
+Clock:<br/>
+<img src="https://user-images.githubusercontent.com/2981891/175519126-049caf93-73d0-4472-9650-33b28f80843c.jpg" width="250" />
+<img src="https://user-images.githubusercontent.com/2981891/175519128-96926e32-2165-4c61-9364-843440304bb9.jpg" width="250" />
+<img src="https://user-images.githubusercontent.com/2981891/175519130-4921073c-48fc-4c29-932d-d42acc3b395c.jpg" width="250" />
+
+Web interface to update weather & scratchpad <br/>
+<a target="_blank" ref="https://dotgreg.github.io/advCasioBangleClock/">https://dotgreg.github.io/advCasioBangleClock</a> 
+
+<img src="https://user-images.githubusercontent.com/2981891/175519121-851bb209-7192-40db-a014-490c344f7597.jpg" width="250" />
+
+## Usage
+### How to update the tasks list / weather
+- you will need a <a target="_blank" href="https://openweathermap.org/price#weather">free openweathermap.org api key</a>. 
+- go to https://dotgreg.github.io/advCasioBangleClock/
+  - Alternatively you can install it on your own server/heroku/service/github pages, the web-app code is <a target="_blank" href="https://github.com/dotgreg/advCasioBangleClock/tree/master/web-app">here</a>
+- fill the location and the api key (it will be saved on your browser, no need to do it each time)
+- edit the scratchpad with what you want
+- click on sync
+- reload your clock!
+
+### How to start/stop the timer
+- swipe up : add time (+5min)
+- swipe down : remove time (-5min)
+- swipe right : start timer
+- swipe left : stop timer
+
+## Links
+### Issues, suggestions and bugtracker
+<a target="_blank" href="https://github.com/dotgreg/advCasioBangleClock/issues">https://github.com/dotgreg/advCasioBangleClock/issues</a>
+
+### Code repository (bangle app and web app)
+<a target="_blank" href="https://github.com/dotgreg/advCasioBangleClock">https://github.com/dotgreg/advCasioBangleClock</a>
+
+### Creator 
+<a target="_blank" href="https://github.com/dotgreg">https://github.com/dotgreg</a>
--- a/apps/advcasio/app-icon.js
+++ b/apps/advcasio/app-icon.js
@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwghC/AH4A/AGsCmUQC6kf/8wC6k///wgEv//zD4PxAQIJBABP//4QBC4IcBh/yEQIXKgP/l4rBl/yGAMP/4iBKJUC/5gBIAQVBBAMR/8gC5IQBAAMQC4IVBFoMjAYIXNmAXBgYXCPgQAJl/xHwPwj/yn5kC/55BUxSlC+JiBVgQ5BUxiDBUIIXBIQQXBcCoA/AH4ADXAUgUAUQBAkPeoTDFgIHBAALQEA4XwC4IOEAAQRBbAQBBCAIgBEYMQC4TnEC4XyeQgBDAAMwC4pIDC4kDAgJLD//xC5QIBNQISCFYIZCC4aEBAQRCDAAPyl4hBOIh3Cn53GNgMRiKxGBAR5BAoYA/AH4A/AH4A5A"))
--- a/apps/advcasio/app.js
+++ b/apps/advcasio/app.js
@ -0,0 +1,304 @@
+const storage = require('Storage');
+
+require("Font8x12").add(Graphics);
+require("Font7x11Numeric7Seg").add(Graphics);
+
+function bigThenSmall(big, small, x, y) {
+		g.setFont("7x11Numeric7Seg", 2);
+		g.drawString(big, x, y);
+		x += g.stringWidth(big);
+		g.setFont("8x12");
+		g.drawString(small, x, y);
+}
+
+function getClockBg() {
+		return require("heatshrink").decompress(atob("icVgf/ABv8v4DBx4CB+PH8F+nAGB48fwEHBwXjxwqBuPH//+nAGBBwIjCAwI2D/wGBgIyDI4QGDwAGBHYX/4AGBn4UFEYQpCEYYpCAAMfMhP4FIgABwJ8OEBIA=="));
+}
+
+
+// sun, cloud, rain, thunder
+var iconsWeather = [
+		require("heatshrink").decompress(atob("i8Ugf/ACcfA434BA/AAwsAv0/8F/BAcDwEHHIpECFI3wn4GC/gOC+PAGoXggEH/+ODQgXBGQv/wAbBBAnguEACIn4gfxI4JXFwJmG/kPBA3jSynw")), require("heatshrink").decompress(atob("i0Ugf/AEXggIGE/0A/kPBAmBCIN/A4Y8CgAICwEHBYoUE/ACCj4sDn4CBC4YyDwBrDCgYA3A")), require("heatshrink").decompress(atob("h8Rgf/AAuBAgf8h4FDCwM/AgPA/gFC/0HgEBBQPwnEfDoWAg4jC/gOCAoQmBAQXjFIV//8f//4IQP4j/+gAIB4EcHII4CAoI+DLQJXF/AA==")), require("heatshrink").decompress(atob("h0Pgf/AA8fAYX+g4EC8EBAgXADAeAgAECgAOC/wrCDQIOBBYfwgAaC/kAn4EB/EAv4aDHAeBIg38"))
+];
+
+
+function getBackgroundImage() {
+		return require("heatshrink").decompress(atob("2GwghC/AH4A/AH4AMl////wAwURiQECgUzmcxBQQCBiYUBBARW+LAcCAgcPBYgFBkAIFG7kQiAKIiIKBgISOAAJBD//zKQfxK4vyAoMQCgn/ERBhBBYR5BAwR1DB4Y2DgYPCGIQRCCQcP+EfGJI0FEgRSCGAQCCX4JXCkAhDn4lI+HyK4YWBFIPzJYJXHAIMSK4cwJ4I3CAYMzA4cfcRMBdwytBK4i6FK4IUCMgYAEGIITBK4cCaAPwgJXB+fzK4sAgYtCK5EfA4pXR+AmBaIZYCK6KcCAwSjDEYXx/8vK5QRCK4kPK6cDkJREBIMBfgIrDK5svUAIQBAwIaCK4w+DK4YGBK7IaBboIuCK4gFCJwYBBiBCCCgQhHHYgGDgArBK5IGDAYMgJ4Xwn53BGgLVDmBXKAAinDLpJXCAAYhHR4YODn/wJIPyTYZXDE4RXD+ECNILIDAIPwj4xIAAYNCR4fyVIYLFA4KEBBAglKAGUCmcykEAiMQBIURBYM/BgIUEgcz+bTKAH4A/AH4A/AHP/AGY1d+BWCh5X/LCpW1K74fgG/5X/AH5X/K9Bg/K63wK/5XWgBX/K6pWBK/5XU+BWBh5J/K6auCK/5XTVwRfFAH5XOKwRX/K6auDh5I/K6SuDWP5XSVwYADWX6vXK/5XQWQpW/K6auDJP5XWV35XT+Cu/K7Ku/K65H/K6hW/K7EPI35XWIv5XWAH5X/K/4A/K/5X/K/4A/K9cAAH4A/AFzz/AHRX/K/5X/AH5X/K/5X/AH5X/K/4A/K/5X/K/4A/K/5X/K/4A/K/5X/AH5X/K/5X/AH5X/K/5X/AH5X/K/4A/K/5X/K/4A/K/5X/K/4A/K/5X/AH5X/K/5X/AH5X/K/5X/AH5X/K/4A/K/5X/K/4A/K/5X/K/4A/K/5X/AH5X/K/5X/AH5X/K/5X/AH5X/K/4A/K/5X/K/4A/K/5X/K/4A/K/5X/AH5X/K/5X/AH5X/K/40VAH4A/AFzLb+EPDm4AdK/5X/K+PwgEAHy5X9HgMAK/5XXH6xX/H65X/K/5X/K98AK7sAgBX3DjBWFO644DSTHwGzJXED4RXaDoLqcK7weWDIQcXK8I6YK77KXK4o8DPbY6ZK7qvDDy6vdR7JXDh60EDyw5BAIRXYSwjMbAgIhUDwJZCHwJX0GwjRWNwIAEHSwBCDSpXFH4pXzDS5XIEARXVSYbQEDaYzCK+6vcKaxXNDypX9HwQkbHS40COSpXKK2A6CHgRXcPIhX0SwpXYVuQ6EgBX/K644YODBXkSDJX/K/5X/DtRX6gA3YOkRWbLDZX4KwYA/AG8F5vdABncKH4AGhpRJAYXNAgPAKP4AF5vMJwoDBAQIKE6BR/AAvc5vO9wAB7oCB9veAoPcAoPcK+kwh8AgcA98An//gH/+sD//wCISgBJ4IABAYpaC9vdK4UP/9AAQNQr/zgHwEYNQFYQAh+EP+FegH+A4QBCMQIKBAAPNK4yxBA4RXCV4YZBE4IjChwCDmApCK8VdmHggHgFYf0SQJXE5nMK4anCAoYHC5pXCaQJXBop+BqAGEK7f/AAQeEKwQrBqCtDAILjBCQfNK4JTCAYZXF7qvD//gV4S2DgEFFIYAECgIACMC8PKoIBB8n1K4ivF5vc5xOCWYZbBAYavHU4RXCr4pEAEMDfoNQGoMEgEwYQPwAoIBBAAPM5ipC7oDCVIIAE7hXCD4SdBiEP+gGBgihCFYIAz5pXBAAnN7oIB7nc5gOBK4QA/K4pNCWgSpCBInNK/4AGhncKIStC7gCBA4QAC4BR/AAysCABZW/AHwA="));
+}
+
+
+
+// schedule a draw for the next minute
+let rocketInterval;
+var drawTimeout;
+function queueDraw() {
+		if (drawTimeout) clearTimeout(drawTimeout);
+		drawTimeout = setTimeout(function() {
+				drawTimeout = undefined;
+				draw();
+		}, 60000 - (Date.now() % 60000));
+}
+
+
+function clearIntervals() {
+		if (rocketInterval) clearInterval(rocketInterval);
+		rocketInterval = undefined;
+		if (drawTimeout) clearTimeout(drawTimeout);
+		drawTimeout = undefined;
+}
+
+////////////////////////////////////////////
+// TIMER FUNC
+//
+var timer_time = 0;
+var alreadyListenTouch = false;
+function initTouchTimer () {
+		if (alreadyListenTouch) return;
+		alreadyListenTouch = true;
+		
+		Bangle.on('swipe', function(dirX,dirY) {
+				if (canTouch === false) return;
+				var njson = getDataJson();
+        if (!njson) return;
+				
+				if (dirX === -1) {
+						timer_time = 0;
+						delete njson.timer;
+						setDataJson(njson);
+				}
+				else if (dirX === 1) { 
+						var now = new Date().getTime();
+						njson.timer = now + (timer_time * 1000 * 60);
+						Bangle.setLocked(true);
+						setDataJson(njson);
+						Bangle.buzz(200, 0);
+						timer_time = 0;
+				}
+				else if (dirY === -1) { 
+						if (canTouch === false || njson.timer) return;
+						timer_time = timer_time + 5;
+				}
+				else if (dirY === 1) { 
+						if (canTouch === false || njson.timer) return;
+						timer_time = timer_time - 5;
+				}
+				draw();
+		});
+}
+setTimeout(() => {
+		initTouchTimer ();
+});
+
+function getTimerTime() {
+		// if timer_time !== -1, take it
+		if (timer_time !== 0) {
+				return timer_time + "m";
+		} else {
+				// else, show diff between njsontime and now
+				var njson = getDataJson();
+        if (!njson) return false;
+				var now = new Date().getTime();
+				var diff = Math.round((njson.timer - now) / (1000 * 60));
+				//console.log(123, njson, diff, now, njson.timer - now);
+				if (diff > 0) return diff + "m";
+				else if (njson.timer) {
+						Bangle.buzz(1000, 1);
+						console.log("END OF TIMER");
+						delete njson.timer;
+						setDataJson(njson);
+						return false;
+				} else {
+						return false;
+				}
+				// if diff is <0, delete timer from json
+		}
+}
+function drawTimer() {
+		//g.drawString(getTimerTime(), 100, 100);
+		g.setFont("8x12", 2);
+		var t = 97;
+		var l = 105;
+		var time = getTimerTime();
+		if (time || timer_time !== 0) g.drawString(time, l+5, t+0);
+		if (time && timer_time === 0) g.drawImage(getClockBg(), l-20, t+2, { scale: 1 });
+}
+
+
+////////////////////////////////////////////
+// DATA READING
+//
+function getDataJson(){
+		var res = {"tasks":"", "weather":[]};
+		try {
+				res = storage.readJSON('advcasio.data.json');
+		} catch(ex) {
+				return res;
+		}
+		return res;
+}
+function setDataJson(resJson){
+		try {
+				res = storage.writeJSON('advcasio.data.json', resJson);
+		} catch(ex) {
+				return res;
+		}
+		return res;
+}
+var dataJson = getDataJson();
+
+////////////////////////////////////////////
+// WEATHER!
+//
+function drawWeather(arr) {
+		g.setFont("6x8", 1);
+		var p = {l: 8, tText: 40, tIcon:20, decal:25};
+    var today = new Date().getTime();
+    var yesterday = today - (1000 * 60 * 60 * 24);
+    var testday = today + (1000 * 60 * 60 * 24 * 2);
+    //12h auj > 12h hier qui est sup a 0h auj
+    //23h59 hier est sup a 0h auj
+    var j = 0;
+		for(var i = 0; i<arr.length;i++) {
+        if (arr[i][2] > yesterday && j < 4) {
+						g.drawString(arr[i][0], p.l + p.decal*j + 4, p.tText);
+						g.drawImage(iconsWeather[arr[i][1]], p.l + p.decal*j, p.tIcon, { scale: 1 });
+						j++
+        }
+		}
+}
+
+
+////////////////////////////////////////////
+// DRAWING FUNCS
+//
+function drawTasks(str) {
+		g.setFont("6x8", 1);
+		var t = 57;
+		var l = 0;
+		g.drawString(str, l+5, t+0);
+}
+
+function drawSteps() {
+		g.setFont("8x12", 2);
+		var t = 132;
+		var l = 150;
+		g.drawString(getSteps(), l+5, t+0);
+}
+
+
+function drawClock() {
+		g.setFont("7x11Numeric7Seg", 3);
+		g.clearRect(80, 57, 170, 96);
+		g.setColor(255, 255, 255);
+		var l = 77;
+		var t = 57;
+		var w = 170;
+		var h = 116;
+		g.drawRect(l, t, w, h);
+		g.fillRect(l, t, w, h);
+		g.setColor(0, 0, 0);
+		g.drawString(require("locale").time(new Date(), 1), 76, 60);
+		
+		// day
+		//g.setFont("8x12", 1);
+		//g.setFont("9x18", 1);
+		//g.drawString(require("locale").dow(new Date(), 2).toUpperCase(), 25, 136);
+		g.setFont("8x12", 2);
+		g.drawString(require("locale").dow(new Date(), 2), 18, 130);
+		
+		// month
+		g.setFont("8x12");
+		g.drawString(require("locale").month(new Date(), 2).toUpperCase(), 80, 127);
+		
+		// day nb
+		g.setFont("8x12", 2);
+		const time = new Date().getDate();
+		g.drawString(time < 10 ? "0" + time : time, 78, 137);
+}
+
+function drawBattery() {
+		bigThenSmall(E.getBattery(), "%", 140, 23);
+}
+
+
+function getSteps() {
+		var steps = 0;
+		try{
+				if (WIDGETS.wpedom !== undefined) {
+						steps = WIDGETS.wpedom.getSteps();
+				} else if (WIDGETS.activepedom !== undefined) {
+						steps = WIDGETS.activepedom.getSteps();
+				} else {
+						steps = Bangle.getHealthStatus("day").steps;
+				}
+		} catch(ex) {
+				// In case we failed, we can only show 0 steps.
+				return "? k";
+		}
+
+		steps = Math.round(steps/1000);
+		return steps + "k";
+}
+
+
+
+function draw() {
+		
+		queueDraw();
+
+		g.reset();
+		g.clear();
+		g.setColor(255, 255, 255);
+		g.fillRect(0, 0, g.getWidth(), g.getHeight());
+		let background = getBackgroundImage();
+		g.drawImage(background, 0, 0, { scale: 1 });
+		
+		
+		g.setColor(0, 0, 0);
+		if(dataJson && dataJson.weather) drawWeather(dataJson.weather);
+		if(dataJson && dataJson.tasks) drawTasks(dataJson.tasks);
+		
+
+		g.setFontAlign(0,-1);
+		g.setFont("8x12", 2);
+
+		drawSteps();
+		g.setFontAlign(-1,-1);
+		drawClock();
+		drawBattery();
+    drawTimer();
+		// Hide widgets
+		for (let wd of WIDGETS) {wd.draw=()=>{};wd.area="";}
+}
+
+// save batt power, does not seem to work although...
+var canTouch = true;
+Bangle.on("lcdPower", (on) => {
+		if (on) {
+				draw();
+		} else {
+				canTouch = false;
+				clearIntervals();
+		}
+});
+
+
+Bangle.on("lock", (locked) => {
+		clearIntervals();
+		draw();
+		if (!locked) {
+				canTouch = true;
+		} else {
+				canTouch = false;
+    }
+});
+
+
+Bangle.setUI("clock");
+
+// Load widgets, but don't show them
+Bangle.loadWidgets();
+
+g.reset();
+g.clear();
+draw();
--- a/apps/advcasio/app.png
+++ b/apps/advcasio/app.png
--- a/apps/advcasio/data.json
+++ b/apps/advcasio/data.json
@ -0,0 +1 @@
+{"tasks":"", "weather":[]};
--- a/apps/advcasio/metadata.json
+++ b/apps/advcasio/metadata.json
@ -0,0 +1,25 @@
+{ "id": "advcasio",
+  "name": "Advanced Casio Clock",
+  "shortName":"advcasio",
+  "version":"0.03",
+  "description": "An over-engineered clock inspired by Casio watches. It has a 4 days weather, a  timer using swipe and a scratchpad. Can be updated using a dedicated webapp.",
+  "icon": "app.png",
+  "tags": "clock",
+	"type": "clock",
+	"screenshots": [
+			{ "url": "screenshot-clock-1.jpg" },
+			{ "url": "screenshot-clock-2.jpg" },
+			{ "url": "screenshot-clock-3.jpg" },
+			{ "url": "screenshot-webapp.jpg" }
+  ],
+  "supports" : ["BANGLEJS", "BANGLEJS2"],  
+  "readme": "README.md",
+	"allow_emulator":true,
+  "storage": [
+			{"name":"advcasio.app.js","url":"app.js"},
+			{"name":"advcasio.img","url":"app-icon.js","evaluate":true}
+  ],
+	"data": [
+			{ "name": "advcasio.data.json", "url": "data.json", "storageFile": true }
+  ]
+}
--- a/apps/advcasio/screenshot-clock-1.jpg
+++ b/apps/advcasio/screenshot-clock-1.jpg
--- a/apps/advcasio/screenshot-clock-2.jpg
+++ b/apps/advcasio/screenshot-clock-2.jpg
--- a/apps/advcasio/screenshot-clock-3.jpg
+++ b/apps/advcasio/screenshot-clock-3.jpg
--- a/apps/advcasio/screenshot-webapp.jpg
+++ b/apps/advcasio/screenshot-webapp.jpg
--- a/apps/agenda/ChangeLog
+++ b/apps/agenda/ChangeLog
@ -0,0 +1,7 @@
+0.01: Basic agenda with events from GB
+0.02: Added settings page to force calendar sync
+0.03: Disable past events display from settings
+0.04: Added awareness of allDay field
+0.05: Displaying calendar colour and name
+0.06: Added clkinfo for clocks.
+0.07: Clkinfo improvements.
--- a/apps/agenda/README.md
+++ b/apps/agenda/README.md
@ -0,0 +1,30 @@
+# Agenda
+
+Basic agenda reading the events synchronised from GadgetBridge.
+
+### Functionalities
+
+* List all events in the next week (or whatever is synchronized)
+* Optionally view past events (until GB removes them)
+* Show start time and location of the events in the list
+* Show the colour of the calendar in the list
+* Display description, location and calendar name after tapping on events
+
+### Troubleshooting
+
+For the events sync to work, GadgetBridge needs to have the calendar permission and calendar sync should be enabled in the devices settings (gear sign in GB, also check the blacklisted calendars there, if events are missing).  
+Keep in mind that GadgetBridge won't synchronize all events on your calendar, just the ones in a time window of 7 days (you don't want your watch to explode), ideally every day old events get deleted since they appear out of such window.
+
+#### Force Sync
+
+If for any reason events still cannot sync or some are missing, you can try any of the following (just one, you normally don't need to do this):
+1. from GB open the burger menu (side), tap debug and set time.
+2. from the bangle, open settings > apps > agenda > Force calendar sync, then select not to delete the local events (this is equivalent to option 1).
+3. do like option 2 but delete events, GB will synchronize a fresh database instead of patching the old one (good in case you somehow cannot get rid of older events)
+
+After any of the options, you may need to disconnect/force close Gadgetbridge before reconnecting and let it sync (give it some time for that too), restart the agenda app on the bangle after a while to see the changes.
+
+### Report a bug
+
+You can easily open an issue in the espruino repo, but I won't be notified and it might take time.  
+If you want a (hopefully) quicker response, just report [on my fork](https://github.com/glemco/BangleApps).
--- a/apps/agenda/agenda-icon.js
+++ b/apps/agenda/agenda-icon.js
@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwg1yhGIxAPMBwIPFhH//GAC5n/C4oHBC5/IGwoXBHQQAKC4OIFAWOxHv9GO9wAKI4XoC4foEIIWLC4IABC4gIBFxnuE4IqBC4gARC4ZzNAAwXaxe7ACO4C625C4m4xIJBzAeCxGbCAOIFgQOBC4pOBxe4AYIPBAYQKCAYYXE3GL/ADBx/oxb3BC4X+xG4xwOBC4uP/YDB54MBf4Po3eM/4XBx/+C4pTBGIIkBLgOYAYIvB9GJBwI6BL45zCL4aCCL4h3GU64ALdYS1CI55bBAAgXFO4mMO4QDBDIO/////YxBU53IxIVB/GfDAWYa5wtC/GPAYWIL4wXBL4oSBC4jcBC4m4QIWYSwWIIQIAG/CnMMAIAC/JLCMIIvMIwZHFJAJfLC5yPHAYIRDAoy/KCIi7BMon4d4+Od4IXBxAZBEQLtB/+YxIXDL4SLCL4WPzAXCNgRFBLIKnKLIrcEI4gXNAAp3CxGZAAzCBC5KnCKAIAICxBlBC4IAJxG/C4/4wAXLhBgD/IcD3AXMGAIqDDgRGNGAoXDFxxhEI4W4FxwwCaoYWBFx4YDAAQWRAEQ"))
--- a/apps/agenda/agenda.clkinfo.js
+++ b/apps/agenda/agenda.clkinfo.js
@ -0,0 +1,29 @@
+(function() {
+    var agendaItems = {
+        name: "Agenda",
+        img: atob("GBiBAf////////85z/AAAPAAAPgAAP////AAAPAAAPAAAPAAAOAAAeAAAeAAAcAAA8AAAoAABgAADP//+P//8PAAAPAAAPgAAf///w=="),
+        items: []
+      };
+
+      var now = new Date();
+      var agenda = storage.readJSON("android.calendar.json")
+              .filter(ev=>ev.timestamp + ev.durationInSeconds > now/1000)
+              .sort((a,b)=>a.timestamp - b.timestamp);
+
+      agenda.forEach((entry, i) => {
+
+        var title = entry.title.slice(0,18);
+        var date = new Date(entry.timestamp*1000);
+        var dateStr = locale.date(date).replace(/\d\d\d\d/,"");
+        dateStr += entry.durationInSeconds < 86400 ? "/ " + locale.time(date,1) : "";
+
+        agendaItems.items.push({
+          name: null,
+          get: () => ({ text: title + "\n" + dateStr, img: null}),
+          show: function() { agendaItems.items[i].emit("redraw"); },
+          hide: function () {}
+        });
+      });
+
+    return agendaItems;
+})
--- a/apps/agenda/agenda.js
+++ b/apps/agenda/agenda.js
@ -0,0 +1,138 @@
+/* CALENDAR is a list of:
+  {id:int,
+    type,
+    timestamp,
+    durationInSeconds,
+    title,
+    description,
+    location,
+    color:int,
+    calName,
+    allDay: bool,
+  }
+*/
+
+Bangle.loadWidgets();
+Bangle.drawWidgets();
+
+var FILE = "android.calendar.json";
+
+var Locale = require("locale");
+
+var fontSmall = "6x8";
+var fontMedium = g.getFonts().includes("6x15")?"6x15":"6x8:2";
+var fontBig = g.getFonts().includes("12x20")?"12x20":"6x8:2";
+var fontLarge = g.getFonts().includes("6x15")?"6x15:2":"6x8:4";
+
+//FIXME maybe write the end from GB already? Not durationInSeconds here (or do while receiving?)
+var CALENDAR = require("Storage").readJSON("android.calendar.json",true)||[];
+var settings = require("Storage").readJSON("agenda.settings.json",true)||{};
+
+CALENDAR=CALENDAR.sort((a,b)=>a.timestamp - b.timestamp);
+
+function getDate(timestamp) {
+  return new Date(timestamp*1000);
+}
+function formatDateLong(date, includeDay, allDay) {
+  let shortTime = Locale.time(date,1)+Locale.meridian(date);
+  if(allDay) shortTime = "";
+  if(includeDay || allDay)
+    return Locale.date(date)+" "+shortTime;
+  return shortTime;
+}
+function formatDateShort(date, allDay) {
+  return Locale.date(date).replace(/\d\d\d\d/,"")+(allDay?
+    "" : Locale.time(date,1)+Locale.meridian(date));
+}
+
+var lines = [];
+function showEvent(ev) {
+  var bodyFont = fontBig;
+  if(!ev) return;
+  g.setFont(bodyFont);
+  //var lines = [];
+  if (ev.title) lines = g.wrapString(ev.title, g.getWidth()-10);
+  var titleCnt = lines.length;
+  var start = getDate(ev.timestamp);
+  var end = getDate((+ev.timestamp) + (+ev.durationInSeconds));
+  var includeDay = true;
+  if (titleCnt) lines.push(""); // add blank line after title
+  if(start.getDay() == end.getDay() && start.getMonth() == end.getMonth())
+    includeDay = false;
+  if(includeDay || ev.allDay) {
+    lines = lines.concat(
+      /*LANG*/"Start:",
+      g.wrapString(formatDateLong(start, includeDay, ev.allDay), g.getWidth()-10),
+      /*LANG*/"End:",
+      g.wrapString(formatDateLong(end, includeDay, ev.allDay), g.getWidth()-10));
+  } else {
+    lines = lines.concat(
+      g.wrapString(Locale.date(start), g.getWidth()-10),
+      g.wrapString(/*LANG*/"Start"+": "+formatDateLong(start, includeDay, ev.allDay), g.getWidth()-10),
+      g.wrapString(/*LANG*/"End"+": "+formatDateLong(end, includeDay, ev.allDay), g.getWidth()-10));
+  }
+  if(ev.location)
+    lines = lines.concat(/*LANG*/"Location"+": ", g.wrapString(ev.location, g.getWidth()-10));
+  if(ev.description)
+    lines = lines.concat("",g.wrapString(ev.description, g.getWidth()-10));
+  if(ev.calName)
+    lines = lines.concat(/*LANG*/"Calendar"+": ", g.wrapString(ev.calName, g.getWidth()-10));
+  lines = lines.concat(["",/*LANG*/"< Back"]);
+  E.showScroller({
+    h : g.getFontHeight(), // height of each menu item in pixels
+    c : lines.length, // number of menu items
+    // a function to draw a menu item
+    draw : function(idx, r) {
+      // FIXME: in 2v13 onwards, clearRect(r) will work fine. There's a bug in 2v12
+      g.setBgColor(idx<titleCnt ? g.theme.bg2 : g.theme.bg).
+        setColor(idx<titleCnt ? g.theme.fg2 : g.theme.fg).
+        clearRect(r.x,r.y,r.x+r.w, r.y+r.h);
+      g.setFont(bodyFont).drawString(lines[idx], r.x, r.y);
+    }, select : function(idx) {
+      if (idx>=lines.length-2)
+        showList();
+    },
+    back : () => showList()
+  });
+}
+
+function showList() {
+  //it might take time for GB to delete old events, decide whether to show them grayed out or hide entirely
+  if(!settings.pastEvents) {
+    let now = new Date();
+    //TODO add threshold here?
+    CALENDAR = CALENDAR.filter(ev=>ev.timestamp + ev.durationInSeconds > now/1000);
+  }
+  if(CALENDAR.length == 0) {
+    E.showMessage("No events");
+    return;
+  }
+  E.showScroller({
+    h : 52,
+    c : Math.max(CALENDAR.length,3), // workaround for 2v10.219 firmware (min 3 not needed for 2v11)
+    draw : function(idx, r) {"ram"
+      var ev = CALENDAR[idx];
+      g.setColor(g.theme.fg);
+      g.clearRect(r.x,r.y,r.x+r.w, r.y+r.h);
+      if (!ev) return;
+      var isPast = false;
+      var x = r.x+2, title = ev.title;
+      var body = formatDateShort(getDate(ev.timestamp),ev.allDay)+"\n"+(ev.location?ev.location:/*LANG*/"No location");
+      if(settings.pastEvents) isPast = ev.timestamp + ev.durationInSeconds < (new Date())/1000;
+      if (title) g.setFontAlign(-1,-1).setFont(fontBig)
+        .setColor(isPast ? "#888" : g.theme.fg).drawString(title, x+4,r.y+2);
+      if (body) {
+        g.setFontAlign(-1,-1).setFont(fontMedium).setColor(isPast ? "#888" : g.theme.fg);
+        g.drawString(body, x+10,r.y+20);
+      }
+      g.setColor("#888").fillRect(r.x,r.y+r.h-1,r.x+r.w-1,r.y+r.h-1); // dividing line between items
+      if(ev.color) {
+        g.setColor("#"+(0x1000000+Number(ev.color)).toString(16).padStart(6,"0"));
+        g.fillRect(r.x,r.y+4,r.x+3, r.y+r.h-4);
+      }
+    },
+    select : idx => showEvent(CALENDAR[idx]),
+    back : () => load()
+  });
+}
+showList();
--- a/apps/agenda/agenda.png
+++ b/apps/agenda/agenda.png
--- a/apps/agenda/metadata.json
+++ b/apps/agenda/metadata.json
@ -0,0 +1,19 @@
+{
+  "id": "agenda",
+  "name": "Agenda",
+  "version": "0.07",
+  "description": "Simple agenda",
+  "icon": "agenda.png",
+  "screenshots": [{"url":"screenshot_agenda_overview.png"}, {"url":"screenshot_agenda_event1.png"}, {"url":"screenshot_agenda_event2.png"}],
+  "tags": "agenda",
+  "supports": ["BANGLEJS","BANGLEJS2"],
+  "readme": "README.md",
+  "allow_emulator": true,
+  "storage": [
+    {"name":"agenda.app.js","url":"agenda.js"},
+    {"name":"agenda.settings.js","url":"settings.js"},
+    {"name":"agenda.clkinfo.js","url":"agenda.clkinfo.js"},
+    {"name":"agenda.img","url":"agenda-icon.js","evaluate":true}
+  ],
+  "data": [{"name":"agenda.settings.json"}]
+}
--- a/apps/agenda/screenshot_agenda_event1.png
+++ b/apps/agenda/screenshot_agenda_event1.png
--- a/apps/agenda/screenshot_agenda_event2.png
+++ b/apps/agenda/screenshot_agenda_event2.png
--- a/apps/agenda/screenshot_agenda_overview.png
+++ b/apps/agenda/screenshot_agenda_overview.png
--- a/apps/agenda/settings.js
+++ b/apps/agenda/settings.js
@ -0,0 +1,48 @@
+(function(back) {
+  function gbSend(message) {
+    Bluetooth.println("");
+    Bluetooth.println(JSON.stringify(message));
+  }
+  var settings = require("Storage").readJSON("agenda.settings.json",1)||{};
+  function updateSettings() {
+    require("Storage").writeJSON("agenda.settings.json", settings);
+  }
+  var CALENDAR = require("Storage").readJSON("android.calendar.json",true)||[];
+  var mainmenu = {
+    "" : { "title" : "Agenda" },
+    "< Back" : back,
+    /*LANG*/"Connected" : { value : NRF.getSecurityStatus().connected?/*LANG*/"Yes":/*LANG*/"No" },
+    /*LANG*/"Force calendar sync" : () => {
+      if(NRF.getSecurityStatus().connected) {
+        E.showPrompt(/*LANG*/"Do you want to also clear the internal database first?", {
+            buttons: {/*LANG*/"Yes": 1, /*LANG*/"No": 2, /*LANG*/"Cancel": 3}
+        }).then((v)=>{
+            switch(v) {
+                case 1:
+                    require("Storage").writeJSON("android.calendar.json",[]);
+                    CALENDAR = [];
+                    /* falls through */
+                case 2:
+                    gbSend({t:"force_calendar_sync", ids: CALENDAR.map(e=>e.id)});
+                    E.showAlert(/*LANG*/"Request sent to the phone").then(()=>E.showMenu(mainmenu));
+                    break;
+                case 3:
+                default:
+                    E.showMenu(mainmenu);
+                    return;
+            }
+        });
+      } else {
+        E.showAlert(/*LANG*/"You are not connected").then(()=>E.showMenu(mainmenu));
+      }
+    },
+    /*LANG*/"Show past events" : {
+      value : !!settings.pastEvents,
+      onchange: v => {
+        settings.pastEvents = v;
+        updateSettings();
+      }
+    },
+  };
+  E.showMenu(mainmenu);
+})
--- a/apps/agpsdata/ChangeLog
+++ b/apps/agpsdata/ChangeLog
@ -0,0 +1,4 @@
+0.01: First, proof of concept
+0.02: Load AGPS data on app start and automatically in background
+0.03: Do not load AGPS data on boot
+      Increase minimum interval to 6 hours
--- a/apps/agpsdata/README.md
+++ b/apps/agpsdata/README.md
@ -0,0 +1,19 @@
+# A-GPS Data
+
+Load assisted GPS (A-GPS) data directly to your Bangle.js using the new http requests on Android GadgetBridge.
+
+Will download A-GPS data in background (if enabled in settings).
+
+The GNSS type can be configured in the settings.
+
+Make sure:
+* your GadgetBridge version supports http requests
+* turn on internet access in GadgetBridge settings
+
+Currently proof of concept on Bangle.js 2 only.
+
+## Creator
+[@pidajo](https://github.com/pidajo)
+
+## Contributor
+[@myxor](https://github.com/myxor)
--- a/apps/agpsdata/agpsdata-icon.js
+++ b/apps/agpsdata/agpsdata-icon.js
@ -0,0 +1 @@
+atob("MDCEAAAAAAAAAAAAAAAAiIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAIiIiAAAAAAAAAAAAAAAAAAAAAAAAAAAAIiIiAAAAAAAAAAAAAAAAAAAAAAAAAAACIiIiIAAAAAAAAAAAAAAAAAAAAAAAAAACIiIiIAAAAAAAAAAAAAAAAAAAAAAAAAACIiIiIAAAAAAAAAAAAAAAAAAAAAAAAAAiIiIiIgAAAAAAAAAAAAAAAAAAAAAAAAAiIiIiIgAAAAAAAAAAAAAAAAAAAAAAAAIiIOIiIiAAAAAAAAAAAAAAAAAAAAAAAAIiDOIiIiAAAAAAAAAAAAAAAAAAAAAAAAIiDOIiIiIAAAAAAAAAAAAAAAAAAAAAACIiPOIiIiIAAAAAAAAAAAAAAAAAAAAAAiIj/OIiIiIgAAAAAAAAAAAAAAAAAAAAAiI//OIiIiIgAAAAAAAAAAAAAAAAAAAAAiI//OIiIiIiAAAAAAAAAAAAAAAAAAAAAiD//OIiIiIiAAAAAAAAAAAAAAAAAAAAIiP//OIiIiIiAAAAAAAAAAAAAAAAAAAAIg///OIiIiIiIAAAAAAAAAAAAAAAAAACIj///OIiIiIiIAAAAAAAAAAAAAAAAAACIP///OIiIiIiIgAAAAAAAAAAAAAAAAACI////OIiIiIiIgAAAAAAAAAAAAAAAAAiD////OIiIiIiIiAAAAAAAAAAAAAAAAAiP////OIiIiIiIiAAAAAAAAAAAAAAAAIiP////OIiIiIiIiIAAAAAAAAAAAAAAAIj/////OIiIiIiIiIAAAAAAAAAAAAAACIj/////OIiIiIiIiIgAAAAAAAAAAAAACI//////OIiIiIiIiIgAAAAAAAAAAAAAiI//////OIiIiIiIiIgAAAAAAAAAAAAAiIiIiIiIgzMzMzMziIiAAAAAAAAAAAAAiIiIiIiIj///////+IiAAAAAAAAAAAAIiIiIiIiIj////////4iIAAAAAAAAAAAIiIiIiIiIgzMzMzMzM4iIAAAAAAAAAACIP///////OIiIiIiIiIiIgAAAAAAAAACI////////OIiIiIiIiIiIgAAAAAAAAAiI////////OIiIiIiIiIiIiAAAAAAAAAiP////////OIiIiIiIiIiIiAAAAAAAAIiP////////OIiIiIiIiIiIiIAAAAAAAIj/////////OIiIiIiIiIiIiIAAAAAACIj////////ziIiIiIiIiIiIiIgAAAAACIP///////+IiIiIiIiIiIiIiIgAAAAACI//////84gYiIiIiIiIiIiIiIgAAAAAiD////84iIiAAAiIiIiIiIiIiIiAAAAAiP///ziIiIAAAAAIiIiIiIiIiIiAAAAIg/8ziIiIAAAAAAAAAIiIiIiIiIiIAAAIj/iIiIAAAAAAAAAAAAAIiIiIiIiIAACIiIiBgAAAAAAAAAAAAAAACIiIiIiIgACIiIgAAAAAAAAAAAAAAAAAAACIiIiIgACIgAAAAAAAAAAAAAAAAAAAAAAAiIiIgA==")
--- a/apps/agpsdata/agpsdata.png
+++ b/apps/agpsdata/agpsdata.png
--- a/apps/agpsdata/app.js
+++ b/apps/agpsdata/app.js
@ -0,0 +1,54 @@
+function display(text1, text2) {
+  g.reset();
+  g.clear();
+  var img = require("Storage").read("agpsdata.img");
+  if (img) {
+    g.drawImage(img, g.getWidth() - 48, g.getHeight() - 48 - 24);
+  }
+  g.setFont("Vector", 18);
+  g.setFontAlign(0, 1);
+  g.drawString(text1, g.getWidth() / 2, g.getHeight() / 3 + 24);
+  if (text2 != undefined) {
+    g.setFont("Vector", 12);
+    g.setFontAlign(-1, -1);
+    g.drawString(text2, 5, g.getHeight() / 3 + 29);
+  }
+  Bangle.drawWidgets();
+}
+
+// Show launcher when middle button pressed
+// Load widgets
+Bangle.loadWidgets();
+Bangle.drawWidgets();
+
+let waiting = false;
+
+function start() {
+  g.reset();
+  g.clear();
+  waiting = false;
+  display("Retry?", "touch to retry");
+  Bangle.on("touch", () => { updateAgps(); });
+}
+
+function updateAgps() {
+  g.reset();
+  g.clear();
+  if (!waiting) {
+    waiting = true;
+    display("Updating A-GPS...");
+    require("agpsdata").pull(function() {
+      waiting = false;
+      display("A-GPS updated.", "touch to close");
+      Bangle.on("touch", () => { load(); });
+    },
+    function(error) {
+      waiting = false;
+      E.showAlert(error, "Error")
+                    .then(() => { start(); });
+    });
+  } else {
+    display("Waiting...");
+  }
+}
+updateAgps();
--- a/apps/agpsdata/boot.js
+++ b/apps/agpsdata/boot.js
@ -0,0 +1,26 @@
+(function() {
+  let waiting = false;
+  let settings = require("Storage").readJSON("agpsdata.settings.json", 1) || {
+    enabled: true,
+    refresh: 1440
+  };
+  
+  if (settings.refresh == undefined) settings.refresh = 1440;
+
+  function successCallback(){
+    waiting = false;
+  }
+
+  function errorCallback(){
+    waiting = false;
+  }
+
+  if (settings.enabled) {
+    setInterval(() => {
+      if (!waiting && NRF.getSecurityStatus().connected){
+        waiting = true;
+        require("agpsdata").pull(successCallback, errorCallback);
+      }
+    }, settings.refresh * 1000 * 60);
+  }
+})();
--- a/apps/agpsdata/default.json
+++ b/apps/agpsdata/default.json
@ -0,0 +1 @@
+{"enabled":true,"refresh":1440,"gnsstype":1}
--- a/apps/agpsdata/lib.js
+++ b/apps/agpsdata/lib.js
@ -0,0 +1,75 @@
+function readSettings() {
+  settings = Object.assign(
+      require('Storage').readJSON("agpsdata.default.json", true) || {},
+      require('Storage').readJSON(FILE, true) || {});
+}
+
+var FILE = "agpsdata.settings.json";
+var settings;
+readSettings();
+
+function setAGPS(data) {
+  var js = jsFromBase64(data);
+  try {
+    eval(js);
+    return true;
+  }
+  catch(e) {
+    console.log("error:", e);
+  }
+  return false;
+}
+
+function jsFromBase64(b64) {
+  var bin = atob(b64);
+  var chunkSize = 128;
+  var js = "Bangle.setGPSPower(1);\n"; // turn GPS on
+  var gnsstype = settings.gnsstype || 1; // default GPS
+  js += `Serial1.println("${CASIC_CHECKSUM("$PCAS04,"+gnsstype)}")\n`; // set GNSS mode
+  // 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) {
+    var chunk = bin.substr(i,chunkSize);
+    js += `Serial1.write(atob("${btoa(chunk)}"))\n`;
+  }
+  return js;
+}
+
+function CASIC_CHECKSUM(cmd) {
+  var cs = 0;
+  for (var i=1;i<cmd.length;i++)
+    cs = cs ^ cmd.charCodeAt(i);
+  return cmd+"*"+cs.toString(16).toUpperCase().padStart(2, '0');
+}
+
+function updateLastUpdate() {
+  const file = "agpsdata.json";
+  let data = require("Storage").readJSON(file, 1) || {};
+  data.lastUpdate = Math.round(Date.now());
+  require("Storage").writeJSON(file, data);
+}
+
+exports.pull = function(successCallback, failureCallback) {
+  let uri = "https://www.espruino.com/agps/casic.base64";
+  if (Bangle.http){
+    Bangle.http(uri, {timeout:10000}).then(event => {
+      let result = setAGPS(event.resp);
+      if (result) {
+          updateLastUpdate();
+          if (successCallback) successCallback();
+      } else {
+          console.log("error applying AGPS data");
+          if (failureCallback) failureCallback("Error applying AGPS data");
+      }
+    }).catch((e)=>{
+      console.log("error", e);
+      if (failureCallback) failureCallback(e);
+    });
+  } else {
+    console.log("error: No http method found");
+    if (failureCallback) failureCallback(/*LANG*/"No http method");
+  }
+};
--- a/apps/agpsdata/metadata.json
+++ b/apps/agpsdata/metadata.json
@ -0,0 +1,24 @@
+{ "id": "agpsdata",
+  "name": "A-GPS Data Downloader App",
+  "shortName":"A-GPS Data",
+  "icon": "agpsdata.png",
+  "version":"0.03",
+  "description": "Once installed, this app allows you to download assisted GPS (A-GPS) data directly to your Bangle.js **via Gadgetbridge on an Android phone** when you run the app. If you just want to upload the latest AGPS data from this app loader, please use the `Assisted GPS Update (AGPS)` app.",
+  "tags": "boot,tool,assisted,gps,agps,http",
+  "allow_emulator":true, 
+  "supports": ["BANGLEJS2"],
+  "readme":"README.md",
+  "screenshots" : [ { "url":"screenshot.png" }, { "url":"screenshot2.png" } ],
+  "storage": [
+    {"name":"agpsdata.app.js","url":"app.js"},
+    {"name":"agpsdata.img","url":"agpsdata-icon.js","evaluate":true},
+    {"name":"agpsdata.default.json","url":"default.json"},
+    {"name":"agpsdata.boot.js","url":"boot.js"},
+    {"name":"agpsdata","url":"lib.js"},
+    {"name":"agpsdata.settings.js","url":"settings.js"}
+  ],
+  "data": [
+    {"name": "agpsdata.json"},
+    {"name": "agpsdata.settings.json"}
+  ]
+}
--- a/apps/agpsdata/screenshot.png
+++ b/apps/agpsdata/screenshot.png
--- a/apps/agpsdata/screenshot2.png
+++ b/apps/agpsdata/screenshot2.png
--- a/apps/agpsdata/settings.js
+++ b/apps/agpsdata/settings.js
@ -0,0 +1,71 @@
+(function(back) {
+function writeSettings(key, value) {
+  var s = Object.assign(
+      require('Storage').readJSON(settingsDefaultFile, true) || {},
+      require('Storage').readJSON(settingsFile, true) || {});
+  s[key] = value;
+  require('Storage').writeJSON(settingsFile, s);
+  readSettings();
+}
+
+function readSettings() {
+  settings = Object.assign(
+      require('Storage').readJSON(settingsDefaultFile, true) || {},
+      require('Storage').readJSON(settingsFile, true) || {});
+}
+
+var settingsFile = "agpsdata.settings.json";
+var settingsDefaultFile = "agpsdata.default.json";
+
+var settings;
+readSettings();
+
+const gnsstypes = [
+  "", "GPS", "BDS", "GPS+BDS", "GLONASS", "GPS+GLONASS", "BDS+GLONASS",
+  "GPS+BDS+GLON."
+];
+
+function buildMainMenu() {
+  var mainmenu = {
+    '' : {'title' : 'AGPS download'},
+    '< Back' : back,
+    "Enabled" : {
+      value : !!settings.enabled,
+      onchange : v => { writeSettings("enabled", v); }
+    },
+    "Refresh every" : {
+      value : settings.refresh / 60,
+      min : 6,
+      max : 168,
+      step : 1,
+      format : v => v + "h",
+      onchange : v => { writeSettings("refresh", Math.round(v * 60)); }
+    },
+    "GNSS type" : {
+      value : settings.gnsstype,
+      min : 1,
+      max : 7,
+      step : 1,
+      format : v => gnsstypes[v],
+      onchange : x => writeSettings('gnsstype', x)
+    },
+    "Force refresh" : () => {
+      E.showMessage("Loading A-GPS data");
+      require("agpsdata")
+          .pull(
+              function() {
+                E.showAlert("Success").then(
+                    () => { E.showMenu(buildMainMenu()); });
+              },
+              function(error) {
+                E.showAlert(error, "Error")
+                    .then(() => { E.showMenu(buildMainMenu()); });
+              });
+    }
+  };
+
+  return mainmenu;
+}
+
+E.showMenu(buildMainMenu());
+});
--- a/apps/aiclock/ChangeLog
+++ b/apps/aiclock/ChangeLog
@ -0,0 +1,2 @@
+0.01: New app!
+0.02: Design improvements and fixes.
--- a/apps/aiclock/README.md
+++ b/apps/aiclock/README.md
@ -0,0 +1,21 @@
+# AI Clock
+This clock was designed by stable diffusion ([paper](https://arxiv.org/abs/2112.10752)) using the following prompt:
+
+`A rectangle banglejs watchface`
+
+
+The original output of stable diffusion is shown here:
+
+![](orig.png)
+
+And my implementation is shown here:
+
+![](impl.png)
+
+
+# Thanks to
+The great open source community: I used an open source diffusion model (https://github.com/CompVis/stable-diffusion)
+to generate a watch face for the open source smartwatch BangleJs.
+
+## Creator
+- [David Peer](https://github.com/peerdavid).
--- a/apps/aiclock/aiclock.app.js
+++ b/apps/aiclock/aiclock.app.js
@ -0,0 +1,218 @@
+/**
+ * AI Clock
+ */
+require("Font7x11Numeric7Seg").add(Graphics);
+Graphics.prototype.setFontGochiHand = function(scale) {
+    // Actual height 27 (29 - 3)
+    this.setFontCustom(
+      atob('AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOAAAAAA8AAAAADwAAAAAPAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAA/+AAAB//4AAH///gAH///gAAf//AAAB/+AAAAH8AAAAAAAAAAAAAAAAAAAAH8AAAAB/8AAAAP/4AAAB//wAAAPx/AAAB8B+AAAHgD4AAA+AHgAADwAeAAAPAB4AAA8AHgAAD4AeAAAPgB4AAAeAPgAAB8A8AAAH4HwAAAP/+AAAAf/wAAAA/+AAAAB/wAAAAB8AAAAAAAAAAADgAAAAAfAAAAAB4AAAAAPAAAAAB8AAAAAHgAAAAA8AAAAADwAAAAAf4AAAAB//8AAAD//4AAAH//gAAAD/+AAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA4AHgAAHgA+AAA/AD4AAD4AfgAAfAD+AAB4Af4AAHgD/gAAeAfeAAB4D54AAHw/HgAAf/4fAAA//B8AAD/4DwAAH+APAAAHgA8AAAAADwAAAAAOAAAAAAAAABgAAAAAPAAAAAB8AAAAAHwAYAAAeAD4AAD4APwAAPA4fgAA8Hw+AADwfB4AAPh4HwAA+HgPAAB/+A8AAH/4DwAAP/weAAAf/j4AAAc//gAAAB/8AAAAD/gAAAAD8AAAAAAAAAAAAAAAAAADAAAAAA+AAAAAP4AAAAB/wAAAAP/AAAAD+8AAAAfzwAAAf8HAAAB/gcAAAH/hwAAAf//gAAA//+AAAAf//gAAAP//gAAAD/+AAAAB/4AAAAH/AAAAAeAAAAAAgAAAAAAAAAAAAcAAAB8H8AAAP4f4AAA/x/wAAD/H/gAAf+A+AAB74B4AAHnwHgAAefAfAAB58A8AAHj4DwAAePgPAAB4fA8AAHh+HgAAeD8+AAB4P/4AAHgf/AAAeA/4AAAAA+AAAAAAAAAAAAAAAAAAHgAAAAD/wAAAA//gAAAH//AAAA//+AAAD4H8AAAfA/wAAB4D/AAAHgP+AAAeB54AAB4HngAAHweeAAAfB54AAA4HngAAAAeeAAAAB/4AAAAH/AAAAAP4AAAAAfAAADwAAAAAPAAAAAA8HgAAADweAAAAPB4AAAA8HgAAADweAAAAPh4AAAA+HgAAAB4eAAAAHx4AAAAf//8AAA///wAAD//+AAAH//4AAAAeAAAAAB4AAAAAHgAAAAAeAAAAAB4AAAAAHgAAAAAAAAAAAAAAAAAAD+AAAA+f+AAAH//8AAA///wAAH/4fgAAePgeAAB4+B4AAHj4HwAAePgPAAB4+A8AAHz4DwAAfngeAAA//B4AAD/+HgAAH//8AAAP//wAAAAf+AAAAA/wAAAAAYAAAAAAAAAAA/gAAAAH/AAAAA/8AAAAD34AAAAeHgAAAB4eAAAAHh4AAAA8HgAAADweAAAAPDwAAAA8PAAAADx4AAAAPvgAAAAf///AAB///8AAH///wAAP///AAA/wA4AABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOA4AAAA8DwAAADwPAAAAPA8AAAAYBgAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=='),
+      46,
+      atob("DQoXEBQVExUUFRYUDQ=="),
+      40+(scale<<8)+(1<<16)
+    );
+    return this;
+}
+
+/*
+ * Set some important constants such as width, height and center
+ */
+var W = g.getWidth(),R=W/2;
+var H = g.getHeight();
+var cx = W/2;
+var cy = H/2;
+var drawTimeout;
+
+/*
+ * Based on the great multi clock from https://github.com/jeffmer/BangleApps/
+ */
+Graphics.prototype.drawRotRect = function(w, r1, r2, angle) {
+    angle = angle % 360;
+    var w2=w/2, h=r2-r1, theta=angle*Math.PI/180;
+    return this.fillPoly(this.transformVertices([-w2,0,-w2,-h,w2,-h,w2,0],
+        {x:cx+r1*Math.sin(theta),y:cy-r1*Math.cos(theta),rotate:theta}));
+};
+
+
+function drawBackground() {
+    g.setFontAlign(0,0);
+    g.setColor(g.theme.fg);
+
+    y = 0;
+    while(y < H){
+        y += 3 + Math.floor(Math.random() * 10);
+        g.drawLine(0, y, W, y);
+        g.drawLine(0, y+1, W, y+1);
+        g.drawLine(0, y+2, W, y+2);
+        y += 2;
+    }
+}
+
+
+function drawCircle(isLocked){
+    g.setColor(g.theme.fg);
+    g.fillCircle(cx, cy, 12);
+
+    var c = isLocked ? "#f00" : g.theme.bg;
+    g.setColor(c);
+    g.fillCircle(cx, cy, 6);
+}
+
+function toAngle(a){
+    if (a < 0){
+        return 360 + a;
+    }
+
+    if(a > 360) {
+        return 360 - a;
+    }
+
+    return a
+}
+
+function drawTime(){
+    var drawHourHand = g.drawRotRect.bind(g,8,12,R-38);
+    var drawMinuteHand = g.drawRotRect.bind(g,6,12,R-12 );
+
+    g.setFontAlign(0,0);
+
+    // Compute angles
+    var date = new Date();
+    var m = parseInt(date.getMinutes() * 360 / 60);
+    var h = date.getHours();
+    h = h > 12 ? h-12 : h;
+    h += date.getMinutes()/60.0;
+    h = parseInt(h*360/12);
+
+    // Draw minute and hour bg
+    g.setColor(g.theme.bg);
+    drawHourHand(toAngle(h-3));
+    drawHourHand(toAngle(h+3));
+    drawMinuteHand(toAngle(m-2));
+    drawMinuteHand(toAngle(m+3));
+
+    // Draw minute and hour fg
+    g.setColor(g.theme.fg);
+    drawHourHand(h);
+    drawMinuteHand(m);
+}
+
+
+
+function drawDate(){
+    var date = new Date();
+    g.setFontAlign(0,0);
+    g.setFontGochiHand();
+
+    var text = ("0"+date.getDate()).substr(-2) + "/" + ("0"+date.getMonth()).substr(-2);
+    var w = g.stringWidth(text);
+    g.setColor(g.theme.bg);
+    g.fillRect(cx-w/2-4, 20, cx+w/2+4, 40+12);
+
+    g.setColor(g.theme.fg);
+    // Draw right line as designed by stable diffusion
+    g.drawLine(cx+w/2+5, 20, cx+w/2+5, 40+12);
+    g.drawLine(cx+w/2+6, 20, cx+w/2+6, 40+12);
+    g.drawLine(cx+w/2+7, 20, cx+w/2+7, 40+12);
+
+    // And finally the text
+    g.drawString(text, cx, 40);
+}
+
+
+function drawDigits(){
+    var date = new Date();
+
+    g.setFontAlign(0,0);
+    g.setFont("7x11Numeric7Seg",3);
+
+    var text = ("0"+date.getHours()).substr(-2) + ":" + ("0"+date.getMinutes()).substr(-2); //Bangle.getHealthStatus("day").steps;
+    var w = g.stringWidth(text);
+    g.setColor(g.theme.bg);
+    g.fillRect(cx-w/2-4, 120, cx+w/2+4, 140+20);
+
+    // Draw right line as designed by stable diffusion
+    g.setColor(g.theme.fg);
+    g.drawLine(cx+w/2+5, 120, cx+w/2+5, 140+20);
+    g.drawLine(cx+w/2+6, 120, cx+w/2+6, 140+20);
+    g.drawLine(cx+w/2+7, 120, cx+w/2+7, 140+20);
+
+    // And the 7set text
+    g.setColor("#BBB");
+    g.drawString("88:88", cx, 140);
+    g.drawString("88:88", cx+1, 140);
+    g.drawString("88:88", cx, 141);
+
+    g.setColor(g.theme.fg);
+    g.drawString(text, cx, 140);
+    g.drawString(text, cx+1, 140);
+    g.drawString(text, cx, 141);
+}
+
+
+
+function draw(){
+    // Queue draw in one minute
+    queueDraw();
+
+
+    g.reset();
+    g.clearRect(0, 0, g.getWidth(), g.getHeight());
+
+    g.setColor(1,1,1);
+    drawBackground();
+    drawDate();
+    drawDigits();
+    drawTime();
+    drawCircle(Bangle.isLocked());
+}
+
+
+/*
+ * Listeners
+ */
+Bangle.on('lcdPower',on=>{
+    if (on) {
+        draw(true);
+    } else { // stop draw timer
+        if (drawTimeout) clearTimeout(drawTimeout);
+        drawTimeout = undefined;
+    }
+});
+
+Bangle.on('lock', function(isLocked) {
+    drawCircle(isLocked);
+});
+
+
+/*
+ * Some helpers
+ */
+function queueDraw() {
+    if (drawTimeout) clearTimeout(drawTimeout);
+    drawTimeout = setTimeout(function() {
+      drawTimeout = undefined;
+      draw();
+    }, 60000 - (Date.now() % 60000));
+}
+
+
+
+/*
+ * Lets start widgets, listen for btn etc.
+ */
+// Show launcher when middle button pressed
+Bangle.setUI("clock");
+Bangle.loadWidgets();
+/*
+ * we are not drawing the widgets as we are taking over the whole screen
+ * so we will blank out the draw() functions of each widget and change the
+ * area to the top bar doesn't get cleared.
+ */
+for (let wd of WIDGETS) {wd.draw=()=>{};wd.area="";}
+
+// Clear the screen once, at startup and draw clock
+g.setTheme({bg:"#fff",fg:"#000",dark:false}).clear();
+draw();
+
+// After drawing the watch face, we can draw the widgets
+// Bangle.drawWidgets();
--- a/apps/aiclock/aiclock.icon.js
+++ b/apps/aiclock/aiclock.icon.js
@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwgP/ACfAEZU/ECZELIKhSR/+PAoWAv4FDhk/x/ggP+j0fx/AgP8n8PCIX8CwIFC/F/w4FBgP4gEHC4QFE//w//DC4QFB8YFC+P/8IdCAoYdBAoPxDoQAd+CiKh4dQwDhfAA4A="))
--- a/apps/aiclock/aiclock.png
+++ b/apps/aiclock/aiclock.png
--- a/apps/aiclock/impl.png
+++ b/apps/aiclock/impl.png
--- a/apps/aiclock/metadata.json
+++ b/apps/aiclock/metadata.json
@ -0,0 +1,20 @@
+{
+  "id": "aiclock",
+  "name": "AI Clock",
+  "shortName":"AI Clock",
+  "icon": "aiclock.png",
+  "version":"0.02",
+  "readme": "README.md",
+  "supports": ["BANGLEJS2"],
+  "description": "A watch face that was designed by an AI (stable diffusion) and implemented by a human.",
+  "type": "clock",
+  "tags": "clock",
+  "screenshots": [
+    {"url":"orig.png"},
+    {"url":"impl.png"}
+  ],
+  "storage": [
+    {"name":"aiclock.app.js","url":"aiclock.app.js"},
+    {"name":"aiclock.img","url":"aiclock.icon.js","evaluate":true}
+  ]
+}
--- a/apps/aiclock/orig.png
+++ b/apps/aiclock/orig.png
--- a/apps/alarm/ChangeLog
+++ b/apps/alarm/ChangeLog
@ -29,3 +29,9 @@
 0.27: New UI!
 0.28: Fix bug with alarms not firing when configured to fire only once
 0.29: Fix wrong 'dow' handling in new timer if first day of week is Monday
+0.30: Fix "Enable All"
+0.31: Add seconds to timers
+0.32: Fix wrong hidden filter
+      Add option for auto-delete a timer after it expires
+0.33: Allow hiding timers&alarms
+
--- a/apps/alarm/app.js
+++ b/apps/alarm/app.js
@ -86,7 +86,8 @@ function showEditAlarmMenu(selectedAlarm, alarmIndex) {
  const menu = {
    "": { "title": isNew ? /*LANG*/"New Alarm" : /*LANG*/"Edit Alarm" },
    "< Back": () => {
-      saveAlarm(alarm, alarmIndex, time);
+      prepareAlarmForSave(alarm, alarmIndex, time);
+      saveAndReload();
      showMainMenu();
    },
    /*LANG*/"Hour": {
@ -123,6 +124,10 @@ function showEditAlarmMenu(selectedAlarm, alarmIndex) {
      value: alarm.as,
      onchange: v => alarm.as = v
    },
+    /*LANG*/"Hidden": {
+      value: alarm.hidden || false,
+      onchange: v => alarm.hidden = v
+    },
    /*LANG*/"Cancel": () => showMainMenu()
  };

@ -144,7 +149,7 @@ function showEditAlarmMenu(selectedAlarm, alarmIndex) {
  E.showMenu(menu);
 }

-function saveAlarm(alarm, alarmIndex, time) {
+function prepareAlarmForSave(alarm, alarmIndex, time) {
  alarm.t = require("time_utils").encodeTime(time);
  alarm.last = alarm.t < require("time_utils").getCurrentTimeMillis() ? new Date().getDate() : 0;

@ -153,8 +158,6 @@ function saveAlarm(alarm, alarmIndex, time) {
  } else {
    alarms[alarmIndex] = alarm;
  }
-
-  saveAndReload();
 }

 function saveAndReload() {
@ -251,7 +254,8 @@ function showEditTimerMenu(selectedTimer, timerIndex) {
  const menu = {
    "": { "title": isNew ? /*LANG*/"New Timer" : /*LANG*/"Edit Timer" },
    "< Back": () => {
-      saveTimer(timer, timerIndex, time);
+      prepareTimerForSave(timer, timerIndex, time);
+      saveAndReload();
      showMainMenu();
    },
    /*LANG*/"Hours": {
@ -268,11 +272,28 @@ function showEditTimerMenu(selectedTimer, timerIndex) {
      wrap: true,
      onchange: v => time.m = v
    },
+    /*LANG*/"Seconds": {
+      value: time.s,
+      min: 0,
+      max: 59,
+      step: 1,
+      wrap: true,
+      onchange: v => time.s = v
+    },
    /*LANG*/"Enabled": {
      value: timer.on,
      onchange: v => timer.on = v
    },
+    /*LANG*/"Delete After Expiration": {
+      value: timer.del,
+      onchange: v => timer.del = v
+    },
+    /*LANG*/"Hidden": {
+      value: timer.hidden || false,
+      onchange: v => timer.hidden = v
+    },
    /*LANG*/"Vibrate": require("buzz_menu").pattern(timer.vibrate, v => timer.vibrate = v),
+    /*LANG*/"Cancel": () => showMainMenu()
  };

  if (!isNew) {
@ -293,7 +314,7 @@ function showEditTimerMenu(selectedTimer, timerIndex) {
  E.showMenu(menu);
 }

-function saveTimer(timer, timerIndex, time) {
+function prepareTimerForSave(timer, timerIndex, time) {
  timer.timer = require("time_utils").encodeTime(time);
  timer.t = require("time_utils").getCurrentTimeMillis() + timer.timer;
  timer.last = 0;
@ -303,8 +324,6 @@ function saveTimer(timer, timerIndex, time) {
  } else {
    alarms[timerIndex] = timer;
  }
-
-  saveAndReload();
 }

 function showAdvancedMenu() {
@ -327,7 +346,16 @@ function enableAll(on) {
  } else {
    E.showPrompt(/*LANG*/"Are you sure?", { title: on ? /*LANG*/"Enable All" : /*LANG*/"Disable All" }).then((confirm) => {
      if (confirm) {
-        alarms.forEach(alarm => alarm.on = on);
+        alarms.forEach((alarm, i) => {
+          alarm.on = on;
+          if (on) {
+            if (alarm.timer) {
+              prepareTimerForSave(alarm, i, require("time_utils").decodeTime(alarm.timer))
+            } else {
+              prepareAlarmForSave(alarm, i, require("time_utils").decodeTime(alarm.t))
+            }
+          }
+        });
        saveAndReload();
        showMainMenu();
      } else {
--- a/apps/alarm/metadata.json
+++ b/apps/alarm/metadata.json
@ -2,7 +2,7 @@
  "id": "alarm",
  "name": "Alarms & Timers",
  "shortName": "Alarms",
-  "version": "0.29",
+  "version": "0.33",
  "description": "Set alarms and timers on your Bangle",
  "icon": "app.png",
  "tags": "tool,alarm,widget",
--- a/apps/alarm/widget.js
+++ b/apps/alarm/widget.js
@ -2,7 +2,7 @@ WIDGETS["alarm"]={area:"tl",width:0,draw:function() {
    if (this.width) g.reset().drawImage(atob("GBgBAAAAAAAAABgADhhwDDwwGP8YGf+YMf+MM//MM//MA//AA//AA//AA//AA//AA//AB//gD//wD//wAAAAADwAABgAAAAAAAAA"),this.x,this.y);
  },reload:function() {
    // don't include library here as we're trying to use as little RAM as possible
-    WIDGETS["alarm"].width = (require('Storage').readJSON('sched.json',1)||[]).some(alarm=>alarm.on&&(alarm.hidden!==false)) ? 24 : 0;
+    WIDGETS["alarm"].width = (require('Storage').readJSON('sched.json',1)||[]).some(alarm=>alarm.on&&(alarm.hidden!==true)) ? 24 : 0;
  }
 };
 WIDGETS["alarm"].reload();
--- a/apps/android/ChangeLog
+++ b/apps/android/ChangeLog
@ -9,3 +9,8 @@
 0.08: Handling of alarms
 0.09: Alarm vibration, repeat, and auto-snooze now handled by sched
 0.10: Fix SMS bug
+0.12: Use default Bangle formatter for booleans
+0.13: Added Bangle.http function (see Readme file for more info)
+0.14: Fix timeout of http function not being cleaned up
+0.15: Allow method/body/headers to be specified for `http` (needs Gadgetbridge 0.68.0b or later)
+0.16: Bangle.http now fails immediately if there is no Bluetooth connection (fix #2152)
--- a/apps/android/README.md
+++ b/apps/android/README.md
@ -32,6 +32,25 @@ Responses are sent back to Gadgetbridge simply as one line of JSON.

 More info on message formats on http://www.espruino.com/Gadgetbridge

+## Functions provided
+
+The boot code also provides some useful functions:
+
+* `Bangle.messageResponse = function(msg,response)` - send a yes/no response to a message. `msg` is a message object, and `response` is a boolean.
+* `Bangle.musicControl = function(cmd)` - control music, cmd = `play/pause/next/previous/volumeup/volumedown`
+* `Bangle.http = function(url,options)` - make an HTTPS request to a URL and return a promise with the data. Requires the [internet enabled `Bangle.js Gadgetbridge` app](http://www.espruino.com/Gadgetbridge#http-requests). `options` can contain:
+  * `id` - a custom (string) ID
+  * `timeout` - a timeout for the request in milliseconds (default 30000ms)
+  * `xpath` an xPath query to run on the request (but right now the URL requested must be XML - HTML is rarely XML compliant)
+
+eg:
+
+```
+Bangle.http("https://pur3.co.uk/hello.txt").then(data=>{
+  console.log("Got ",data);
+});
+```
+
 ## Testing

 Bangle.js can only hold one connection open at a time, so it's hard to see
--- a/apps/android/boot.js
+++ b/apps/android/boot.js
@ -90,10 +90,83 @@
        sched.setAlarms(alarms);
        sched.reload();
      },
+      //TODO perhaps move those in a library (like messages), used also for viewing events?
+      //simple package with events all together
+      "calendarevents" : function() {
+        require("Storage").writeJSON("android.calendar.json", event.events);
+      },
+      //add and remove events based on activity on phone (pebble-like)
+      "calendar" : function() {
+        var cal = require("Storage").readJSON("android.calendar.json",true);
+        if (!cal || !Array.isArray(cal)) cal = [];
+        var i = cal.findIndex(e=>e.id==event.id);
+        if(i<0)
+          cal.push(event);
+        else
+          cal[i] = event;
+        require("Storage").writeJSON("android.calendar.json", cal);
+      },
+      "calendar-" : function() {
+        var cal = require("Storage").readJSON("android.calendar.json",true);
+        //if any of those happen we are out of sync!
+        if (!cal || !Array.isArray(cal)) return;
+        cal = cal.filter(e=>e.id!=event.id);
+        require("Storage").writeJSON("android.calendar.json", cal);
+      },
+      //triggered by GB, send all ids
+      "force_calendar_sync_start" : function() {
+          var cal = require("Storage").readJSON("android.calendar.json",true);
+          if (!cal || !Array.isArray(cal)) cal = [];
+          gbSend({t:"force_calendar_sync", ids: cal.map(e=>e.id)});
+      },
+      "http":function() {
+        //get the promise and call the promise resolve
+        if (Bangle.httpRequest === undefined) return;
+        var request=Bangle.httpRequest[event.id];
+        if (request === undefined) return; //already timedout or wrong id
+        delete Bangle.httpRequest[event.id];
+        clearTimeout(request.t); //t = timeout variable
+        if(event.err!==undefined) //if is error
+          request.j(event.err); //r = reJect function
+        else
+          request.r(event); //r = resolve function
+      }
    };
    var h = HANDLERS[event.t];
    if (h) h(); else console.log("GB Unknown",event);
  };
+  // HTTP request handling - see the readme
+  // options = {id,timeout,xpath}
+  Bangle.http = (url,options)=>{
+    options = options||{};
+    if (!NRF.getSecurityStatus().connected)
+      return Promise.reject("Not connected to Bluetooth");
+    if (Bangle.httpRequest === undefined)
+      Bangle.httpRequest={};
+    if (options.id === undefined) {
+      // try and create a unique ID
+      do {
+        options.id = Math.random().toString().substr(2);
+      } while( Bangle.httpRequest[options.id]!==undefined);
+    }
+    //send the request
+    var req = {t: "http", url:url, id:options.id};
+    if (options.xpath) req.xpath = options.xpath;
+    if (options.method) req.method = options.method;
+    if (options.body) req.body = options.body;
+    if (options.headers) req.headers = options.headers;
+    gbSend(req);
+    //create the promise
+    var promise = new Promise(function(resolve,reject) {
+      //save the resolve function in the dictionary and create a timeout (30 seconds default)
+      Bangle.httpRequest[options.id]={r:resolve,j:reject,t:setTimeout(()=>{
+        //if after "timeoutMillisec" it still hasn't answered -> reject
+        delete Bangle.httpRequest[options.id];
+        reject("Timeout");
+      },options.timeout||30000)};
+    });
+    return promise;
+  }

  // Battery monitor
  function sendBattery() { gbSend({ t: "status", bat: E.getBattery(), chg: Bangle.isCharging()?1:0 }); }
--- a/apps/android/metadata.json
+++ b/apps/android/metadata.json
@ -2,7 +2,7 @@
  "id": "android",
  "name": "Android Integration",
  "shortName": "Android",
-  "version": "0.10",
+  "version": "0.16",
  "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",
@ -15,6 +15,6 @@
    {"name":"android.img","url":"app-icon.js","evaluate":true},
    {"name":"android.boot.js","url":"boot.js"}
  ],
-  "data": [{"name":"android.settings.json"}],
+  "data": [{"name":"android.settings.json"}, {"name":"android.calendar.json"}],
  "sortorder": -8
 }
--- a/apps/android/settings.js
+++ b/apps/android/settings.js
@ -18,7 +18,6 @@
      }),
    /*LANG*/"Keep Msgs" : {
      value : !!settings.keep,
-      format : v=>v?/*LANG*/"Yes":/*LANG*/"No",
      onchange: v => {
        settings.keep = v;
        updateSettings();
--- a/apps/animclk/ChangeLog
+++ b/apps/animclk/ChangeLog
@ -1,3 +1,5 @@
 0.01: New App!
 0.02: Fix bug if image clock wasn't installed
 0.03: Update to use setUI
+0.04: Tell clock widgets to hide. Move loadWidgets() so it only runs on
+startup and not on every draw.
--- a/apps/animclk/app.js
+++ b/apps/animclk/app.js
@ -87,7 +87,6 @@ if (g.drawImages) {
  draw();
  var secondInterval = setInterval(draw,100);
  // load widgets
-  Bangle.loadWidgets();
  Bangle.drawWidgets();
  // Stop when LCD goes off
  Bangle.on('lcdPower',on=>{
@ -104,3 +103,5 @@ if (g.drawImages) {
 }
 // Show launcher when button pressed
 Bangle.setUI("clock");
+
+Bangle.loadWidgets();
--- a/apps/animclk/metadata.json
+++ b/apps/animclk/metadata.json
@ -2,7 +2,7 @@
  "id": "animclk",
  "name": "Animated Clock",
  "shortName": "Anim Clock",
-  "version": "0.03",
+  "version": "0.04",
  "description": "An animated clock face using Mark Ferrari's amazing 8 bit game art and palette cycling: http://www.markferrari.com/art/8bit-game-art",
  "icon": "app.png",
  "type": "clock",
--- a/apps/antonclk/ChangeLog
+++ b/apps/antonclk/ChangeLog
@ -10,3 +10,5 @@
      week is buffered until date or timezone changes
 0.07: align default settings with app.js (otherwise the initial displayed settings will be confusing to users)
 0.08: fixed calendar weeknumber not shortened to two digits
+0.09: Use default Bangle formatter for booleans
+0.10: Use Bangle.setUI({remove:...}) to allow loading the launcher without a full reset on 2v16
--- a/apps/antonclk/app.js
+++ b/apps/antonclk/app.js
--- a/apps/antonclk/metadata.json
+++ b/apps/antonclk/metadata.json
@ -1,7 +1,7 @@
 {
  "id": "antonclk",
  "name": "Anton Clock",
-  "version": "0.08",
+  "version": "0.10",
  "description": "A clock using the bold Anton font, optionally showing seconds and date in ISO-8601 format.",
  "readme":"README.md",
  "icon": "app.png",
--- a/apps/antonclk/settings.js
+++ b/apps/antonclk/settings.js
@ -2,7 +2,6 @@

 (function(back) {
  var FILE = "antonclk.json";
-  // Load settings
  var settings = Object.assign({
    secondsOnUnlock: false,
  }, require('Storage').readJSON(FILE, true) || {});
@ -41,7 +40,6 @@
    "Date": stringInSettings("dateOnMain", ["Long", "Short", "ISO8601"]),
    "Show Weekday": {
      value: (settings.weekDay !== undefined ? settings.weekDay : true),
-      format: v => v ? "On" : "Off",
      onchange: v => {
        settings.weekDay = v;
        writeSettings();
@ -49,7 +47,6 @@
    },
    "Show CalWeek": {
      value: (settings.calWeek !== undefined ? settings.calWeek : false),
-      format: v => v ? "On" : "Off",
      onchange: v => {
        settings.calWeek = v;
        writeSettings();
@ -57,7 +54,6 @@
    },
    "Uppercase": {
      value: (settings.upperCase !== undefined ? settings.upperCase : true),
-      format: v => v ? "On" : "Off",
      onchange: v => {
        settings.upperCase = v;
        writeSettings();
@ -65,7 +61,6 @@
    },
    "Vector font": {
      value: (settings.vectorFont !== undefined ? settings.vectorFont : false),
-      format: v => v ? "On" : "Off",
      onchange: v => {
        settings.vectorFont = v;
        writeSettings();
@ -82,7 +77,6 @@
    "Show": stringInSettings("secondsMode", ["Never", "Unlocked", "Always"]),
    "With \":\"": {
      value: (settings.secondsWithColon !== undefined ? settings.secondsWithColon : true),
-      format: v => v ? "On" : "Off",
      onchange: v => {
        settings.secondsWithColon = v;
        writeSettings();
@ -90,7 +84,6 @@
    },
    "Color": {
      value: (settings.secondsColoured !== undefined ? settings.secondsColoured : true),
-      format: v => v ? "On" : "Off",
      onchange: v => {
        settings.secondsColoured = v;
        writeSettings();
@ -99,9 +92,6 @@
    "Date": stringInSettings("dateOnSecs", ["Year", "Weekday", "No"])
  };

-  // Actually display the menu
  E.showMenu(mainmenu);

 });
-
-// end of file
--- a/apps/assistedgps/metadata.json
+++ b/apps/assistedgps/metadata.json
@ -1,11 +1,12 @@
 {
  "id": "assistedgps",
-  "name": "Assisted GPS Update (AGPS)",
+  "name": "Assisted GPS Updater (AGPS)",
  "version": "0.03",
-  "description": "Downloads assisted GPS (AGPS) data to Bangle.js 1 or 2 for faster GPS startup and more accurate fixes. **No app will be installed**, this just uploads new data to the GPS chip.",
+  "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",
  "type": "RAM",
-  "tags": "tool,outdoors,agps",
+  "tags": "tool,outdoors,agps,gps,a-gps",
  "supports": ["BANGLEJS","BANGLEJS2"],
  "custom": "custom.html",
  "customConnect": true,
--- a/apps/astral/ChangeLog
+++ b/apps/astral/ChangeLog
@ -1,3 +1,4 @@
 0.01: Create astral clock app
 0.02: Fixed Whirlpool galaxy RA/DA, larger compass display, fixed moonphase overlapping battery widget
 0.03: Update to use Bangle.setUI instead of setWatch
+0.04: Tell clock widgets to hide.
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				require("heatshrink").decompress(atob("mEwgZC/AH4ADkAPOgVJkgEBAQQAJiQRByEJgmQCJWSpMEAQMkyQJCpASHhAOBpAmBJJgjBCIUJCRg4CCIJxFMQ2SoARCkmACI0EBAJHCCIMLj4RFiUBskAgIXBEAU5A4P34CtCiEJsEJ/AHBCgOBAoQAEi0H////HciQsBwywICIXWzkG4A+BEY0gif46dt6/cgnIgkWnHfLIP/MoUWwHbpvC/kAjEEj0HNYQCCkEfGgP/64RB2EAifHLwMAjg1CCIMD/0H/0B8EAh+HgeAkARCE4IjC/4jBYIMPLIcIAYUPB4OBCIQABhu/AoShCHYIRBx6QBDgUw2//8OHPwcJ39//ILBCIU9LgMBSQgsBJAYRBkE/CIIABgRHD3wRFkk/2zBDAYU//3b/oRB8ARBj6ABgEE7YREEYf+oMkSwINCyClCn//z//+4RBgMkgU3EgUcwFJgEeboOXCIP2EYJCDAAVJkkGWoIuBgf2EYQPDkECCIOGd4ffyEJkgFBAAcSoEkwQCBhw+BwQaByVAkGAKwIFBBANLkEQgAyBCIVIkBpBgmSBYOQoApBgcgiQRCAQIyCCgsSjIFBCIcgRgJNCCgQyBpAgDAQT2BCgIOBBAQUCCIpfBCIwCKP4QRNpCSDCLyJBCIbjBTwYRLboJ0BCI4QD"))
				`@ -0,0 +1 @@`
				`require("heatshrink").decompress(atob("mEwwJC/AAl/Agf/AAUAgIFDwEHAofgh/g/0Ag/wj+AnwVB/EegEfEIN4nkAh+AgE8vgVBAoV4Aoce/EAgfADQIFcjwpFHYIFCnxBFJopZBn5ZCMopxFPoqJFSowA/gA="))`
				`@ -0,0 +1 @@`
				atob("MDCEAAAAAAAAAAAAAAAAiIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAIiIiAAAAAAAAAAAAAAAAAAAAAAAAAAAAIiIiAAAAAAAAAAAAAAAAAAAAAAAAAAACIiIiIAAAAAAAAAAAAAAAAAAAAAAAAAACIiIiIAAAAAAAAAAAAAAAAAAAAAAAAAACIiIiIAAAAAAAAAAAAAAAAAAAAAAAAAAiIiIiIgAAAAAAAAAAAAAAAAAAAAAAAAAiIiIiIgAAAAAAAAAAAAAAAAAAAAAAAAIiIOIiIiAAAAAAAAAAAAAAAAAAAAAAAAIiDOIiIiAAAAAAAAAAAAAAAAAAAAAAAAIiDOIiIiIAAAAAAAAAAAAAAAAAAAAAACIiPOIiIiIAAAAAAAAAAAAAAAAAAAAAAiIj/OIiIiIgAAAAAAAAAAAAAAAAAAAAAiI//OIiIiIgAAAAAAAAAAAAAAAAAAAAAiI//OIiIiIiAAAAAAAAAAAAAAAAAAAAAiD//OIiIiIiAAAAAAAAAAAAAAAAAAAAIiP//OIiIiIiAAAAAAAAAAAAAAAAAAAAIg///OIiIiIiIAAAAAAAAAAAAAAAAAACIj///OIiIiIiIAAAAAAAAAAAAAAAAAACIP///OIiIiIiIgAAAAAAAAAAAAAAAAACI////OIiIiIiIgAAAAAAAAAAAAAAAAAiD////OIiIiIiIiAAAAAAAAAAAAAAAAAiP////OIiIiIiIiAAAAAAAAAAAAAAAAIiP////OIiIiIiIiIAAAAAAAAAAAAAAAIj/////OIiIiIiIiIAAAAAAAAAAAAAACIj/////OIiIiIiIiIgAAAAAAAAAAAAACI//////OIiIiIiIiIgAAAAAAAAAAAAAiI//////OIiIiIiIiIgAAAAAAAAAAAAAiIiIiIiIgzMzMzMziIiAAAAAAAAAAAAAiIiIiIiIj///////+IiAAAAAAAAAAAAIiIiIiIiIj////////4iIAAAAAAAAAAAIiIiIiIiIgzMzMzMzM4iIAAAAAAAAAACIP///////OIiIiIiIiIiIgAAAAAAAAACI////////OIiIiIiIiIiIgAAAAAAAAAiI////////OIiIiIiIiIiIiAAAAAAAAAiP////////OIiIiIiIiIiIiAAAAAAAAIiP////////OIiIiIiIiIiIiIAAAAAAAIj/////////OIiIiIiIiIiIiIAAAAAACIj////////ziIiIiIiIiIiIiIgAAAAACIP///////+IiIiIiIiIiIiIiIgAAAAACI//////84gYiIiIiIiIiIiIiIgAAAAAiD////84iIiAAAiIiIiIiIiIiIiAAAAAiP///ziIiIAAAAAIiIiIiIiIiIiAAAAIg/8ziIiIAAAAAAAAAIiIiIiIiIiIAAAIj/iIiIAAAAAAAAAAAAAIiIiIiIiIAACIiIiBgAAAAAAAAAAAAAAACIiIiIiIgACIiIgAAAAAAAAAAAAAAAAAAACIiIiIgACIgAAAAAAAAAAAAAAAAAAAAAAAiIiIgA==")
				`@ -0,0 +1 @@`
				`{"enabled":true,"refresh":1440,"gnsstype":1}`