Massive refactor - Make all clocks responsible for loading widgets if they want them, and for loading the launcher on BTN2.

Also make bootloader try and polyfill missing stuff from 2v04

README.md

@@ -185,7 +185,7 @@ about the app.
   "name": "Readable name",    // readable name
   "icon": "icon.png",         // icon in apps/
   "description": "...",       // long description
-  "type":"...",               // optional(if app) - 'app' or 'widget'
+  "type":"...",               // optional(if app) - 'app'/'widget'/'launch'
   "tags": "",                 // comma separated tag list for searching
 
   "custom": "custom.html",    // if supplied, apps/custom.html is loaded in an
@@ -210,7 +210,7 @@ about the app.
 ```
 
 * name, icon and description present the app in the app loader.
-* tags is used for grouping apps in the library, separate multiple entries by comma. Known tags are `tool`, `system`, `clock`, `game`, `sound`, `gps`, `widget` or empty.
+* tags is used for grouping apps in the library, separate multiple entries by comma. Known tags are `tool`, `system`, `clock`, `game`, `sound`, `gps`, `widget`, `launcher` or empty.
 * storage is used to identify the app files and how to handle them
 
 ## Coding hints

apps.json

@@ -6,7 +6,21 @@
     "description": "This is needed by Bangle.js to automatically load the clock, menu, widgets and settings",
     "tags": "tool,system",
     "storage": [
-      {"name":".bootcde","url":"bootloader.js"}
+      {"name":".boot0","url":"boot0.js"},
+      {"name":".bootcde","url":"bootloader.js"},
+      {"name":"+boot","url":"bootloader.json"}
+    ],
+    "sortorder" : -10
+  },
+  { "id": "launch",
+    "name": "Launcher",
+    "icon": "app.png",
+    "version":"0.01",
+    "description": "This is needed by Bangle.js to display a menu allowing you to choose your own applications. You can replace this with a customised launcher.",
+    "tags": "tool,system,launcher",
+    "storage": [
+      {"name":"+launch","url":"app.json"},
+      {"name":"-launch","url":"app.js"}
     ],
     "sortorder" : -10
   },
@@ -26,7 +40,7 @@
   { "id": "mclock",
     "name": "Morphing Clock",
     "icon": "clock-morphing.png",
-    "version":"0.01",
+    "version":"0.02",
     "description": "7 segment clock that morphs between minutes and hours",
     "tags": "clock",
     "type":"clock",
@@ -56,7 +70,7 @@
   { "id": "wclock",
     "name": "Word Clock",
     "icon": "clock-word.png",
-    "version":"0.01",
+    "version":"0.02",
     "description": "Display Time as Text",
     "tags": "clock",
     "type":"clock",
@@ -70,7 +84,7 @@
   { "id": "aclock",
     "name": "Analog Clock",
     "icon": "clock-analog.png",
-    "version":"0.01",
+    "version":"0.02",
     "description": "An Analog Clock",
     "tags": "clock",
     "type":"clock",
@@ -84,7 +98,7 @@
   { "id": "clck3x2",
     "name": "3x2 Pixel Clock",
     "icon": "clock3x2.png",
-    "version":"0.01",
+    "version":"0.02",
     "description": "This is a simple clock using minimalistic 3x2 pixel numerical digits",
     "tags": "clock",
     "storage": [
@@ -359,17 +373,20 @@
       {"name":"=route"}
     ]
   },
+
+
+
   {
-    "id": "start",
+    "id": "ncstart",
     "name": "NCEU Startup",
     "icon": "start.png",
-    "version":"0.01",
+    "version":"0.02",
-    "description": "NodeConfEU 2019 Startup Sequence",
+    "description": "NodeConfEU 2019 'First Start' Sequence",
     "tags": "start",
     "storage": [
-      {"name":"+start","url":"start.json"},
+      {"name":"+ncstart","url":"start.json"},
-      {"name":"-start","url":"start.js"},
+      {"name":".boot3","url":"start.js"},
-      {"name":"*start","url":"start-icon.js","evaluate":true},
+      {"name":"*ncstart","url":"start-icon.js","evaluate":true},
       {"name":"*bangle","url":"start-bangle.js","evaluate":true},
       {"name":"*nceu","url":"start-nceu.js","evaluate":true},
       {"name":"*nfr","url":"start-nfr.js","evaluate":true},
@@ -378,16 +395,16 @@
     ],
     "sortorder" : -1
   },
-  { "id": "funrun5",
+  { "id": "ncfrun",
     "name": "NCEU 5K Fun Run",
     "icon": "nceu-funrun.png",
     "version":"0.01",
     "description": "Display a map of the NodeConf EU 2019 5K Fun Run route and your location on it",
     "tags": "health",
     "storage": [
-      {"name":"+funrun5","url":"nceu-funrun.json"},
+      {"name":"+ncfrun","url":"nceu-funrun.json"},
-      {"name":"-funrun5","url":"nceu-funrun.js"},
+      {"name":"-ncfrun","url":"nceu-funrun.js"},
-      {"name":"*funrun5","url":"nceu-funrun-icon.js","evaluate":true}
+      {"name":"*ncfrun","url":"nceu-funrun-icon.js","evaluate":true}
     ],
     "sortorder" : -1
   },
@@ -404,10 +421,13 @@
     ],
     "sortorder" : -1
   },
+
+
+
   { "id": "sclock",
     "name": "Simple Clock",
     "icon": "clock-simple.png",
-    "version":"0.01",
+    "version":"0.02",
     "description": "Simple Digital Clock",
     "tags": "clock",
     "type":"clock",
@@ -421,7 +441,7 @@
   { "id": "stclck",
     "name": "Simple 12H Clock",
     "icon": "clock-simple.png",
-    "version":"0.01",
+    "version":"0.02",
     "description": "Simple Digital 12-Hour Clock",
     "tags": "clock",
     "type":"clock",
@@ -543,7 +563,7 @@
   { "id": "miclock",
     "name": "Mixed Clock",
     "icon": "clock-mixed.png",
-    "version":"0.01",
+    "version":"0.02",
     "description": "A mix of analog and digital Clock",
     "tags": "clock",
     "type":"clock",
@@ -557,7 +577,7 @@
   { "id": "bclock",
     "name": "Binary Clock",
     "icon": "clock-binary.png",
-    "version":"0.01",
+    "version":"0.02",
     "description": "A simple binary clock watch face",
     "tags": "clock",
     "type":"clock",
@@ -625,9 +645,9 @@
     ]
   },
   { "id": "blobclk",
-    "name": "Large Digit Clock",
+    "name": "Large Digit Blob Clock",
     "icon": "clock-blob.png",
-    "version":"0.02",
+    "version":"0.03",
     "description": "A clock with big digits",
     "tags": "clock",
     "type":"clock",
@@ -641,7 +661,7 @@
   { "id": "boldclk",
     "name": "Bold Clock",
     "icon": "bold_clock.png",
-    "version":"0.01",
+    "version":"0.02",
     "description": "Simple, readable and practical clock",
     "tags": "clock",
     "type":"clock",
@@ -679,6 +699,7 @@
   { "id": "berlinc",
     "name": "Berlin Clock",
     "icon": "berlin-clock.png",
+    "version":"0.02",
     "description": "Berlin Clock (see https://en.wikipedia.org/wiki/Mengenlehreuhr)",
     "tags": "clock",
     "type":"clock",
@@ -692,7 +713,7 @@
   { "id": "ctrclk",
     "name": "Centerclock",
     "icon": "app.png",
-    "version":"0.01",
+    "version":"0.02",
     "description": "Watch-centered digital 24h clock with date in dd.mm.yyyy format.",
     "tags": "clock",
     "type":"clock",

apps/_example_app/app.js

@@ -1,16 +1,12 @@
-(() => {
+// place your const, vars, functions or classes here
 
-    // place your const, vars, functions or classes here
+// special function to handle display switch on
-
+Bangle.on('lcdPower', (on) => {
-
-    // special function to handle display switch on
-    Bangle.on('lcdPower', (on) => {
   if (on) {
-        	drawWidgets();
     // call your app function here
-    }});
+    // If you clear the screen, do Bangle.drawWidgets();
+  }
+});
 
-    g.clear();
+g.clear();
-    // call your app function here 
+// call your app function here
-
-})();

apps/_example_widget/widget.js

@@ -1,14 +1,13 @@
+/* run widgets in their own function scope so they don't interfere with
+currently-running apps */
 (() => {
-
     // add the width
-    var xpos = WIDGETPOS.tr-<the widget width>;
+    var xpos = WIDGETPOS.tr-24;/*<the widget width>*/;
-    WIDGETPOS.tr-=<the widget width plus some extra pixel to keep distance to others>;
+    WIDGETPOS.tr-= 28;/* the widget width plus some extra pixel to keep distance to others */;
 
     // draw your widget at xpos
     function draw() {
-    
     	// add your code
-        
     }
 
     // add your widget

apps/aclock/ChangeLog

@@ -0,0 +1 @@
+0.02: Modified for use with new bootloader and firmware

apps/aclock/clock-analog.js

@@ -1,21 +1,19 @@
-(function(){
+const p = Math.PI/2;
-  g.clear();
+const PRad = Math.PI/180;
-  const p = Math.PI/2;
-  const PRad = Math.PI/180;
 
-  let intervalRefMin = null;
+let intervalRefMin = null;
-  let intervalRefSec = null;
+let intervalRefSec = null;
 
-  let minuteDate = new Date();
+let minuteDate = new Date();
-  let secondDate = new Date();
+let secondDate = new Date();
 
-  function seconds(angle, r) {
+function seconds(angle, r) {
   const a = angle*PRad;
   const x = 120+Math.sin(a)*r;
   const y = 120-Math.cos(a)*r;
   g.fillRect(x-1,y-1,x+1,y+1);
-  }
+}
-  function hand(angle, r1,r2) {
+function hand(angle, r1,r2) {
   const a = angle*PRad;
   const r3 = 3;
   g.fillPoly([
@@ -27,9 +25,9 @@
     120-Math.cos(a)*r2,
     120+Math.sin(a-p)*r3,
     120-Math.cos(a-p)*r3]);
-  }
+}
 
-  function drawAll() {
+function drawAll() {
   g.clear();
   secondDate = minuteDate = new Date();
   // draw hands first
@@ -39,9 +37,9 @@
   for (let i=0;i<60;i++)
     seconds(360*i/60, 90);
   onSecond();
-  }
+}
 
-  function onSecond() {
+function onSecond() {
   g.setColor(0,0,0.6);
   seconds(360*secondDate.getSeconds()/60, 90);
   g.setColor(1,0,0);
@@ -49,44 +47,48 @@
   seconds(360*secondDate.getSeconds()/60, 90);
   g.setColor(1,1,1);
 
-  }
+}
 
-  function onMinute() {
+function onMinute() {
   g.setColor(0,0,0);
-    hand(360*minuteDate.getHours()/12, -10, 50);
+  hand(360*(minuteDate.getHours() + (minuteDate.getMinutes()/60))/12, -10, 50);
   hand(360*minuteDate.getMinutes()/60, -10, 82);
   minuteDate = new Date();
   g.setColor(1,1,1);
-    hand(360*minuteDate.getHours()/12, -10, 50);
+  hand(360*(minuteDate.getHours() + (minuteDate.getMinutes()/60))/12, -10, 50);
   hand(360*minuteDate.getMinutes()/60, -10, 82);
   if(minuteDate.getHours() >= 0 && minuteDate.getMinutes() === 0) {
     Bangle.buzz();
   }
-  }
+}
 
-  function clearTimers() {
+function clearTimers() {
   if(intervalRefMin) {clearInterval(intervalRefMin);}
   if(intervalRefSec) {clearInterval(intervalRefSec);}
-  }
+}
 
-  function startTimers() {
+function startTimers() {
   minuteDate = new Date();
   secondDate = new Date();
   intervalRefSec = setInterval(onSecond,1000);
   intervalRefMin = setInterval(onMinute,60*1000);
   drawAll();
-  }
+}
 
-  startTimers();
+Bangle.on('lcdPower',function(on) {
-
-  Bangle.on('lcdPower',function(on) {
   if (on) {
     g.clear();
-      drawWidgets();
+    Bangle.drawWidgets();
     startTimers();
   }else {
     clearTimers();
   }
-  });
+});
 
-})();
+g.clear();
+Bangle.loadWidgets();
+Bangle.drawWidgets();
+drawAll();
+startTimers();
+// Show launcher when middle button pressed
+setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});

apps/bclock/ChangeLog

@@ -0,0 +1 @@
+0.02: Modified for use with new bootloader and firmware

apps/bclock/clock-binary.js

@@ -1,12 +1,11 @@
-(() => {
+const canvasWidth = 290;
-    const canvasWidth = 290;
+const numberOfColumns = 6;
-    const numberOfColumns = 6;
+const drawFullGrid = false;
-    const drawFullGrid = false;
 
-    const colpos = canvasWidth / numberOfColumns - 10;
+const colpos = canvasWidth / numberOfColumns - 10;
-    const binSize = (canvasWidth / numberOfColumns) / 3;
+const binSize = (canvasWidth / numberOfColumns) / 3;
 
-    const findBinary = target => {
+const findBinary = target => {
     return [
         [0, 0, 0, 0],  // 0
         [1, 0, 0, 0],  // 1
@@ -19,9 +18,9 @@
         [0, 0, 0, 1],  // 8
         [1, 0, 0, 1],  // 9
     ][target];
-    };
+};
 
-    const getCurrentTime = () => {
+const getCurrentTime = () => {
     const flattenArray = (array = []) => [].concat.apply([], array);
     const format = number => {
         const numberStr = number.toString();
@@ -29,10 +28,10 @@
     };
     const now = new Date();
     return flattenArray([now.getHours(), now.getMinutes(), now.getSeconds()].map(format));
-    };
+};
 
-    let prevFrame = [];
+let prevFrame = [];
-    const drawColumn = (position = 0, column = [0, 0, 0, 0]) => {
+const drawColumn = (position = 0, column = [0, 0, 0, 0]) => {
     const maxDotsPerColumn = [2, 4, 3, 4, 3, 4];
 
     const columnPos = position * colpos;
@@ -63,18 +62,18 @@
         }
         pos += colpos;
     }
-    };
+};
 
-    const drawClock = () => {
+const drawClock = () => {
     const data = getCurrentTime().map(findBinary);
     for (let i = 0; i < data.length; i += 1) {
         drawColumn(i, data[i]);
     }
     prevFrame = data;
-    };
+};
 
-    // Themes
+// Themes
-    const drawTheme = (idx) => () => {
+const drawTheme = (idx) => () => {
     idx += 1;
     const themes = [
         [[0, 0, 0], [1, 1, 1]],
@@ -88,19 +87,23 @@
     g.setBgColor.apply(g, color[0]);
     g.setColor.apply(g, color[1]);
     g.clear();
-    };
+};
 
-    const nextTheme = drawTheme(0);
+const nextTheme = drawTheme(0);
-    setWatch(() => {
+setWatch(() => {
     prevFrame = [];
     Bangle.beep();
     nextTheme();
-    }, BTN1, { repeat: true });
+}, BTN1, { repeat: true });
 
-    Bangle.on('lcdPower', on => {
+Bangle.on('lcdPower', on => {
     if (on) drawClock();
-    });
+});
 
-    g.clear();
+g.clear();
-    setInterval(() => { drawClock(); }, 1000);
+Bangle.loadWidgets();
-})();
+Bangle.drawWidgets();
+setInterval(() => { drawClock(); }, 1000);
+drawClock();
+// Show launcher when middle button pressed
+setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});

apps/berlinc/ChangeLog

@@ -0,0 +1 @@
+0.02: Modified for use with new bootloader and firmware

apps/berlinc/berlin-clock.js

@@ -1,13 +1,11 @@
-(() => {
+// place your const, vars, functions or classes here
+fields = [ 4 , 4 , 11 , 4 ];
+width = g.getWidth();
+height = g.getHeight();
+rowHeight = height/4;
+rowlights = [];
 
-    // place your const, vars, functions or classes here
+function drawBerlinClock() {
-    fields = [ 4 , 4 , 11 , 4 ];
-    width = g.getWidth();
-    height = g.getHeight();
-    rowHeight = height/4;
-    rowlights = [];
-
-    function drawBerlinClock() {
     var now = new Date();
     rowlights[0] = Math.floor(now.getHours() / 5);
     rowlights[1] = now.getHours() % 5;
@@ -45,21 +43,23 @@
         }
       }
     }
-    }
+}
 
-    // special function to handle display switch on
+// special function to handle display switch on
-    Bangle.on('lcdPower', (on) => {
+Bangle.on('lcdPower', (on) => {
+  g.clear();
   if (on) {
-        	drawWidgets();
+  	Bangle.drawWidgets();
   // call your app function here
   drawBerlinClock();
-    }});
+}});
 
-    // call your app function here 
+// refesh every 15 sec
+setInterval(drawBerlinClock, 15E3);
 
-    // refesh every 15 sec
+g.clear();
-    setInterval(drawBerlinClock, 15E3);
+Bangle.loadWidgets();
-
+Bangle.drawWidgets();
-    drawBerlinClock();
+drawBerlinClock();
-
+// Show launcher when middle button pressed
-})();
+setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});

apps/blobclk/ChangeLog

@@ -1,3 +1,4 @@
 0.02: Improve performance when screen wakes
       Only draw widgets after clearing screen - they update automatically
       Remove 'faceUp' check as it's automatic
+0.03: Modified for use with new bootloader and firmware

apps/blobclk/clock-blob.js

@@ -1,6 +1,5 @@
-(function(){
+const buf = Graphics.createArrayBuffer(144,200,1,{msb:true});
-    const buf = Graphics.createArrayBuffer(144,200,1,{msb:true});
+const NUMBERS = [
-    const NUMBERS = [
     [1,1,1,1,3,1,1,0,1,1,1,1,0,1,1,1,1,1,1,1,1,1,1,1,1],//0
     [0,1,1,1,3,0,0,1,1,1,0,0,1,1,1,0,0,1,1,1,0,0,1,1,1],//1
     [1,1,1,1,3,0,0,1,1,1,2,1,1,1,4,1,1,1,0,0,1,1,1,1,1],//2
@@ -11,14 +10,14 @@
     [1,1,1,1,3,0,0,1,1,1,0,2,1,1,1,0,1,1,1,0,0,1,1,1,0],//7
     [1,1,1,1,3,1,1,0,1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1],//8
     [1,1,1,1,3,1,1,0,1,1,1,1,1,1,1,0,0,1,1,1,1,1,1,1,1] //9
-    ];
+];
-    let intervalRef = null;
+let intervalRef = null;
-    let digits = [-1,-1,-1,-1,-1,-1];
+let digits = [-1,-1,-1,-1,-1,-1];
-    function flip() {
+function flip() {
     g.setColor(1,1,1);
     g.drawImage({width:buf.getWidth(),height:buf.getHeight(),buffer:buf.buffer},55,26);
-    }
+}
-    function drawPixel(ox,oy,x,y,r,p) {
+function drawPixel(ox,oy,x,y,r,p) {
     let x1 = ox+x*(r*2+1);
     let y1 = oy+y*(r*2+1);
     let xmid = x1+r;
@@ -45,8 +44,8 @@
     } else if (p === 5) {
         buf.fillPoly([x1,y1,x2,y1,x2,y2,xmid,y2,x1,ymid]);
     }
-    }
+}
-    function redraw() {
+function redraw() {
     let time = new Date();
     let hours = time.getHours();
     let mins = time.getMinutes();
@@ -78,25 +77,27 @@
     }
     digits = newDigits;
     flip();
-    }
+}
-    function clearTimers() {
+function clearTimers() {
     if(intervalRef) {
       clearInterval(intervalRef);
       intervalRef = undefined;
     }
-    }
+}
-    function startTimers() {
+function startTimers() {
     g.clear();
-        try { if (drawWidgets) { drawWidgets();} } catch(err) {}
+    Bangle.drawWidgets();
     intervalRef = setInterval(redraw,1000);
     redraw();
-    }
+}
-    startTimers();
+Bangle.loadWidgets();
-    Bangle.on('lcdPower',function(on) {
+startTimers();
+Bangle.on('lcdPower',function(on) {
     if (on) {
         startTimers();
     } else {
         clearTimers();
     }
-    });
+});
-})();
+// Show launcher when middle button pressed
+setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});

apps/boldclk/ChangeLog

@@ -0,0 +1 @@
+0.02: Modified for use with new bootloader and firmware

apps/boldclk/bold_clock.js

@@ -1,65 +1,63 @@
-(() => {
+var hour_hand = {
-    // https://www.espruino.com/Image+Converter
-    var hour_hand = {
     width : 61, height : 8, bpp : 1,
     transparent : 0,
     buffer : E.toArrayBuffer(atob("/////////////////////////////////////////////////////////////////////////////////w=="))
-    };
+};
-    var minute_hand = {
+var minute_hand = {
     width : 110, height : 4, bpp : 1,
     transparent : 0,
     buffer : E.toArrayBuffer(atob("/////////////////////////////////////////////////////////////////////////w=="))
-    };
+};
 
-    //g.fillRect(0,24,239,239); // Apps area
+//g.fillRect(0,24,239,239); // Apps area
-    let intervalRef = null;
+let intervalRef = null;
-    const p180 = Math.PI/180;
+const p180 = Math.PI/180;
-    const clock_center = {x:Math.floor((240-1)/2), y:24+Math.floor((239-24)/2)};
+const clock_center = {x:Math.floor((240-1)/2), y:24+Math.floor((239-24)/2)};
-    // ={ x: 119, y: 131 }
+// ={ x: 119, y: 131 }
-    const radius = Math.floor((239-24+1)/2); // =108
+const radius = Math.floor((239-24+1)/2); // =108
 
-    let tick0 = Graphics.createArrayBuffer(30,8,1);
+let tick0 = Graphics.createArrayBuffer(30,8,1);
-    tick0.fillRect(0,0,tick0.getWidth()-1, tick0.getHeight()-1);
+tick0.fillRect(0,0,tick0.getWidth()-1, tick0.getHeight()-1);
-    let tick5 = Graphics.createArrayBuffer(20,6,1);
+let tick5 = Graphics.createArrayBuffer(20,6,1);
-    tick5.fillRect(0,0,tick5.getWidth()-1, tick5.getHeight()-1);
+tick5.fillRect(0,0,tick5.getWidth()-1, tick5.getHeight()-1);
-    let tick1 = Graphics.createArrayBuffer(8,4,1);
+let tick1 = Graphics.createArrayBuffer(8,4,1);
-    tick1.fillRect(0,0,tick1.getWidth()-1, tick1.getHeight()-1);
+tick1.fillRect(0,0,tick1.getWidth()-1, tick1.getHeight()-1);
 
-    function big_wheel_x(angle){
+function big_wheel_x(angle){
     return clock_center.x + radius * Math.cos(angle*p180);
-    }
+}
-    function big_wheel_y(angle){
+function big_wheel_y(angle){
     return clock_center.y + radius * Math.sin(angle*p180);
-    }
+}
-    function rotate_around_x(center_x, angle, tick){
+function rotate_around_x(center_x, angle, tick){
     return center_x + Math.cos(angle*p180) * tick.getWidth()/2;
-    }
+}
-    function rotate_around_y(center_y, angle, tick){
+function rotate_around_y(center_y, angle, tick){
     return center_y + Math.sin(angle*p180) * tick.getWidth()/2;
-    }
+}
-    function hour_pos_x(angle){
+function hour_pos_x(angle){
     return clock_center.x + Math.cos(angle*p180) * hour_hand.width/2;
-    }
+}
-    function hour_pos_y(angle){
+function hour_pos_y(angle){
     return clock_center.y + Math.sin(angle*p180) * hour_hand.width/2;
-    }
+}
-    function minute_pos_x(angle){
+function minute_pos_x(angle){
     return clock_center.x + Math.cos(angle*p180) * minute_hand.width/2;
-    }
+}
-    function minute_pos_y(angle){
+function minute_pos_y(angle){
     return clock_center.y + Math.sin(angle*p180) * minute_hand.width/2;
-    }
+}
-    function minute_angle(date){
+function minute_angle(date){
     //let minutes = date.getMinutes() + date.getSeconds()/60;
     let minutes = date.getMinutes();
     return 6*minutes - 90;
-    }
+}
-    function hour_angle(date){
+function hour_angle(date){
     let hours= date.getHours() + date.getMinutes()/60;
     return 30*hours - 90;
-    }
+}
 
-    function draw_clock(){
+function draw_clock(){
     //console.log("draw_clock");
     let date = new Date();
     //g.clear();
@@ -103,44 +101,45 @@
 
     g.flip();
     //console.log(date);
-    }
+}
-    function clearTimers(){
+function clearTimers(){
     //console.log("clearTimers");
     if(intervalRef) {
         clearInterval(intervalRef);
         intervalRef = null;
         //console.log("interval is cleared");
     }
-    }
+}
-    function startTimers(){
+function startTimers(){
     //console.log("startTimers");
     if(intervalRef) clearTimers();
     intervalRef = setInterval(draw_clock, 60*1000);
     //console.log("interval is set");
     draw_clock();
-    }
+}
 
-    Bangle.on('lcdPower', (on) => {
+Bangle.on('lcdPower', (on) => {
     if (on) {
         //console.log("lcdPower: on");
-            try { if (drawWidgets) { drawWidgets();} } catch(err) {}
+        Bangle.drawWidgets();
         startTimers();
     } else {
         //console.log("lcdPower: off");
         clearTimers();
     }
-    });
+});
-    Bangle.on('faceUp',function(up){
+Bangle.on('faceUp',function(up){
     //console.log("faceUp: " + up + " LCD: " + Bangle.isLCDOn());
     if (up && !Bangle.isLCDOn()) {
         //console.log("faceUp and LCD off");
         clearTimers();
         Bangle.setLCDPower(true);
     }
-    });
+});
 
-    g.clear();
+g.clear();
-    //Bangle.setLCDPower(true);
+Bangle.loadWidgets();
-    startTimers();
+Bangle.drawWidgets();
-
+startTimers();
-})();
+// Show launcher when middle button pressed
+setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});

apps/boot/boot0.js

@@ -0,0 +1,42 @@
+// This ALWAYS runs at boot
+E.setFlags({pretokenise:1});
+// All of this is just shim for older Bangles
+if (!Bangle.loadWidgets) {
+  Bangle.loadWidgets = function(){
+    global.WIDGETPOS={tl:32,tr:g.getWidth()-32,bl:32,br:g.getWidth()-32};
+    global.WIDGETS={};
+    require("Storage").list().filter(a=>a[0]=='=').forEach(widget=>eval(require("Storage").read(widget)));
+  };
+  Bangle.drawWidgets = function(){
+    for(var w of WIDGETS)w.draw()
+  };
+  Bangle.showLauncher = function(){
+    var l = require("Storage").list().filter(a=>a[0]=='+').map(app=>{
+      try { return require("Storage").readJSON(app); } catch (e) {}
+    }).find(app=>app.type=="launch");
+    if (l) load(l.src);
+    else E.showMessage("Launcher\nnot found");
+  };
+  var _load = load;
+  global.load = function(x) {
+    if (!x) _load(x);
+    else setTimeout(function(){
+      // attempt to remove any currently-running code
+      delete Bangle.buzz;
+      delete Bangle.beep;
+      Bangle.setLCDOffset&&Bangle.setLCDOffset(0);
+      Bangle.setLCDMode("direct");
+      g.clear();
+      clearInterval();
+      clearWatch();
+      Bangle.removeAllListeners();
+      NRF.removeAllListeners();
+      Bluetooth.removeAllListeners();
+      E.removeAllListeners();
+      delete GB;
+      delete WIDGETS;
+      delete WIDGETPOS;
+      setTimeout('eval(require("Storage").read("'+x+'"));',20);
+    },20);
+  }
+}

apps/boot/bootloader.js

@@ -1,121 +1,14 @@
-E.setFlags({pretokenise:1});
+// This runs after a 'fresh' boot
-var startapp;
+var settings;
 try {
-  startapp = require('Storage').readJSON('+start');
-} catch (e) {}
-if (startapp) {
-  eval(require("Storage").read(startapp.src));
-} else {
-  setWatch(function displayMenu() {
-    Bangle.setLCDOffset(0); // remove notifications
-    Bangle.setLCDMode("direct");
-    g.clear();
-    // attempt to remove any currently-running code
-    clearInterval();
-    clearWatch();
-    Bangle.removeAllListeners();
-    NRF.removeAllListeners();
-    Bluetooth.removeAllListeners();
-    E.removeAllListeners();
-    delete GB;
-    delete WIDGETS;
-    delete WIDGETPOS;
-    delete drawWidgets;
-    var s = require("Storage");
-    var apps = s.list().filter(a=>a[0]=='+').map(app=>{
-      try { return s.readJSON(app); }
-      catch (e) { return {name:"DEAD: "+app.substr(1)} }
-    }).filter(app=>app.type=="app" || app.type=="clock" || !app.type);
-    apps.sort((a,b)=>{
-      var n=(0|a.sortorder)-(0|b.sortorder);
-      if (n) return n; // do sortorder first
-      if (a.name<b.name) return -1;
-      if (a.name>b.name) return 1;
-      return 0;
-    });
-    var selected = 0;
-    var menuScroll = 0;
-    var menuShowing = false;
-
-    function drawMenu() {
-      g.setFont("6x8",2);
-      g.setFontAlign(-1,0);
-      var n = 3;
-      if (selected>=n+menuScroll) menuScroll = 1+selected-n;
-      if (selected<menuScroll) menuScroll = selected;
-      if (menuScroll) g.fillPoly([120,0,100,20,140,20]);
-      else g.clearRect(100,0,140,20);
-      if (apps.length>n+menuScroll) g.fillPoly([120,239,100,219,140,219]);
-      else g.clearRect(100,219,140,239);
-      for (var i=0;i<n;i++) {
-        var app = apps[i+menuScroll];
-        if (!app) break;
-        var y = 24+i*64;
-        if (i+menuScroll==selected) {
-          g.setColor(0.3,0.3,0.3);
-          g.fillRect(0,y,239,y+63);
-          g.setColor(1,1,1);
-          g.drawRect(0,y,239,y+63);
-        } else
-          g.clearRect(0,y,239,y+63);
-        g.drawString(app.name,64,y+32);
-        var icon=undefined;
-        if (app.icon) icon = s.read(app.icon);
-        if (icon) try {g.drawImage(icon,8,y+8);} catch(e){}
-      }
-    }
-    drawMenu();
-    setWatch(function() {
-      if (selected>0) {
-        selected--;
-        drawMenu();
-      }
-    }, BTN1, {repeat:true});
-    setWatch(function() {
-      if (selected+1<apps.length) {
-        selected++;
-        drawMenu();
-      }
-    }, BTN3, {repeat:true});
-    setWatch(function() { // run
-      if (!apps[selected].src) return;
-      clearWatch();
-      g.clear(1);
-      g.setFont("6x8",2);
-      g.setFontAlign(0,0);
-      g.drawString("Loading...",120,120);
-      // if clock, just set the default setting and restart
-      if (apps[selected].type=="clock") {
-        try {
-          var settings = require("Storage").readJSON('@setting');
-          settings.clock = apps[selected].src;
-          require("Storage").write('@setting',settings);
-        } catch (e) { }
-        load();
-      } else {
-        // load like this so we ensure we've cleared out our RAM
-        setTimeout(process.memory,10); // force GC
-        setTimeout('eval(require("Storage").read("'+apps[selected].src+'"));',20);
-      }
-    }, BTN2, {repeat:true,edge:"falling"});
-  }, BTN2, {repeat:false,edge:"falling"}); // menu on middle button
-
-  var WIDGETPOS={tl:32,tr:g.getWidth()-32,bl:32,br:g.getWidth()-32};
-  var WIDGETS={};
-  function drawWidgets() { for (var w of WIDGETS) w.draw(); }
-  var settings;
-  try {
   settings = require("Storage").readJSON('@setting');
-  } catch (e) {
+} catch (e) {
   settings = {}
-  }
+}
-  // load widgets
+// load clock if specified
-  require("Storage").list().filter(a=>a[0]=='=').forEach(widget=>eval(require("Storage").read(widget)));
+var clockApp = settings.clock;
-  setTimeout(drawWidgets,100);
+if (clockApp) clockApp = require("Storage").read(clockApp)
-  // load clock if specified
+if (!clockApp) {
-  var clockApp = settings.clock;
-  if (clockApp) clockApp = require("Storage").read(clockApp)
-  if (!clockApp) {
   var clockApps = require("Storage").list().filter(a=>a[0]=='+').map(app=>{
     try { return require("Storage").readJSON(app); }
     catch (e) {}
@@ -123,8 +16,7 @@ if (startapp) {
   if (clockApps && clockApps.length > 0)
     clockApp = require("Storage").read(clockApps[0].src);
   delete clockApps;
-  }
-  if (clockApp) eval(clockApp);
-  else E.showMessage("No Clock Found");
-  delete clockApp;
 }
+if (clockApp) eval(clockApp);
+else E.showMessage("No Clock Found");
+delete clockApp;

apps/boot/bootloader.json

@@ -0,0 +1,3 @@
+{
+  "name":"Bootloader","type":"boot"
+}

apps/clck3x2/ChangeLog

@@ -0,0 +1 @@
+0.02: Modified for use with new bootloader and firmware

apps/clck3x2/clock3x2.js

@@ -1,31 +1,29 @@
-(function(){
+const ox=10; // x offset
+const oy=80;
+const pw=20; // pixel width
+const ps=5; // pixel spacing
+const ds=10; // digit spacing
+const ms=20; // middle space
 
-  const ox=10; // x offset
+const x00=ox; // digit 0, pixel 0, x position
-  const oy=80;
+const x01=x00+pw+ps;
-  const pw=20; // pixel width
+const x10=x01+pw+ds;
-  const ps=5; // pixel spacing
+const x11=x10+pw+ps;
-  const ds=10; // digit spacing
+const x20=x11+pw+ms;
-  const ms=20; // middle space
+const x21=x20+pw+ps;
-
+const x30=x21+pw+ds;
-  const x00=ox; // digit 0, pixel 0, x position
+const x31=x30+pw+ps;
-  const x01=x00+pw+ps;
+const xSpace=[[x00,x01], // all pixel x spacing
-  const x10=x01+pw+ds;
-  const x11=x10+pw+ps;
-  const x20=x11+pw+ms;
-  const x21=x20+pw+ps;
-  const x30=x21+pw+ds;
-  const x31=x30+pw+ps;
-  const xSpace=[[x00,x01], // all pixel x spacing
               [x10,x11],
               [x20,x21],
               [x30,x31]];
 
-  const y0=oy; // y spacing
+const y0=oy; // y spacing
-  const y1=y0+pw+ps;
+const y1=y0+pw+ps;
-  const y2=y1+pw+ps;
+const y2=y1+pw+ps;
-  const ySpace=[y0, y1, y2];
+const ySpace=[y0, y1, y2];
 
-  const pixels =  [[[0,0], // digit on/off pixels
+const pixels =  [[[0,0], // digit on/off pixels
                   [1,1],
                   [1,1]],
                      [[0,1], // digit 1
@@ -56,11 +54,11 @@
                       [1,1],
                       [0,1]]];
 
-  let idTimeout = null;
+let idTimeout = null;
 
-  function drawTime() {
+function drawTime() {
   g.clear();
-    drawWidgets();
+  Bangle.drawWidgets();
 
   let d = Date();
   let h = d.getHours();
@@ -80,16 +78,10 @@
   let t = d.getSeconds()*1000 + d.getMilliseconds();
   let delta = (60000 - t) % 60000; // time till next minute
   idTimeout = setTimeout(drawTime, delta);
-  }
+}
 
-  Bangle.on('gesture', function(gesture) {
+// special function to handle display switch on
-    if (gesture && !Bangle.isLCDOn()) {
+Bangle.on('lcdPower', function(on){
-      Bangle.setLCDPower(true);
-    }
-  });
-
-  // special function to handle display switch on
-  Bangle.on('lcdPower', function(on){
   if (on) {
     drawTime();
   } else {
@@ -97,8 +89,9 @@
       clearTimeout(idTimeout);
     }
   }
-  });
+});
 
-  drawTime();
+Bangle.loadWidgets();
-
+drawTime();
-})();
+// Show launcher when middle button pressed
+setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});

apps/ctrclk/ChangeLog

@@ -0,0 +1 @@
+0.02: Modified for use with new bootloader and firmware

apps/ctrclk/app.js

@@ -1,43 +1,42 @@
-(function () {
+let bigCustomFont = [
-  let bigCustomFont = [
   atob(
     'AAAA/+AAAAAAB///wAAAAB////8AAAA/////+AAAP/////8AAD//////8AAf/8AAf/8AD/8AAAH/4Af+AAAAD/wD/gAAAAD/gf4AAAAAH+D/AAAAAAP8P4AAAAAAf5/AAAAAAA/n4AAAAAAB+/gAAAAAAH/+AAAAAAAf/wAAAAAAA//AAAAAAAD/8AAAAAAAP/4AAAAAAB//gAAAAAAH9+AAAAAAAfn8AAAAAAD+fwAAAAAAP4/gAAAAAB/D/AAAAAAP8H/AAAAAB/gP+AAAAAf8Af/AAAAH/gA//gAAD/8AB//8AH//gAB//////8AAB//////AAAB/////wAAAA////4AAAAAP//4AAAAAAAAAAAAAAGAAAAAAAAA8AAAAAAAAH8AAAAAAAA/wAAAAAAAH+AAAAAAAA/wAAAAAAAH+AAAAAAAA/wAAAAAAAH////////w/////////H////////8/////////3//////////////////8AAAAAAAAAAAAAAAAAADAAAAAAAAAcQAAAAAAAHzwAAAAAAA/PwAAAAAAH9/AAAAAAB/34AAAAAAP/fgAAAAAD//+AAAAAAf//wAAAAAH///AAAAAA///8AAAAAH///4AAAAB/4//gAAAAP/D/+AAAAD/wP34AAAAf+A/fwAAAD/wD8/gAAA/8APz/AAAH/gA/H+AAB/4AD8f8AAP/AAPw/8AD/wAA/B/+A/+AAD8D////wAAPwH///8AAA/AH///gAAD8AH//4AAAPwAH/+AAAAAAAAAAAAAAD8AAAAAAAAPwAAAAAAAA/AAgAAAAD/8AHAAAAAP/wB8AAAAA//APwAAAAD/8D/AAAAAP/wf8AAAAB//H/wAAAAH/8//gAAAAfv//+AAAAD+///8AAAAP7//fwAAAB/P/w/gAAAP8/+D/AAAB/j/wH+AAAP8P8AP8AAB/w/gAf8AAf+D4AA/8AH/wPAAB////+AwAAD////gCAAAH///8AAAAAH///AAAAAAD//wAAAAAAA/wAAAAAAAAAAAAAAAAAAAQAAAAAAAAHAAAAAAAAD8AAAAAAAA/wAAAAAAAP/AAAAAAAD/8AAAAAAB//wAAAAAAf//AAAAAAH//8AAAAAB//PwAAAAAf/w/AAAAAP/8D8AAAAD//APwAAAA//gA/AAAAP/4AD8AAAH/+AAPwAAB//gAA/AAAf/4AAD8AAH/8AAAPwAD//AAAA/AAP/wAAAD8AA/8AAAAPwAD/AAAAA/gAPgAAA/////4AAAD////+AAAAP////wAAAA/////AAAAD////8AAAAAA/AAAAAAAAD8AAAAAAAAPwAAAAAAAAAAAAAA8AAAAAAAB/wAAAAAAD//AAAAAP///8AAAAA////wAAAAD////AAAAAP///8AAAAA//4PwAAAAH/8A/gAAAAf/wB+AAAAB+/AH4AAAAP78AfwAAAA/vwA/AAAAH8/AD+AAAA/z8AP8AAAD+PwAf4AAAf4/AA/wAAH/D8AD/gAA/4PwAH/gAf/A/AAP/8f/4AAAAf////AAAAAf///wAAAAA///8AAAAAAf//AAAAAAAH/gAAAAAAAAAAAAAAAAH/4AAAAAAP//8AAAAAD///+AAAAB////8AAAAf////8AAAH//8f/4AAA//8AD/wAAP//AAD/gAB//wAAH/AAP/+AAAH+AB//wAAAP4AP/+AAAAfwB//wAAAB/AP9/AAAAD+B/n4AAAAH4H8/gAAAAfg/j8AAAAB/H8PwAAAAH8fw/AAAAAPz+D8AAAAA/P4PwAAAAD9/A/AAAAAf38D8AAAAB/fgP4AAAAH5+A/gAAAAfv4B/AAAAD+/gH8AAAAPz+AP4AAAB/PwA/wAAAP8/AB/gAAB/gAAD/AAAP8AAAP+AAD/gAAAf+AA/8AAAA//gf/gAAAA////8AAAAB////gAAAAB///4AAAAAB//+AAAAAAA//AAAAAAAAAAAAPwAAAAAAAA/AAAAAAAAD8AAAAAAAAfwAAAAAAAP/AAAAAAAH/8AAAAAAD//wAAAAAD///AAAAAB///8AAAAA///vwAAAA///w/AAAAP//wD8AAAP//4APwAAH//8AA/AAD//+AAD8AD//+AAAPwB///AAAA/A///gAAAD8f//wAAAAP///4AAAAA///4AAAAAD//8AAAAAAP/+AAAAAAA/+AAAAAAAD/AAAAAAAAPgAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAD/AAAAAAAH//wAAAAAB///wAAAAAf///wAAAAD////wAAAAf////gAAAH/wAf/AAAA/8AAP+AAAD/AAAf8AAAf4AAAf4AAD/AAAA/gB/P4AAAB/A///AAAAH8H//8AAAAP4///gAAAAfn//+AAAAB+f//wAAAAH/+B/AAAAAf/4H8AAAAA//APwAAAAD/8A/AAAAAP/4H8AAAAB/fw/wAAAAH9///gAAAAfj//+AAAAB+P//4AAAAP4P//wAAAA/gf//gAAAH8APD/AAAA/wAAH8AAAH+AAAf8AAA/wAAA/4AAH/AAAB/4AB/4AAAD/8A//AAAAH////wAAAAP///+AAAAAP///gAAAAAP//4AAAAAAH/+AAAAAAAAAAAAAAA/wAAAAAAA//8AAAAAAP//+AAAAAD///8AAAAA////8AAAAH////4AAAA/+AD/wAAAH/AAD/gAAA/4AAD/AAAH+AAAH+AAAfwAAAP8APz+AAAAfwA/P4AAAA/gH9/AAAAD+Af34AAAAH4B+fgAAAAfwH7+AAAAA/A/v4AAAAD8D+/AAAAAPwPz8AAAAA/B/PwAAAAD8P8/gAAAAPw/j+AAAAA/H8H4AAAAH8/wfgAAAAf3+B/AAAAB+fwH8AAAAP//AP4AAAB//4A/wAAAH//AB/gAAA//4AD/AAAP//AAH+AAB//wAAf+AAf/+AAAf/AP//gAAA/////8AAAB/////AAAAB////wAAAAB///4AAAAAB//4AAAAAAAAAAAAAAA='),
   atob('Jg8dGiAaKBsoKA==')
-  ];
+];
-  let smallCustomFont = [
+let smallCustomFont = [
   atob(
     'AAAAAAAAAAfkAAwAAAwAAACQf8CQf8CQAAGIJEf+JEE4AAMMMQBgCMMMAAAYMkTEMkAYBkAAwAgAAAHwIIQEAAQEIIHwAABAFQDgBADgFQBABABAHwBABAAAACAMAABABABABABAAAAEAAAEAYAgDAEAYAAAP4QkRESEP4AAEEIEf8AEAAMMQUQUQkPEAAIIQEREREO4AABwCQEQIQf8AAeISESESER4AAH4KESESEB4AAYAQAQcTgcAAAO4REREREO4AAPAQkQkQoPwAACIAAACCMAABACgEQIIAACQCQCQCQCQAAIIEQCgBAAAMAQAQ0RAOAAAP4QETkUUUUP0AAP8RARARAP8AAf8REREREO4AAP4QEQEQEIIAAf8QEQEIIHwAAf8REREREQEAAf8RARARAQAAAP4QEQEREJ4AAf8BABABAf8AAQEf8QEAAAYAEQEf4QAAAf8BACgEQYMAAf8AEAEAEAEAAf8IAEACAEAIAf8AAf8EACABAf8AAP4QEQEQEP4AAf8RARARAOAAAP4QEQEQGP6AAf8RgRQRIOEAAOIREREREI4AAQAQAf8QAQAAAf4AEAEAEf4AAeABwAMBweAAAf8AIAQAgAQAIf8AAYMGwBAGwYMAAYAGAB8GAYAAAQMQ0REWEYEAAf8QEAAMACABgAQAMAAQEf8AAIAQAgAQAIAAAACACACACACAAgAwAAAAYCkCkCkB8AAf8CECECEB4AAB4CECECEBIAAB4CECECEf8AAB4CUCUCUBwAACAP8SAQAAAB4CFCFCFD+AAf8CACACAB8AACET8AEAAACABT+AAf8AgBQCIAEAAQEf8AEAAD8CACAD8CACAB8AAD8CACACAB8AAB4CECECEB4AAD/CECECEB4AAB4CECECED/AAD8BACACACAAABICkCkCkAYAACAP4CECEAAD4AEAEAED8AADAAwAMAwDAAAD4AEAEA4AEAED4AACMBQAgBQCMAAD4AFAFAFD+AACMCUCkDECEAABAO4QEQEAAf8AAQEQEO4BAAAYAgAQAQAIAwAAAAAAAAAAAAA'),
   atob(
     'BQIEBgYGBwMEBAcGAwYCBwYFBgYGBgYGBgYCAwUGBQYHBgYGBgYGBgYEBgYGCAYGBgYGBgYGBggGBgYDBgMGBgMGBgYGBgUGBgQEBgQIBgYGBgYGBQYGCAYGBgUCBQcF')
-  ];
+];
-  let interval = null;
+let interval = null;
-  let middleX = 120;
+let middleX = 120;
-  let middleY = 106;
+let middleY = 106;
-  let lineLength = 114;
+let lineLength = 114;
-  let lineY1 = middleY - 10;
+let lineY1 = middleY - 10;
-  let lineY2 = middleY + 60;
+let lineY2 = middleY + 60;
-  let clearRectSegmentY1 = middleY - 9;
+let clearRectSegmentY1 = middleY - 9;
-  let clearRectSegmentY2 = middleY + 59;
+let clearRectSegmentY2 = middleY + 59;
 
-  function setBigFont () {
+function setBigFont () {
   g.setFontCustom(
     bigCustomFont[0],
     48,
     bigCustomFont[1],
     58
   );
-  }
+}
 
-  function setSmallFont () {
+function setSmallFont () {
   g.setFontCustom(
     smallCustomFont[0],
     32,
     smallCustomFont[1],
     12
   );
-  }
+}
 
-  function drawSegment (align, base, str) {
+function drawSegment (align, base, str) {
   let point = base;
   let maxSegmentWidth = g.stringWidth('00');
   if (align === 'r') {
@@ -49,36 +48,36 @@
   }
   g.setColor(1, 1, 1);
   g.drawString(str, point, middleY - 4, false);
-  }
+}
 
-  function drawDots (center) {
+function drawDots (center) {
   g.setColor(0xFD20);
   g.fillCircle(center, middleY + 10, 2);
   g.fillCircle(center, middleY + 40, 2);
-  }
+}
 
-  function drawLines () {
+function drawLines () {
   g.setColor(0.5, 0.5, 0.5);
   g.drawLine(middleX - lineLength, lineY1, middleX + lineLength, lineY1);
   g.drawLine(middleX - lineLength, lineY2, middleX + lineLength, lineY2);
-  }
+}
 
-  function drawDate (str) {
+function drawDate (str) {
   let maxSegmentWidth = 236;
   g.setColor(0.5, 0.5, 0.5);
   g.setColor(0.5, 0.5, 0.5);
   g.drawString(str, (maxSegmentWidth) - (g.stringWidth(str)), middleY - 22,
     false);
-  }
+}
 
-  function fixedDigits (numb) {
+function fixedDigits (numb) {
   if (numb < 10) {
     return '0' + numb;
   }
   return numb.toString();
-  }
+}
 
-  function step () {
+function step () {
   let d = new Date();
   let hour = d.getHours();
   let minute = d.getMinutes();
@@ -128,15 +127,15 @@
   step.lastHour = hour;
   step.lastMinute = minute;
   step.lastSecond = second;
-  }
+}
 
-  function stop () {
+function stop () {
   if (interval) {
     clearInterval(interval);
   }
-  }
+}
 
-  function start () {
+function start () {
   if (interval) {
     clearInterval(interval);
   }
@@ -147,17 +146,18 @@
   step.lastSecond = null;
   interval = setInterval(step, 1000);
   step();
-  }
+}
 
-  start();
+start();
-
+Bangle.loadWidgets();
-  Bangle.on('lcdPower', function (on) {
+Bangle.drawWidgets();
+Bangle.on('lcdPower', function (on) {
   if (on) {
-      drawWidgets();
     start();
-    }
+  } else {
-    else {
     stop();
   }
-  });
+});
-})();
+
+// Show launcher when middle button pressed
+setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});

apps/launch/app.js

@@ -0,0 +1,66 @@
+var s = require("Storage");
+var apps = s.list().filter(a=>a[0]=='+').map(app=>{
+  try { return s.readJSON(app); }
+  catch (e) { return {name:"DEAD: "+app.substr(1)} }
+}).filter(app=>app.type=="app" || app.type=="clock" || !app.type);
+apps.sort((a,b)=>{
+  var n=(0|a.sortorder)-(0|b.sortorder);
+  if (n) return n; // do sortorder first
+  if (a.name<b.name) return -1;
+  if (a.name>b.name) return 1;
+  return 0;
+});
+var selected = 0;
+var menuScroll = 0;
+var menuShowing = false;
+
+function drawMenu() {
+  g.setFont("6x8",2);
+  g.setFontAlign(-1,0);
+  var n = 3;
+  if (selected>=n+menuScroll) menuScroll = 1+selected-n;
+  if (selected<menuScroll) menuScroll = selected;
+  if (menuScroll) g.fillPoly([120,0,100,20,140,20]);
+  else g.clearRect(100,0,140,20);
+  if (apps.length>n+menuScroll) g.fillPoly([120,239,100,219,140,219]);
+  else g.clearRect(100,219,140,239);
+  for (var i=0;i<n;i++) {
+    var app = apps[i+menuScroll];
+    if (!app) break;
+    var y = 24+i*64;
+    if (i+menuScroll==selected) {
+      g.setColor(0.3,0.3,0.3);
+      g.fillRect(0,y,239,y+63);
+      g.setColor(1,1,1);
+      g.drawRect(0,y,239,y+63);
+    } else
+      g.clearRect(0,y,239,y+63);
+    g.drawString(app.name,64,y+32);
+    var icon=undefined;
+    if (app.icon) icon = s.read(app.icon);
+    if (icon) try {g.drawImage(icon,8,y+8);} catch(e){}
+  }
+}
+drawMenu();
+setWatch(function() {
+  if (selected>0) {
+    selected--;
+    drawMenu();
+  }
+}, BTN1, {repeat:true});
+setWatch(function() {
+  if (selected+1<apps.length) {
+    selected++;
+    drawMenu();
+  }
+}, BTN3, {repeat:true});
+setWatch(function() { // run
+  if (!apps[selected].src) return;
+  if (require("Storage").read(apps[selected].src)===undefined) {
+    E.showMessage("App Source\nNot found");
+    setTimeout(drawMenu, 2000);
+  } else {
+    E.showMessage("Loading...");
+    load(apps[selected].src);
+  }
+}, BTN2, {repeat:true,edge:"falling"});

apps/launch/app.json

@@ -0,0 +1,4 @@
+{
+  "name":"Launcher","type":"launch",
+  "src":"-launch"
+}

apps/mclock/ChangeLog

@@ -0,0 +1 @@
+0.02: Modified for use with new bootloader and firmware

apps/mclock/clock-morphing.js

@@ -1,4 +1,3 @@
-(function(){ // make our own scope so this is GC'd when intervals are cleared
 // Offscreen buffer
 var buf = Graphics.createArrayBuffer(240,86,1,{msb:true});
 function flip() {
@@ -178,14 +177,16 @@ function showTime() {
 }
 
 Bangle.on('lcdPower',function(on) {
-  if (on) {
+  if (on)
     showTime();
-    drawWidgets();
-  }
 });
 
 g.clear();
+Bangle.loadWidgets();
+Bangle.drawWidgets();
 // Update time once a second
 setInterval(showTime, 1000);
 showTime();
-})();
+
+// Show launcher when middle button pressed
+setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});

apps/miclock/ChangeLog

@@ -0,0 +1 @@
+0.02: Modified for use with new bootloader and firmware

apps/miclock/clock-mixed.js

@@ -1,10 +1,8 @@
 /* jshint esversion: 6 */
-(function() {
+const Radius = { "center": 8, "hour": 78, "min": 95, "dots": 102 };
+const Center = { "x": 120, "y": 132 };
 
-    const Radius = { "center": 8, "hour": 78, "min": 95, "dots": 102 };
+function rotatePoint(x, y, d) {
-    const Center = { "x": 120, "y": 132 };
-
-    function rotatePoint(x, y, d) {
     rad = -1 * d / 180 * Math.PI;
     var sin = Math.sin(rad);
     var cos = Math.cos(rad);
@@ -12,9 +10,9 @@
     yn = ((Center.y + x * sin - y * cos) + 0.5) | 0;
     p = [xn, yn];
     return p;
-    }
+}
 
-    function drawMixedClock() {
+function drawMixedClock() {
 
     var date = new Date();
     var dateArray = date.toString().split(" ");
@@ -71,16 +69,17 @@
     // draw center
     g.setColor(0xFD20);
     g.fillCircle(Center.x, Center.y, Radius.center);
-    }
+}
-    Bangle.on('lcdPower', function(on) {
+Bangle.on('lcdPower', function(on) {
-        if (on) {
+  if (on)
-            drawWidgets();
     drawMixedClock();
-        }
+});
-    });
 
-    g.clear();
+g.clear();
-    setInterval(drawMixedClock, 5E3);
+Bangle.loadWidgets();
-    drawMixedClock();
+Bangle.drawWidgets();
+setInterval(drawMixedClock, 5E3);
+drawMixedClock();
 
-})();
+// Show launcher when middle button pressed
+setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});

apps/ncfrun/nceu-funrun.json

@@ -1,6 +1,6 @@
 {
   "name":"5K Fun Run","type":"app",
-  "icon":"*funrun5",
+  "icon":"*ncfrun",
-  "src":"-funrun5",
+  "src":"-ncfrun",
   "sortorder":-1
 }

apps/ncstart/ChangeLog

@@ -0,0 +1,2 @@
+0.02: Modified for use with new bootloader and firmware
+      Renamed as nodeconf-specific

apps/ncstart/start.js

@@ -124,9 +124,9 @@ function cleanup() {
   s.erase('*bangle');
   s.erase('*nodew');
   s.erase('*tf');
-  s.erase('+start');
+  s.erase('+ncstart');
-  s.erase('-start');
+  s.erase('.boot3');
-  s.erase('*start');
+  s.erase('*ncstart');
   return Promise.resolve();
 }
 

apps/ncstart/start.json

@@ -0,0 +1,6 @@
+{
+  "name": "NCEU Start",
+  "type": "app",
+  "icon": "*ncstart",
+  "src": ".boot3"
+}

apps/sclock/ChangeLog

@@ -0,0 +1 @@
+0.02: Modified for use with new bootloader and firmware

apps/sclock/clock-simple.js

@@ -1,18 +1,16 @@
 /* jshint esversion: 6 */
-(function() {
+const timeFontSize = 6;
+const dateFontSize = 3;
+const gmtFontSize = 2;
+const font = "6x8";
 
-    const timeFontSize = 6;
+const xyCenter = g.getWidth() / 2;
-    const dateFontSize = 3;
+const yposTime = 75;
-    const gmtFontSize = 2;
+const yposDate = 130;
-    const font = "6x8";
+const yposYear = 175;
+const yposGMT = 220;
 
-    const xyCenter = g.getWidth() / 2;
+function drawSimpleClock() {
-    const yposTime = 75;
-    const yposDate = 130;
-    const yposYear = 175;
-    const yposGMT = 220;
-
-    function drawSimpleClock() {
 
     // get date
     var d = new Date();
@@ -49,23 +47,23 @@
     g.setFont(font, gmtFontSize);
     g.drawString(gmt, xyCenter, yposGMT, true);
 
-    }
+}
 
-    // handle switch display on by pressing BTN1
+// handle switch display on by pressing BTN1
-    Bangle.on('lcdPower', function(on) {
+Bangle.on('lcdPower', function(on) {
-        if (on) {
+  if (on) drawSimpleClock();
-            drawWidgets();
+});
-            drawSimpleClock();
-        }
-    });
 
-    // clean app screen
+// clean app screen
-    g.clear();
+g.clear();
+Bangle.loadWidgets();
+Bangle.drawWidgets();
 
-    // refesh every 15 sec
+// refesh every 15 sec
-    setInterval(drawSimpleClock, 15E3);
+setInterval(drawSimpleClock, 15E3);
 
-    // draw now
+// draw now
-    drawSimpleClock();
+drawSimpleClock();
 
-})();
+// Show launcher when middle button pressed
+setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});

apps/start/start.json

@@ -1,6 +0,0 @@
-{
-  "name": "Start",
-  "type": "app",
-  "icon": "*start",
-  "src": "-start"
-}

apps/stclck/ChangeLog

@@ -0,0 +1 @@
+0.02: Modified for use with new bootloader and firmware

apps/stclck/clock-simple.js

@@ -1,17 +1,16 @@
 /* jshint esversion: 6 */
-(function() {
+const timeFontSize = 6;
-  const timeFontSize = 6;
+const dateFontSize = 3;
-  const dateFontSize = 3;
+const gmtFontSize = 2;
-  const gmtFontSize = 2;
+const font = "6x8";
-  const font = "6x8";
 
-  const xyCenter = g.getWidth() / 2;
+const xyCenter = g.getWidth() / 2;
-  const yposTime = 75;
+const yposTime = 75;
-  const yposDate = 130;
+const yposDate = 130;
-  const yposYear = 175;
+const yposYear = 175;
-  const yposGMT = 220;
+const yposGMT = 220;
 
-  function drawSimpleClock() {
+function drawSimpleClock() {
   // get date
   var d = new Date();
   var da = d.toString().split(" ");
@@ -47,22 +46,24 @@
   var gmt = da[5];
   g.setFont(font, gmtFontSize);
   g.drawString(gmt, xyCenter, yposGMT, true);
-  }
+}
 
-  // handle switch display on by pressing BTN1
+// handle switch display on by pressing BTN1
-  Bangle.on("lcdPower", function(on) {
+Bangle.on("lcdPower", function(on) {
-    if (on) {
+  if (on)
-      drawWidgets();
     drawSimpleClock();
-    }
+});
-  });
 
-  // clean app screen
+// clean app screen
-  g.clear();
+g.clear();
+Bangle.loadWidgets();
+Bangle.drawWidgets();
 
-  // refesh every 15 sec
+// refesh every 15 sec
-  setInterval(drawSimpleClock, 15e3);
+setInterval(drawSimpleClock, 15E3);
 
-  // draw now
+// draw now
-  drawSimpleClock();
+drawSimpleClock();
-})();
+
+// Show launcher when middle button pressed
+setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});

apps/wclock/ChangeLog

@@ -0,0 +1 @@
+0.02: Modified for use with new bootloader and firmware

apps/wclock/clock-word.js

@@ -1,7 +1,5 @@
 /* jshint esversion: 6 */
-(function() {
+const allWords = [
-
-    const allWords = [
     "ATWENTYD",
     "QUARTERY",
     "FIVEHALF",
@@ -10,8 +8,8 @@
     "SIXTHREE",
     "TWELEVEN",
     "FOURNINE"
-    ];
+];
-    const hours = {
+const hours = {
     0: ["", 0, 0],
     1: ["ONE", 17, 47, 77],
     2: ["TWO", 06, 16, 17],
@@ -25,9 +23,9 @@
     10: ["TEN", 74, 75, 76],
     11: ["ELEVEN", 26, 36, 46, 56, 66, 76],
     12: ["TWELVE", 06, 16, 26, 36, 56, 66]
-    };
+};
 
-    const mins = {
+const mins = {
     0: ["A", 0, 0],
     1: ["FIVE", 02, 12, 22, 32],
     2: ["TEN", 10, 30, 40],
@@ -36,20 +34,20 @@
     5: ["HALF", 42, 52, 62, 72],
     6: ["PAST", 13, 23, 33, 43],
     7: ["TO", 43, 53]
-    };
+};
 
-    // offsets and incerments
+// offsets and incerments
-    const xs = 35;
+const xs = 35;
-    const ys = 31;
+const ys = 31;
-    const dy = 22;
+const dy = 22;
-    const dx = 25;
+const dx = 25;
 
-    // font size and color
+// font size and color
-    const fontSize = 3;  // "6x8"
+const fontSize = 3;  // "6x8"
-    const passivColor = 0x3186 /*grey*/ ;
+const passivColor = 0x3186 /*grey*/ ;
-    const activeColor = 0xF800 /*red*/ ;
+const activeColor = 0xF800 /*red*/ ;
 
-    function drawWordClock() {
+function drawWordClock() {
 
     // get time
     var t = new Date();
@@ -116,17 +114,17 @@
     g.setColor(activeColor);
     g.clearRect(0, 215, 240, 240);
     g.drawString(time, 120, 215);
-    }
+}
 
-    Bangle.on('lcdPower', function(on) {
+Bangle.on('lcdPower', function(on) {
-        if (on) {
+  if (on) drawWordClock();
-            drawWidgets();
+});
-            drawWordClock();
-        }
-    });
 
-    g.clear();
+g.clear();
-    setInterval(drawWordClock, 1E4);
+Bangle.loadWidgets();
-    drawWordClock();
+Bangle.drawWidgets();
+setInterval(drawWordClock, 1E4);
+drawWordClock();
 
-})();
+// Show launcher when middle button pressed
+setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});