From 86c90c81ca15c9a186fa1ca861a89adf51f8badd Mon Sep 17 00:00:00 2001
From: hughbarney <hughbarney@googlemail.com>
Date: Fri, 17 Dec 2021 21:57:26 +0000
Subject: [PATCH 01/10] 93dub: fix issue with light theme so that this dark
 does not end up with a white strip at the top

---
 apps.json            | 2 +-
 apps/93dub/ChangeLog | 1 +
 apps/93dub/app.js    | 8 +++++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/apps.json b/apps.json
index 4a333cdbd..2179e766b 100644
--- a/apps.json
+++ b/apps.json
@@ -4620,7 +4620,7 @@
    "shortName":"93 Dub",
    "icon": "93dub.png",
    "screenshots": [{"url":"screenshot.png"}],
-   "version":"0.05",
+   "version":"0.06",
    "description": "Fan recreation of orviwan's 91 Dub app for the Pebble smartwatch. Uses assets from his 91-Dub-v2.0 repo",
    "tags": "clock",
    "type": "clock",
diff --git a/apps/93dub/ChangeLog b/apps/93dub/ChangeLog
index c1b2588bb..1c18ca59b 100644
--- a/apps/93dub/ChangeLog
+++ b/apps/93dub/ChangeLog
@@ -3,3 +3,4 @@
 0.03: Code style cleanup
 0.04: Set 00:00 to 12:00 for 12 hour time
 0.05: Display time, even on Thursday
+0.06: Fix light theme issue, where widgets would end up on a light strip
diff --git a/apps/93dub/app.js b/apps/93dub/app.js
index 1b0f69a94..f970eec5d 100644
--- a/apps/93dub/app.js
+++ b/apps/93dub/app.js
@@ -122,7 +122,13 @@ function draw(){
   queueDraw();
 }
 
-
+/**
+ * This watch is mostly dark, it does not make sense to respect the
+ * light theme as you end up with a white strip at the top for the
+ * widgets and black watch. So set the colours to the dark theme.
+ *
+ */
+g.setTheme({bg:"#000",fg:"#fff",dark:true}).clear();
 draw();
 
 //the following section is also from waveclk

From 200f9e19b58c6691b8ba5cffe4a61c9ee7fedaeb Mon Sep 17 00:00:00 2001
From: hughbarney <hughbarney@googlemail.com>
Date: Sun, 19 Dec 2021 21:09:00 +0000
Subject: [PATCH 02/10] Pastel: added weather, change to queueDraw() update
 once per minute

---
 apps/pastel/pastel.app.js      | 139 +++++++++++++++++++++++++++------
 apps/pastel/pastel.settings.js |  13 ++-
 2 files changed, 124 insertions(+), 28 deletions(-)

diff --git a/apps/pastel/pastel.app.js b/apps/pastel/pastel.app.js
index aa4f6abf8..e0c7df831 100644
--- a/apps/pastel/pastel.app.js
+++ b/apps/pastel/pastel.app.js
@@ -1,10 +1,22 @@
 var SunCalc = require("https://raw.githubusercontent.com/mourner/suncalc/master/suncalc.js");
 require("f_latosmall").add(Graphics);
+const storage = require('Storage');
+const locale = require("locale");
 const SETTINGS_FILE = "pastel.json";
 const LOCATION_FILE = "mylocation.json";
 let settings;
 let location;
 
+// cloud, sun, partSun, snow, rain, storm, error
+// create 1 bit, max contrast, brightness set to 85
+var cloudIcon = require("heatshrink").decompress(atob("kEggIfcj+AAYM/8ADBuFwAYPAmADCCAMBwEf8ADBhFwg4aBnEPAYMYjAVBhgDDDoQDHCYc4jwDB+EP///FYIDBMTgA=="));
+var sunIcon = require("heatshrink").decompress(atob("kEggILIgOAAZkDAYPAgeBwPAgIFBBgPhw4TBp/yAYMcnADBnEcAYMwhgDBsEGgE/AYP8AYYLDCYgbDEYYrD8fHIwI7CIYZLDL54AHA=="));
+var sunPartIcon = require("heatshrink").decompress(atob("kEggIHEmADJjEwsEAjkw8EAh0B4EAg35wEAgP+CYMDwv8AYMDBAP2g8HgH+g0DBYMMgPwAYX8gOMEwMG3kAg8OvgSBjg2BgcYGQIcBAY5CBg0Av//HAM///4MYgNBEIMOCoUMDoUAnBwGkEA"));
+var snowIcon = require("heatshrink").decompress(atob("kEggITQj/AAYM98ADBsEwAYPAjADCj+AgOAj/gAYMIuEHwEAjEPAYQVChk4AYQhCAYcYBYQTDnEPgEB+EH///IAQACE4IAB8EICIPghwDB4EeBYNAjgDBg8EAYQYCg4bCgZuFA=="));
+var rainIcon = require("heatshrink").decompress(atob("kEggIPMh+AAYM/8ADBuFwAYPgmADB4EbAYOAj/ggOAhnwg4aBnAeCjEcCIMMjADCDoQDHjAPCnAXCuEP///8EDAYJECAAXBwkAgPDhwDBwUMgEEhkggEOjFgFgMQLYQAOA=="));
+var errIcon = require("heatshrink").decompress(atob("kEggILIgOAAYsD4ADBg/gAYMGsADBhkwAYsYjADCjgDBmEMAYNxxwDBsOGAYPBwYDEgOBwOAgYDB4EDHYPAgwDBsADDhgDBFIcwjAHBjE4AYMcmADBhhNCKIcG/4AGOw4A=="));
+
+
 function loadSettings() {
   settings = require("Storage").readJSON(SETTINGS_FILE,1)||{};
   settings.grid = settings.grid||false;
@@ -93,6 +105,50 @@ function prevInfo() {
   }
 }
 
+
+/**
+Choose weather icon to display based on condition.
+Based on function from the Bangle weather app so it should handle all of the conditions
+sent from gadget bridge.
+*/
+function chooseIcon(condition) {
+  condition = condition.toLowerCase();
+  if (condition.includes("thunderstorm")) return stormIcon;
+  if (condition.includes("freezing")||condition.includes("snow")||
+    condition.includes("sleet")) {
+    return snowIcon;
+  }
+  if (condition.includes("drizzle")||
+    condition.includes("shower")) {
+    return rainIcon;
+  }
+  if (condition.includes("rain")) return rainIcon;
+  if (condition.includes("clear")) return sunIcon;
+  if (condition.includes("few clouds")) return partSunIcon;
+  if (condition.includes("scattered clouds")) return cloudIcon;
+  if (condition.includes("clouds")) return cloudIcon;
+  if (condition.includes("mist") ||
+    condition.includes("smoke") ||
+    condition.includes("haze") ||
+    condition.includes("sand") ||
+    condition.includes("dust") ||
+    condition.includes("fog") ||
+    condition.includes("ash") ||
+    condition.includes("squalls") ||
+    condition.includes("tornado")) {
+    return cloudIcon;
+  }
+  return cloudIcon;
+}
+
+/**
+Get weather stored in json file by weather app.
+*/
+function getWeather() {
+  let jsonWeather = storage.readJSON('weather.json');
+  return jsonWeather;
+}
+
 var mm_prev = "xx";
 
 function draw() {
@@ -114,7 +170,25 @@ function draw() {
   var h = g.getHeight();
   var x = (g.getWidth()/2);
   var y = (g.getHeight()/3);
-  
+
+  var weatherJson = getWeather();
+  var w_temp;
+  var w_icon;
+  var w_wind;
+
+  if (settings.weather && weatherJson && weatherJson.weather) {
+      var currentWeather = weatherJson.weather;
+      const temp = locale.temp(currentWeather.temp-273.15).match(/^(\D*\d*)(.*)$/);
+      w_temp = temp[1] + " " + temp[2];
+      w_icon = chooseIcon(currentWeather.txt);
+      const wind = locale.speed(currentWeather.wind).match(/^(\D*\d*)(.*)$/);
+      w_wind = wind[1] + " " + wind[2] + " " + (currentWeather.wrose||'').toUpperCase();
+  } else {
+      w_temp = "Err";
+      w_wind = "???";
+      w_icon = errIcon;
+  }
+
   g.reset();
 
   if (process.env.HWVERSION == 1) {
@@ -139,6 +213,18 @@ function draw() {
 
   g.setColor(g.theme.fg);
 
+  // draw weather line
+  if (settings.weather) {
+    g.drawImage(w_icon, (w/2) - 40, 24);
+    g.setFontLatoSmall();
+    g.setFontAlign(-1,0); // left aligned
+    if (drawCount % 2 == 0)
+      g.drawString(w_temp, (w/2) + 6, 24 + ((y - 24)/2));
+    else
+      g.drawString( (w_wind.split(' ').slice(0, 2).join(' ')), (w/2) + 6, 24 + ((y - 24)/2));
+  // display first 2 words of the wind string eg '4 mph'
+  }
+  
   if (settings.font == "Architect")
     g.setFontArchitect();
   else if (settings.font == "GochiHand")
@@ -161,36 +247,39 @@ function draw() {
 
   // for the colon
   g.setFontAlign(0,-1); // centre aligned
-
-  if (d.getSeconds()&1) {
-    g.drawString(":", x,y);
-  } else {
-    // on bangle 1, we are not using clearRect(), hide : by printing over it in reverse color
-    if (process.env.HWVERSION == 1) {
-      g.setColor(g.theme.bg);
-      g.drawString(":", x,y);
-      g.setColor(g.theme.fg);
-    }
-  }
-
+  g.drawString(":", x,y);
   g.setFontLatoSmall();
   g.setFontAlign(0, -1);
   g.drawString((infoData[infoMode].calc()), w/2, h - 24 - 24);
 
-  if (drawCount % 3600 == 0)
+  // recalc sunrise / sunset every hour
+  if (drawCount % 60 == 0)
     updateSunRiseSunSet(new Date(), location.lat, location.lon);
   drawCount++;
+  queueDraw();
 }
 
-// Only update when display turns on
-if (process.env.BOARD!="SMAQ3") // hack for Q3 which is always-on
-Bangle.on('lcdPower', function(on) {
-  if (secondInterval)
-    clearInterval(secondInterval);
-  secondInterval = undefined;
-  if (on)
-    secondInterval = setInterval(draw, 1000);
-  draw();
+// timeout used to update every minute
+var drawTimeout;
+
+// schedule a draw for the next minute
+function queueDraw() {
+  if (drawTimeout) clearTimeout(drawTimeout);
+  drawTimeout = setTimeout(function() {
+    drawTimeout = undefined;
+    nextInfo();
+    draw();
+  }, 60000 - (Date.now() % 60000));
+}
+
+// Stop updates when LCD is off, restart when on
+Bangle.on('lcdPower',on=>{
+  if (on) {
+    draw(); // draw immediately, queue redraw
+  } else { // stop draw timer
+    if (drawTimeout) clearTimeout(drawTimeout);
+    drawTimeout = undefined;
+  }
 });
 
 Bangle.setUI("clockupdown", btn=> {
@@ -204,8 +293,6 @@ loadFonts();
 loadLocation();
 
 g.clear();
-var secondInterval = setInterval(draw, 1000);
-draw();
-
 Bangle.loadWidgets();
 Bangle.drawWidgets();
+draw();
diff --git a/apps/pastel/pastel.settings.js b/apps/pastel/pastel.settings.js
index fad36964d..bf83fa7c2 100644
--- a/apps/pastel/pastel.settings.js
+++ b/apps/pastel/pastel.settings.js
@@ -4,6 +4,7 @@
   // initialize with default settings...
   let s = {
     'grid': false,
+    'weather': false,
     'font': "Lato"
   }
 
@@ -39,8 +40,16 @@
       value: s.grid,
       format: () => (s.grid ? 'Yes' : 'No'),
       onchange: () => {
-        s.grid = !s.grid
-        save()
+        s.grid = !s.grid;
+        save();
+      },
+    },
+    'Show Weather': {
+      value: s.weather,
+      format: () => (s.weather ? 'Yes' : 'No'),
+      onchange: () => {
+        s.weather = !s.weather;
+        save();
       },
     }
   })

From 9d180064f54ca3e5decebca46e990a50c9b88661 Mon Sep 17 00:00:00 2001
From: hughbarney <hughbarney@googlemail.com>
Date: Sun, 19 Dec 2021 22:25:18 +0000
Subject: [PATCH 03/10] Pastel: added dependancy on weather, fix issues on a
 B1, extend support to B1 for Pebble and Widbata

---
 apps.json                 |  8 ++++----
 apps/pastel/ChangeLog     |  1 +
 apps/pastel/pastel.app.js | 16 ++--------------
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/apps.json b/apps.json
index 909c4793a..214b8b350 100644
--- a/apps.json
+++ b/apps.json
@@ -4210,10 +4210,10 @@
     "id": "pastel",
     "name": "Pastel Clock",
     "shortName": "Pastel",
-    "version": "0.09",
+    "version": "0.10",
     "description": "A Configurable clock with custom fonts and background. Has a cyclic information line that includes, day, date, battery, sunrise and sunset times",
     "icon": "pastel.png",
-    "dependencies": {"mylocation":"app", "widpedom":"app"},
+    "dependencies": {"mylocation":"app", "widpedom":"app","weather":"app"},
     "screenshots": [{"url":"screenshot_pastel.png"}],
     "type": "clock",
     "tags": "clock",
@@ -4733,7 +4733,7 @@
     "screenshots": [{"url":"pebble_screenshot.png"}],
     "type": "clock",
     "tags": "clock",
-    "supports": ["BANGLEJS2"],
+    "supports": ["BANGLEJS", "BANGLEJS2"],
     "storage": [
       {"name":"pebble.app.js","url":"pebble.app.js"},
       {"name":"pebble.settings.js","url":"pebble.settings.js"},
@@ -4767,7 +4767,7 @@
     "screenshots": [{"url":"screenshot_widbata_1.png"}],
     "version":"0.01",
     "type": "widget",
-    "supports": ["BANGLEJS2"],
+    "supports": ["BANGLEJS", "BANGLEJS2"],
     "readme": "README.md",
     "description": "Shows the current battery level status in the top right using the clocks colour theme",
     "tags": "widget,battery",
diff --git a/apps/pastel/ChangeLog b/apps/pastel/ChangeLog
index afeb305c5..627531f03 100644
--- a/apps/pastel/ChangeLog
+++ b/apps/pastel/ChangeLog
@@ -7,3 +7,4 @@
 0.07: Added info line that cycles on BTN1/BTN3 (or vitual buttons on a bangle 2)
 0.08: Added dependancy on MyLocation
 0.09: Added dependancy on Pedometer Widget
+0.10: Added Weather line, fixed issues on a Bangle 1, update every minute
diff --git a/apps/pastel/pastel.app.js b/apps/pastel/pastel.app.js
index e0c7df831..db60a2738 100644
--- a/apps/pastel/pastel.app.js
+++ b/apps/pastel/pastel.app.js
@@ -149,8 +149,6 @@ function getWeather() {
   return jsonWeather;
 }
 
-var mm_prev = "xx";
-
 function draw() {
   var d = new Date();
   var da = d.toString().split(" ");
@@ -190,18 +188,8 @@ function draw() {
   }
 
   g.reset();
-
-  if (process.env.HWVERSION == 1) {
-    // avoid flicker on a bangle 1 by comparing with previous minute
-    if (mm_prev != mm) {
-      mm_prev = mm;
-      g.clearRect(0, 30, w, h - 24);
-    }
-  } else {
-    // on a b2 safe to just clear anyway as there is no flicker
-    g.clearRect(0, 30, w, h - 24);
-  }
-    
+  g.clearRect(0, 30, w, h - 24);
+  
   // draw a grid like graph paper
   if (settings.grid && process.env.HWVERSION !=1) {
     g.setColor("#0f0");

From 165d1f7b999079aaf98d18ab09b5abdc681f68db Mon Sep 17 00:00:00 2001
From: hughbarney <hughbarney@googlemail.com>
Date: Fri, 24 Dec 2021 12:44:06 +0000
Subject: [PATCH 04/10] Pastel: updated README and screenshots

---
 apps.json                         |   4 +--
 apps/pastel/README.md             |  46 ++++++++++++++++++++++++------
 apps/pastel/screenshot_pastel.png | Bin 4014 -> 2993 bytes
 apps/pastel/weather_icons.png     | Bin 0 -> 1506 bytes
 4 files changed, 39 insertions(+), 11 deletions(-)
 create mode 100644 apps/pastel/weather_icons.png

diff --git a/apps.json b/apps.json
index 214b8b350..a3f2788ee 100644
--- a/apps.json
+++ b/apps.json
@@ -4214,9 +4214,9 @@
     "description": "A Configurable clock with custom fonts and background. Has a cyclic information line that includes, day, date, battery, sunrise and sunset times",
     "icon": "pastel.png",
     "dependencies": {"mylocation":"app", "widpedom":"app","weather":"app"},
-    "screenshots": [{"url":"screenshot_pastel.png"}],
+    "screenshots": [{"url":"screenshot_pastel.png"}, {"url":"weather_icons.png"}],
     "type": "clock",
-    "tags": "clock",
+    "tags": "clock, weather, tool",
     "supports": ["BANGLEJS","BANGLEJS2"],
     "readme": "README.md",
     "storage": [
diff --git a/apps/pastel/README.md b/apps/pastel/README.md
index 66ae0e189..7dbfbe9a1 100644
--- a/apps/pastel/README.md
+++ b/apps/pastel/README.md
@@ -1,45 +1,73 @@
 # Pastel Clock
 
-   *a configurable clock with custom fonts and background. Has a cyclic information line that includes, day, date, battery, sunrise and sunset times*
+   *a configurable clock with custom fonts, background and optional weather icons. Has a cyclic information line that includes, day, date, battery, sunrise and sunset times*
 
 * Designed specifically for Bangle 1 and Bangle 2
 * A choice of 7 different custom fonts
 * Supports the Light and Dark themes
-* Has a settings menu, change font, enable/disable the grid
+* Has a settings menu, change font, enable/disable the grid, weather icons
 * On Bangle 1 use BTN1,BTN3 to cycle through the info display (Date, ID, Batt %, Ram % etc)
 * On Bangle 2 touch the top right/top left to cycle through the info display (Date, ID, Batt %, Ram % etc)
 * Uses mylocation.json from MyLocation app to calculate sunrise and sunset times for your location
 * Uses pedometer widget to get latest step count
+* Use the wesather widget to get weather status
 * Dependant apps are installed when Pastel installs
 
 I came up with the name Pastel due to the shade of the grid background.
 
 Written by: [Hugh Barney](https://github.com/hughbarney)  For support and discussion please post in the [Bangle JS Forum](http://forum.espruino.com/microcosms/1424/)
 
-## Lato
+
+## Weather Support
+
+
+![](screenshot_pastel.png)
+
+Pastel installs the weather app and weather widget.  You may want to
+hide the weather widget display, this can be done through the weather
+widget settings.  You should first get the weather app working.  If
+the weather App is not working, then it is not going to work for
+Pastel.
+
+The following weather icons are supported.
+
+![](weather_icons.png)
+
+Mostly cloudy, Sunny, Mostly Sunny, Snow, Rain.
+
+The triangle icon shows there is a problem connecting to GadgetBridge and the weather service.
+You should follow the setup and trouble shooting guide for the Weather App.
+
+If you find the weather / gadgetbridge service unreliable you can
+disable weather updates to pastel through the settings app.
+
+
+## Fonts
+
+### Lato
 ![](screenshot_lato.png)
 
 
-## Architect
+### Architect
 ![](screenshot_architect.png)
 
 
-## Gochihand
+### Gochihand
 ![](screenshot_gochihand.png)
 
 
-## Monoton
+### Monoton
 ![](screenshot_monoton.png)
 
 
-## Elite
+### Elite
 ![](screenshot_elite.png)
 
 
-## Cabin Sketch
+### Cabin Sketch
 ![](screenshot_cabinsketch.png)
 
 
-## Orbitron
+### Orbitron
 ![](screenshot_orbitron.png)
 
diff --git a/apps/pastel/screenshot_pastel.png b/apps/pastel/screenshot_pastel.png
index d489f19143b598f426b309b2e07904b222d1108f..c792ada8d932feabe3eba3feed17b61de7ed87c5 100644
GIT binary patch
literal 2993
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
PiUamG&S<KY-|c?`V^o9H

literal 4014
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
ZUC)-FR5SG?>SO>1SRic>b;jt#{{nWedZPdU

diff --git a/apps/pastel/weather_icons.png b/apps/pastel/weather_icons.png
new file mode 100644
index 0000000000000000000000000000000000000000..59d4f007f51ed9a607e3765edbf0c5fb525ee619
GIT binary patch
literal 1506
zcmb7E`#;kQ0Nr;sn-Nx_&08uZ2}!19=CQ<O74z7KkY^<#Qj_L!MR~3y@3|HWLu_b$
z^uDFb*w)&l(nF+q%j{asz3!iI&*yW_`Qdy%=W~8K`9vSW1_T-b0)aMo9(Fsn?#y+1
z!&TRHwf2|Ex&g_@2zXH2kimBl2wLsw=HizYI$Qmj_Rd5jr%HZhYTDfJqqZKu%^Y4b
zJB(J3lbOEqNh+>ehqGb_RM-ELDNc`9@cz<H6CCuZ5CJFd#TLID=N#LFv<MV-vVa;j
z-e4asiIRf?5RFHvYn!CP`kV2Q0Z97qLM*&bf?KPPvOmzKPrwVoKjxO<#*kPjf3)>2
zn4J^tmbFJdmv~6ttTcAR-0#08;QE}Ecc%y8N^ezi8vSyRRYCekHZD+eV?Qqfh37`r
z1}S{fb<|Nu?eN`4we>lSvQ&y)Ip+~9?<aQ9XfRmh@FM!R9t-_M=q%5<Vba7pOkVNI
zlBUxo*@GaUV4adY@De+Jrf~2sv!<sg*N>>ac^Y%0gaoa?>a9d@X=0U;8wH1D1_1mx
zcD`##=gN7X{gxI|bMBDJ>5JC{%`d9cTX^y|`ImgWRKV7CAmjcZ23@k@GJsL1Ck3v3
zIb?sH-6;_*JTrXTd+u37A(BcT$Fo3@--_=^prRvw?S>NC;{z|)3JT?Jp^BBo!FaR)
z8g$YhJ)G&PnP#aa$c{2RxLoqsj!F1hpgSISpM`=W3*QzCa#$V(vopO17t+$hPPUTx
zNUQBhnD2C|Joi>F3yV5&TWTP9d2NDaX3q})60veR1<$TpgIQ3ds2GYFn--K20fzaT
z*T+bf`X&?hm0D>xq_P5AHGh0pR&5Pjt&GdPL5ku!Db#RY#_grsx>`ggO2$e{x4isB
z3kZ#xYlvrv!2>WBGGsz?eOQ7acp4LYhjrDNz3Cx<5jsYyc4iTjt`ZwFk2Cwp0a3aJ
z_lEm8<*@dY4$A4)gEm~V?hMPR!{=-P!<`Fx6*mC(8II(#H|INWb#xj#Vv3WA(;_Mm
zvCG=aqo0_%C|L!Rts1vk!`FQf@<wGcVWQ4H+XKWk@+<jTRtFGr?)SXVAfsx`Rm3%C
z{ETV*R4N30S-}Y%5TzFy<f4*M$IAwu<xkc0HGVriU+68)%pJ>)hVn3mfK`&U?SQ+z
z3ny&6AA&~RojcdD7L38y{Ym!dgpE@ydk#5uw^5=yN=q(%ay!`%dEQ*hIdFT9ni!Q)
zrDkIrv0-DZxDvS*GZGnoz3BMF`*=e|@PwO|Q3J1&YUW}>HA@|_pLsZ=2$p%!hQT4%
zorGefaU82OLDc0D!z$iBHoik0cwn^nsuNY=`nLP*YS#1D<Oal%UHwLgRO}ZYk|kk9
zv5W>PZ)OV080V8GLp_&zd1p2-ouq(65%cB;arr`x1h8dPZKiwDJSHES>lN+WiYxY>
zc63qWCnsHuG&jY?42KY+aV{x3+H`Pa9P~Xk<Mo5yJ9cTk$$N0~iJ|DiznRmCN}bwz
z9Gt&2@MQQhgqb!#qN=iGVGLN~jHrL?H~{R@yhWmdMa?v^>`qxpve&M?5F)R^Yx0s;
zQy5Ml&1-vi%*qiP0>JrV$%9jSGhPQgX^fdxcVK|xm04QKf2>6TrZAno04D>?uXK1L
z&8`s4T0<dBTwpLTbzyPFm)M@??_NHn)E%-1+>KIqgOK`Uruh!%Myguu{ErlMzC>ej
z+oPJ*Kvk`ey$B10{|fgRhm@wd-r>6MgRO7o<cS{FhnTA*B1dsi4IAI2O)uD@F<217
z!jdzk#vSg>O-;KH!me;M@`E+KHUPgnu@>tAv8wuMv0zM(l`Z=b=dnNgclvheqyc}C
zo-#Le$*(I~emXZ%LCWftQ55mh;xC)+9cM>2Ml-fd=4e>AP(dO4?UQC?gPlL>Kmmy1
z035ZpZk)AsGo9QtpZ*Oxwdy#A!2{eB#n6S&{}(-dM6aI-QY|w0@4G>s?mlj9_^_;h
E0d)$;RR910

literal 0
HcmV?d00001


From 39adcc7fa6a5c399361b8ebfd347d4d5c558b815 Mon Sep 17 00:00:00 2001
From: hughbarney <hughbarney@googlemail.com>
Date: Fri, 24 Dec 2021 13:00:31 +0000
Subject: [PATCH 05/10] Pastel: updated README and screenshots

---
 apps.json                       |   2 +-
 apps/pastel/README.md           |  12 +++++++++++-
 apps/pastel/screenshot_grid.png | Bin 0 -> 3921 bytes
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 apps/pastel/screenshot_grid.png

diff --git a/apps.json b/apps.json
index a3f2788ee..8a0d86b97 100644
--- a/apps.json
+++ b/apps.json
@@ -4211,7 +4211,7 @@
     "name": "Pastel Clock",
     "shortName": "Pastel",
     "version": "0.10",
-    "description": "A Configurable clock with custom fonts and background. Has a cyclic information line that includes, day, date, battery, sunrise and sunset times",
+    "description": "A Configurable clock with custom fonts, background and weather display. Has a cyclic information line that includes, day, date, battery, sunrise and sunset times",
     "icon": "pastel.png",
     "dependencies": {"mylocation":"app", "widpedom":"app","weather":"app"},
     "screenshots": [{"url":"screenshot_pastel.png"}, {"url":"weather_icons.png"}],
diff --git a/apps/pastel/README.md b/apps/pastel/README.md
index 7dbfbe9a1..b396386af 100644
--- a/apps/pastel/README.md
+++ b/apps/pastel/README.md
@@ -8,10 +8,13 @@
 * Has a settings menu, change font, enable/disable the grid, weather icons
 * On Bangle 1 use BTN1,BTN3 to cycle through the info display (Date, ID, Batt %, Ram % etc)
 * On Bangle 2 touch the top right/top left to cycle through the info display (Date, ID, Batt %, Ram % etc)
+* The information display will cycle on each screen update
 * Uses mylocation.json from MyLocation app to calculate sunrise and sunset times for your location
 * Uses pedometer widget to get latest step count
-* Use the wesather widget to get weather status
+* Use the weather widget to get weather status
 * Dependant apps are installed when Pastel installs
+* The screen is updated every minute to save battery power
+* The weather display will display temperature and wind speed on alternate screen refreshes
 
 I came up with the name Pastel due to the shade of the grid background.
 
@@ -71,3 +74,10 @@ disable weather updates to pastel through the settings app.
 ### Orbitron
 ![](screenshot_orbitron.png)
 
+### The Grid
+
+Setting the grid on provides a graph paper style background to the App.
+The grid is not supported on a Bangle 1 due to flicker issues.
+
+![](screenshot_grid.png)
+
diff --git a/apps/pastel/screenshot_grid.png b/apps/pastel/screenshot_grid.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b993353b533d4ceab374d6cd7272133aa740597
GIT binary patch
literal 3921
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
DDi=Wr

literal 0
HcmV?d00001


From c6f43446906e873a226a93e766cdcd8999d30a41 Mon Sep 17 00:00:00 2001
From: hughbarney <hughbarney@googlemail.com>
Date: Fri, 31 Dec 2021 22:14:24 +0000
Subject: [PATCH 06/10] Pebble: foxed icon to 48x48

---
 apps.json                  |   2 +-
 apps/pebble/ChangeLog      |   1 +
 apps/pebble/pebble.icon.js |   2 +-
 apps/pebble/pebble.png     | Bin 1213 -> 1365 bytes
 4 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps.json b/apps.json
index 8a0d86b97..f78098b3a 100644
--- a/apps.json
+++ b/apps.json
@@ -4725,7 +4725,7 @@
     "id": "pebble",
     "name": "Pebble Clock",
     "shortName": "Pebble",
-    "version": "0.06",
+    "version": "0.07",
     "description": "A pebble style clock to keep the rebellion going",
     "dependencies": {"widpedom":"app"},
     "readme": "README.md",
diff --git a/apps/pebble/ChangeLog b/apps/pebble/ChangeLog
index d92be5e9c..0cba5a2b2 100644
--- a/apps/pebble/ChangeLog
+++ b/apps/pebble/ChangeLog
@@ -4,3 +4,4 @@
 0.04: Fix widget hiding code (fix #1046)
 0.05: Fix typo in settings - Purple
 0.06: Added dependancy on Pedometer Widget
+0.07: Fixed icon and ong file to 48x48
diff --git a/apps/pebble/pebble.icon.js b/apps/pebble/pebble.icon.js
index ecd7feb7f..1c1166156 100644
--- a/apps/pebble/pebble.icon.js
+++ b/apps/pebble/pebble.icon.js
@@ -1 +1 @@
-require("heatshrink").decompress(atob("oFAwgNKiIAIFqofegIf/DAUzAAMyAwUQD60T/4ACD7Q/cPxIf/YCofcDhYiSXYYfuUZgf/D/4f/D6USkUgD/4fuogAID6vtDw/UD6vu6geF73kb6vuEAtN9wfYMIneD7JADDwIfaIAJdBD7YgBHwQfbAAgfkf6Qf/D/4feogAID6oAND/4f/iAdJD/4f/D/4fUDxYABD74iODiAftTZgfnYYczAAMyD7UT/4ACH/S+bD8DAKD9Y="))
+require("heatshrink").decompress(atob("mEw4UA///ssp4XthFCBwUBqoABqAaGBZcFBZdX1W1qgLHrwLKqv/6oLJAAILHioLJn5qBAAYLEBQoLeHQQABv4LjGAgLYq2qAAOlBbBHFBdPAKcQLdWcb7jAAoLcn4LKgEVHQVUBQsAgoLLq//6oLIr2q2oXJBZQvCqALGgILTA="))
diff --git a/apps/pebble/pebble.png b/apps/pebble/pebble.png
index 10f5adb56b224f3e4d037c4d195fbd9efc81b959..368e08750d5ede99497d54b310fe9b91e03d9c10 100644
GIT binary patch
literal 1365
zcmV-b1*-aqP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px)4@pEpRA@upn$J%oWf;f5@65Ech+x<y$VRCG%8wZ;iSh?%RW2G1dXR(0Gl_0?
z1w%qiOJdYzmv#5x#dv|sLO@OQ#L~(I4n)~C&6F5C7$9sQ-6bLj{lUDic?+{CZRt#>
zv{2{Lr1SoGKJW9q@AEwGGXxf&j*gBFO6h${sg)5nRaJf3O2^bb#OfezZEaUYQ5<26
z<vfHS2yi-`RSOFX|K!{`rGsSvMNxhR@K*A82L}hxG%ZagNs=In;^Y500D$gbF!<A1
z0;~aeMi+n!+0)a5&dyFGYlWNG)YKH_=H@`i;d=33O6k|3Q0VHJ0Jz=m=P9MX0=S?H
z;B-3S^ZDR*yN?0z_v7Q^7#kZ)mGz#gsxO}jfGo>hgpeNqlqU<|a5!MM+tXy)-`__(
z9#8#$LlA_fU@-V^J`k4nfTAcL1GvSlA&<$o1wnW%7!2OaV+?Bo$g<3Zznss+0AlfY
z{JrJn<sb7I$8ZHb9uK$kJA{xr#uz_h2&J?}(=>jL8}`p4TwIc*HA2YF(Z&`TV|N3A
zz$du?84BR>cxDJ8uUk3qa}k8M<tLe@Y47^|{_oB9H3P5=;01j^{U|g$fthyt;vD&h
zfti_^Yi9Z-G-uS%<MI3fpqaPhCrK<8GwPD_`||Sggm2&gjImGse*bl|gO~>36YTEp
zVrM5|vZwa&)vv9sO$dJk(C_#AZ<w9H62NJikq)41fKu8Q2n0q-5`aV4Y&LIiZ|{x8
z#YKn1;m`&K2DY=ooGT6RxT(3h84V2$JXS(98eR8#y^rIqOd#hDpsA?|_4V}$007Hg
zuQzdkob*@*;8{Q<X4pOByaEBrY=?P7@*dzq7X^TyzE74je0L>`$UZ?XIgKO%tB)k~
zeOsM?$OPbWxe^*+jQ#2LdS5(s4KNT?RZs-3hq1m%@Nml*f<xMDz@=J-)rS&3`0@fA
z_TvB?#^rLYG&VM_X`04Eixr>G*HbV6|8N+4QG#d;Sbsoppz&lSeLBj3C!9cC9YdJ}
zgjOVc_*FUp_XC8G&!(rRuMH0mI|M<X{r&w}!)-$&);)2uBhxjY18|Y~o?G7_h(wM9
zaG<J6hMJ?)M-+gi)sq1jV}*BQnE(zqB=Bep*!uf$UAVnptY)aJ<S!4w&NYC(_IrE4
z);2-yMV7Gp<fkM6xWL?WGM!G@0Jxdj?e@>RySs0P!{IVQ$id*?;AX)$vDvuA$b@u1
zkaUa|#*v-02h4zE(?HQ2+5ZCIsS1i;M#9*O7@ow(6eEcYp%ok6|03NF6iov>l&Ekr
zd~<mVk$7$Z+=TvmAi+0U1^Wr1MA3q|Xdb~F7yitGxk6=RMKhs70+e(@Q}QV#k4B4<
z)SGcwX4@3)T7?T#sux=&f3<j*5b{Q`E_Y+G*gLbcv%Gj>>M?YqU0q$(nx@?Wa7n*j
z*EFq$Qd)@X_31z$&}T~Wqeg}RnFecZZM`K3LTMB@G65)x@)3aBW^T8$tmZbQ^wp)M
zrTe+8cxqcq8c-DFO#r+!bgan7E0wm?91_5}EAq9pv^*zC(r>9{)}f&xw70jXm02ey
zCNMfWn!0$4s;a({&*~>qSE~akin0peS-pR@Lign4B<APmQw!ZUL!nSk^{`B`<^#Y#
z6L>p$&|E$>&@`<(6bhZ)rv|btUl9c1rWOBiE<W~<W%(sh6o0q)xy^>Es&!V)H@V+`
XI5?_a++oDw00000NkvXXu0mjfkw}hY

literal 1213
zcmV;u1Va0XP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00006VoOIv0RI60
z0RN!9r;`8x1ae74K~#90?VHbQV^tK#zvsTZzL>POM$%3@Whhhyn@nYhxDeg-e<-cZ
zYFr2k?%buN)IY$D3u)c7&`lO@rMoJkr~#QIf+Nxtsa1-};Ey<Y&bxOO(@HYAFXrW)
z+e}D5&_&<neDBFO@1A?_%Y6h!78e&^mr{PlC|N9(N{ftoZ3s>=&+{^zdH@zOnM{mX
zvjtWIh=|(&%XQtCm^E8qH2}cN%z6O8ZE6b<E}>K^H45MbUEA#JEV9`wMn*=ov6V^%
zySuwkO0~5~DF?#<%d&1sDYbW0Hk-xj>T1XM!^1;VDwVeD28LA&YzBCqmmwl;+y4GO
zgb;{C^xd7DoZ$HQ*iU*PlgY#ig+iSt(^m8u_dq(G-UG14rPmA*y;>|5zciuESp-cK
zzzd8G0~P~16+jM57D5&SEX%sZrKQ7UAq-RlmX?-oDy4Ra==sOnq?EQ&YLqXv|L}<D
zPa#Ch9I2H07eGFdNW7cR=e=IV1I+?TsT}~X=;mu8g5N9<5(~hDu1^4O*J`z|0qpiF
z9`v?N_u7#`ZiWdCYJiciI1EauP&tKK2sIiFxUL&UA~5lI976Eb+fW9$u8Vrz$O6rm
zSd4dfY;5Wp6o%daw#`t#a2#i1Yin!1>5|Ola!1|954-`%Wb(F@@^;gu`v9KmHh$=b
zz?A|0PN3hg)_~-=MDC3mBG9he1EGlU<1aQo_~dDZ%=}?Bz_u0A^B$@-pn9+O6{;nG
zYf}<`Kd>0H)5AUs5CP97fT*MJ>ls1HVDZr?Fg>Z@^Z2lhdcFPy5q)~`|M@n#Ym7~U
z@i=f}MB(%|LZi#=!uS}FOsYUTu4=XV)%yDS`#mKI!$r`xf!P^_vHy8YA_Oo!r7#)r
z!*gJK77zlsHtGN2E=(GYo6bbfrL6?V#{kEEG$bCJKfoG|15-%_#@%gTE_Ep!jRH5W
zKPrx~n8GvTm)X0XOWzAv5#aiC_;mso1HT!XnVETOb91x#hsS?5Ha6yc10G}G4G==a
z0W_D;`+?$l(-}Oj4Cr?P{buM5U@d|Tm+;LG`eQJ?aQA2PHJY`D-~SMJ@1qG$N#hLt
z5V$g+-wE`afj8jn?CfJ9#B)u53qj%sekt5&H16ecxu1HCANV^UEJJTVs3G8Y_SYob
z=a51f;5ZH($KlGQF9aO|PtK#9bBHKZPJs*{qGFiNOdzGa6DB^;5D-GVDW%+j=2&bW
z4obR2luslQ`(eacDoQGqdX0!a=g{)uPN`Hf^6CuNH258Wo{y_`LBW(Tivi_w`7Z!>
zIka>rrJig9&iR&6s|Cxlj2XbW7bpP8>Kf+e=CHQ52Fud_-hX;}itX)f?MqVtJlnQI
zRr*e_8K9IZ_^r}bR#vdQyxcMV;NU>}(iDKQsrQ8d-aFu;5Vn2IdwY9OO8KrDkB*Ky
zy)<R)_6L|xf2Y&w?*Y8Xsi~BDr(7<7$f?;3_im8A5SlE20KWm;$r>$y0J8xG=4+z`
b5C9$mizYm;5j?(%00000NkvXXu0mjfggZkP


From 0516b13669b272d9e48169e17b996e05ad4a85ec Mon Sep 17 00:00:00 2001
From: hughbarney <hughbarney@googlemail.com>
Date: Fri, 31 Dec 2021 22:29:02 +0000
Subject: [PATCH 07/10] Rebble: fixed icon to 48x48

---
 apps.json                  |   2 +-
 apps/rebble/ChangeLog      |   1 +
 apps/rebble/README.md      |   1 +
 apps/rebble/rebble.icon.js |   2 +-
 apps/rebble/rebble.png     | Bin 4570 -> 4067 bytes
 5 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps.json b/apps.json
index f78098b3a..e4f280a0b 100644
--- a/apps.json
+++ b/apps.json
@@ -4879,7 +4879,7 @@
     "id": "rebble",
     "name": "Rebble Clock",
     "shortName": "Rebble",
-    "version": "0.03",
+    "version": "0.04",
     "description": "A Pebble style clock, with configurable background, three sidebars including steps, day, date, sunrise, sunset, long live the rebellion",
     "readme": "README.md",
     "icon": "rebble.png",
diff --git a/apps/rebble/ChangeLog b/apps/rebble/ChangeLog
index 16e65d4f9..b9c26b4e3 100644
--- a/apps/rebble/ChangeLog
+++ b/apps/rebble/ChangeLog
@@ -1,3 +1,4 @@
 0.01: First release
 0.02: Fix typo to Purple
 0.03: Added dependancy on Pedometer Widget
+0.04: Fixed icon and png to 48x48 pixels
diff --git a/apps/rebble/README.md b/apps/rebble/README.md
index 712fa4e9b..0ecb51d7a 100644
--- a/apps/rebble/README.md
+++ b/apps/rebble/README.md
@@ -11,6 +11,7 @@
 * Uses pedometer widget to get latest step count
 * Dependant apps are installed when Rebble installs
 * Uses the whole screen, widgets are made invisible but still run in the background
+* The icon is James Dean - 'Rebel Without a Cause'
 
 ![](screenshot_rebble.png)
 ![](screenshot_rebble2.png)
diff --git a/apps/rebble/rebble.icon.js b/apps/rebble/rebble.icon.js
index 4c898974e..3fc45b820 100644
--- a/apps/rebble/rebble.icon.js
+++ b/apps/rebble/rebble.icon.js
@@ -1 +1 @@
-require("heatshrink").decompress(atob("oFA4X/AAIHBw3Aiv3HmE/HQQAF/gPEnWqAAOpy2VqoFB3gPIBoIABtQPJ1PVqv1q3qB5OlrNVEIQPK2tlBwOptQPIyvdH4VtrQPI3tbqtdB4OaB5FVH4NV0pgBB5F13//MIIPJ1O2TgWV/o/I1fbB4WpqoPI1NvB4REBJ5APD/wPBD5JOBB4WVqwPH0oPE0oPJ/NX//6AoNVF5HZq3pq2qSYIPI6tX+pNBB5Ol6v6B4IABH5P7//b1oPBN5GlLwPr9IPK1IPC/SvK1QPCOAIPL6te//5B5lW/5ABL5APB/wPB3IPJ1Y/C/yuBF5APC9X+yo/K34LB3QPBtQPJ//23SPB1QPI3eVs2qJwIPJ1flqyeBtQPJtZPBLwIPKzf/1ROCB5OWAQJOBB5QsBAAQGBf5FlB5tVvoPMNQO9B4daB5O+B4aPIqtX35tBB5M1qtbB4i/HB4WvOAjvGB4IpBIQIADB46aBB4t8B49VB54AFB6zrB1Wm1RTBywPI0oPCeQOaB4+ltOlq2V02VqwPOrQPIF5w/PFQIvPB71pH4uqX8g"))
+require("heatshrink").decompress(atob("mEw4X/AoOG4EV+/I+dVAAVUCgcFBIYABpIJBgcFoIKEqkQgEH6EH0ILEqAhCgkBqEVBYdAhUBBoU9GAlAlw5CgERgILDIocEgEGoALDlEHwEAlkUg8EBYfAFwVA+BgEqmQjWrBgMQhgvDqmA9Wq1WsNoMALweDBQIAB4E8BYdTpwLD/kA4AXDjwKC1f/IAILDnQLC1//4ALEHQQLCKgILDFwYLB6EATgVABYe///MNgdA3kQEoILGqCNBlfQh//4NAPAVQ+YLBQYM/ocABYfAiEqgE0g6DBF4eAlFrYQZHDoOu1Xo8lgBYtCKIOo9aOBAAJrCBYWv9X/+gXEqSZC/f//4LHz/6DQIjEBYOhgG6BY1a1WggDCB3ojErYTBoEOa4QLF1X9jWrXwILGKYOvBYtfKYX+17iBHYdX1WQgf/34LBUwQLB1cLWIJqCBYdV9W+1+//oLBWQVVqnuD4M/KQoAB/+kBYJGBCwYLCI4P/DQILFnwLCEQ1Vp+q/46CBYtDXgJ1FAAVwfI4ABqAUCBY8A9gLIqEA9ALEKYYLB9YLERwQ="))
diff --git a/apps/rebble/rebble.png b/apps/rebble/rebble.png
index 69653015cfec75e34382125a56c258c7e9074f5b..acfd37400804494014976eea6bf456b1bdc2fcf6 100644
GIT binary patch
literal 4067
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
Voil!`qIv)T002ovPDHLkV1j)J*pL7K

literal 4570
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
Eg6GD=00000


From 9b779a0e2c749b58f7d15921059760f0355a635b Mon Sep 17 00:00:00 2001
From: hughbarney <hughbarney@googlemail.com>
Date: Fri, 31 Dec 2021 22:52:28 +0000
Subject: [PATCH 08/10] GPStouch: enhanced icon image, it was a but wishy washy

---
 apps.json                      |   2 +-
 apps/gpstouch/Changelog        |   1 +
 apps/gpstouch/gpstouch.icon.js |   2 +-
 apps/gpstouch/gpstouch.png     | Bin 1571 -> 1443 bytes
 4 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps.json b/apps.json
index e4f280a0b..b4364166e 100644
--- a/apps.json
+++ b/apps.json
@@ -4382,7 +4382,7 @@
   {
     "id": "gpstouch",
     "name": "GPS Touch",
-    "version": "0.01",
+    "version": "0.02",
     "description": "A touch based GPS watch, shows OS map reference",
     "icon": "gpstouch.png",
     "screenshots": [{"url":"screenshot4.png"},{"url":"screenshot2.png"},{"url":"screenshot3.png"},{"url":"screenshot1.png"}],
diff --git a/apps/gpstouch/Changelog b/apps/gpstouch/Changelog
index 7f837e50e..e4a0bdfe8 100644
--- a/apps/gpstouch/Changelog
+++ b/apps/gpstouch/Changelog
@@ -1 +1,2 @@
 0.01: First version
+0.02: Enchanced contrast of icon image
diff --git a/apps/gpstouch/gpstouch.icon.js b/apps/gpstouch/gpstouch.icon.js
index c4cf85676..3e05da0ff 100644
--- a/apps/gpstouch/gpstouch.icon.js
+++ b/apps/gpstouch/gpstouch.icon.js
@@ -1 +1 @@
-require("heatshrink").decompress(atob("mEw4UA///j+EAYO/uYDB//wCYcPBA4AFh/ABZMDBbkX6gLIgtX6tQBY9VBYNVBY0BBYdABYsFqoACEgQLDitVtWpqtUBYtVq2q1WVGAQLErQLB0oLFHQNqBYIkBHgMDIwYKBAAJIDIweqz/2BYJtDBYI6Bv/9HgILHYwILGh4gBBYWfbooLF6AjPBYW//wLGL4Wv/RfGNZaDIBYibEBYizIBYjLDBYzXBd4TXCBZ60BBYRqEBZpUBBYRSFJAQLCA4b7BHgQLFgYLGIwYLEgoLBHQYLEgILBHQYLEgALBAoYLFi/UBZMHBZUD6ALKApQAFBbHwBZMP/4ABBwgIDA="))
+require("heatshrink").decompress(atob("mEw4UA///iADCn+EqoAWqAuJgoLcn/8BZENGwNwBY/VBYNXBY0DJ4fABYoiCEggLDmtX1Wq6tcBYvVrQLB0owCBYdVtQLB1NVBYg6BBQIABHgQLCgIuCGAVABYcNqwtBGIOVJAILFyoCCBY5eBBdo7IgIIB1t6BYJfENZaDB9QKB1aDFBYKbEBYizBrwLB2qnFdwSmCX401cYdUBZTjGfYgHCBZB2BBYhUBAARSBBYhICAAIGCBYkVBQJSCBYpICIwQLFHgQ6CBYo8CHQQLFHgQFDBYsVQIQLHgo6DBY0BHQYLGgY6DBYwAFBbCjDACY"))
diff --git a/apps/gpstouch/gpstouch.png b/apps/gpstouch/gpstouch.png
index c411356ae69347a83882fe195782df211aa629e9..a40419a3f15ca9a07e80397db537ca307fba02a1 100644
GIT binary patch
delta 1425
zcmV;C1#bGI45JH>B!3BTNLh0L01m_e01m_fl`9S#000G5Nkl<ZXo1~XTWAzl82<j*
zjo>93g^E$p2P<AkQHfZnSbCuvBcipMnoEmC3Z|f?SXA6Sdv^BUc!NHaJ`_z+C>Si7
zxZt%9rL|&hEGG71Olz$eL1GIPvv^sXozsUg>dwq&XJ$8*^nZgu=0E@C`<OXr&pAH<
zQH4Pa?P(Lp7s1E>M(OF%@B{P98T4;p&<hCWc5#n}1~uC-u#^Z3ltO7T**g^gii?An
z0o)+MX~V#gNQ8bYRL#5vD5Z!Qs{rVskUl+&TiL_Eg#egYT>=mZhtW(#d98x<cp3FR
ziJ8?@08K*ZbASC5XO`yx)CfUWyhrCbiFI8q0?_K0JOBux&jZjFkE^AAbNCX#tQKk-
zjtZfV_FK3QLg*uvLW{1e*ZjnL{)Cv-3;^E=p_f?4cI=QSF9&AM1jdhlY*z}naRcb+
z0NUDsEn9Slys}5rFh3NcU))hQd3zENjVdh=z&RoGa)0aCfddjtmH;D0^q(V{1dbjB
zYHA!sw5QXU8;z3TR)D8ZNYhZ~ME>}3iK?pH<N=_#7+Ad;ICf0h#)Q!41cRvd#L2Cr
zQi_NWvD%xOBq}NZ^00;x0gD#{`}f;L0EoKJ<Uv3~1ImTar#xxfzFnfS(wY42o;zr5
z??h{RCx34D+_8-l0hN`&wr!ar!eRZ{SWL}v%ggl-nPFg=)i!GuFltn$O(})Xo4-Qh
z%d<#)W`4@c-_@|9Vm|6#e;M?I+L978hXa-aXfLP$BFwhhX3VhrH6^~mnpI~qY>7q#
ziN@0iCNxwpdnsoQr&`(IWfG6K8YWE0e7<`xg@2ZlXRL0IaOlJt+`FI3uuYuku2wd<
z7SPkvJJV__D$0ER<9at*_N24sXxZJ1D_!0F<^X_XvbW4FFV_MB0lJsVCm6_`t|$<2
zQ|qofRvrWlA0GJ4YP)|w^LfhTQdF-Wnl(qw`k|OIxwPLL05EJ=;Idm@Ugp5BR>QSx
znSakk!64SYxiD*jwW}8)7|eVFSFbv{4v2s@tKs5ByVI-lXXDiOE3jtc$Vaw!J{*Z}
zTi?JdFWA@2jt+YcB6mwD;9(inG@P>9E?ok;yMb}zGVL!u{~Q*~E5o);w*Ua+o*A97
z{`cYLO`x;WUdu3W)-^A;j-e1;V3rv#JbxV4kw^fkl--|*P&#%DO2>|IB>&(6kVu$0
zo&>Y}(=gClZ~+f-$ZDvs*U{YUEFv3HDd6BiVBI?VjugOQce_y&UIpxCmbT=zwL13g
z1Fm1souI1=*t-{~t8*j|rO@bwkf%ev5OgILQzrl{v5wW(n}nL0B&JUXCQUN8&VPV;
z2I%TC=S*#_GjRZ5mOltV=e=<9b1Na4Wu*|h;|AL4pyB~>uK}LV#E}S{2XM@5TrM!n
z^WiX#c#ZRQs86Ty0kiZlZF55@Z1i(S<V!#_O1~?GkNw0tfmwbLiIDAg#tnSm3zd{0
z!YqIG8{Y?J`In~QeZTR(1#H+rDSu7F+syKT-y9FIE)=4heuMM6oeqWQ0)Uv`cxKrs
z1hwSDA@A$;Y16PH9+zKxjf=%(=a3=Tm~Z{O1yog0y0;fAnWgIsT4s4G7{s#8n<<%Z
z{em<&qEY%=)3AbB+V4*+V3ujaK<(D8WIG`FLBTpSp%DE<gtwSw_Cv9W^?y>*i9*#a
zXp1Qvro&3%y=>$0xD-Orr-iIp@E%ztLVMzIDXey8`B6Abp7%N~5LE-w>}FP*`*O$Q
z>Jz0@f!nxd?z~z|xv*)|KPQP0*txUFSM#EOn7j+xrL<z#uA+*8%n$qz`ox1?01d<h
f{x31;-@w1B_qYw!XLc|E015yANkvXXu0mjfJ5;#Z

delta 1554
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
Ef*6AFy8r+H


From 9f1e978822d5f4321ba9414114de89993f987b99 Mon Sep 17 00:00:00 2001
From: hughbarney <hughbarney@googlemail.com>
Date: Fri, 31 Dec 2021 23:02:01 +0000
Subject: [PATCH 09/10] MyLocation: enhanced icon image, it was a but wishy
 washy

---
 apps.json                          |   2 +-
 apps/mylocation/ChangeLog          |   1 +
 apps/mylocation/mylocation.icon.js |   2 +-
 apps/mylocation/mylocation.png     | Bin 1909 -> 1664 bytes
 4 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps.json b/apps.json
index b4364166e..427b86fbb 100644
--- a/apps.json
+++ b/apps.json
@@ -4708,7 +4708,7 @@
     "icon": "mylocation.png",
     "type": "app",
     "screenshots": [{"url":"screenshot_1.png"}],
-    "version":"0.01",
+    "version":"0.02",
     "description": "Sets and stores the lat and long of your preferred City or it can be set from the GPS. mylocation.json can be used by other apps that need your main location lat and lon. See README",
     "readme": "README.md",
     "tags": "tool,utility",
diff --git a/apps/mylocation/ChangeLog b/apps/mylocation/ChangeLog
index 7b83706bf..653f859ae 100644
--- a/apps/mylocation/ChangeLog
+++ b/apps/mylocation/ChangeLog
@@ -1 +1,2 @@
 0.01: First release
+0.02: Enhanced icon, make it bolder
diff --git a/apps/mylocation/mylocation.icon.js b/apps/mylocation/mylocation.icon.js
index bfb38d5ac..b79f5875f 100644
--- a/apps/mylocation/mylocation.icon.js
+++ b/apps/mylocation/mylocation.icon.js
@@ -1 +1 @@
-require("heatshrink").decompress(atob("mEw4UA///t/7j/P3/vB4cBqtVoAbHBQIABBQ0FBYdQBYsVBYdUERIkGHIQADHoguEGAwuEGAwKFBZg8DHQw8EBYNf/1Vq3/8oLDIwNf/Wpv//0oLG9Wq3/qBYJUCBYuqBaBqBBYW+BepHEBbybCBYP+BYSnErYLDyoLFAANq/r8Ga5T7MBZZUBAAhSCfhA6DBZhIGBQg8FHQg8GHQgwGFwowFBQwwDFwwLMlS7Bqta1AKEn2q1K1C1WgBYf/1WqBYIDB1QKCgYLC0taBYoXB/QICBY0//7vBAAQ8EEgIABCwwME9QVEA"))
+require("heatshrink").decompress(atob("mEw4UA///gH4AYPO/QPDgNVqtADY/1BYNfBQ0PBQIAB+ALFmoLDrgLF6oLDq4KEgYKDBYPABYcNBYlVuAuIGAwuEAANUBYYKFHgg6Bq4ZCr4DBHgQLBvWq2te1WlBYZGBBYOr1Wq1qSDBYNqBIILDKgQLLgoLHqBqDBfJHLBZBrOgKPCBYiPCU4NaBYe1WYrABBQLCCfgYGCrwVBa4kAirvKNgIAErgLDKgIAEKQQ8EAAY6DBZhIDIww8GHQg8GHQgwGFwowEFwx5EOog8GHQ0AlWpBYNq1AKFWIILBAYOgBYbICytWAgQKCgTgDcwYXGAAgvGAAY8EEgYWGBgoVEA=="))
diff --git a/apps/mylocation/mylocation.png b/apps/mylocation/mylocation.png
index 7148990a42a1c8858d933d2a4cb35b80123a5505..038ee177e660e3bf643c74bbaa5f549b382fd5f8 100644
GIT binary patch
delta 1647
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

delta 1894
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


From 6c4e59d5957f13d5db66046d99e32b3631ddb962 Mon Sep 17 00:00:00 2001
From: hughbarney <hughbarney@googlemail.com>
Date: Sun, 2 Jan 2022 16:40:49 +0000
Subject: [PATCH 10/10] Settings, moved Turn Off into Utils

---
 apps.json                | 2 +-
 apps/setting/ChangeLog   | 1 +
 apps/setting/settings.js | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps.json b/apps.json
index 427b86fbb..26ed3d4b1 100644
--- a/apps.json
+++ b/apps.json
@@ -167,7 +167,7 @@
   {
     "id": "setting",
     "name": "Settings",
-    "version": "0.38",
+    "version": "0.39",
     "description": "A menu for setting up Bangle.js",
     "icon": "settings.png",
     "tags": "tool,system",
diff --git a/apps/setting/ChangeLog b/apps/setting/ChangeLog
index 143144d51..449091bca 100644
--- a/apps/setting/ChangeLog
+++ b/apps/setting/ChangeLog
@@ -41,3 +41,4 @@
 0.36: Added 'Utils' menu with helpful utilities for restoring Bangle.js
 0.37: Going into passkey menu now saves settings with passkey
 0.38: Restructed menus as per forum discussion
+0.39: Moved off into Utils, put System after Apps
diff --git a/apps/setting/settings.js b/apps/setting/settings.js
index 1a9463858..9934a1765 100644
--- a/apps/setting/settings.js
+++ b/apps/setting/settings.js
@@ -66,11 +66,10 @@ function showMainMenu() {
     '': { 'title': 'Settings' },
     '< Back': ()=>load(),
     /*LANG*/'Apps': ()=>showAppSettingsMenu(),
-    /*LANG*/'Bluetooth': ()=>showBLEMenu(),
     /*LANG*/'System': ()=>showSystemMenu(),
+    /*LANG*/'Bluetooth': ()=>showBLEMenu(),
     /*LANG*/'Alerts': ()=>showAlertsMenu(),
-    /*LANG*/'Utils': ()=>showUtilMenu(),
-    /*LANG*/'Turn Off': ()=>{ if (Bangle.softOff) Bangle.softOff(); else Bangle.off() }
+    /*LANG*/'Utils': ()=>showUtilMenu()
   };
 
   return E.showMenu(mainmenu);
@@ -535,7 +534,8 @@ function showUtilMenu() {
           setTimeout(showMainMenu, 50);
         } else showUtilMenu();
       });
-    }
+    },
+    /*LANG*/'Turn Off': ()=>{ if (Bangle.softOff) Bangle.softOff(); else Bangle.off() }
   };
   if (Bangle.factoryReset) {
     menu['Factory Reset'] = ()=>{