Merge branch 'espruino:master' into sleeplogbuxfix

Author: RKBoss6

apps/accelrec/metadata.json

@@ -6,7 +6,7 @@
   "description": "This app puts the Bangle's accelerometer into 100Hz mode and reads 2 seconds worth of data after movement starts. The data can then be exported back to the PC.",
   "icon": "app.png",
   "tags": "",
-  "supports": ["BANGLEJS","BANGLEJS2"],
+  "supports": ["BANGLEJS2"],
   "readme": "README.md",
   "interface": "interface.html",
   "storage": [

apps/clkinfodice/ChangeLog

@@ -0,0 +1 @@
+0.01: New Clock Info!

apps/clkinfodice/clkinfo.js

@@ -0,0 +1,26 @@
+(function() {
+  let random = Math.randInt(6);
+  return {
+    name: "Bangle",
+    items: [
+      { name : "Dice",
+        get : function() {
+          return {
+            text : (random+1).toString(),
+            img : [
+              atob("GBiBAAAAAAAAAAAAAAAAAA//8A//8AwAMAwAMAwAMAwAMAwAMAwYMAwYMAwAMAwAMAwAMAwAMAwAMA//8A//8AAAAAAAAAAAAAAAAA=="),
+              atob("GBiBAAAAAAAAAAAAAAAAAA//8A//8AwAMAwAMAzAMAzAMAwAMAwAMAwAMAwAMAwDMAwDMAwAMAwAMA//8A//8AAAAAAAAAAAAAAAAA=="),
+              atob("GBiBAAAAAAAAAAAAAAAAAA//8A//8AwAMAwAMAzAMAzAMAwAMAwYMAwYMAwAMAwDMAwDMAwAMAwAMA//8A//8AAAAAAAAAAAAAAAAA=="),
+              atob("GBiBAAAAAAAAAAAAAAAAAA//8A//8AwAMAwAMAzDMAzDMAwAMAwAMAwAMAwAMAzDMAzDMAwAMAwAMA//8A//8AAAAAAAAAAAAAAAAA=="),
+              atob("GBiBAAAAAAAAAAAAAAAAAA//8A//8AwAMAwAMAzDMAzDMAwAMAwYMAwYMAwAMAzDMAzDMAwAMAwAMA//8A//8AAAAAAAAAAAAAAAAA=="),
+              atob("GBiBAAAAAAAAAAAAAAAAAA//8A//8AwAMAwAMAzDMAzDMAwAMAzDMAzDMAwAMAzDMAzDMAwAMAwAMA//8A//8AAAAAAAAAAAAAAAAA==")
+            ][random]
+          };
+        },
+        show : function() { random = Math.randInt(6); },
+        hide : function() {},
+        run : function() { random = Math.randInt(6); this.emit("redraw"); }
+      }
+    ]
+  };
+})

apps/clkinfodice/icon.png

@@ -0,0 +1,13 @@
+{ "id": "clkinfodice",
+  "name": "Dice Clockinfo",
+  "version":"0.01",
+  "author": "gfwilliams",
+  "description": "A ClockInfo that shows a random dice face. Tap to roll.",
+  "icon": "icon.png",
+  "type": "clkinfo",
+  "tags": "clkinfo,gaming,game",
+  "supports" : ["BANGLEJS2"],
+  "storage": [
+    {"name":"clkinfodice.clkinfo.js","url":"clkinfo.js"}
+  ]
+}

apps/clkinfodice/metadata.json

@@ -20,3 +20,4 @@
 0.19: Fix Altitude ClockInfo after BLE added
       Tapping Altitude now updates the reading
 0.20: Altitude ClockInfo now uses the distance units set in locale.
+0.21: Add haptics when changing infos and a setting to toggle it on or off

apps/clock_info/ChangeLog

@@ -40,6 +40,7 @@ and previously focussed Clock Infos
   progress/percent indicator may be shown. The percentage for altitude will be how far towards
   the Max Altitude you are. If you go higher than `Max Altitude` the correct altitude will still
   be shown - the percent indicator will just read 100%
+* `Haptics` - Whether or not to use a slight vibration when cycling between different infos, or lists (with a slightly stronger buzz). 
 
 ## API (Software development)
 

apps/clock_info/README.md

@@ -23,6 +23,7 @@ exports.loadSettings = function() {
       hrmOn : 0, // 0(Always), 1(Tap)
       defocusOnLock : true,
       maxAltitude : 3000,
+      haptics:true,
       apps : {}
     },
     require("Storage").readJSON("clock_info.json",1)||{}
@@ -293,13 +294,15 @@ exports.addInteractive = function(menu, options) {
     var oldMenuItem;
     if (ud) {
       if (menu[options.menuA].items.length==1) return; // 1 item - can't move
+      if(settings.haptics) Bangle.buzz(30);
       oldMenuItem = menu[options.menuA].items[options.menuB];
       options.menuB += ud;
       if (options.menuB<0) options.menuB = menu[options.menuA].items.length-1;
       if (options.menuB>=menu[options.menuA].items.length) options.menuB = 0;
     } else if (lr) {
       if (menu.length==1) return; // 1 item - can't move
       oldMenuItem = menu[options.menuA].items[options.menuB];
+      if(settings.haptics) Bangle.buzz(44);
       do {
         options.menuA += lr;
         if (options.menuA<0) options.menuA = menu.length-1;
@@ -355,7 +358,7 @@ exports.addInteractive = function(menu, options) {
       if (!options.focus) {
         focus();
       } else if (menu[options.menuA].items[options.menuB].run) {
-        Bangle.buzz(100, 0.7);
+        if(settings.haptics) Bangle.buzz(100, 0.7);
         menu[options.menuA].items[options.menuB].run(options); // allow tap on an item to run it (eg home assistant)
       }
     };

apps/clock_info/lib.js

@@ -1,7 +1,7 @@
 { "id": "clock_info",
   "name": "Clock Info Module",
   "shortName": "Clock Info",
-  "version":"0.20",
+  "version":"0.21",
   "description": "A library used by clocks to provide extra information on the clock face (Altitude, BPM, etc)",
   "icon": "app.png",
   "type": "module",

apps/clock_info/metadata.json

@@ -24,6 +24,10 @@
       min: 500, max: 10000, step: 500,
       format: v => v+"m",
       onchange: x => save('maxAltitude', x),
+    },
+    /*LANG*/'Haptics': {
+      value:  !!settings.haptics,
+      onchange: x => save('haptics', x),
     }
   };
   E.showMenu(menu);