Merge remote-tracking branch 'espruino/master'

.eslintignore

@@ -2,5 +2,5 @@ lib/espruinotools.js
 lib/imageconverter.js
 lib/qrcode.min.js
 lib/heatshrink.js
-
+lib/marked.min.js
 apps/animclk/V29.LBM.js

CHANGELOG.md

@@ -20,3 +20,4 @@ Changed for individual apps are listed in `apps/appname/ChangeLog`
 * New 'espruinotools' which fixes pretokenise issue when ID follows ID (fix #416)
 * Improve upload of binary files
 * App description can now be markdown
+* Fix `marked is not defined` error (and include in repo, just in case)

apps.json

@@ -1024,7 +1024,7 @@
     "name": "Commandline-Clock",
     "shortName":"CLI-Clock",
     "icon": "app.png",
-    "version":"0.07",
+    "version":"0.08",
     "description": "Simple CLI-Styled Clock",
     "tags": "clock,cli,command,bash,shell",
     "type":"clock",
@@ -1845,7 +1845,7 @@
     "name": "Vertical watch face",
     "shortName":"Vertical Face",
     "icon": "app.png",
-    "version":"0.4.1",
+    "version":"0.04",
     "description": "A simple vertical watch face with the date.",
     "tags": "clock",
     "type":"clock",

apps/cliock/ChangeLog

@@ -1 +1,2 @@
 0.07: Submitted to App Loader
+0.08: Fixes issue where face would redraw on wake leading to all memory being used and watch crashing. 

apps/cliock/app.js

@@ -5,9 +5,6 @@ var flag = false;
 var WeekDays = ["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"];
 
 function drawAll(){
-  g.clear();
-  Bangle.loadWidgets();
-  Bangle.drawWidgets();
   updateTime();
   updateRest(new Date());
 }
@@ -42,6 +39,9 @@ function writeLine(str,line){
   g.drawString(str,25,marginTop+line*30);
 } 
 
+g.clear();
+Bangle.loadWidgets();
+Bangle.drawWidgets();
 drawAll();
 Bangle.on('lcdPower',function(on) {
   if (on)

apps/verticalface/ChangeLog

@@ -0,0 +1 @@
+0.04: Fixed day being displayed

index.html

@@ -174,14 +174,14 @@
     </footer>
 
     <script src="https://www.puck-js.com/puck.js"></script>
+    <script src="lib/marked.min.js"></script>
+    <script src="lib/espruinotools.js"></script>
+    <script src="lib/heatshrink.js"></script>    
     <script src="js/utils.js"></script>
     <script src="js/ui.js"></script>
     <script src="js/comms.js"></script>
     <script src="js/appinfo.js"></script>
     <script src="js/index.js"></script>
-    <script src="lib/espruinotools.js"></script>
-    <script src="lib/heatshrink.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
     <script src="js/pwa.js" defer></script>
   </body>
 </html>