Merge branch 'espruino:master' into clicompleteclk

apps.json

@@ -1937,6 +1937,19 @@
       {"name":"widmp.wid.js","url":"widget.js"}
     ]
   },
+  {
+    "id": "widmpsh",
+    "name": "Moon Phase Widget Southern Hemisphere",
+    "version": "0.01",
+    "description": "Display the current moon phase in blueish for the southern hemisphere in eight phases",
+    "icon": "widget.png",
+    "type": "widget",
+    "tags": "widget,tools",
+    "supports": ["BANGLEJS","BANGLEJS2"],
+    "storage": [
+      {"name":"widmpsh.wid.js","url":"widget.js"}
+    ]
+  },
   {
     "id": "minionclk",
     "name": "Minion clock",
@@ -4593,9 +4606,10 @@
   "version":"0.01",
   "description": "Simple app to power off your Bangle.js",
   "icon": "app.png",
-  "tags": "poweroff, shutdown",
+  "tags": "tool, poweroff, shutdown",
   "supports" : ["BANGLEJS", "BANGLEJS2"],
   "readme": "README.md",
+  "allow_emulator": true,
   "storage": [
     {"name":"poweroff.app.js","url":"app.js"},
     {"name":"poweroff.img","url":"app-icon.js","evaluate":true}
@@ -4813,7 +4827,7 @@
     "id": "ptlaunch",
     "name": "Pattern Launcher",
     "shortName": "Pattern Launcher",
-    "version": "0.01",
+    "version": "0.02",
     "description": "Directly launch apps from the clock screen with custom patterns.",
     "icon": "app.png",
     "tags": "tools",

apps/ptlaunch/ChangeLog

@@ -1 +1,2 @@
 0.01: Initial creation of the pattern launch app
+0.02: Turn on lcd when launching an app if the lock screen was disabled in the settings

apps/ptlaunch/boot.js

@@ -135,6 +135,12 @@ var dragHandler = (position) => {
       if (storedPatterns[pattern]) {
         var app = storedPatterns[pattern].app;
         if (!!app && !!app.src) {
+          if (storedPatterns.settings) {
+            if (storedPatterns.settings.lockDisabled) {
+              Bangle.setLCDPower(true);
+            }
+          }
+
           Bangle.removeListener("drag", dragHandler);
           load(app.src);
         }

apps/widmpsh/ChangeLog

@@ -0,0 +1 @@
+0.01: Copied from widmp and flipped the phase directions!

apps/widmpsh/widget.js

@@ -0,0 +1,25 @@
+WIDGETS["widmoonsh"] = { area: "tr", width: 24, draw: function() {
+  const MC = 29.5305882, NM = 694039.09;
+  var r = 11, mx = this.x + 12; my = this.y + 12;
+
+  function moonPhase(d) {
+    var tmp, month = d.getMonth(), year = d.getFullYear(), day = d.getDate();
+    if (month < 3) {year--; month += 12;}
+    tmp = ((365.25 * year + 30.6 * ++month + day - NM) / MC);
+    return Math.round(((tmp - (tmp | 0)) * 7)+1);
+  }
+
+  const BLACK = g.theme.bg, MOON = 0x41f;
+  var moon = {
+    0: () => { g.reset().setColor(BLACK).fillRect(mx - r, my - r, mx + r, my + r);},
+    1: () => { moon[0](); g.setColor(MOON).drawCircle(mx, my, r);},
+    2: () => { moon[3](); g.setColor(BLACK).fillEllipse(mx - r / 2, my - r, mx + r / 2, my + r);},
+    3: () => { moon[0](); g.setColor(MOON).fillCircle(mx, my, r).setColor(BLACK).fillRect(mx, my - r, mx + r, my + r);},
+    4: () => { moon[3](); g.setColor(MOON).fillEllipse(mx - r / 2, my - r, mx + r / 2, my + r);},
+    5: () => { moon[0](); g.setColor(MOON).fillCircle(mx, my, r);},
+    6: () => { moon[7](); g.setColor(MOON).fillEllipse(mx - r / 2, my - r, mx + r / 2, my + r);},
+    7: () => { moon[0](); g.setColor(MOON).fillCircle(mx, my, r).setColor(BLACK).fillRect(mx - r, my - r, mx, my + r);},
+    8: () => { moon[7](); g.setColor(BLACK).fillEllipse(mx - r / 2, my - r, mx + r / 2, my + r);}
+  };
+  moon[moonPhase(Date())]();
+} };