From bad193f739f625a8dd698240f6040267f4c97af8 Mon Sep 17 00:00:00 2001
From: pancake <pancake@nopcode.org>
Date: Tue, 16 May 2023 12:16:34 +0200
Subject: [PATCH 01/28] Fix regression in kanawatch picking the wrong bitmap
 sometimes

---
 apps/kanawatch/ChangeLog     | 1 +
 apps/kanawatch/app.js        | 2 +-
 apps/kanawatch/metadata.json | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/kanawatch/ChangeLog b/apps/kanawatch/ChangeLog
index 70a2d18bf..b2d2bab86 100644
--- a/apps/kanawatch/ChangeLog
+++ b/apps/kanawatch/ChangeLog
@@ -4,3 +4,4 @@
 0.04: Show a random kana every minute to improve learning
 0.05: Tell clock widgets to hide
 0.06: Fix exception when showing missing hiragana 'WO'
+0.07: Fix regression in bitmap selection on some code paths
diff --git a/apps/kanawatch/app.js b/apps/kanawatch/app.js
index 2793e9a93..264058230 100644
--- a/apps/kanawatch/app.js
+++ b/apps/kanawatch/app.js
@@ -224,6 +224,7 @@ function drawKana (x, y) {
   g.setColor(0, 0, 0);
   g.fillRect(0, 0, g.getWidth(), 6 * (h / 8) + 1);
   g.setColor(1, 1, 1);
+  kana = hiramode ? hiragana[curkana] : katakana[curkana];
   g.drawImage(kana, x + 20, 40, { scale: 1.6 });
   g.setColor(1, 1, 1);
   g.setFont('Vector', 24);
@@ -266,4 +267,3 @@ Bangle.setUI('clock');
 Bangle.loadWidgets();
 tickWatch();
 setInterval(tickWatch, 1000 * 60);
-
diff --git a/apps/kanawatch/metadata.json b/apps/kanawatch/metadata.json
index c0b048a37..d7a6f8c23 100644
--- a/apps/kanawatch/metadata.json
+++ b/apps/kanawatch/metadata.json
@@ -2,7 +2,7 @@
   "id": "kanawatch",
   "name": "Kanawatch",
   "shortName": "Kanawatch",
-  "version": "0.06",
+  "version": "0.07",
   "type": "clock",
   "description": "Learn Hiragana and Katakana",
   "icon": "app.png",

From 5428e482b8dfeea3b6109dbaff3cff0643c439cb Mon Sep 17 00:00:00 2001
From: Richard de Boer <git@tubul.net>
Date: Tue, 16 May 2023 22:29:44 +0200
Subject: [PATCH 02/28] hasensors: inline config

There is no need for a config file: we can customize the code directly.
---
 apps/hasensors/ChangeLog     |  3 ++-
 apps/hasensors/custom.html   | 30 +++++++++++++++++++++++-------
 apps/hasensors/lib.js        | 13 +++++--------
 apps/hasensors/metadata.json |  5 +----
 4 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/apps/hasensors/ChangeLog b/apps/hasensors/ChangeLog
index 759f68777..2c904fc71 100644
--- a/apps/hasensors/ChangeLog
+++ b/apps/hasensors/ChangeLog
@@ -1 +1,2 @@
-0.01: New app!
\ No newline at end of file
+0.01: New app!
+0.02: Customize code directly, remove config file
diff --git a/apps/hasensors/custom.html b/apps/hasensors/custom.html
index 805001701..1fd1bcc3c 100644
--- a/apps/hasensors/custom.html
+++ b/apps/hasensors/custom.html
@@ -39,14 +39,27 @@
         <a href="https://my.home-assistant.io/redirect/profile/" target="_blank">your user profile</a>.</span></label>
 </form>
 <p>
-    <button id="upload" class="btn btn-primary">Upload</button>
+    <button id="upload" class="btn btn-primary" disabled>Upload</button>
 </p>
 <script src="../../core/lib/customize.js"></script>
 <script>
     const STORAGE_KEY = 'hasensors-config';
     const fields = ['id', 'name', 'url', 'token'];
     const form = document.getElementById('sensorform');
+    const LIBRARY_URL = './lib.js';
 
+    // fetch library code template, enable upload button once we've got it
+    let libTpl;
+    fetch(LIBRARY_URL).then(response=>{
+        if (! response.ok) return;
+console.log(response);
+        response.text().then(code=>{
+            libTpl = code;
+            document.getElementById('upload').disabled = false;
+        });
+    });
+
+    // try to pre-fill form with values previously saved in localStorage
     let stored = localStorage.getItem(STORAGE_KEY);
     if (stored) {
         try {
@@ -62,7 +75,7 @@
     }
 
     document.getElementById("upload").addEventListener("click", function () {
-        let config = {};
+        // validate form fields or bail out
         for (const field of fields) {
             if (!form[field].validity.valid) {
                 form[field].focus();
@@ -70,18 +83,21 @@
                 return;
             }
         }
+        let config = {};
         for (const field of fields) {
-            config[field] = form[field].value
+            config[field] = form[field].value;
         }
-        console.log('config:', config, JSON.stringify(config));
+        // save config to localStorage for re-use next time
         localStorage.setItem(STORAGE_KEY, JSON.stringify(config));
+        // replace {placeholders} in library code template
+        const lib = libTpl.replace(/\{(\w+)\}/g, (_,f) => config[f]);
+        console.log('config:', config, JSON.stringify(config));
         sendCustomizedApp({
             id: "hasensors",
             storage: [
                 {name: "hasensors.boot.js", url: "boot.js"},
-                {name: "hasensors", url: "lib.js"},
-                {name: "hasensors.settings.json", content: JSON.stringify(config)},
-            ]
+                {name: "hasensors", content: lib},
+            ],
         });
     });
 </script>
diff --git a/apps/hasensors/lib.js b/apps/hasensors/lib.js
index 60cfb6da4..555e52dce 100644
--- a/apps/hasensors/lib.js
+++ b/apps/hasensors/lib.js
@@ -1,16 +1,13 @@
 // split out into a separate file to keep bootcode short.
-function s(key) {
-    return (require('Storage').readJSON('hasensors.settings.js', true) || {})[key];
-}
-
+// placeholders are replaced by custom.html before upload
 function post(sensor, data) {
-    const url = s('url') + '/api/states/sensor.' + s('id') + '_' + sensor;
+    const url = '{url}/api/states/sensor.{id}_' + sensor;
     Bangle.http(url, {
         method: 'POST',
         body: JSON.stringify(data),
         headers: {
             'Content-Type': 'application/json',
-            Authorization: 'Bearer ' + s('token'),
+            Authorization: 'Bearer {token}',
         }
     });
 }
@@ -20,7 +17,7 @@ exports.sendBattery = function () {
     post('battery_level', {
         state: E.getBattery(),
         attributes: {
-            friendly_name: s('name') + " Battery Level",
+            friendly_name: "{name} Battery Level",
             unit_of_measurement: "%",
             device_class: "battery",
             state_class: "measurement",
@@ -29,7 +26,7 @@ exports.sendBattery = function () {
     post('battery_state', {
         state: Bangle.isCharging() ? 'charging' : 'discharging',
         attributes: {
-            friendly_name: s('name') + " Battery State",
+            friendly_name: "{name} Battery State",
         }
     });
 }
\ No newline at end of file
diff --git a/apps/hasensors/metadata.json b/apps/hasensors/metadata.json
index 7713fadc7..106f11407 100644
--- a/apps/hasensors/metadata.json
+++ b/apps/hasensors/metadata.json
@@ -2,7 +2,7 @@
   "id": "hasensors",
   "name": "Home Assistant Sensors",
   "shortName": "HA sensors",
-  "version": "0.01",
+  "version": "0.02",
   "description": "Send sensor values to Home Assistant using the Android Integration.",
   "icon": "ha.png",
   "type": "bootloader",
@@ -14,8 +14,5 @@
   "storage": [
     {"name":"hasensors","url":"lib.js"},
     {"name":"hasensors.boot.js","url":"boot.js"}
-  ],
-  "data": [
-    {"name":"hasensors.settings.json"}
   ]
 }

From b500e96b3601a2cee80f06d7f8101023d519707a Mon Sep 17 00:00:00 2001
From: Richard de Boer <git@tubul.net>
Date: Tue, 16 May 2023 22:54:48 +0200
Subject: [PATCH 03/28] hasensors: add icons

Home Assistant already sets a level-dependant icon, but doesn't know
how to apply the charging state.
---
 apps/hasensors/ChangeLog |  3 ++-
 apps/hasensors/lib.js    | 25 ++++++++++++++++++-------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/apps/hasensors/ChangeLog b/apps/hasensors/ChangeLog
index 2c904fc71..7b3a63039 100644
--- a/apps/hasensors/ChangeLog
+++ b/apps/hasensors/ChangeLog
@@ -1,2 +1,3 @@
 0.01: New app!
-0.02: Customize code directly, remove config file
+0.02: Add sensor icons
+      Customize code directly, remove config file
diff --git a/apps/hasensors/lib.js b/apps/hasensors/lib.js
index 555e52dce..b8ee1bfb9 100644
--- a/apps/hasensors/lib.js
+++ b/apps/hasensors/lib.js
@@ -14,19 +14,30 @@ function post(sensor, data) {
 
 exports.sendBattery = function () {
     if (!NRF.getSecurityStatus().connected) return;
+    const b = E.getBattery(), 
+        c = Bangle.isCharging();
+    let i = "mdi:battery";
+    if (c) i += "-charging";
+
+    post('battery_state', {
+        state: c ? 'charging' : 'discharging',
+        attributes: {
+            friendly_name: "{name} Battery State",
+            icon: i + (c ? "" : "-minus"),
+        }
+    });
+
+    if (b<10) i += "-outline"; // there is no battery-0
+    else if (b<100 || c) i += "-" + Math.floor(b/10)*10; // no battery-100 either
+
     post('battery_level', {
-        state: E.getBattery(),
+        state: b,
         attributes: {
             friendly_name: "{name} Battery Level",
             unit_of_measurement: "%",
             device_class: "battery",
             state_class: "measurement",
-        }
-    });
-    post('battery_state', {
-        state: Bangle.isCharging() ? 'charging' : 'discharging',
-        attributes: {
-            friendly_name: "{name} Battery State",
+            icon: i,
         }
     });
 }
\ No newline at end of file

From b79a1caae60df3678610206773860bd493b28995 Mon Sep 17 00:00:00 2001
From: Richard de Boer <git@tubul.net>
Date: Tue, 16 May 2023 23:04:08 +0200
Subject: [PATCH 04/28] hasensors: cleanup: use double quotes everywhere

---
 apps/hasensors/boot.js     |  2 +-
 apps/hasensors/custom.html | 14 +++++++-------
 apps/hasensors/lib.js      | 14 +++++++-------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/apps/hasensors/boot.js b/apps/hasensors/boot.js
index a9122be5d..efafbc8a3 100644
--- a/apps/hasensors/boot.js
+++ b/apps/hasensors/boot.js
@@ -1,5 +1,5 @@
 (function () {
-    const sb = () => require('hasensors').sendBattery();
+    const sb = () => require("hasensors").sendBattery();
     Bangle.on("charging", sb);
     NRF.on("connect", () => setTimeout(sb, 2000));
     setInterval(sb, 10 * 60 * 1000);
diff --git a/apps/hasensors/custom.html b/apps/hasensors/custom.html
index 1fd1bcc3c..265f80f46 100644
--- a/apps/hasensors/custom.html
+++ b/apps/hasensors/custom.html
@@ -43,19 +43,19 @@
 </p>
 <script src="../../core/lib/customize.js"></script>
 <script>
-    const STORAGE_KEY = 'hasensors-config';
-    const fields = ['id', 'name', 'url', 'token'];
-    const form = document.getElementById('sensorform');
-    const LIBRARY_URL = './lib.js';
+    const STORAGE_KEY = "hasensors-config";
+    const fields = ["id", "name", "url", "token"];
+    const form = document.getElementById("sensorform");
+    const LIBRARY_URL = "./lib.js";
 
-    // fetch library code template, enable upload button once we've got it
+    // fetch library code template, enable upload button once we"ve got it
     let libTpl;
     fetch(LIBRARY_URL).then(response=>{
         if (! response.ok) return;
 console.log(response);
         response.text().then(code=>{
             libTpl = code;
-            document.getElementById('upload').disabled = false;
+            document.getElementById("upload").disabled = false;
         });
     });
 
@@ -91,7 +91,7 @@ console.log(response);
         localStorage.setItem(STORAGE_KEY, JSON.stringify(config));
         // replace {placeholders} in library code template
         const lib = libTpl.replace(/\{(\w+)\}/g, (_,f) => config[f]);
-        console.log('config:', config, JSON.stringify(config));
+        console.log("config:", config, JSON.stringify(config));
         sendCustomizedApp({
             id: "hasensors",
             storage: [
diff --git a/apps/hasensors/lib.js b/apps/hasensors/lib.js
index b8ee1bfb9..83072262c 100644
--- a/apps/hasensors/lib.js
+++ b/apps/hasensors/lib.js
@@ -1,13 +1,13 @@
 // split out into a separate file to keep bootcode short.
 // placeholders are replaced by custom.html before upload
 function post(sensor, data) {
-    const url = '{url}/api/states/sensor.{id}_' + sensor;
+    const url = "{url}/api/states/sensor.{id}_" + sensor;
     Bangle.http(url, {
-        method: 'POST',
+        method: "POST",
         body: JSON.stringify(data),
         headers: {
-            'Content-Type': 'application/json',
-            Authorization: 'Bearer {token}',
+            "Content-Type": "application/json",
+            Authorization: "Bearer {token}",
         }
     });
 }
@@ -19,8 +19,8 @@ exports.sendBattery = function () {
     let i = "mdi:battery";
     if (c) i += "-charging";
 
-    post('battery_state', {
-        state: c ? 'charging' : 'discharging',
+    post("battery_state", {
+        state: c ? "charging" : "discharging",
         attributes: {
             friendly_name: "{name} Battery State",
             icon: i + (c ? "" : "-minus"),
@@ -30,7 +30,7 @@ exports.sendBattery = function () {
     if (b<10) i += "-outline"; // there is no battery-0
     else if (b<100 || c) i += "-" + Math.floor(b/10)*10; // no battery-100 either
 
-    post('battery_level', {
+    post("battery_level", {
         state: b,
         attributes: {
             friendly_name: "{name} Battery Level",

From 557f77f7c86be865cf8ecfe12ecff84b8368ad10 Mon Sep 17 00:00:00 2001
From: Rob Pilling <robpilling@gmail.com>
Date: Tue, 16 May 2023 22:50:33 +0100
Subject: [PATCH 05/28] Regenerate types

---
 typescript/types/main.d.ts | 91 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 90 insertions(+), 1 deletion(-)

diff --git a/typescript/types/main.d.ts b/typescript/types/main.d.ts
index 4e4dd224e..59fb18d30 100644
--- a/typescript/types/main.d.ts
+++ b/typescript/types/main.d.ts
@@ -465,6 +465,46 @@ declare class ESP32 {
    */
   static deepSleep(us: number): void;
 
+  /**
+   * Put device in deepsleep state until interrupted by pin "pin".
+   * Eligible pin numbers are restricted to those [GPIOs designated
+   * as RTC GPIOs](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/peripherals/gpio.html#gpio-summary).
+   *
+   * @param {Pin} pin - Pin to trigger wakeup
+   * @param {number} level - Logic level to trigger
+   * @url http://www.espruino.com/Reference#l_ESP32_deepSleepExt0
+   */
+  static deepSleepExt0(pin: Pin, level: number): void;
+
+  /**
+   * Put device in deepsleep state until interrupted by pins in the "pinVar" array.
+   * The trigger "mode" determines the pin state which will wake up the device.
+   * Valid modes are:
+   * * `0: ESP_EXT1_WAKEUP_ALL_LOW` - all nominated pins must be set LOW to trigger wakeup
+   * * `1: ESP_EXT1_WAKEUP_ANY_HIGH` - any of nominated pins set HIGH will trigger wakeup
+   * Eligible pin numbers are restricted to those [GPIOs designated
+   * as RTC GPIOs](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/peripherals/gpio.html#gpio-summary).
+   *
+   * @param {any} pinVar - Array of Pins to trigger wakeup
+   * @param {number} mode - Trigger mode
+   * @url http://www.espruino.com/Reference#l_ESP32_deepSleepExt1
+   */
+  static deepSleepExt1(pinVar: any, mode: number): void;
+
+  /**
+   * Returns a variable identifying the cause of wakeup from deep sleep.
+   * Possible causes include:
+   * * `0: ESP_SLEEP_WAKEUP_UNDEFINED` - reset was not caused by exit from deep sleep
+   * * `2: ESP_SLEEP_WAKEUP_EXT0` - Wakeup caused by external signal using RTC_IO
+   * * `3: ESP_SLEEP_WAKEUP_EXT1` - Wakeup caused by external signal using RTC_CNTL
+   * * `4: ESP_SLEEP_WAKEUP_TIMER` - Wakeup caused by timer
+   * * `5: ESP_SLEEP_WAKEUP_TOUCHPAD` - Wakeup caused by touchpad
+   * * `6: ESP_SLEEP_WAKEUP_ULP` - Wakeup caused by ULP program
+   * @returns {number} The cause of the ESP32's wakeup from sleep
+   * @url http://www.espruino.com/Reference#l_ESP32_getWakeupCause
+   */
+  static getWakeupCause(): number;
+
   /**
    * Returns an object that contains details about the state of the ESP32 with the
    * following fields:
@@ -5597,7 +5637,9 @@ declare class Graphics<IsBuffer extends boolean = boolean> {
    *   `width,height,bpp,[transparent,]image_bytes...`. If a transparent colour is
    *   specified the top bit of `bpp` should be set.
    * * An ArrayBuffer Graphics object (if `bpp<8`, `msb:true` must be set) - this is
-   *   disabled on devices without much flash memory available
+   *   disabled on devices without much flash memory available. If a Graphics object
+   *   is supplied, it can also contain transparent/palette fields as if it were
+   *   an image.
    * Draw an image at the specified position.
    * * If the image is 1 bit, the graphics foreground/background colours will be
    *   used.
@@ -5678,6 +5720,9 @@ declare class Graphics<IsBuffer extends boolean = boolean> {
    * * Is 8 bpp *OR* the `{msb:true}` option was given
    * * No other format options (zigzag/etc) were given
    * Otherwise data will be copied, which takes up more space and may be quite slow.
+   * If the `Graphics` object contains `transparent` or `pelette` fields,
+   * [as you might find in an image](http://www.espruino.com/Graphics#images-bitmaps),
+   * those will be included in the generated image too.
    *
    * @param {any} type - The type of image to return. Either `object`/undefined to return an image object, or `string` to return an image string
    * @returns {any} An Image that can be used with `Graphics.drawImage`
@@ -5800,6 +5845,19 @@ declare class Graphics<IsBuffer extends boolean = boolean> {
    */
   transformVertices(arr: number[], transformation: { x?: number, y?: number, scale?: number, rotate?: number } | [number, number, number, number, number, number]): number[];
 
+  /**
+   * Flood fills the given Graphics instance out from a particular point.
+   * **Note:** This only works on Graphics instances that support readback with `getPixel`. It
+   * is also not capable of filling over dithered patterns (eg non-solid colours on Bangle.js 2)
+   *
+   * @param {number} x - X coordinate to start from
+   * @param {number} y - Y coordinate to start from
+   * @param {any} col - The color to fill with (if undefined, foreground is used)
+   * @returns {any} The instance of Graphics this was called on, to allow call chaining
+   * @url http://www.espruino.com/Reference#l_Graphics_floodFill
+   */
+  floodFill(x: number, y: number, col: any): Graphics;
+
   /**
    * Returns an object of the form:
    * ```
@@ -8223,6 +8281,10 @@ declare class E {
   /**
    * Dump any locked variables that aren't referenced from `global` - for debugging
    * memory leaks only.
+   * **Note:** This does a linear scan over memory, finding variables
+   * that are currently locked. In some cases it may show variables
+   * like `Unknown 66` which happen when *part* of a string has ended
+   * up placed in memory ahead of the String that it's part of. See https://github.com/espruino/Espruino/issues/2345
    * @url http://www.espruino.com/Reference#l_E_dumpLockedVars
    */
   static dumpLockedVars(): void;
@@ -8655,6 +8717,24 @@ declare class E {
    */
   static decodeUTF8(str: string, lookup: string[], replaceFn: string | ((charCode: number) => string)): string;
 
+  /**
+   * When using events with `X.on('foo', function() { ... })`
+   * and then `X.emit('foo')` you might want to stop subsequent
+   * event handlers from being executed.
+   * Calling this function doing the execution of events will
+   * ensure that no subsequent event handlers are executed.
+   * ```
+   * var X = {}; // in Espruino all objects are EventEmitters
+   * X.on('foo', function() { print("A"); })
+   * X.on('foo', function() { print("B"); E.stopEventPropagation(); })
+   * X.on('foo', function() { print("C"); })
+   * X.emit('foo');
+   * // prints A,B but not C
+   * ```
+   * @url http://www.espruino.com/Reference#l_E_stopEventPropagation
+   */
+  static stopEventPropagation(): void;
+
 
 }
 
@@ -8959,6 +9039,9 @@ interface Object {
    * o.emit('answer', 44);
    * // nothing printed
    * ```
+   * If you have more than one handler for an event, and you'd
+   * like that handler to stop the event being passed to other handlers
+   * then you can call `E.stopEventPropagation()` in that handler.
    *
    * @param {any} event - The name of the event, for instance 'data'
    * @param {any} listener - The listener to call when this event is received
@@ -10074,6 +10157,12 @@ declare class Serial {
    * @url http://www.espruino.com/Reference#l_Serial_pipe
    */
   pipe(destination: any, options?: PipeOptions): void
+
+  /**
+   * Flush this serial stream (pause execution until all data has been sent)
+   * @url http://www.espruino.com/Reference#l_Serial_flush
+   */
+  flush(): void;
 }
 
 interface StringConstructor {

From 5fcdbc29110db5e8c46cea14be0948379de82bd5 Mon Sep 17 00:00:00 2001
From: Rob Pilling <robpilling@gmail.com>
Date: Tue, 16 May 2023 23:16:31 +0100
Subject: [PATCH 06/28] types: add BangleEvents

---
 typescript/types/bangle_extensions.d.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 typescript/types/bangle_extensions.d.ts

diff --git a/typescript/types/bangle_extensions.d.ts b/typescript/types/bangle_extensions.d.ts
new file mode 100644
index 000000000..e5d94d079
--- /dev/null
+++ b/typescript/types/bangle_extensions.d.ts
@@ -0,0 +1,10 @@
+type BangleHandler<T extends (...args: any[]) => any> = T | (T | undefined)[];
+
+type BangleEvents = {
+  ["#ontap"]?: BangleHandler<(data: { dir: "left" | "right" | "top" | "bottom" | "front" | "back", double: boolean, x: TapAxis, y: TapAxis, z: TapAxis }) => void>,
+  ["#ongesture"]?: BangleHandler<(xyz: Int8Array) => void>,
+  ["#onswipe"]?: BangleHandler<SwipeCallback>,
+  ["#ontouch"]?: BangleHandler<TouchCallback>,
+  ["#ondrag"]?: BangleHandler<DragCallback>,
+  ["#onstroke"]?: BangleHandler<(event: { xy: Uint8Array, stroke?: string }) => void>,
+};

From c4b08bda3bfd3146a5d59dbb9202ecb3c5030367 Mon Sep 17 00:00:00 2001
From: Rob Pilling <robpilling@gmail.com>
Date: Tue, 16 May 2023 23:15:45 +0100
Subject: [PATCH 07/28] widhid: fix "#ondrag" singular being a function

---
 apps/widhid/wid.js |  5 ++++-
 apps/widhid/wid.ts | 13 +++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/apps/widhid/wid.js b/apps/widhid/wid.js
index dd411513e..91f2fd488 100644
--- a/apps/widhid/wid.js
+++ b/apps/widhid/wid.js
@@ -81,7 +81,10 @@
         if (!wasActive) {
             waitForRelease = true;
             Bangle.on("drag", onDrag);
-            Bangle["#ondrag"] = [onDrag].concat(Bangle["#ondrag"].filter(function (f) { return f !== onDrag; }));
+            var dragHandlers = Bangle["#ondrag"];
+            if (dragHandlers && typeof dragHandlers !== "function") {
+                Bangle["#ondrag"] = [onDrag].concat(dragHandlers.filter(function (f) { return f !== onDrag; }));
+            }
             redraw();
         }
         if (activeTimeout)
diff --git a/apps/widhid/wid.ts b/apps/widhid/wid.ts
index 3291c188d..1c13d10d9 100644
--- a/apps/widhid/wid.ts
+++ b/apps/widhid/wid.ts
@@ -23,7 +23,7 @@
 
 	const onDrag = (e => {
 		// Espruino/35c8cb9be11
-		(E as any).stopEventPropagation && (E as any).stopEventPropagation();
+		E.stopEventPropagation && E.stopEventPropagation();
 
 		if(e.b === 0){
 			// released
@@ -84,10 +84,15 @@
 			waitForRelease = true; // wait for first touch up before accepting gestures
 
 			Bangle.on("drag", onDrag);
+
 			// move our drag to the start of the event listener array
-			(Bangle as any)["#ondrag"] = [onDrag].concat(
-				(Bangle as any)["#ondrag"].filter((f: unknown) => f !== onDrag)
-			);
+			const dragHandlers = (Bangle as BangleEvents)["#ondrag"]
+
+			if(dragHandlers && typeof dragHandlers !== "function"){
+				(Bangle as BangleEvents)["#ondrag"] = [onDrag as undefined | typeof onDrag].concat(
+					dragHandlers.filter((f: unknown) => f !== onDrag)
+				);
+			}
 
 			redraw();
 		}

From d595b5a9e14f1fd9b1fa48e35e287dcf9d2eb4f4 Mon Sep 17 00:00:00 2001
From: Rob Pilling <robpilling@gmail.com>
Date: Tue, 16 May 2023 23:25:01 +0100
Subject: [PATCH 08/28] stlapview: fix back button on lap view

---
 apps/stlapview/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/stlapview/app.js b/apps/stlapview/app.js
index 7a58b5782..22aa2e43b 100644
--- a/apps/stlapview/app.js
+++ b/apps/stlapview/app.js
@@ -53,7 +53,7 @@ function view(fileName) {
   let lapMenu = {
     '': {
       'title': fileNameToDateString(fileName),
-      'back': () => { E.showMenu(mainMenu); }
+      'back': showMainMenu
     },
   };
   lapMenu[`Total time: ${msToHumanReadable(fileData[fileData.length - 1])}`] = () => { };

From 2efc24c5a406954befa01a561f34143b82a24169 Mon Sep 17 00:00:00 2001
From: Rob Pilling <robpilling@gmail.com>
Date: Tue, 16 May 2023 23:25:21 +0100
Subject: [PATCH 09/28] stlapview: remove eval & comment

---
 apps/stlapview/app.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/apps/stlapview/app.js b/apps/stlapview/app.js
index 22aa2e43b..7d70be071 100644
--- a/apps/stlapview/app.js
+++ b/apps/stlapview/app.js
@@ -93,11 +93,8 @@ function showMainMenu() {
     }
   };
 
-  //I know eval is evil, but I can't think of any other way to do this.
   for (let lapFile of LAP_FILES) {
-    mainMenu[fileNameToDateString(lapFile)] = eval(`(function() {
-      view('${lapFile}');
-    })`);
+    mainMenu[fileNameToDateString(lapFile)] = () => view(lapFile);
   }
 
   if (LAP_FILES.length == 0) {

From 7bd8d4701aeb876806bb3a492be54af9d815baf9 Mon Sep 17 00:00:00 2001
From: Rob Pilling <robpilling@gmail.com>
Date: Tue, 16 May 2023 23:25:32 +0100
Subject: [PATCH 10/28] stlapview: add top-level back button

---
 apps/stlapview/app.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/stlapview/app.js b/apps/stlapview/app.js
index 7d70be071..deed578ce 100644
--- a/apps/stlapview/app.js
+++ b/apps/stlapview/app.js
@@ -89,7 +89,8 @@ function showMainMenu() {
 
   let mainMenu = {
     '': {
-      'title': 'Sessions'
+      'title': 'Sessions',
+      'back': () => load()
     }
   };
 

From 42e925d35e504fac9153372b187c9712ac7ae529 Mon Sep 17 00:00:00 2001
From: Rob Pilling <robpilling@gmail.com>
Date: Tue, 16 May 2023 23:17:53 +0100
Subject: [PATCH 11/28] widhid: continue on HID Report errors

e.g.
```
Uncaught Error: ERR 0xf (FORBIDDEN) (:3020)
 at line 1 col 2082 in widhid.wid.js
NRF.sendHIDReport([1,code],function(){return NRF.sendHIDReport([1,0]);});
                                                                       ^
in function "sendHid" called from line 1 col 2165 in widhid.wid.js
sendHid(0x10);
            ^
in function "toggle" called from line 1 col 567 in widhid.wid.js
...s(e.y-anchor.y)<2)){toggle();onEvent();return;}}if(waitForRelease)...
                                    ^
in function called from system
```
---
 apps/widhid/wid.js |  7 ++++++-
 apps/widhid/wid.ts | 12 ++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/apps/widhid/wid.js b/apps/widhid/wid.js
index 91f2fd488..06ef0cea4 100644
--- a/apps/widhid/wid.js
+++ b/apps/widhid/wid.js
@@ -123,7 +123,12 @@
         redraw();
     });
     var sendHid = function (code) {
-        NRF.sendHIDReport([1, code], function () { return NRF.sendHIDReport([1, 0]); });
+        try {
+            NRF.sendHIDReport([1, code], function () { return NRF.sendHIDReport([1, 0]); });
+        }
+        catch (e) {
+            console.log("sendHIDReport:", e);
+        }
     };
     var next = function () { return sendHid(0x01); };
     var prev = function () { return sendHid(0x02); };
diff --git a/apps/widhid/wid.ts b/apps/widhid/wid.ts
index 1c13d10d9..e788be1a8 100644
--- a/apps/widhid/wid.ts
+++ b/apps/widhid/wid.ts
@@ -145,10 +145,14 @@
 	//const DEBUG = true;
 	const sendHid = (code: number) => {
 		//if(DEBUG) return;
-		NRF.sendHIDReport(
-			[1, code],
-			() => NRF.sendHIDReport([1, 0]),
-		);
+		try{
+			NRF.sendHIDReport(
+				[1, code],
+				() => NRF.sendHIDReport([1, 0]),
+			);
+		}catch(e){
+			console.log("sendHIDReport:", e);
+		}
 	};
 
 	const next = () => /*DEBUG ? console.log("next") : */ sendHid(0x01);

From 23081d95cc6b16b46fe03b0a2cbb6cc8509a17fb Mon Sep 17 00:00:00 2001
From: Rob Pilling <robpilling@gmail.com>
Date: Tue, 16 May 2023 23:19:12 +0100
Subject: [PATCH 12/28] widhid: bump changelog

---
 apps/widhid/ChangeLog     | 2 ++
 apps/widhid/metadata.json | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/widhid/ChangeLog b/apps/widhid/ChangeLog
index a6ed84766..b0e479108 100644
--- a/apps/widhid/ChangeLog
+++ b/apps/widhid/ChangeLog
@@ -1,3 +1,5 @@
 0.01: New widget - music control via a swipe
 0.02: Improve interactivity - avoid responding to swipes when a menu or
       launcher is active.
+0.03: Handle errors when sending input over BLE and the special-case of
+      replacing a single handler
diff --git a/apps/widhid/metadata.json b/apps/widhid/metadata.json
index 84334636b..b819c9b64 100644
--- a/apps/widhid/metadata.json
+++ b/apps/widhid/metadata.json
@@ -2,7 +2,7 @@
   "id": "widhid",
   "name": "Bluetooth Music Swipe Control Widget",
   "shortName": "BLE Swipe Widget",
-  "version": "0.02",
+  "version": "0.03",
   "description": "Based on Swipe Bluetooth Music Controls (based on Bluetooth Music Controls). Swipe down to enable, then swipe up/down for volume, left/right for previous and next and tap for play/pause. Enable HID in settings, pair with your phone/computer, then use this widget to control music from your watch!",
   "icon": "icon.png",
   "readme": "README.md",

From ca9bae78af642a384d768eb3612d37b3100228d8 Mon Sep 17 00:00:00 2001
From: Rob Pilling <robpilling@gmail.com>
Date: Tue, 16 May 2023 23:35:37 +0100
Subject: [PATCH 13/28] stlapview: fix closure let-capture

---
 apps/stlapview/app.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/stlapview/app.js b/apps/stlapview/app.js
index deed578ce..c93728039 100644
--- a/apps/stlapview/app.js
+++ b/apps/stlapview/app.js
@@ -95,7 +95,10 @@ function showMainMenu() {
   };
 
   for (let lapFile of LAP_FILES) {
-    mainMenu[fileNameToDateString(lapFile)] = () => view(lapFile);
+    // `let` variables in JS have special behaviour in loops,
+    // where capturing them captures that instance of the variable,
+    // but for espruino we need to do a slightly older trick:
+    mainMenu[fileNameToDateString(lapFile)] = ((lapFile) => () => view(lapFile))(lapFile);
   }
 
   if (LAP_FILES.length == 0) {

From 9ea17e7f4a0c6cbee7f894135db48b309fba1a83 Mon Sep 17 00:00:00 2001
From: Rob Pilling <robpilling@gmail.com>
Date: Tue, 16 May 2023 23:36:18 +0100
Subject: [PATCH 14/28] stlapview: bump version

---
 apps/stlapview/ChangeLog     | 3 ++-
 apps/stlapview/metadata.json | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/stlapview/ChangeLog b/apps/stlapview/ChangeLog
index c819919ed..dd7cb5728 100644
--- a/apps/stlapview/ChangeLog
+++ b/apps/stlapview/ChangeLog
@@ -1,2 +1,3 @@
 0.01: New app!
-0.02: Submitted to the app loader
\ No newline at end of file
+0.02: Submitted to the app loader
+0.03: Fix going back from a lap view, and add a main-menu back button
diff --git a/apps/stlapview/metadata.json b/apps/stlapview/metadata.json
index aa54a7b67..fb3818fc0 100644
--- a/apps/stlapview/metadata.json
+++ b/apps/stlapview/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "stlapview",
   "name": "Stopwatch laps",
-  "version": "0.02",
+  "version": "0.03",
   "description": "Optional lap viewer for my stopwatch app",
   "icon": "icon.png",
   "type": "app",

From b3d251f681b45c671db54f14f78aa58da897e2e5 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Wed, 17 May 2023 09:06:09 +0100
Subject: [PATCH 15/28] Adding app id to clockinfo to ensure clock faces
 remember their own settings

---
 apps/aiclock/ChangeLog        |  1 +
 apps/aiclock/aiclock.app.js   |  1 +
 apps/aiclock/metadata.json    |  2 +-
 apps/lato/ChangeLog           |  1 +
 apps/lato/app.js              | 14 +++++++-------
 apps/lato/lato.fast.js        | 14 +++++++-------
 apps/lato/lato.slow.js        |  6 +++---
 apps/lato/metadata.json       |  2 +-
 apps/lcdclock/ChangeLog       |  1 +
 apps/lcdclock/app.js          |  4 ++--
 apps/lcdclock/metadata.json   |  2 +-
 apps/pebblepp/ChangeLog       |  1 +
 apps/pebblepp/app.js          |  2 ++
 apps/pebblepp/metadata.json   |  2 +-
 apps/simplestpp/ChangeLog     |  1 +
 apps/simplestpp/app.js        | 10 +++++-----
 apps/simplestpp/metadata.json |  2 +-
 apps/widclkinfo/ChangeLog     |  1 +
 apps/widclkinfo/metadata.json |  4 ++--
 apps/widclkinfo/widget.js     |  5 +++--
 20 files changed, 43 insertions(+), 33 deletions(-)

diff --git a/apps/aiclock/ChangeLog b/apps/aiclock/ChangeLog
index 43236015e..c8c5c75cb 100644
--- a/apps/aiclock/ChangeLog
+++ b/apps/aiclock/ChangeLog
@@ -6,3 +6,4 @@
 0.06: ClockInfo Fix: Use .get instead of .show as .show is not implemented for weather etc.
 0.07: Use clock_info.addInteractive instead of a custom implementation
 0.08: Use clock_info module as an app
+0.09: clock_info now uses app name to maintain settings specifically for this clock face
\ No newline at end of file
diff --git a/apps/aiclock/aiclock.app.js b/apps/aiclock/aiclock.app.js
index 350832367..8d76bc9fe 100644
--- a/apps/aiclock/aiclock.app.js
+++ b/apps/aiclock/aiclock.app.js
@@ -193,6 +193,7 @@ function queueDraw() {
  */
 let clockInfoItems = clock_info.load();
 let clockInfoMenu = clock_info.addInteractive(clockInfoItems, {
+  app : "aiclock",
   x : 0,
   y: 0,
   w: W,
diff --git a/apps/aiclock/metadata.json b/apps/aiclock/metadata.json
index ee9059f75..66f5de664 100644
--- a/apps/aiclock/metadata.json
+++ b/apps/aiclock/metadata.json
@@ -3,7 +3,7 @@
   "name": "AI Clock",
   "shortName":"AI Clock",
   "icon": "aiclock.png",
-  "version":"0.08",
+  "version":"0.09",
   "readme": "README.md",
   "supports": ["BANGLEJS2"],
   "dependencies" : { "clock_info":"module" },
diff --git a/apps/lato/ChangeLog b/apps/lato/ChangeLog
index 7e6c3b0d5..686f3b707 100644
--- a/apps/lato/ChangeLog
+++ b/apps/lato/ChangeLog
@@ -1,2 +1,3 @@
 0.01: first release
 0.02: Use clock_info module as an app
+0.03: clock_info now uses app name to maintain settings specifically for this clock face
\ No newline at end of file
diff --git a/apps/lato/app.js b/apps/lato/app.js
index 6045d7f17..88e723a78 100644
--- a/apps/lato/app.js
+++ b/apps/lato/app.js
@@ -37,13 +37,13 @@ Graphics.prototype.setFontLatoSmall = function(scale) {
 {
   // must be inside our own scope here so that when we are unloaded everything disappears
   // we also define functions using 'let fn = function() {..}' for the same reason. function decls are global
-  
+
   let draw = function() {
     var date = new Date();
     var timeStr = require("locale").time(date,1);
     var h = g.getHeight();
     var w = g.getWidth();
-    
+
     g.reset();
     g.setColor(g.theme.bg);
     g.fillRect(Bangle.appRect);
@@ -66,7 +66,7 @@ Graphics.prototype.setFontLatoSmall = function(scale) {
   /**
    * clock_info_support
    * this is the callback function that get invoked by clockInfoMenu.redraw();
-   * 
+   *
    * We will display the image and text on the same line and centre the combined
    * length of the image+text
    *
@@ -76,7 +76,7 @@ Graphics.prototype.setFontLatoSmall = function(scale) {
     //g.reset().setFont('Vector',24).setBgColor(options.bg).setColor(options.fg);
     g.reset().setFontLatoSmall();
     g.setBgColor(options.bg).setColor(options.fg);
-    
+
     //use info.text.toString(), steps does not have length defined
     var text_w = g.stringWidth(info.text.toString());
     // gap between image and text
@@ -88,7 +88,7 @@ Graphics.prototype.setFontLatoSmall = function(scale) {
 
     // clear the whole info line, allow additional 2 pixels in case LatoFont overflows area
     g.clearRect(0, options.y -2, g.getWidth(), options.y+ 23 + 2);
-    
+
     // draw the image if we have one
     if (info.img) {
       // image start
@@ -110,8 +110,8 @@ Graphics.prototype.setFontLatoSmall = function(scale) {
   // clock_info_support
   // setup the way we wish to interact with the menu
   // the hl property defines the color the of the info when the menu is selected after tapping on it
-  let clockInfoMenu = require("clock_info").addInteractive(clockInfoItems, { x:64, y:132, w:50, h:40, draw : clockInfoDraw, bg : g.theme.bg, fg : g.theme.fg, hl : "#0ff"} );
-  
+  let clockInfoMenu = require("clock_info").addInteractive(clockInfoItems, { app : "lato", x:64, y:132, w:50, h:40, draw : clockInfoDraw, bg : g.theme.bg, fg : g.theme.fg, hl : "#0ff"} );
+
   // timeout used to update every minute
   var drawTimeout;
   g.clear();
diff --git a/apps/lato/lato.fast.js b/apps/lato/lato.fast.js
index 6045d7f17..88e723a78 100644
--- a/apps/lato/lato.fast.js
+++ b/apps/lato/lato.fast.js
@@ -37,13 +37,13 @@ Graphics.prototype.setFontLatoSmall = function(scale) {
 {
   // must be inside our own scope here so that when we are unloaded everything disappears
   // we also define functions using 'let fn = function() {..}' for the same reason. function decls are global
-  
+
   let draw = function() {
     var date = new Date();
     var timeStr = require("locale").time(date,1);
     var h = g.getHeight();
     var w = g.getWidth();
-    
+
     g.reset();
     g.setColor(g.theme.bg);
     g.fillRect(Bangle.appRect);
@@ -66,7 +66,7 @@ Graphics.prototype.setFontLatoSmall = function(scale) {
   /**
    * clock_info_support
    * this is the callback function that get invoked by clockInfoMenu.redraw();
-   * 
+   *
    * We will display the image and text on the same line and centre the combined
    * length of the image+text
    *
@@ -76,7 +76,7 @@ Graphics.prototype.setFontLatoSmall = function(scale) {
     //g.reset().setFont('Vector',24).setBgColor(options.bg).setColor(options.fg);
     g.reset().setFontLatoSmall();
     g.setBgColor(options.bg).setColor(options.fg);
-    
+
     //use info.text.toString(), steps does not have length defined
     var text_w = g.stringWidth(info.text.toString());
     // gap between image and text
@@ -88,7 +88,7 @@ Graphics.prototype.setFontLatoSmall = function(scale) {
 
     // clear the whole info line, allow additional 2 pixels in case LatoFont overflows area
     g.clearRect(0, options.y -2, g.getWidth(), options.y+ 23 + 2);
-    
+
     // draw the image if we have one
     if (info.img) {
       // image start
@@ -110,8 +110,8 @@ Graphics.prototype.setFontLatoSmall = function(scale) {
   // clock_info_support
   // setup the way we wish to interact with the menu
   // the hl property defines the color the of the info when the menu is selected after tapping on it
-  let clockInfoMenu = require("clock_info").addInteractive(clockInfoItems, { x:64, y:132, w:50, h:40, draw : clockInfoDraw, bg : g.theme.bg, fg : g.theme.fg, hl : "#0ff"} );
-  
+  let clockInfoMenu = require("clock_info").addInteractive(clockInfoItems, { app : "lato", x:64, y:132, w:50, h:40, draw : clockInfoDraw, bg : g.theme.bg, fg : g.theme.fg, hl : "#0ff"} );
+
   // timeout used to update every minute
   var drawTimeout;
   g.clear();
diff --git a/apps/lato/lato.slow.js b/apps/lato/lato.slow.js
index f458ecddd..f0d1c09a7 100644
--- a/apps/lato/lato.slow.js
+++ b/apps/lato/lato.slow.js
@@ -64,7 +64,7 @@ function queueDraw() {
 /**
  * clock_info_support
  * this is the callback function that get invoked by clockInfoMenu.redraw();
- * 
+ *
  * We will display the image and text on the same line and centre the combined
  * length of the image+text
  *
@@ -109,8 +109,8 @@ let clockInfoItems = require("clock_info").load();
  * selected after tapping on it
  *
  */
-let clockInfoMenu = require("clock_info").addInteractive(clockInfoItems, { x:64, y:132, w:50, h:40, draw : clockInfoDraw, bg : g.theme.bg, fg : g.theme.fg, hl : "#0ff"} );
-  
+let clockInfoMenu = require("clock_info").addInteractive(clockInfoItems, { app : "lato", x:64, y:132, w:50, h:40, draw : clockInfoDraw, bg : g.theme.bg, fg : g.theme.fg, hl : "#0ff"} );
+
 g.clear();
 
 // Show launcher when middle button pressed
diff --git a/apps/lato/metadata.json b/apps/lato/metadata.json
index 994fec77d..406413790 100644
--- a/apps/lato/metadata.json
+++ b/apps/lato/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "lato",
   "name": "Lato",
-  "version": "0.02",
+  "version": "0.03",
   "description": "A Lato Font clock with fast load and clock_info",
   "readme": "README.md",
   "icon": "app.png",
diff --git a/apps/lcdclock/ChangeLog b/apps/lcdclock/ChangeLog
index 220369925..56ea03c2c 100644
--- a/apps/lcdclock/ChangeLog
+++ b/apps/lcdclock/ChangeLog
@@ -1,2 +1,3 @@
 0.01: New App!
 0.02: Use clock_info module as an app
+0.03: clock_info now uses app name to maintain settings specifically for this clock face
\ No newline at end of file
diff --git a/apps/lcdclock/app.js b/apps/lcdclock/app.js
index 2bc23247c..3808f46fe 100644
--- a/apps/lcdclock/app.js
+++ b/apps/lcdclock/app.js
@@ -79,6 +79,6 @@ let clockInfoDraw = (itm, info, options) => {
 
 };
 let clockInfoItems = require("clock_info").load();
-let clockInfoMenu = require("clock_info").addInteractive(clockInfoItems, { x:R.x, y:R.y, w:midX-2, h:barY-R.y-2, draw : clockInfoDraw});
-let clockInfoMenu2 = require("clock_info").addInteractive(clockInfoItems, { x:midX+2, y:R.y, w:midX-3, h:barY-R.y-2, draw : clockInfoDraw});
+let clockInfoMenu = require("clock_info").addInteractive(clockInfoItems, { app:"lcdclock", x:R.x, y:R.y, w:midX-2, h:barY-R.y-2, draw : clockInfoDraw});
+let clockInfoMenu2 = require("clock_info").addInteractive(clockInfoItems, {  app:"lcdclock", x:midX+2, y:R.y, w:midX-3, h:barY-R.y-2, draw : clockInfoDraw});
 }
diff --git a/apps/lcdclock/metadata.json b/apps/lcdclock/metadata.json
index e286dc017..b144c125e 100644
--- a/apps/lcdclock/metadata.json
+++ b/apps/lcdclock/metadata.json
@@ -1,6 +1,6 @@
 { "id": "lcdclock",
   "name": "LCD Clock",
-  "version":"0.02",
+  "version":"0.03",
   "description": "A Casio-style clock, with ClockInfo areas at the top and bottom. Tap them and swipe up/down to toggle between different information",
   "icon": "app.png",
   "screenshots": [{"url":"screenshot.png"}],
diff --git a/apps/pebblepp/ChangeLog b/apps/pebblepp/ChangeLog
index 7b83706bf..6e88ab1ff 100644
--- a/apps/pebblepp/ChangeLog
+++ b/apps/pebblepp/ChangeLog
@@ -1 +1,2 @@
 0.01: First release
+0.02: clock_info now uses app name to maintain settings specifically for this clock face
\ No newline at end of file
diff --git a/apps/pebblepp/app.js b/apps/pebblepp/app.js
index d296cdc1a..a04ae8bb0 100644
--- a/apps/pebblepp/app.js
+++ b/apps/pebblepp/app.js
@@ -90,10 +90,12 @@ let clockInfoDraw = (itm, info, options) => {
 };
 
 let clockInfoMenuA = require("clock_info").addInteractive(clockInfoItems, {
+  app:"pebblepp",
   x : 0, y: 0, w: w/2, h:h/2,
   draw : clockInfoDraw
 });
 let clockInfoMenuB = require("clock_info").addInteractive(clockInfoItems, {
+  app:"pebblepp",
   x : w/2, y: 0, w: w/2, h:h/2,
   draw : clockInfoDraw
 });
diff --git a/apps/pebblepp/metadata.json b/apps/pebblepp/metadata.json
index aede7ae12..252584d4f 100644
--- a/apps/pebblepp/metadata.json
+++ b/apps/pebblepp/metadata.json
@@ -2,7 +2,7 @@
   "id": "pebblepp",
   "name": "Pebble++ Clock",
   "shortName": "Pebble++",
-  "version": "0.01",
+  "version": "0.02",
   "description": "A pebble style clock (based on the 'Pebble Clock' app) but with two configurable ClockInfo items at the top",
   "icon": "app.png",
   "screenshots": [{"url":"screenshot.png"}],
diff --git a/apps/simplestpp/ChangeLog b/apps/simplestpp/ChangeLog
index 51186fbdb..53ccf75db 100644
--- a/apps/simplestpp/ChangeLog
+++ b/apps/simplestpp/ChangeLog
@@ -1,3 +1,4 @@
 0.01: first release
 0.02: removed fast load, minimalism is useful for narrowing down on issues
 0.03: Use clock_info module as an app
+0.04: clock_info now uses app name to maintain settings specifically for this clock face
\ No newline at end of file
diff --git a/apps/simplestpp/app.js b/apps/simplestpp/app.js
index 0dcb883d3..66caadfe2 100644
--- a/apps/simplestpp/app.js
+++ b/apps/simplestpp/app.js
@@ -5,7 +5,7 @@ function draw() {
   var timeStr = require("locale").time(date,1);
   var h = g.getHeight();
   var w = g.getWidth();
-  
+
   g.reset();
   g.setColor(g.theme.bg);
   g.fillRect(Bangle.appRect);
@@ -34,7 +34,7 @@ function queueDraw() {
 /**
  * clock_info_support
  * this is the callback function that get invoked by clockInfoMenu.redraw();
- * 
+ *
  * We will display the image and text on the same line and centre the combined
  * length of the image+text
  *
@@ -42,7 +42,7 @@ function queueDraw() {
 function clockInfoDraw(itm, info, options) {
 
   g.reset().setFont('Vector',24).setBgColor(options.bg).setColor(options.fg);
-  
+
   //use info.text.toString(), steps does not have length defined
   var text_w = g.stringWidth(info.text.toString());
   // gap between image and text
@@ -54,7 +54,7 @@ function clockInfoDraw(itm, info, options) {
 
   // clear the whole info line
   g.clearRect(0, options.y -1, g.getWidth(), options.y+24);
-  
+
   // draw the image if we have one
   if (info.img) {
     // image start
@@ -82,7 +82,7 @@ let clockInfoItems = require("clock_info").load();
  * selected after tapping on it
  *
  */
-let clockInfoMenu = require("clock_info").addInteractive(clockInfoItems, { x:64, y:132, w:50, h:40, draw : clockInfoDraw, bg : g.theme.bg, fg : g.theme.fg, hl : "#0ff"} );
+let clockInfoMenu = require("clock_info").addInteractive(clockInfoItems, { app:"simplestpp", x:64, y:132, w:50, h:40, draw : clockInfoDraw, bg : g.theme.bg, fg : g.theme.fg, hl : "#0ff"} );
 
 // Clear the screen once, at startup
 g.clear();
diff --git a/apps/simplestpp/metadata.json b/apps/simplestpp/metadata.json
index 64dc19ae2..c81846539 100644
--- a/apps/simplestpp/metadata.json
+++ b/apps/simplestpp/metadata.json
@@ -2,7 +2,7 @@
   "id": "simplestpp",
   "name": "Simplest++ Clock",
   "shortName": "Simplest++",
-  "version": "0.03",
+  "version": "0.04",
   "description": "The simplest working clock, with clock_info, acts as a tutorial piece",
   "readme": "README.md",
   "icon": "app.png",
diff --git a/apps/widclkinfo/ChangeLog b/apps/widclkinfo/ChangeLog
index 4c21f3ace..3ca502120 100644
--- a/apps/widclkinfo/ChangeLog
+++ b/apps/widclkinfo/ChangeLog
@@ -1 +1,2 @@
 0.01: New Widget!
+0.02: Now use an app ID (to avoid conflicts with clocks that also use ClockInfo)
\ No newline at end of file
diff --git a/apps/widclkinfo/metadata.json b/apps/widclkinfo/metadata.json
index 3848563c6..282e80b76 100644
--- a/apps/widclkinfo/metadata.json
+++ b/apps/widclkinfo/metadata.json
@@ -1,8 +1,8 @@
 { "id": "widclkinfo",
   "name": "Clock Info Widget",
-  "version":"0.01",
+  "version":"0.02",
   "description": "Use 'Clock Info' in the Widget bar. Tap on the widget to select, then drag up/down/left/right to choose what information is displayed.",
-  "icon": "widget.png",  
+  "icon": "widget.png",
   "screenshots" : [ { "url":"screenshot.png" }],
   "type": "widget",
   "tags": "widget,clkinfo",
diff --git a/apps/widclkinfo/widget.js b/apps/widclkinfo/widget.js
index 403f289e7..95bc9a111 100644
--- a/apps/widclkinfo/widget.js
+++ b/apps/widclkinfo/widget.js
@@ -3,6 +3,7 @@ if (!require("clock_info").loadCount) { // don't load if a clock_info was alread
   let clockInfoItems = require("clock_info").load();
   // Add the
   let clockInfoMenu = require("clock_info").addInteractive(clockInfoItems, {
+    app : "widclkinfo",
     // Add the dimensions we're rendering to here - these are used to detect taps on the clock info area
     x : 0, y: 0, w: 72, h:24,
     // You can add other information here you want to be passed into 'options' in 'draw'
@@ -19,8 +20,8 @@ if (!require("clock_info").loadCount) { // don't load if a clock_info was alread
   let clockInfoInfo; // when clockInfoMenu.draw is called we set this up
 
   // The actual widget we're displaying
-  WIDGETS["clkinfo"] = { 
-    area:"tl", 
+  WIDGETS["clkinfo"] = {
+    area:"tl",
     width: clockInfoMenu.w,
     draw:function(e) {
       clockInfoMenu.x = e.x;

From 0f7c1d5e40fb60df07c4cad94784b31e7cf65814 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Wed, 17 May 2023 09:08:17 +0100
Subject: [PATCH 16/28] screenshot

---
 apps/clkinfocal/metadata.json  |   1 +
 apps/clkinfocal/screenshot.png | Bin 0 -> 2299 bytes
 2 files changed, 1 insertion(+)
 create mode 100644 apps/clkinfocal/screenshot.png

diff --git a/apps/clkinfocal/metadata.json b/apps/clkinfocal/metadata.json
index 6d6dd63fc..1d14c3b59 100644
--- a/apps/clkinfocal/metadata.json
+++ b/apps/clkinfocal/metadata.json
@@ -3,6 +3,7 @@
   "version":"0.01",
   "description": "For clocks that display 'clockinfo' (messages that can be cycled through using the clock_info module) this displays the day of the month in the icon, and the weekday",
   "icon": "app.png",
+  "screenshots": [{"url":"screenshot.png"}],
   "type": "clkinfo",
   "tags": "clkinfo,calendar",
   "supports" : ["BANGLEJS2"],
diff --git a/apps/clkinfocal/screenshot.png b/apps/clkinfocal/screenshot.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb054e3a4b981840fd0674962275f8eacefdb3a9
GIT binary patch
literal 2299
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

literal 0
HcmV?d00001


From 1d7d9e2962a7cf5194610e9eea7c0cb8cd14cc33 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Wed, 17 May 2023 09:25:47 +0100
Subject: [PATCH 17/28] 0.10: Option to hide widgets, tweak top widget width to
 avoid overlap with hour text at 9am

---
 apps/slopeclockpp/ChangeLog      |   1 +
 apps/slopeclockpp/app.js         |  20 +++++++++++++++-----
 apps/slopeclockpp/metadata.json  |   2 +-
 apps/slopeclockpp/screenshot.png | Bin 3307 -> 3302 bytes
 apps/slopeclockpp/settings.js    |   4 ++++
 5 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/apps/slopeclockpp/ChangeLog b/apps/slopeclockpp/ChangeLog
index c9fb0de7a..39f837386 100644
--- a/apps/slopeclockpp/ChangeLog
+++ b/apps/slopeclockpp/ChangeLog
@@ -10,3 +10,4 @@
 0.08: Stability improvements - ensure we continue even if a flat string can't be allocated
       Stop ClockInfo text drawing outside the allocated area
 0.09: Use clock_info module as an app
+0.10: Option to hide widgets, tweak top widget width to avoid overlap with hour text at 9am
\ No newline at end of file
diff --git a/apps/slopeclockpp/app.js b/apps/slopeclockpp/app.js
index b57650f9e..5b1d898d1 100644
--- a/apps/slopeclockpp/app.js
+++ b/apps/slopeclockpp/app.js
@@ -58,7 +58,8 @@ let draw = function() {
   // Now draw this one
   R = Bangle.appRect;
   x = R.w / 2;
-  y = R.y + R.h / 2 - 12; // 12 = room for date
+  y = R.y + R.h / 2 - 6;
+  if (!settings.hideWidgets) y-= 6; // extra room for date
   var date = new Date();
   var local_time = require("locale").time(date, 1);
   var hourStr = local_time.split(":")[0].trim().padStart(2,'0');
@@ -77,6 +78,8 @@ let draw = function() {
   g2.setColor(0).fillRect(0,0,g2.getWidth(),g2.getHeight()).setFontAlign(1, 0).setFont("PaytoneOne");
   g2.setColor(1).drawString(minStr, g2.getWidth()-fontBorder, g2.getHeight()/2).setFont("4x6"); // draw and unload custom font
   g2.setColor(0).fillPoly([0,0, g2.getWidth(),0, 0,slope*2]);
+  // redraw the top widget
+  clockInfoMenu.redraw();
   // start the animation *in*
   animate(true);
 };
@@ -141,8 +144,14 @@ let clockInfoDraw = (itm, info, options) => {
   g.setClipRect(0,0,g.getWidth()-1, g.getHeight()-1);
 };
 let clockInfoItems = require("clock_info").load();
-let clockInfoMenu = require("clock_info").addInteractive(clockInfoItems, { app:"slopeclockpp",x:126, y:24, w:50, h:40, draw : clockInfoDraw, bg : g.theme.bg, fg : g.theme.fg, hl : "#f00"/*red*/ });
-let clockInfoMenu2 = require("clock_info").addInteractive(clockInfoItems, { app:"slopeclockpp",x:0, y:115, w:50, h:40, draw : clockInfoDraw, bg : bgColor, fg : g.theme.bg, hl : (bgColor=="#000")?"#f00"/*red*/:g.theme.fg });
+let clockInfoMenu = require("clock_info").addInteractive(clockInfoItems, {  // top right
+  app:"slopeclockpp",x:132, y:settings.hideWidgets ? 12 : 24, w:44, h:40,
+  draw : clockInfoDraw, bg : g.theme.bg, fg : g.theme.fg, hl : "#f00"/*red*/
+});
+let clockInfoMenu2 = require("clock_info").addInteractive(clockInfoItems, { // bottom left
+  app:"slopeclockpp",x:0, y:115, w:50, h:40,
+  draw : clockInfoDraw, bg : bgColor, fg : g.theme.bg, hl : (bgColor=="#000")?"#f00"/*red*/:g.theme.fg
+});
 
 // Show launcher when middle button pressed
 Bangle.setUI({
@@ -163,6 +172,7 @@ Bangle.setUI({
 });
 // Load widgets
 Bangle.loadWidgets();
+if (settings.hideWidgets) require("widget_utils").swipeOn();
+else setTimeout(Bangle.drawWidgets,0);
 draw();
-setTimeout(Bangle.drawWidgets,0);
-}
+}
\ No newline at end of file
diff --git a/apps/slopeclockpp/metadata.json b/apps/slopeclockpp/metadata.json
index 116b6c665..086b8148f 100644
--- a/apps/slopeclockpp/metadata.json
+++ b/apps/slopeclockpp/metadata.json
@@ -1,6 +1,6 @@
 { "id": "slopeclockpp",
   "name": "Slope Clock ++",
-  "version":"0.09",
+  "version":"0.10",
   "description": "A clock where hours and minutes are divided by a sloping line. When the minute changes, the numbers slide off the screen. This is a clone of the original Slope Clock which shows extra information and allows the colors to be selected.",
   "icon": "app.png",
   "screenshots": [{"url":"screenshot.png"}],
diff --git a/apps/slopeclockpp/screenshot.png b/apps/slopeclockpp/screenshot.png
index dfa76fed70b61e0cdf2fb5e5663b54a756245fac..1d9cec8e4e86b379460ac59d532ae0ace1e94ddd 100644
GIT binary patch
literal 3302
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

delta 3290
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
YfAF8BPGs4;L;wH)07*qoM6N<$f{EZCRR910

diff --git a/apps/slopeclockpp/settings.js b/apps/slopeclockpp/settings.js
index 1d285767a..3c0e0a6e9 100644
--- a/apps/slopeclockpp/settings.js
+++ b/apps/slopeclockpp/settings.js
@@ -15,6 +15,10 @@
     let menu ={
       '': { 'title': 'Slope Clock ++' },
       /*LANG*/'< Back': back,
+      /*LANG*/'Hide Widgets': {
+        value: !!settings.hideWidgets,
+        onchange: x => save('hideWidgets', x),
+      },
       /*LANG*/'Red': {
         value: !!settings.colorRed,
         format: () => (settings.colorRed ? 'Yes' : 'No'),

From 5f715b7f782729fce98ce059abfbf1cfd2718684 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Wed, 17 May 2023 10:37:27 +0100
Subject: [PATCH 18/28] ensure clockinfo text is usppercase (font doesn't
 render lowercase)

---
 apps/pebblepp/ChangeLog | 3 ++-
 apps/pebblepp/app.js    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/pebblepp/ChangeLog b/apps/pebblepp/ChangeLog
index 6e88ab1ff..de19d9ba4 100644
--- a/apps/pebblepp/ChangeLog
+++ b/apps/pebblepp/ChangeLog
@@ -1,2 +1,3 @@
 0.01: First release
-0.02: clock_info now uses app name to maintain settings specifically for this clock face
\ No newline at end of file
+0.02: clock_info now uses app name to maintain settings specifically for this clock face
+      ensure clockinfo text is usppercase (font doesn't render lowercase)
\ No newline at end of file
diff --git a/apps/pebblepp/app.js b/apps/pebblepp/app.js
index a04ae8bb0..555183d3d 100644
--- a/apps/pebblepp/app.js
+++ b/apps/pebblepp/app.js
@@ -86,7 +86,7 @@ let clockInfoDraw = (itm, info, options) => {
     }
   }
   g.setFontLECO1976Regular22().setFontAlign(0, 0);
-  g.drawString(info.text, midx,options.y+options.h-12); // draw the text
+  g.drawString(info.text.toString().toUpperCase(), midx,options.y+options.h-12); // draw the text
 };
 
 let clockInfoMenuA = require("clock_info").addInteractive(clockInfoItems, {

From 397c16757cbe5dcfc2ccd8a53af8e9b4f0a7e67a Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Wed, 17 May 2023 10:38:21 +0100
Subject: [PATCH 19/28] Attempt at fixing openstreetmap map when viewed on
 mobile (I find going portrait/landscape was needed previously)

---
 apps/openstmap/interface.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/openstmap/interface.html b/apps/openstmap/interface.html
index ba1246d9f..618c5822e 100644
--- a/apps/openstmap/interface.html
+++ b/apps/openstmap/interface.html
@@ -239,6 +239,8 @@ TODO:
         document.getElementById("mapContainer").style.display = "";
         document.getElementById("maptiles").style.display="none";
         document.getElementById("uploadbuttons").style.display="none";
+        map.invalidateSize();
+        map.locate({setView: true, maxZoom: 16, enableHighAccuracy:true});
       }
 
       // -----------------------------------------------------

From 087f6d0f1aebbaf64e4953620183a6528eb08e93 Mon Sep 17 00:00:00 2001
From: Rob Pilling <robpilling@gmail.com>
Date: Wed, 17 May 2023 12:54:28 +0100
Subject: [PATCH 20/28] stlap: use closure to avoid hanging onto `arguments` in
 `showMainMenu`

---
 apps/stlapview/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/stlapview/app.js b/apps/stlapview/app.js
index c93728039..c11739af7 100644
--- a/apps/stlapview/app.js
+++ b/apps/stlapview/app.js
@@ -53,7 +53,7 @@ function view(fileName) {
   let lapMenu = {
     '': {
       'title': fileNameToDateString(fileName),
-      'back': showMainMenu
+      'back': () => showMainMenu()
     },
   };
   lapMenu[`Total time: ${msToHumanReadable(fileData[fileData.length - 1])}`] = () => { };

From bd3c8b4107ee2673b8cd089d3e36817286c93a51 Mon Sep 17 00:00:00 2001
From: Martin Boonk <martin@boonk.info>
Date: Wed, 17 May 2023 21:54:35 +0200
Subject: [PATCH 21/28] owmweather - Read defaults to prevent loading weather
 every few seconds

---
 apps/owmweather/boot.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/owmweather/boot.js b/apps/owmweather/boot.js
index 737413940..7803bcf3b 100644
--- a/apps/owmweather/boot.js
+++ b/apps/owmweather/boot.js
@@ -1,8 +1,9 @@
 {
   let waiting = false;
-  let settings = require("Storage").readJSON("owmweather.json", 1) || {
-    enabled: false
-  };
+  let settings = Object.assign(
+    require('Storage').readJSON("owmweather.default.json", true) || {},
+    require('Storage').readJSON("owmweather.json", true) || {}
+  );
   
   let completion = function(){
     waiting = false;

From 4c5e9ce74bb1ca50506a0065535a4f29cb6c97a6 Mon Sep 17 00:00:00 2001
From: Martin Boonk <martin@boonk.info>
Date: Wed, 17 May 2023 21:56:21 +0200
Subject: [PATCH 22/28] owmweather - Bump version

---
 apps/owmweather/ChangeLog     | 1 +
 apps/owmweather/metadata.json | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/owmweather/ChangeLog b/apps/owmweather/ChangeLog
index dba6a755a..6b4a80e23 100644
--- a/apps/owmweather/ChangeLog
+++ b/apps/owmweather/ChangeLog
@@ -1,2 +1,3 @@
 0.01: New App!
 0.02: Do first update request 5s after boot to boot up faster
+0.03: Fix updating weather too often
diff --git a/apps/owmweather/metadata.json b/apps/owmweather/metadata.json
index 56f9afca7..7ea3dc9bb 100644
--- a/apps/owmweather/metadata.json
+++ b/apps/owmweather/metadata.json
@@ -1,7 +1,7 @@
 { "id": "owmweather",
   "name": "OpenWeatherMap weather provider",
   "shortName":"OWM Weather",
-  "version":"0.02",
+  "version":"0.03",
   "description": "Pulls weather from OpenWeatherMap (OWM) API",
   "icon": "app.png",
   "type": "bootloader",

From bd34c54eed48af473e737ac02e1e2d1d6289ec91 Mon Sep 17 00:00:00 2001
From: Martin Boonk <martin@boonk.info>
Date: Wed, 17 May 2023 22:05:08 +0200
Subject: [PATCH 23/28] owmweather - Respect update interval even on boot

---
 apps/owmweather/boot.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/owmweather/boot.js b/apps/owmweather/boot.js
index 7803bcf3b..5ac32c55a 100644
--- a/apps/owmweather/boot.js
+++ b/apps/owmweather/boot.js
@@ -7,14 +7,15 @@
   
   let completion = function(){
     waiting = false;
+    settings.updated = Date.now();
+    require('Storage').writeJSON("owmweather.json", settings);
   }
 
   if (settings.enabled) {    
     let weather = require("Storage").readJSON('weather.json') || {};
-    let lastUpdate;
     if (weather && weather.weather && weather.weather.time) lastUpdate = weather.weather.time;
 
-    if (!lastUpdate || lastUpdate + settings.refresh * 1000 * 60 < Date.now()){
+    if (!settings.updated || settings.updated + settings.refresh * 1000 * 60 < Date.now()){
       setTimeout(() => {
         if (!waiting){
           waiting = true;

From fe240ea27c163afc59267bb6d2a7ad2644e0554e Mon Sep 17 00:00:00 2001
From: Martin Boonk <martin@boonk.info>
Date: Wed, 17 May 2023 22:22:48 +0200
Subject: [PATCH 24/28] owmweather - Fix calling weather if it is not available

---
 apps/owmweather/lib.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/owmweather/lib.js b/apps/owmweather/lib.js
index 6ba52b498..67cdc115b 100644
--- a/apps/owmweather/lib.js
+++ b/apps/owmweather/lib.js
@@ -25,7 +25,7 @@ function parseWeather(response) {
 
     json.weather = weather;
     require("Storage").writeJSON('weather.json', json);
-    require("weather").emit("update", json.weather);
+    if (require("Storage").read("weather")!==undefined) require("weather").emit("update", json.weather);
     return undefined;
   } else {
     return /*LANG*/"Not OWM data";

From b39bd76770825c3b5f77313042569d295257a24b Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Thu, 18 May 2023 11:01:06 +0100
Subject: [PATCH 25/28] Added an app to adjust the loading screen

---
 apps/loadingscreen/ChangeLog     |   1 +
 apps/loadingscreen/README.md     |  15 ++++++
 apps/loadingscreen/app.png       | Bin 0 -> 773 bytes
 apps/loadingscreen/metadata.json |  13 +++++
 apps/loadingscreen/settings.js   |  81 +++++++++++++++++++++++++++++++
 5 files changed, 110 insertions(+)
 create mode 100644 apps/loadingscreen/ChangeLog
 create mode 100644 apps/loadingscreen/README.md
 create mode 100644 apps/loadingscreen/app.png
 create mode 100644 apps/loadingscreen/metadata.json
 create mode 100644 apps/loadingscreen/settings.js

diff --git a/apps/loadingscreen/ChangeLog b/apps/loadingscreen/ChangeLog
new file mode 100644
index 000000000..5560f00bc
--- /dev/null
+++ b/apps/loadingscreen/ChangeLog
@@ -0,0 +1 @@
+0.01: New App!
diff --git a/apps/loadingscreen/README.md b/apps/loadingscreen/README.md
new file mode 100644
index 000000000..2d6128a53
--- /dev/null
+++ b/apps/loadingscreen/README.md
@@ -0,0 +1,15 @@
+# Loading Screen Settings
+
+This app allows you to choose the loading screen that's displayed when swapping between apps on Bangle.js.
+
+## Usage
+
+Go to the Launcher, then `Settings`, then `Apps` and click on `Loading Screen` - you can then click to choose the loading screen you'll see.
+
+## Internals
+
+When reloading an app (fast load doesn't display anything), Bangle.js looks for a file called `.loading` (in versions 2v18+)  which should be
+an image. If it doesn't exist, the default `Loading...` screen is displayed. If it does exist and is less than 3 bytes long,
+nothing is displayed, or if it's an image it is displayed, centered.
+
+This app sets that image file accordingly, but you can always upload your own file.
\ No newline at end of file
diff --git a/apps/loadingscreen/app.png b/apps/loadingscreen/app.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9f36d1fc2ae6101682b5a94868d094ed166d926
GIT binary patch
literal 773
zcmV+g1N!`lP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000XU
z000XU0RWnu7ytkQw@E}nRCt{2nL%q4K^TSy^w0_(6i@Z$L1=$PqX<fS>mQKhXcF`w
zqToMhKyP9r3RVwQFQToPT}?4Tv%#V{1fzCllWk*iP(d5pWG3k+yKzF;re>F#&bI6e
z?`28gd1t@*W@ZN=U%q^~QY;e8#-bq@h$Ep48ngxmA8mW!0j8rtZBX#j(coLOn~F>Z
z;C~p&(mn_<uI&^)JQ3L4vgwwp^K%O2U^=tf1fgne(|YE}IzKBdfI`_r0rL5K%Ytt-
z0g^?B@RS3lY*t<X!l?jR`PB~a<wwi;=u-}ua3U=LCTv}R7(d$qvgM}B0Bl`mfQkSq
zd}{|t8P4Gq(}b1f1)%Ja0MW|rNt|{YfU-GHbRpAgjZMf^-Ib6^_!%Tq3gu}5vs7ui
zYN430S4g(7ULVDTZFIL&b4_pnzo8cEW5^4_I=k2n_wH-|04iyOke7rhk2~)?{08!x
zk~$1w$~6aVGm%WfLF7dx3vdh*p8v<lXVM?xF!Hi+2}aEA!PY$w&%H3<DDt|Vmf;Yl
z{B@7ffB&omN068G#(-gkGIdXu&>X-4g|g>;`#)valam-z9&^3|^P9*^O6ZOAy+Da_
z9rVQIZOW+;L|%|m+BktJTeIyj!I%#N+(MR13lZy?Z9Vv{korm4{N}OprG0dZ3zs_Z
z!p8iCUh_eb3XhlhX*(3f*S5e5n<ZucePWrP^2DLubUq#57G5}?x??}kJdhRu6SgWq
zGPxya%?$Sq(7HVY+6S$>j8<d@u+9N0sY7jcv@g7H?f#hcALZ}4KxTlVRXV8|$MBs}
zO2@_OOr-@-D0^Z;=!q+?15kWbl+a^&0SKQmAr?PXpniA6F?{{raab%=#T%HC79cz^
zp55`s-O0e<Z)NuJ=k>te3lQ@!`9l6BpD$m&P)C0N&cm|XbPbj@00000NkvXXu0mjf
D%3NWJ

literal 0
HcmV?d00001

diff --git a/apps/loadingscreen/metadata.json b/apps/loadingscreen/metadata.json
new file mode 100644
index 000000000..4d2327824
--- /dev/null
+++ b/apps/loadingscreen/metadata.json
@@ -0,0 +1,13 @@
+{ "id": "loadingscreen",
+  "name": "Loading Screen",
+  "version":"0.01",
+  "description": "On Bangle.js 2v18+, customize the app loading screen",
+  "icon": "app.png",
+  "tags": "tool",
+  "type": "settings",
+  "supports" : ["BANGLEJS2"],
+  "readme": "README.md",
+  "storage": [
+    {"name":"loadingscreen.settings.js","url":"settings.js"}
+  ]
+}
diff --git a/apps/loadingscreen/settings.js b/apps/loadingscreen/settings.js
new file mode 100644
index 000000000..8489423a2
--- /dev/null
+++ b/apps/loadingscreen/settings.js
@@ -0,0 +1,81 @@
+(function(back) {
+  function goBack() {
+    var im = require("Storage").read(".loading");
+    if (im && im.length>3) {
+      var i = g.imageMetrics(im);
+      g.reset().drawImage(im, (g.getWidth()-i.width)/2, (g.getHeight()-i.height)/2);
+    }
+    setTimeout(back, 500);
+  }
+
+  function savePattern(pattern) {
+    E.showMessage("Please wait...");
+    var im = Graphics.createImage(pattern,"string");
+    var w = g.getWidth(), h = g.getHeight();
+    var b = Graphics.createArrayBuffer(w,h,1,{msb:true});
+    for (var y=0;y<h;y+=im.height)
+      for (var x=0;x<w;x+=im.width)
+        b.drawImage(im,x,y);
+    b.transparent = 0;
+    require("Storage").write(".loading",b.asImage("string"));
+    goBack();
+  }
+
+  function iconHourglass() {
+    // To get FG+BG+transparent, convert a monochrome image as a 2 bit greyscale using the image converter
+    return require("heatshrink").decompress(atob("mE4wUBqAOJgtABZMBGjH/ABALlBhA8LBIJrBBZCDCBZEFqoLJqoLO4BBDgYLcn/wBYcP/gLFCYIbBBY38BYYFBBYVACIILE+EBBYY1BLgX/BYgVBEAQECBYSQCJAQcCRwNVqg8CBYIDCioLDCYQbDBYRUBFYPwBwJ8BBQQ8BCgQaCHQQLNEZQ7LKZZrLQYbKDQYabDAASbFYoQACWYg2DAQrjPNIRtCBYjKCBYLMCBaIKBAAILGAAwLNRwQLHgrJCBY8BRIQLHSoYLJBQ4MDBcYAWNYIAIgKDBABEFA="));
+  }
+
+  function iconRetro() {
+    // A mac-style loading window
+      return require("heatshrink").decompress(atob("rk1gP/ABP4DBMDwALJnAWK39/+4tH3EEgIWJoEXC34WZORSghZ1oW/CzkB8AQC4AWFhgEBgOMFowSCjAtGhkPx8HzncuwWE4OMjHY41sDgQWCjHPzOMs3MCwuNzOYCw9Y7IWI5oWE5uwCwUf5+O53es187aJJFogAFFooAEg4HCcv4Wbn//ACnwA"))
+  }
+
+  E.showMenu({
+    "": {title:/*LANG*/"Loading Screen"},
+    "Default" : () => {require("Storage").erase(".loading");goBack()},
+    "No Screen" : () => {require("Storage").write(".loading","NO");goBack()}, // less than 3 chars and nothing is rendered
+    "Hourglass" : () => {require("Storage").write(".loading",iconHourglass());goBack()},
+    "Retro" : () => {require("Storage").write(".loading",iconRetro());goBack()},
+    "Stripes" : () => savePattern(`
+XX..XX..
+.XX..XX.
+..XX..XX
+X..XX..X
+XX..XX..
+.XX..XX.
+..XX..XX
+X..XX..X
+`),
+    "Lines" : () => savePattern(`
+XXXXXXXX
+........
+XXXXXXXX
+........
+XXXXXXXX
+........
+XXXXXXXX
+........
+`),
+    "Dots" : () => savePattern(`
+......
+..XX..
+.XXXX.
+.XXXX.
+..XX..
+......
+`)
+  });
+
+  /* For testing, this generates an image with a different colour surrounding on it
+require("FontSinclair").add(Graphics);
+var b = Graphics.createArrayBuffer(84,12,2);
+b.setBgColor(1).clear();
+b.transparent = 1;
+b.setFont("Sinclair").setColor(0);
+for (var y=-2;y<=2;y++) for (var x=-2;x<=2;x++) b.drawString("LOADING...",2+x,2+y);
+b.setColor(3).drawString("LOADING...",2,2);
+g.drawImage(b.asImage("string"));
+  */
+
+})
\ No newline at end of file

From 72861b48585a8ff2dc62b9e87da067df584d708e Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Thu, 18 May 2023 11:01:22 +0100
Subject: [PATCH 26/28] remove whitespace

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 0808f31fa..30f660717 100644
--- a/index.html
+++ b/index.html
@@ -195,7 +195,7 @@
     </footer>
 
     <script src="webtools/puck.js"></script>
-    <script src="webtools/heatshrink.js"></script>    
+    <script src="webtools/heatshrink.js"></script>
     <script src="core/lib/marked.min.js"></script>
     <script src="core/lib/espruinotools.js"></script>
     <script src="core/js/utils.js"></script>

From c90dd72ce39b400cf56e62f75379de2a405c8e88 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Thu, 18 May 2023 11:14:14 +0100
Subject: [PATCH 27/28] screenshots

---
 apps/loadingscreen/metadata.json   |   1 +
 apps/loadingscreen/screenshot1.png | Bin 0 -> 1698 bytes
 apps/loadingscreen/screenshot2.png | Bin 0 -> 1641 bytes
 3 files changed, 1 insertion(+)
 create mode 100644 apps/loadingscreen/screenshot1.png
 create mode 100644 apps/loadingscreen/screenshot2.png

diff --git a/apps/loadingscreen/metadata.json b/apps/loadingscreen/metadata.json
index 4d2327824..ed1e56e45 100644
--- a/apps/loadingscreen/metadata.json
+++ b/apps/loadingscreen/metadata.json
@@ -3,6 +3,7 @@
   "version":"0.01",
   "description": "On Bangle.js 2v18+, customize the app loading screen",
   "icon": "app.png",
+  "screenshots" : [ { "url":"screenshot1.png" }, { "url":"screenshot2.png" } ],
   "tags": "tool",
   "type": "settings",
   "supports" : ["BANGLEJS2"],
diff --git a/apps/loadingscreen/screenshot1.png b/apps/loadingscreen/screenshot1.png
new file mode 100644
index 0000000000000000000000000000000000000000..2eb4055c8037136b1dd67e22be6421719d41c48e
GIT binary patch
literal 1698
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

literal 0
HcmV?d00001

diff --git a/apps/loadingscreen/screenshot2.png b/apps/loadingscreen/screenshot2.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f5f81eefc1720f1436faa5ccf56c01e72b9f36d
GIT binary patch
literal 1641
zcmd6odr;C@6vqiz1I!>;D|MaLR4~`lYMD?=lkkCWO@p>X%r+Y*Sx{5+k;AU7xxNz9
zOhRhaN;Dr?N(f5jBeifD*TzhgRmuk%imPau?vJgR{dfP_nf>G5J7?yc?>+aPdp<WS
z(BIPtVTu5OKt^OQQZTUA>j%sLnCqHVG+@~f7wky{)ylq_0)Y%H$t1UsB--q-oH6aN
z2^6@zp8xh2vP2*tLIznzQTAL?RZF`g%dc7eCiann(cHV3ELm5!uqKN(>Sl_>TYsR4
zYoW#ButJ?i1g|+aErwvIFJ4!_Rmirn;l6Z*p@J*m<w&7e2fc|-D6SV6-!Tlb&J^xd
zAn^_>&b<M2bf*^;pQm>@ZxL?+^L-*iPZLA#(OCmh)tncWO&&b)M6l9-DKI5*#BGsX
ztwJ3*(`5k&)*x$;Cm)uhN<QoB10fV3FjBN3bo{OXHa%+PlfTDBFs4K*LWxkJ&Io-b
zdedsg?v@L40I~JJZL>gpUNl{sSRB4X=)IX0slw^y4R09+{V(L#_JG4v{mj{d(xn06
zEVRri+jaX4&EGD(4tunFo(FA3Ua1@2LPZO$Oh#?0VK=zQS((4G0*QZjz5Z_fHRC>7
zHlZ~P+sb;Z-fJ~y_WJR&n}@j9D$V1+O)T#+=S`S}<CqOn%kx^1W+j)r{7yqsR;a>y
zeU*v*aWiR9fA2B5X^Av4D>**gAy~%y10$}RCg!|sD({l;5ox1jI=J}-4bKeL3fL3(
z;9#6}gDJr^3x4CO7%B@Gu?DjXIY}W(dDX?m!WQ{Lf=iy1-0f`3oKQLTKEx1qWo={k
z?URoto0oa`BpVPl2{Mia^H*uy?ZB&xA3I;U7JLu{j8%+GSRPiA*q&u^%c+R;51XRt
zc&6I;Fddxk4(3ai!fFGIhMg2+_GMCNUY{T<Dg;u^#@#-VY6Hd)T&l5U1yX2P31j{i
z%vZTwQ<~%f#w48*b!6_GgMUE_@LoC^^BPJGKDYZs>QD!-K#DU?Is=~VC^cCxjK=~l
ztpStIp`|A3!qbWrdo~v#-o3x6veU~%J6R&Re~N44v+v#x>QFy30si1%X4;UZO}ozK
zS1nH$r^m0#)%nw7k_s9+xp*4Nu$l9EatM?BVXa_cwg?~Pt#p6i-_xQpVe8c66wZ_x
zX0ZP(8QqrBul4Gf<#RMK8c%rgpYO}L&!RMDjuS1B^D}88l%ELIm!ZH82kkSL07uKO
zUGM+yxX}$OO>nlPTt@pSlBm;<jn`tBVP>_?;FQ>y{Io9@<hes<6=@H)hnwsN^Fx#r
z?0inwMO*bGP;U(4pwopYCq{)`w~z+hm|b0yb$d=*573oQ(ZVqj6w7oUxzu3=n4GGA
zYXU`#XjGAoSpGIv(Bt0+LFS5nB6{3(*V5{)C9LyeFWA1&sVjXrm9(gB?4uhk8fI9E
z=C(FipXo+0ZZqR$g`*}q2t}a4x{IA#feeP0T)v-26DXH=6)r!`z9Mx!xDwtV1Pc0m
zkK58t00{$99);P2lJQ%fZqZYLIfC<prtcwqYI$Mwov;7q5YYV@66=~$SAP4OrCrsh
z-xmp^m9~!UxvyA&m`vvY#YW_0gpPXwoFGi`udnvxULIY5kYKBim7y`*u{HaY-=!Qk
zqv1zC-%rzxuwi<j3^oFAG5H5ByCVixry#mk!#a+}4q#bm>}9jYaR634O#}eB?eOYO
z;7MZZ@5qDKbJvbDO8hUFf953K0q*QW4W&&IL%J;(zPckuzH2fqkn~>kv0O|27Gbb3
w7`U*$F#{mlH`J4O2gg-+ga3e(!^f5Bv2Nncfi_o1fWHGocK0XM66rtw1*Aj)&;S4c

literal 0
HcmV?d00001


From 6597ba3d5f6ce2b3d2de6660ba422e20ac296b3e Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Thu, 18 May 2023 11:15:35 +0100
Subject: [PATCH 28/28] message

---
 apps/loadingscreen/metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/loadingscreen/metadata.json b/apps/loadingscreen/metadata.json
index ed1e56e45..199f4a2b4 100644
--- a/apps/loadingscreen/metadata.json
+++ b/apps/loadingscreen/metadata.json
@@ -1,7 +1,7 @@
 { "id": "loadingscreen",
   "name": "Loading Screen",
   "version":"0.01",
-  "description": "On Bangle.js 2v18+, customize the app loading screen",
+  "description": "On Bangle.js 2v18+, this lets you customize the app loading screen via an new menu in Settings -> Apps",
   "icon": "app.png",
   "screenshots" : [ { "url":"screenshot1.png" }, { "url":"screenshot2.png" } ],
   "tags": "tool",