Merge branch 'master' of github.com:espruino/BangleApps

Author: gfwilliams

.gitignore

@@ -9,4 +9,4 @@ appdates.csv
 _config.yml
 tests/Layout/bin/tmp.*
 tests/Layout/testresult.bmp
-apps.json
+apps.local.json

apps.json

@@ -7,7 +7,10 @@
 #  Otherwise nothing has changed. GitHub Pages will automatically
 #  create apps.json as your site is hosted, or if you're hosting
 #  yourself you can run bin/create_apps_json.sh
-# 
+#
+#  If you serve the store from localhost for development/testing,
+#  the loader looks for apps.local.json instead, you can run
+#  `bin/create_apps_json.sh apps.local.json` to create that file.
 # =================================================================
 
 # Uncomment the following line if you only want explicitly listed

apps/ballmaze/app.js

@@ -1,12 +1,15 @@
-(() => {  
+(() => {
+  BANGLEJS2 = process.env.HWVERSION==2;
   Bangle.setLCDTimeout(0);
   let intervalID;
   let settings = require("Storage").readJSON("ballmaze.json",true) || {};
 
   // density, elasticity of bounces, "drag coefficient"
   const rho = 100, e = 0.3, C = 0.01;
   // screen width & height in pixels
-  const sW = 240, sH = 160;
+  const sW = g.getWidth();
+  const sH = g.getHeight()*2/3;
+  const bgColour ="#f00";  // only for Bangle.js 2
   // gravity constant (lowercase was already taken)
   const G = 9.80665;
 
@@ -17,14 +20,16 @@
   // The play area is 240x160, sizes are the ball radius, so we can use common
   // denominators of 120x80 to get square rooms
   // Reverse the order to show the easiest on top of the menu
-  const sizes = [1, 2, 4, 5, 8, 10, 16, 20, 40].reverse(),
-    // even size 1 actually works, but larger mazes take forever to generate
-    minSize = 4, defaultSize = 10;
   const sizeNames = {
     1: "Insane", 2: "Gigantic", 4: "Enormous", 5: "Huge", 8: "Large",
     10: "Medium", 16: "Small", 20: "Tiny", 40: "Trivial",
   };
-
+  // even size 1 actually works, but larger mazes take forever to generate
+  if (!BANGLEJS2) {
+    const sizes = [1, 2, 4, 5, 8, 10, 16, 20, 40].reverse(), minSize = 4, defaultSize = 10;
+  } else {
+    const sizes = [1, 2, 4, 5, 8, 10, 16, 20    ].reverse(), minSize = 4, defaultSize = 10;
+  }
   /**
    * Draw something to all screen buffers
    * @param draw {function} Callback which performs the drawing
@@ -45,17 +50,17 @@
 
   // use unbuffered graphics for UI stuff
   function showMessage(message, title) {
-    Bangle.setLCDMode();
+    if (!BANGLEJS2) Bangle.setLCDMode();
     return E.showMessage(message, title);
   }
 
   function showPrompt(prompt, options) {
-    Bangle.setLCDMode();
+    if (!BANGLEJS2) Bangle.setLCDMode();
     return E.showPrompt(prompt, options);
   }
 
   function showMenu(menu) {
-    Bangle.setLCDMode();
+    if (!BANGLEJS2) Bangle.setLCDMode();
     return E.showMenu(menu);
   }
 
@@ -105,7 +110,7 @@
       generateMaze(); // this shows unbuffered progress messages
       if (settings.cheat && r>1) findRoute(); // not enough memory for r==1 :-(
 
-      Bangle.setLCDMode("doublebuffered");
+      if (!BANGLEJS2) Bangle.setLCDMode("doublebuffered");
       clearAll();
       drawAll(drawMaze);
       intervalID = setInterval(tick, 100);
@@ -307,6 +312,7 @@
       const range = {top: 0, left: 0, bottom: rows, right: cols};
       const w = sW/cols, h = sH/rows;
       g.clear();
+      if (BANGLEJS2) g.setBgColor(bgColour);
       g.setColor(0.76, 0.60, 0.42);
       for(let row = range.top; row<=range.bottom; row++) {
         for(let col = range.left; col<=range.right; col++) {

apps/balltastic/ChangeLog

@@ -1,2 +1,3 @@
 0.01: Initial version of Balltastic released! Happy!
-0.02: Set LCD timeout for Espruino 2v10 compatibility
+0.02: Set LCD timeout for Espruino 2v10 compatibility
+0.03: Now also works on Bangle.js 2

apps/balltastic/app.js

@@ -1,11 +1,12 @@
+BANGLEJS2 = process.env.HWVERSION==2;
 Bangle.setLCDBrightness(1);
-Bangle.setLCDMode("doublebuffered");
+if (!BANGLEJS2) Bangle.setLCDMode("doublebuffered");
 Bangle.setLCDTimeout(0);
 
 let points = 0;
 let level = 1;
 let levelSpeedStart = 0.8;
-let nextLevelPoints = 20;
+let nextLevelPoints = 10;
 let levelSpeedFactor = 0.2;
 let counterWidth = 10;
 let gWidth = g.getWidth() - counterWidth;
@@ -81,19 +82,31 @@ function drawLevelText() {
   g.setColor("#26b6c7");
   g.setFontAlign(0, 0);
   g.setFont("4x6", 5);
-  g.drawString("Level " + level, 120, 80);
+  g.drawString("Level " + level, g.getWidth()/2, g.getHeight()/2);
+}
+
+function drawPointsText() {
+  g.setColor("#26b6c7");
+  g.setFontAlign(0, 0);
+  g.setFont("4x6", 2);
+  g.drawString("Points " + points, g.getWidth()/2, g.getHeight()-20);
 }
 
 function draw() {
   //bg
-  g.setColor("#71c6cf");
+  if (!BANGLEJS2) {
+    g.setColor("#71c6cf");
+  } else {
+    g.setColor("#002000");
+  }
   g.fillRect(0, 0, g.getWidth(), g.getHeight());
 
   //counter
   drawCounter();
 
   //draw level
   drawLevelText();
+  drawPointsText();
 
   //dot
   g.setColor("#ff0000");
@@ -152,7 +165,7 @@ function count() {
   if (counter <= 0) {
     running = false;
     clearInterval(drawInterval);
-    setTimeout(function(){ E.showMessage("Press Button 1\nto restart.", "Gameover!");},50);
+    setTimeout(function(){ E.showMessage("Press Button 1\nto restart.", "Game over!");},50);
   }
 }
 

apps/balltastic/bangle2-balltastic-screenshot.png

@@ -1,12 +1,13 @@
 {
   "id": "balltastic",
   "name": "Balltastic",
-  "version": "0.02",
+  "version": "0.03",
   "description": "Simple but fun ball eats dots game.",
   "icon": "app.png",
+  "screenshots": [{"url":"bangle2-balltastic-screenshot.png"}],
   "type": "app",
   "tags": "game,fun",
-  "supports": ["BANGLEJS"],
+  "supports": ["BANGLEJS","BANGLEJS2"],
   "storage": [
     {"name":"balltastic.app.js","url":"app.js"},
     {"name":"balltastic.img","url":"app-icon.js","evaluate":true}

apps/balltastic/metadata.json

@@ -5,3 +5,5 @@
 0.03: Prevent readings from internal sensor mixing into BT values
       Mark events with src property
       Show actual source of event in app
+0.04: Automatically reconnect BT sensor
+      App buzzes if no BTHRM events for more than 3 seconds