From 028367d6ffa54eae200a4c476d20476816448166 Mon Sep 17 00:00:00 2001
From: singintime <singintime@gmail.com>
Date: Fri, 4 Sep 2020 20:56:40 +0200
Subject: [PATCH 1/4] minionclk v0.04

---
 apps.json                | 2 +-
 apps/minionclk/ChangeLog | 1 +
 apps/minionclk/app.js    | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps.json b/apps.json
index bb527533c..3a446edb7 100644
--- a/apps.json
+++ b/apps.json
@@ -1243,7 +1243,7 @@
   { "id": "minionclk",
     "name": "Minion clock",
     "icon": "minionclk.png",
-    "version": "0.03",
+    "version": "0.04",
     "description": "Minion themed clock.",
     "tags": "clock,minion",
     "type": "clock",
diff --git a/apps/minionclk/ChangeLog b/apps/minionclk/ChangeLog
index 3b6757d9a..27dab7259 100755
--- a/apps/minionclk/ChangeLog
+++ b/apps/minionclk/ChangeLog
@@ -1,3 +1,4 @@
 0.01: First release
 0.02: Improved date readability, fixed drawing of widgets
 0.03: Fixed rendering for Espruino v2.06
+0.04: Fixed overlapped rendering of dates
diff --git a/apps/minionclk/app.js b/apps/minionclk/app.js
index 2d6a38603..b2813101b 100755
--- a/apps/minionclk/app.js
+++ b/apps/minionclk/app.js
@@ -56,6 +56,7 @@ function startDrawing() {
   hour = '';
   minute = '';
   date = '';
+  g.clear();
   g.drawImage(getBackground(), 0, 24, { scale: 2 });
   Bangle.drawWidgets();
   draw();

From 19549476dd080d54c3494103609c970d1cce26fa Mon Sep 17 00:00:00 2001
From: Stefano Baldan <singintime@gmail.com>
Date: Sat, 5 Sep 2020 00:00:48 +0200
Subject: [PATCH 2/4] Update app.js

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

diff --git a/apps/minionclk/app.js b/apps/minionclk/app.js
index b2813101b..537a6fe7d 100755
--- a/apps/minionclk/app.js
+++ b/apps/minionclk/app.js
@@ -56,7 +56,8 @@ function startDrawing() {
   hour = '';
   minute = '';
   date = '';
-  g.clear();
+  g.setColor(0x0000);
+  g.fillRect(0, 216, 240, 24);
   g.drawImage(getBackground(), 0, 24, { scale: 2 });
   Bangle.drawWidgets();
   draw();

From 51f95e0407b4b89ce3e76231b1d18deb876021ff Mon Sep 17 00:00:00 2001
From: Stefano Baldan <singintime@gmail.com>
Date: Sat, 5 Sep 2020 00:06:49 +0200
Subject: [PATCH 3/4] Update app.js

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

diff --git a/apps/minionclk/app.js b/apps/minionclk/app.js
index 537a6fe7d..f0afbc45c 100755
--- a/apps/minionclk/app.js
+++ b/apps/minionclk/app.js
@@ -57,7 +57,7 @@ function startDrawing() {
   minute = '';
   date = '';
   g.setColor(0x0000);
-  g.fillRect(0, 216, 240, 24);
+  g.fillRect(0, 216, 240, 240);
   g.drawImage(getBackground(), 0, 24, { scale: 2 });
   Bangle.drawWidgets();
   draw();

From 142ccaddf8c911ac1b12b7d62e850d4c45f96de3 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Mon, 14 Sep 2020 10:50:26 +0100
Subject: [PATCH 4/4] 0.21: Handle echo off char from Gadgetbridge app when
 programmable:off (fix #558)

---
 apps.json           | 3 +--
 apps/boot/ChangeLog | 1 +
 apps/boot/boot0.js  | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps.json b/apps.json
index f893deeac..bce3b60fb 100644
--- a/apps.json
+++ b/apps.json
@@ -2,7 +2,7 @@
   { "id": "boot",
     "name": "Bootloader",
     "icon": "bootloader.png",
-    "version":"0.20",
+    "version":"0.21",
     "description": "This is needed by Bangle.js to automatically load the clock, menu, widgets and settings",
     "tags": "tool,system",
     "type":"bootloader",
@@ -2203,4 +2203,3 @@
   ]
  }
 ]
-
diff --git a/apps/boot/ChangeLog b/apps/boot/ChangeLog
index 5dde04f9c..d2f68fd0e 100644
--- a/apps/boot/ChangeLog
+++ b/apps/boot/ChangeLog
@@ -19,3 +19,4 @@
 0.18: Fix  'GPS time' checks for western hemisphere
 0.19: Tweaks to simplify code and lower memory usage
 0.20: Allow Gadgetbridge to work even with programmable:off
+0.21: Handle echo off char from Gadgetbridge app when programmable:off (fix #558)
diff --git a/apps/boot/boot0.js b/apps/boot/boot0.js
index b674d601f..630252dea 100644
--- a/apps/boot/boot0.js
+++ b/apps/boot/boot0.js
@@ -22,6 +22,7 @@ if (s.blerepl===false) { // If not programmable, force terminal off Bluetooth
     l.forEach(n=>Bluetooth.emit("line",n));
   });
   Bluetooth.on('line',function(l) {
+    if (l.startsWith('\x10')) l=l.slice(1);
     if (l.startsWith('GB({') && l.endsWith('})') && global.GB)
       try { global.GB(JSON.parse(l.slice(3,-1))); } catch(e) {}
   });