diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 7c0cfca3a..bebe18748 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -11,10 +11,10 @@ jobs: uses: actions/checkout@v3 with: submodules: recursive - - name: Use Node.js 16.x + - name: Use Node.js 18.x uses: actions/setup-node@v3 with: - node-version: 16.x + node-version: 18.x - name: Install testing dependencies run: npm ci - name: Test all apps and widgets diff --git a/apps/.eslintrc.json b/apps/.eslintrc.js similarity index 93% rename from apps/.eslintrc.json rename to apps/.eslintrc.js index a2973e931..6ff8f8dc8 100644 --- a/apps/.eslintrc.json +++ b/apps/.eslintrc.js @@ -1,4 +1,6 @@ -{ +const lintExemptions = require("./lint_exemptions.js"); + +module.exports = { "env": { // TODO: "espruino": false // TODO: "banglejs": false @@ -154,8 +156,14 @@ "no-useless-catch": "warn", // TODO: "no-undef": "warn", "no-undef": "off", - "no-unused-vars": "off", + "no-unused-vars": ["warn", { "args": "none" } ], "no-useless-escape": "off", "no-control-regex" : "off" - } + }, + overrides: [ + ...Object.entries(lintExemptions).map(([filePath, {rules}]) => ({ + files: [filePath], + rules: Object.fromEntries(rules.map(rule => [rule, "off"])), + })), + ], } diff --git a/apps/2047pp/2047pp.app.js b/apps/2047pp/2047pp.app.js index ac7fe6391..7c1ed4dba 100644 --- a/apps/2047pp/2047pp.app.js +++ b/apps/2047pp/2047pp.app.js @@ -122,13 +122,13 @@ } } - function swipeHandler() { + /*function swipeHandler() { - } + }*/ - function buttonHandler() { + /*function buttonHandler() { - } + }*/ var twok = new TwoK(); twok.addDigit(); twok.addDigit(); diff --git a/apps/2047pp/ChangeLog b/apps/2047pp/ChangeLog index 9436289ae..2c55af1e5 100644 --- a/apps/2047pp/ChangeLog +++ b/apps/2047pp/ChangeLog @@ -1,3 +1,4 @@ 0.01: New app! 0.02: Better support for watch themes -0.03: Workaround minifier bug \ No newline at end of file +0.03: Workaround minifier bug +0.04: Minor code improvements diff --git a/apps/2047pp/metadata.json b/apps/2047pp/metadata.json index ac4dc70bd..ebc043e6c 100644 --- a/apps/2047pp/metadata.json +++ b/apps/2047pp/metadata.json @@ -2,7 +2,7 @@ "name": "2047pp", "shortName":"2047pp", "icon": "app.png", - "version":"0.03", + "version": "0.04", "description": "Bangle version of a tile shifting game", "supports" : ["BANGLEJS","BANGLEJS2"], "allow_emulator": true, diff --git a/apps/2ofthemclk/ChangeLog b/apps/2ofthemclk/ChangeLog index 2286a7f70..7727f3cc4 100644 --- a/apps/2ofthemclk/ChangeLog +++ b/apps/2ofthemclk/ChangeLog @@ -1 +1,2 @@ -0.01: New App! \ No newline at end of file +0.01: New App! +0.02: Minor code improvements diff --git a/apps/2ofthemclk/app.js b/apps/2ofthemclk/app.js index 78415fba7..693789fb7 100644 --- a/apps/2ofthemclk/app.js +++ b/apps/2ofthemclk/app.js @@ -80,7 +80,7 @@ function refreshBattery() { } // Only update displayed battery level every minute as it fluctuates a lot -var batteryInterval = setInterval(refreshBattery, 60000); +setInterval(refreshBattery, 60000); Bangle.setUI("clock"); Bangle.setLocked(false); diff --git a/apps/2ofthemclk/metadata.json b/apps/2ofthemclk/metadata.json index fa02b3e2f..bdaa6e150 100644 --- a/apps/2ofthemclk/metadata.json +++ b/apps/2ofthemclk/metadata.json @@ -1,7 +1,7 @@ { "id": "2ofthemclk", "name": "two of them clock", - "version": "0.01", + "version": "0.02", "description": "You can now wear teh memez on your wrist.", "readme": "README.md", "icon": "app.png", diff --git a/apps/7x7dotsclock/7x7dotsclock.app.js b/apps/7x7dotsclock/7x7dotsclock.app.js index aa6672a4f..0ff96d5c9 100644 --- a/apps/7x7dotsclock/7x7dotsclock.app.js +++ b/apps/7x7dotsclock/7x7dotsclock.app.js @@ -282,7 +282,7 @@ function drawWidgeds() { //print(BluetoothDevice.connected); var x1Bt = 160; var y1Bt = 0; - var x2Bt = x1Bt + 30; + //var x2Bt = x1Bt + 30; var y2Bt = y2Bt; if (NRF.getSecurityStatus().connected) @@ -391,4 +391,4 @@ Bangle.on('lock', function(on) { SetFull(Bangle.isLocked()); -var secondInterval = setInterval(draw, 1000); +/*var secondInterval =*/ setInterval(draw, 1000); diff --git a/apps/7x7dotsclock/ChangeLog b/apps/7x7dotsclock/ChangeLog index 5e8e48b0b..cdc4ffcc5 100644 --- a/apps/7x7dotsclock/ChangeLog +++ b/apps/7x7dotsclock/ChangeLog @@ -1,3 +1,4 @@ 0.01: Initial version for upload 0.02: Better theme support, configurable colors, small improvements -0.03: Use `messages` library to check for new messages \ No newline at end of file +0.03: Use `messages` library to check for new messages +0.04: Minor code improvements diff --git a/apps/7x7dotsclock/metadata.json b/apps/7x7dotsclock/metadata.json index ba1996544..c4edc1ae8 100644 --- a/apps/7x7dotsclock/metadata.json +++ b/apps/7x7dotsclock/metadata.json @@ -1,7 +1,7 @@ { "id": "7x7dotsclock", "name": "7x7 Dots Clock", "shortName":"7x7 Dots Clock", - "version":"0.03", + "version": "0.04", "description": "A clock with a big 7x7 dots Font", "icon": "dotsfontclock.png", "tags": "clock", diff --git a/apps/93dub/ChangeLog b/apps/93dub/ChangeLog index 1c18ca59b..712a52a37 100644 --- a/apps/93dub/ChangeLog +++ b/apps/93dub/ChangeLog @@ -4,3 +4,4 @@ 0.04: Set 00:00 to 12:00 for 12 hour time 0.05: Display time, even on Thursday 0.06: Fix light theme issue, where widgets would end up on a light strip +0.07: Minor code improvements diff --git a/apps/93dub/app.js b/apps/93dub/app.js index f970eec5d..c9f670993 100644 --- a/apps/93dub/app.js +++ b/apps/93dub/app.js @@ -8,7 +8,7 @@ var imgBg = require("heatshrink").decompress(atob("2GwgJC/AH4A/AH4A/AH4A/AH4A/AC // reg number first char 48 28 by 41 var fontNum = atob("AAAAAAAAAAAAAA//8D//g//8P/+I//8//44//w//j4//A/+P4/8A/4/4AAAAD/4AAAAP/wAAAAf/gAAAA//AAAAB/+AAAAD/8AAAAH/4AAAAP/wAAAAf/gAAAA//AAAAB/+AAAAD/8AAAAH/wAAAAH/H/gH/H8f/gf/Hx//h//HH//n//Ef/+H//B//4H//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/wB/4AP/4H/4A//4f/4D//5//4P//h//4//+B//4AAAAAAAAAAAAAAAAAf/+AAAB//4gAAD//jgAAD/+PgABj/4/gAHj/j/gAfgAP/gA/AA//AB+AB/+AD8AD/8AH4AH/4APwAP/wAfgAf/gA/AA//AB+AB/+AD8AD/8AH4AH/4APwAP/wAfgAf/AA/AAf8f88AAfx/8wAAfH/8AAAcf/8AAAR//4AAAH//gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAA4AAAAAD4AAYAAP4AD8AA/4AH4AD/4APwAP/wAfgAf/gA/AA//AB+AB/+AD8AD/8AH4AH/4APwAP/wAfgAf/gA/AA//AB+AB/+AD8AD/8AH4AH/wAHgAH/H/GH/H8f/gf/Hx//h//HH//n//Ef/+H//B//4H//AAAAAAAAAAAAAAP//AAAAP//AAAAP//AAAAP/8AAAAP/2AAAAP/eAAAAAB+AAAAAD8AAAAAH4AAAAAPwAAAAAfgAAAAA/AAAAAB+AAAAAD8AAAAAH4AAAAAPwAAAAAfgAAAAA/AAAAAB+AAAAAD8AAAB/7x/4AH/7H/4Af/4f/4B//5//4H//h//4f/+B//4AAAAAAAAAAAAAD//wAAAD//wAAAj//gAADj/+AAAPj/5gAA/j/ngAD/gAfgAP/gA/AA//AB+AB/+AD8AD/8AH4AH/4APwAP/wAfgAf/gA/AA//AB+AB/+AD8AD/8AH4AH/4APwAP/wAfgAf/AA/AAf8AA8f8fwAAx/8fAAAH/8cAAAf/8QAAA//8AAAA//8AAAAAAAAAAAAAA//8D//g//8P/+I//8//44//0//j4//Y/+P4/94/4/4AH4AD/4APwAP/wAfgAf/gA/AA//AB+AB/+AD8AD/8AH4AH/4APwAP/wAfgAf/gA/AA//AB+AB/+AD8AD/8AH4AH/wAPwAH/AAPH/H8AAMf/HwAAB//HAAAH//EAAAH//AAAAH//AAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAGAAAAAAOAAAAAAeAAAAAA+AAAAAB+AAAAAD8AAAAAH4AAAAAPwAAAAAfgAAAAA/AAAAAB+AAAAAD8AAAAAH4AAAAAPwAAAAAfgAAAAA/AAAAAB8AAAAADx/4B/4HH/4H/4Mf/4f/4R//5//4H//h//4f/+B//4AAAAAAAAAAAAAD//wP/+D//w//4j//z//jj//T/+Pj/9j/4/j/3j/j/gAfgAP/gA/AA//AB+AB/+AD8AD/8AH4AH/4APwAP/wAfgAf/gA/AA//AB+AB/+AD8AD/8AH4AH/4APwAP/wAfgAf/AA/AAf8f+8f8fx/+x/8fH/+H/8cf/+f/8R//4f/8H//gf/8AAAAAAAAAAAAAA//8AAAA//8AAAI//8AAA4//0AAD4//YAAP4/94AA/4AH4AD/4APwAP/wAfgAf/gA/AA//AB+AB/+AD8AD/8AH4AH/4APwAP/wAfgAf/gA/AA//AB+AB/+AD8AD/8AH4AH/wAPwAH/H/vH/H8f/sf/Hx//h//HH//n//Ef/+H//B//4H//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"); // tiny font for percentage first char 48 6 by 8 -var fontTiny = atob("AH6BgYF+ACFB/wEBAGGDhYlxAEKBkZFuAAx0hP8EAPqRkZGOAH6RkZFOAICHmKDAAG6RkZFuAHKJiYl+AAAAAAAAAAAAAAAA"); +//var fontTiny = atob("AH6BgYF+ACFB/wEBAGGDhYlxAEKBkZFuAAx0hP8EAPqRkZGOAH6RkZFOAICHmKDAAG6RkZFuAHKJiYl+AAAAAAAAAAAAAAAA"); // date font first char 48 12 by 15 var fontDate = atob("AAAAAfv149wAeADwAeADwAeADvHr9+AAAAAAAAAAAAAAAAAAAAAAAAAPHn9/AAAAAAP0A9wweGDwweGDwweGDvAL8AAAAAAAAAAAgwOGDwweGDwweGDvHp98AAAAA/gB6AAwAGAAwAGAAwAGAPHj9/AAAAAfgF6BwweGDwweGDwweGDgHoB+AAAAAfv169wweGDwweGDwweGDgHoB+AAAAAAAAAAgAGAAwAGAAwAGAAvHh9/AAAAAfv169wweGDwweGDwweGDvHr9+AAAAAfgF6BwweGDwweGDwweGDvHr9+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"); @@ -25,7 +25,7 @@ var imgSun = E.toArrayBuffer(atob("Ig8BwHf7D7Ac/MHD/z8wMP/PzMQ/8/M/D/z8z8QPf7f6A // define icons var imgSep = E.toArrayBuffer(atob("BhsBAAAAAA///////////////AAAAAAA")); -var imgPercent = E.toArrayBuffer(atob("BwcBuq7ffbqugA==")); +//var imgPercent = E.toArrayBuffer(atob("BwcBuq7ffbqugA==")); var img24hr = E.toArrayBuffer(atob("EwgBj7vO53na73tcDtu9uDev7vA93g==")); var imgPM = E.toArrayBuffer(atob("EwgB+HOfdnPu1X3ar4dV9+q+/bfftg==")); diff --git a/apps/93dub/metadata.json b/apps/93dub/metadata.json index 524780792..4b0b7bd21 100644 --- a/apps/93dub/metadata.json +++ b/apps/93dub/metadata.json @@ -3,7 +3,7 @@ "shortName":"93 Dub", "icon": "93dub.png", "screenshots": [{"url":"screenshot.png"}], - "version":"0.06", + "version": "0.07", "description": "Fan recreation of orviwan's 91 Dub app for the Pebble smartwatch. Uses assets from his 91-Dub-v2.0 repo", "tags": "clock", "type": "clock", diff --git a/apps/BLEcontroller/ChangeLog b/apps/BLEcontroller/ChangeLog index 5560f00bc..7727f3cc4 100644 --- a/apps/BLEcontroller/ChangeLog +++ b/apps/BLEcontroller/ChangeLog @@ -1 +1,2 @@ 0.01: New App! +0.02: Minor code improvements diff --git a/apps/BLEcontroller/app-ex2.js b/apps/BLEcontroller/app-ex2.js index 27e629d5d..8076fc357 100644 --- a/apps/BLEcontroller/app-ex2.js +++ b/apps/BLEcontroller/app-ex2.js @@ -25,7 +25,7 @@ declare global variables for the toggle button statuses; if you add an additional toggle button you should declare it and initiase it here */ -var status_spk = {value: true}; +//var status_spk = {value: true}; var status_face = {value: true}; var status_iris_light = {value: false}; var status_iris = {value: false}; diff --git a/apps/BLEcontroller/metadata.json b/apps/BLEcontroller/metadata.json index bb28b2360..de3a58ba1 100644 --- a/apps/BLEcontroller/metadata.json +++ b/apps/BLEcontroller/metadata.json @@ -2,7 +2,7 @@ "id": "BLEcontroller", "name": "BLE Customisable Controller with Joystick", "shortName": "BLE Controller", - "version": "0.01", + "version": "0.02", "description": "A configurable controller for BLE devices and robots, with a basic four direction joystick. Designed to be easy to customise so you can add your own menus.", "icon": "BLEcontroller.png", "tags": "tool,bluetooth", diff --git a/apps/UI4swatch/ChangeLog b/apps/UI4swatch/ChangeLog index d81132fb6..e6883d3d6 100644 --- a/apps/UI4swatch/ChangeLog +++ b/apps/UI4swatch/ChangeLog @@ -1 +1,2 @@ 0.01: 1st ver, defining a common UI/UX +0.02: Minor code improvements diff --git a/apps/UI4swatch/app.js b/apps/UI4swatch/app.js index 8cf3891b4..af1f5e3e8 100644 --- a/apps/UI4swatch/app.js +++ b/apps/UI4swatch/app.js @@ -5,7 +5,7 @@ identify device and dimensions max printable position max_x-1 i.e 239 */ - var colbackg='#111111';//black + //var colbackg='#111111';//black var colorange='#e56e06'; //RGB format rrggbb var v_color_lines=0xFFFF; //White hex format var v_color_b_area='#111111'; @@ -13,13 +13,13 @@ max printable position max_x-1 i.e 239 var v_font1size=10; //out of quotes var v_font2size=12; var v_font_banner_size=30; - var v_clicks=0; + //var v_clicks=0; //pend identify widget area dinamically var v_model=process.env.BOARD; console.log("device="+v_model); var x_max_screen=g.getWidth();//240; - var y_max_screen=g.getHeight(); //240; + //var y_max_screen=g.getHeight(); //240; var y_wg_bottom=g.getHeight()-25; var y_wg_top=25; if (v_model=='BANGLEJS') { diff --git a/apps/UI4swatch/metadata.json b/apps/UI4swatch/metadata.json index 379d173c3..bcb0e6c51 100644 --- a/apps/UI4swatch/metadata.json +++ b/apps/UI4swatch/metadata.json @@ -2,7 +2,7 @@ "id": "UI4swatch", "name": "UI 4 swatch", "shortName": "UI 4 swatch", - "version": "0.01", + "version": "0.02", "description": "A UI/UX for espruino smartwatches, displays dinamically calc. x,y coordinates.", "icon": "app.png", "tags": "Color,input,buttons,touch,UI", diff --git a/apps/Uke/ChangeLog b/apps/Uke/ChangeLog index ef5ffa3fe..56fcafa19 100644 --- a/apps/Uke/ChangeLog +++ b/apps/Uke/ChangeLog @@ -1,3 +1,4 @@ 0.01: New App! 0.02: Increased Legibility, GUI rework 0.03: 13 new chords +0.04: Minor code improvements diff --git a/apps/Uke/app.js b/apps/Uke/app.js index 095477f3f..975ca8aaa 100644 --- a/apps/Uke/app.js +++ b/apps/Uke/app.js @@ -176,8 +176,6 @@ const b7 = [ -var index = 0; -var chords = []; var menu = { "" : { "title" : "Uke Chords" }, "C" : function() { draw(cc); }, diff --git a/apps/Uke/metadata.json b/apps/Uke/metadata.json index ef31e3663..5a3f17639 100644 --- a/apps/Uke/metadata.json +++ b/apps/Uke/metadata.json @@ -1,7 +1,7 @@ { "id": "Uke", "name": "Uke Chords", "shortName":"Uke", - "version":"0.03", + "version": "0.04", "description": "Wrist mounted ukulele chords", "icon": "app.png", "tags": "uke, chords", diff --git a/apps/a_clock_timer/ChangeLog b/apps/a_clock_timer/ChangeLog index cfb53c432..0e717fee7 100644 --- a/apps/a_clock_timer/ChangeLog +++ b/apps/a_clock_timer/ChangeLog @@ -1,4 +1,5 @@ 0.01: Beta version for Bangle 2 (2021/11/28) 0.02: Shows night time on the map (2022/12/28) 0.03: Add 1 minute timer with upper taps (2023/01/05) -1.00: Page to set up custom time zones (2023/01/06) \ No newline at end of file +1.00: Page to set up custom time zones (2023/01/06) +1.01: Minor code improvements diff --git a/apps/a_clock_timer/app.js b/apps/a_clock_timer/app.js index b01cec59b..6cb56c67f 100644 --- a/apps/a_clock_timer/app.js +++ b/apps/a_clock_timer/app.js @@ -2,7 +2,7 @@ function getImg() { return require("heatshrink").decompress(atob("2FRgP/ABnxBRP5BJH+gEfBZHghnAv4JFmA+Bj0PBIn3//4h3An4oDAQJWEEIf8AwMEuFOCofAh/QjAWEg4VEwEAnw2DDoKEHEYPwAoUBmgrDhgUHS4XgAwUD/gVC/g+FAAZgEwEf4YqC/EQFQ4NDFgV/4Z3C/EcCo1974VCLAV/V4d7Co9/Co0PCoX+vk4Ko/HCosCRYX5nwTFkEAr/nCokICoL+B/aCGCoMHCoq3EdoraGCosPz4HBcILEJCocBwEHOwQrIgQrHgoHCFYMEgwVJYoMBsEnCofAnkMNQJXH4D4EbQMPkF/xwrEj+/HIkAoAVDj8QueHCoorDCoUDLwd96J0BKwgrHh4VDv+9CosDx6QCCo4HB//8VwvvXgQVDJIYSBCo/sBwaZBgF/NoYVHgH8V4qYDAwUYlAVFEYbFDDgwAGConogf9Zg8DCpP4cIh0Dg0BGAgVE+gVIgUA+AVI+wVE/xAEh5HDEgn+CpEAbgJCCHQoVBn4VJ/ED4ANDAAQVJ4EPPQPAt4VF4BeDColgj/8h/gFYwJBCpF//k//ANDCAYVIcgP+CpH/54VHCAIVB/4VIwYECCocIAwIVBx4VG9+AMITbCYAYJB34VG/UAj4VI7/9Cgw9CJYXAmBtDMAQsIfYhvCCofyvywGB4QFFgYGC/d+agYVLSgf8+ArG/APBD4QVBgh0CAwNwv/fCo4PCCo94s7VDCohnDAoI7Enlv8BZECoRCDAggAB3/3/gzDMAIVFY4IVE4IPBOoZ9DCpXwCoMvCqKxB//3bYywD4BtFAAPfDooVFFYIVGw4VFB4KZFngNE/uPCovgFYgEBuK+Fg4zFCoIrFCovwgQVF+AVFgPxEYzFEbgQVD4EDCoozBYogVCgYVE8bpGCo4HDCoPzBgoVIL4fAg4MGgAIHCofgCszND8BOHK4x2BCofwXgv4h6vGCps/Co6uDAA/7RgIjDDwTaDABPA//9FaAtDCop0FC5YVDLwoAH8//94GD/wVNCYKNECpwPBQggVPNggVBNp4VFFZwAGCquHCqnzCB4")); } -var IMAGEWIDTH = 176; +//var IMAGEWIDTH = 176; var IMAGEHEIGHT = 81; Graphics.prototype.setFontMichroma36 = function() { diff --git a/apps/a_clock_timer/metadata.json b/apps/a_clock_timer/metadata.json index 6507857f1..1d3661501 100644 --- a/apps/a_clock_timer/metadata.json +++ b/apps/a_clock_timer/metadata.json @@ -1,7 +1,7 @@ { "id": "a_clock_timer", "name": "A Clock with Timer", - "version": "1.00", + "version": "1.01", "description": "A Clock with Timer, Map and Time Zones", "icon": "app.png", "screenshots": [{"url":"screenshot.png"},{"url":"screenshot-1.png"}], diff --git a/apps/a_dndtoggle/ChangeLog b/apps/a_dndtoggle/ChangeLog index ec66c5568..2d760f914 100644 --- a/apps/a_dndtoggle/ChangeLog +++ b/apps/a_dndtoggle/ChangeLog @@ -1 +1,2 @@ 0.01: Initial version +0.02: Add settings page; Add line break to update message \ No newline at end of file diff --git a/apps/a_dndtoggle/README.md b/apps/a_dndtoggle/README.md index bd0981c5b..c373bc872 100644 --- a/apps/a_dndtoggle/README.md +++ b/apps/a_dndtoggle/README.md @@ -1,10 +1,13 @@ # a_dndtoggle - Toggle Quiet Mode of the watch When Quiet mode is off, just start this app to set quiet mode. Start it again to turn off quiet mode. + +Use the app settings to choose which quiet mode you prefer ("Alarms" or "Silent"). Default is "Silent". + Work in progress. #ToDo -Settings page, current status indicator. +Current status indicator ## Creator diff --git a/apps/a_dndtoggle/a_dndtoggle.app.js b/apps/a_dndtoggle/a_dndtoggle.app.js index c0b968f2c..207034209 100644 --- a/apps/a_dndtoggle/a_dndtoggle.app.js +++ b/apps/a_dndtoggle/a_dndtoggle.app.js @@ -6,11 +6,14 @@ let current = 0|bSettings.quiet; //1 alarms //2 silent +const dndSettings = + require('Storage').readJSON("a_dndtoggle.settings.json", true) || {}; + console.log("old: " + current); switch (current) { case 0: - bSettings.quiet = 2; + bSettings.quiet = dndSettings.mode || 2; Bangle.buzz(); setTimeout('Bangle.buzz();',500); break; @@ -29,7 +32,7 @@ switch (current) { console.log("new: " + bSettings.quiet); -E.showMessage(modeNames[current] + " -> " + modeNames[bSettings.quiet]); +E.showMessage(modeNames[current] + " -> \n" + modeNames[bSettings.quiet]); setTimeout('exitApp();', 2000); diff --git a/apps/a_dndtoggle/metadata.json b/apps/a_dndtoggle/metadata.json index f5ae9cc31..62f0edae9 100644 --- a/apps/a_dndtoggle/metadata.json +++ b/apps/a_dndtoggle/metadata.json @@ -2,14 +2,18 @@ "id": "a_dndtoggle", "name": "a_dndtoggle - Toggle Quiet Mode of the watch", "shortName": "A_DND Toggle", - "version": "0.01", + "version": "0.02", "description": "Toggle Quiet Mode of the watch just by starting this app.", "icon": "a_dndtoggle.png", "type": "app", "tags": "tool", "supports": ["BANGLEJS","BANGLEJS2"], + "data" : [ + {"name":"a_dndtoggle.settings.json"} + ], "storage": [ {"name":"a_dndtoggle.app.js","url":"a_dndtoggle.app.js"}, + {"name":"a_dndtoggle.settings.js","url":"settings.js"}, {"name":"a_dndtoggle.img","url":"app-icon.js","evaluate":true} ], "readme": "README.md" diff --git a/apps/a_dndtoggle/settings.js b/apps/a_dndtoggle/settings.js new file mode 100644 index 000000000..5316525b3 --- /dev/null +++ b/apps/a_dndtoggle/settings.js @@ -0,0 +1,33 @@ +(function(back) { + + const settings = + require('Storage').readJSON("a_dndtoggle.settings.json", true) || {}; + + function updateSettings() { + require('Storage').writeJSON("a_dndtoggle.settings.json", settings); + } + + function buildMainMenu(){ + // 0-Noisy is only a placeholder so that the other values map to the Bangle quiet mode options + const modes = [/*LANG*/"Noisy",/*LANG*/"Alarms",/*LANG*/"Silent"]; + let mainmenu = { + '': { 'title': 'A_DND Toggle' }, + '< Back': back, + /*LANG*/"Quiet Mode": { + value: settings.mode || 2, + min: 1, // don't allow choosing 0-Noisy + max: modes.length - 1, + format: v => modes[v], + onchange: v => { + settings.mode = v; + updateSettings(); + } + } + }; + + return mainmenu; + } + + E.showMenu(buildMainMenu()); + }); + \ No newline at end of file diff --git a/apps/a_speech_timer/ChangeLog b/apps/a_speech_timer/ChangeLog index 73e8a67da..d9b45a518 100644 --- a/apps/a_speech_timer/ChangeLog +++ b/apps/a_speech_timer/ChangeLog @@ -1,3 +1,4 @@ 1.00: Release (2021/12/01) 1.01: Grey font when timer is frozen (2021/12/04) 1.02: Force light theme, since the app is not designed for dark theme (2022/12/28) +1.03: Minor code improvements diff --git a/apps/a_speech_timer/app.js b/apps/a_speech_timer/app.js index cbed2ac00..6bb5a3edf 100644 --- a/apps/a_speech_timer/app.js +++ b/apps/a_speech_timer/app.js @@ -124,7 +124,6 @@ Bangle.on('swipe',(swiperight, swipedown)=>{ } }); -var drawTimeout; var showInstructions = true; function draw() { diff --git a/apps/a_speech_timer/metadata.json b/apps/a_speech_timer/metadata.json index fd8813991..91262896c 100644 --- a/apps/a_speech_timer/metadata.json +++ b/apps/a_speech_timer/metadata.json @@ -2,7 +2,7 @@ "id":"a_speech_timer", "name":"Speech Timer", "icon": "app.png", -"version":"1.02", +"version": "1.03", "description": "A timer designed to help keeping your speeches and presentations to time.", "tags": "tool,timer", "readme":"README.md", diff --git a/apps/about/ChangeLog b/apps/about/ChangeLog index e236e4b34..57e918ad2 100644 --- a/apps/about/ChangeLog +++ b/apps/about/ChangeLog @@ -12,3 +12,4 @@ 0.12: Actual pixels as of 29th Nov 2021 0.13: Bangle.js 2: Use setUI to add software back button 0.14: Add automatic translation of more strings +0.15: Minor code improvements diff --git a/apps/about/app-bangle2.js b/apps/about/app-bangle2.js index ccffd183f..a7aa0d466 100644 --- a/apps/about/app-bangle2.js +++ b/apps/about/app-bangle2.js @@ -20,11 +20,11 @@ function getVersion(name,file) { return v?(name+" "+(v?"v"+v:"Unknown")):"NO "+name; } -var versions = [ +/*var versions = [ getVersion("Bootloader","boot.info"), getVersion("Launcher","launch.info"), getVersion("Settings","setting.info") -]; +];*/ var logo = E.toArrayBuffer(atob("PBwBAAAAAAAB/gAAAAAAAB/gAAAAAAAB/gAAAAAAAB/gAAAAAAAB/gAAAAAAAB/gAAAAAAAD/w+AAAAQAHA4hAAAAQAMAMhAAAAQAYBmhAAAAQAYBGiAAAAQAQCD/H74+R4wGDhoKJCSEwEDgoKJCT8wFDgoKJCSAwHDhoKJCSEQHj/H6I+R4YHmAAAACAAYEGAAABCAAMEMAAAA8AAHA4AAAAAAAD/wAAAAAAAB/gAAAAAAAB/gAAAAAAAB/gAAAAAAAB/gAAAAAAAB/gAAAAAAAB/g")); var imageTop = 24; diff --git a/apps/about/metadata.json b/apps/about/metadata.json index 52cd37b7d..3d9730b81 100644 --- a/apps/about/metadata.json +++ b/apps/about/metadata.json @@ -1,7 +1,7 @@ { "id": "about", "name": "About", - "version": "0.14", + "version": "0.15", "description": "Bangle.js About page - showing software version, stats, and a collaborative mural from the Bangle.js KickStarter backers", "icon": "app.png", "tags": "tool,system", diff --git a/apps/accelrec/ChangeLog b/apps/accelrec/ChangeLog index 6dd2c8a59..2254ad9ea 100644 --- a/apps/accelrec/ChangeLog +++ b/apps/accelrec/ChangeLog @@ -2,4 +2,5 @@ 0.02: Increase record time to 5 second Calculate the time moving in graph display Trigger on 1.04g now, and record 10 samples before trigger -0.03: Bangle.js 2 compatibility \ No newline at end of file +0.03: Bangle.js 2 compatibility +0.04: Minor code improvements diff --git a/apps/accelrec/app.js b/apps/accelrec/app.js index 4312258b8..cf434fd7b 100644 --- a/apps/accelrec/app.js +++ b/apps/accelrec/app.js @@ -1,4 +1,4 @@ -var acc; +//var acc; var HZ = 100; var SAMPLES = 5*HZ; // 5 seconds var SCALE = 5000; diff --git a/apps/accelrec/metadata.json b/apps/accelrec/metadata.json index fa6030f6d..b8831c31b 100644 --- a/apps/accelrec/metadata.json +++ b/apps/accelrec/metadata.json @@ -2,7 +2,7 @@ "id": "accelrec", "name": "Acceleration Recorder", "shortName": "Accel Rec", - "version": "0.03", + "version": "0.04", "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": "", diff --git a/apps/acmaze/ChangeLog b/apps/acmaze/ChangeLog index b8c1ec0b5..085de3be3 100644 --- a/apps/acmaze/ChangeLog +++ b/apps/acmaze/ChangeLog @@ -1,3 +1,4 @@ 0.01: New App! 0.02: Faster maze generation 0.03: Avoid clearing bottom widgets +0.04: Minor code improvements diff --git a/apps/acmaze/app.js b/apps/acmaze/app.js index 16a1ce561..fba317aea 100644 --- a/apps/acmaze/app.js +++ b/apps/acmaze/app.js @@ -54,7 +54,7 @@ function Maze(n) { // Abort if BTN1 pressed [grace period for menu] // (for some reason setWatch() fails inside constructor) if (ngroupsstepsCounted}; })(); diff --git a/apps/agenda/ChangeLog b/apps/agenda/ChangeLog index 836810638..d1b95a702 100644 --- a/apps/agenda/ChangeLog +++ b/apps/agenda/ChangeLog @@ -14,3 +14,4 @@ 0.12: Added color field and updating clkinfo periodically (running events) 0.13: Show day of the week in date 0.14: Fixed "Today" and "Yesterday" wrongly displayed for allDay events on some time zones +0.15: Minor code improvements diff --git a/apps/agenda/agenda.js b/apps/agenda/agenda.js index 814525a2e..4f3a91537 100644 --- a/apps/agenda/agenda.js +++ b/apps/agenda/agenda.js @@ -15,14 +15,14 @@ Bangle.loadWidgets(); Bangle.drawWidgets(); -var FILE = "android.calendar.json"; +//var FILE = "android.calendar.json"; var Locale = require("locale"); -var fontSmall = "6x8"; +//var fontSmall = "6x8"; var fontMedium = g.getFonts().includes("6x15")?"6x15":"6x8:2"; var fontBig = g.getFonts().includes("12x20")?"12x20":"6x8:2"; -var fontLarge = g.getFonts().includes("6x15")?"6x15:2":"6x8:4"; +//var fontLarge = g.getFonts().includes("6x15")?"6x15:2":"6x8:4"; //FIXME maybe write the end from GB already? Not durationInSeconds here (or do while receiving?) var CALENDAR = require("Storage").readJSON("android.calendar.json",true)||[]; diff --git a/apps/agenda/metadata.json b/apps/agenda/metadata.json index 2d5864145..65993609e 100644 --- a/apps/agenda/metadata.json +++ b/apps/agenda/metadata.json @@ -1,7 +1,7 @@ { "id": "agenda", "name": "Agenda", - "version": "0.14", + "version": "0.15", "description": "Simple agenda", "icon": "agenda.png", "screenshots": [{"url":"screenshot_agenda_overview.png"}, {"url":"screenshot_agenda_event1.png"}, {"url":"screenshot_agenda_event2.png"}], diff --git a/apps/alpinenav/ChangeLog b/apps/alpinenav/ChangeLog index b3d1e0874..9e08d0e35 100644 --- a/apps/alpinenav/ChangeLog +++ b/apps/alpinenav/ChangeLog @@ -1,2 +1,3 @@ 0.01: New App! 0.02: Added adjustment for Bangle.js magnetometer heading fix +0.03: Minor code improvements diff --git a/apps/alpinenav/app.js b/apps/alpinenav/app.js index 7cffc39c3..7188e25bf 100644 --- a/apps/alpinenav/app.js +++ b/apps/alpinenav/app.js @@ -145,7 +145,7 @@ Bangle.setCompassPower(1); Bangle.setGPSPower(1); g.clear(); process_GPS(); -var poll_GPS = setInterval(process_GPS, 9000); +/*var poll_GPS =*/ setInterval(process_GPS, 9000); setWatch(function () { if (!button_lock) { diff --git a/apps/alpinenav/metadata.json b/apps/alpinenav/metadata.json index c5a0e0611..f85b80e09 100644 --- a/apps/alpinenav/metadata.json +++ b/apps/alpinenav/metadata.json @@ -1,7 +1,7 @@ { "id": "alpinenav", "name": "Alpine Nav", - "version": "0.02", + "version": "0.03", "description": "App that performs GPS monitoring to track and display position relative to a given origin in realtime", "icon": "app-icon.png", "tags": "outdoors,gps", diff --git a/apps/android/ChangeLog b/apps/android/ChangeLog index 108242825..de5130a91 100644 --- a/apps/android/ChangeLog +++ b/apps/android/ChangeLog @@ -33,3 +33,4 @@ 0.31: Implement API for activity fetching 0.32: Added support for loyalty cards from gadgetbridge 0.33: Fix alarms created in Gadgetbridge not repeating +0.34: Implement API for activity tracks fetching (Recorder app logs). diff --git a/apps/android/boot.js b/apps/android/boot.js index 63f9b2883..666cac6d3 100644 --- a/apps/android/boot.js +++ b/apps/android/boot.js @@ -16,10 +16,12 @@ if (settings.vibrate == undefined) settings.vibrate = ".."; require('Storage').writeJSON("android.settings.json", settings); var _GB = global.GB; + let fetchRecInterval; global.GB = (event) => { // feed a copy to other handlers if there were any if (_GB) setTimeout(_GB,0,Object.assign({},event)); + /* TODO: Call handling, fitness */ var HANDLERS = { // {t:"notify",id:int, src,title,subject,body,sender,tel:string} add @@ -230,6 +232,49 @@ } gbSend({t: "actfetch", state: "end", count: actCount}); }, + //{t:"listRecs", id:"20230616a"} + "listRecs": function() { + let recs = require("Storage").list(/^recorder\.log.*\.csv$/,{sf:true}).map(s => s.slice(12, 21)); + if (event.id.length > 2) { // Handle if there was no id supplied. Then we send a list all available recorder logs back. + let firstNonsyncedIdx = recs.findIndex((logId) => logId > event.id); + if (-1 == firstNonsyncedIdx) { + recs = [] + } else { + recs = recs.slice(firstNonsyncedIdx); + } + } + gbSend({t:"actTrksList", list: recs}); // TODO: split up in multiple transmissions? + }, + //{t:"fetchRec", id:"20230616a"} + "fetchRec": function() { + // TODO: Decide on what names keys should have. + if (fetchRecInterval) { + clearInterval(fetchRecInterval); + fetchRecInterval = undefined; + } + if (event.id=="stop") { + return + } else { + let log = require("Storage").open("recorder.log"+event.id+".csv","r"); + let lines = "init";// = log.readLine(); + let pkgcnt = 0; + gbSend({t:"actTrk", log:event.id, lines:"erase", cnt:pkgcnt}); // "erase" will prompt Gadgetbridge to erase the contents of a already fetched log so we can rewrite it without keeping lines from the previous (probably failed) fetch. + let sendlines = ()=>{ + lines = log.readLine(); + for (var i = 0; i < 3; i++) { + let line = log.readLine(); + if (line) lines += line; + } + pkgcnt++; + gbSend({t:"actTrk", log:event.id, lines:lines, cnt:pkgcnt}); + if (!lines && fetchRecInterval) { + clearInterval(fetchRecInterval); + fetchRecInterval = undefined; + } + } + fetchRecInterval = setInterval(sendlines, 50) + } + }, "nav": function() { event.id="nav"; if (event.instr) { diff --git a/apps/android/metadata.json b/apps/android/metadata.json index 5babc520b..72055f557 100644 --- a/apps/android/metadata.json +++ b/apps/android/metadata.json @@ -2,7 +2,7 @@ "id": "android", "name": "Android Integration", "shortName": "Android", - "version": "0.33", + "version": "0.34", "description": "Display notifications/music/etc sent from the Gadgetbridge app on Android. This replaces the old 'Gadgetbridge' Bangle.js widget.", "icon": "app.png", "tags": "tool,system,messages,notifications,gadgetbridge", diff --git a/apps/angles/ChangeLog b/apps/angles/ChangeLog index 2286a7f70..7727f3cc4 100644 --- a/apps/angles/ChangeLog +++ b/apps/angles/ChangeLog @@ -1 +1,2 @@ -0.01: New App! \ No newline at end of file +0.01: New App! +0.02: Minor code improvements diff --git a/apps/angles/app.js b/apps/angles/app.js index a07c29199..d124d7ce7 100644 --- a/apps/angles/app.js +++ b/apps/angles/app.js @@ -4,8 +4,6 @@ var avrAngle = undefined; var history = []; var R = Bangle.appRect; -var W = g.getWidth(); -var H = g.getHeight(); var relativeTo = undefined; function draw(v) { diff --git a/apps/angles/metadata.json b/apps/angles/metadata.json index f8a90a305..3ddee427a 100644 --- a/apps/angles/metadata.json +++ b/apps/angles/metadata.json @@ -2,7 +2,7 @@ "id": "angles", "name": "Angles (Spirit Level)", "shortName": "Angles", - "version": "0.01", + "version": "0.02", "description": "Shows Angle or Relative angle in degrees (Digital Protractor/Inclinometer). Place Bangle sideways against a surface with the button facing away for best readings.", "icon": "icon.png", "screenshots": [{"url":"screenshot.png"}], diff --git a/apps/animclk/ChangeLog b/apps/animclk/ChangeLog index 76d15bdb1..00192d63b 100644 --- a/apps/animclk/ChangeLog +++ b/apps/animclk/ChangeLog @@ -3,3 +3,4 @@ 0.03: Update to use setUI 0.04: Tell clock widgets to hide. Move loadWidgets() so it only runs on startup and not on every draw. +0.05: Minor code improvements diff --git a/apps/animclk/app.js b/apps/animclk/app.js index bdc399fbe..1158fd0d5 100644 --- a/apps/animclk/app.js +++ b/apps/animclk/app.js @@ -16,7 +16,6 @@ var is12Hour = (require("Storage").readJSON("setting.json",1)||{})["12hour"]; var IX = 80, IY = 10, IBPP = 1; var IW = 174, IH = 45, OY = 24; var inf = {align:0}; -var bgoptions; require("Font7x11Numeric7Seg").add(Graphics); var cg = Graphics.createArrayBuffer(IW,IH,IBPP,{msb:true}); diff --git a/apps/animclk/metadata.json b/apps/animclk/metadata.json index 0b426a37d..157090315 100644 --- a/apps/animclk/metadata.json +++ b/apps/animclk/metadata.json @@ -2,7 +2,7 @@ "id": "animclk", "name": "Animated Clock", "shortName": "Anim Clock", - "version": "0.04", + "version": "0.05", "description": "An animated clock face using Mark Ferrari's amazing 8 bit game art and palette cycling: http://www.markferrari.com/art/8bit-game-art", "icon": "app.png", "type": "clock", diff --git a/apps/approxclock/ChangeLog b/apps/approxclock/ChangeLog index 9ba3e983a..b6a863560 100644 --- a/apps/approxclock/ChangeLog +++ b/apps/approxclock/ChangeLog @@ -1,4 +1,5 @@ 0.1: Initial release 0.2: Added more descriptive approximations 0.2f: Bug fixes: Incorrect hour drawn after 50 mins, incorrect quarter minute drawn after 50 mins -0.3: Added touch interaction to display exact time and date. \ No newline at end of file +0.3: Added touch interaction to display exact time and date. +0.04: Minor code improvements diff --git a/apps/approxclock/app.js b/apps/approxclock/app.js index 4f0bb570a..c4dff67d3 100644 --- a/apps/approxclock/app.js +++ b/apps/approxclock/app.js @@ -93,7 +93,7 @@ const drawTimeExact = () => { var dateTime = Date(); var hours = dateTime.getHours(); var minutes = dateTime.getMinutes().toString().padStart(2,0); - var day = dateTime.getDay(); + //var day = dateTime.getDay(); var date = dateTime.getDate(); var month = dateTime.getMonth(); var year = dateTime.getFullYear(); diff --git a/apps/approxclock/metadata.json b/apps/approxclock/metadata.json index 80e476e5b..c5861523b 100644 --- a/apps/approxclock/metadata.json +++ b/apps/approxclock/metadata.json @@ -1,7 +1,7 @@ { "id": "approxclock", "name": "Approximate Clock", "shortName" : "Approx Clock", - "version": "0.3", + "version": "0.04", "icon": "app.png", "description": "A really basic spelled out time display for people looking for the vague time at a glance.", "readme": "readme.md", diff --git a/apps/arrow/ChangeLog b/apps/arrow/ChangeLog index edd5ccb3d..4d3a6f1a8 100644 --- a/apps/arrow/ChangeLog +++ b/apps/arrow/ChangeLog @@ -4,3 +4,4 @@ 0.04: removed LED1.write() as it was keeping LCD on 0.05: Turn compass off when screen off Calibrate at start if no info +0.06: Minor code improvements diff --git a/apps/arrow/app.js b/apps/arrow/app.js index f1f85e880..c4cf3d32c 100644 --- a/apps/arrow/app.js +++ b/apps/arrow/app.js @@ -20,9 +20,11 @@ function flip2(x,y) { buf2.clear(); } +/* function radians(d) { return (d*Math.PI) / 180; } +*/ // takes 32ms function drawCompass(hd) { @@ -60,7 +62,7 @@ function newHeading(m,h){ // takes approx 7ms function tiltfixread(O,S){ - var start = Date.now(); + //var start = Date.now(); var m = Bangle.getCompass(); var g = Bangle.getAccel(); m.dx =(m.x-O.x)*S.x; m.dy=(m.y-O.y)*S.y; m.dz=(m.z-O.z)*S.z; diff --git a/apps/arrow/metadata.json b/apps/arrow/metadata.json index bf462e33b..58b6f84c1 100644 --- a/apps/arrow/metadata.json +++ b/apps/arrow/metadata.json @@ -1,7 +1,7 @@ { "id": "arrow", "name": "Arrow Compass", - "version": "0.05", + "version": "0.06", "description": "Moving arrow compass that points North, shows heading, with tilt correction. Based on jeffmer's Navigation Compass", "icon": "arrow.png", "type": "app", diff --git a/apps/astrocalc/ChangeLog b/apps/astrocalc/ChangeLog index 156cf17bf..2831b2721 100644 --- a/apps/astrocalc/ChangeLog +++ b/apps/astrocalc/ChangeLog @@ -4,3 +4,4 @@ 0.04: Compatibility with Bangle.js 2, get location from My Location 0.05: Enable widgets 0.06: Fix azimuth (bug #2651), only show degrees +0.07: Minor code improvements diff --git a/apps/astrocalc/astrocalc-app.js b/apps/astrocalc/astrocalc-app.js index 5589a5703..293cd9386 100644 --- a/apps/astrocalc/astrocalc-app.js +++ b/apps/astrocalc/astrocalc-app.js @@ -10,7 +10,6 @@ */ const SunCalc = require("suncalc"); // from modules folder -const storage = require("Storage"); function drawMoon(phase, x, y) { const moonImgFiles = [ @@ -52,7 +51,7 @@ function drawTitle(key) { const x = 0; const x2 = g.getWidth() - 1; const y = fontHeight + 26; - const y2 = g.getHeight() - 1; + //const y2 = g.getHeight() - 1; const title = titlizeKey(key); g.setFont("6x8", 2); diff --git a/apps/astrocalc/metadata.json b/apps/astrocalc/metadata.json index 09dc53170..4b9d1c8a0 100644 --- a/apps/astrocalc/metadata.json +++ b/apps/astrocalc/metadata.json @@ -1,7 +1,7 @@ { "id": "astrocalc", "name": "Astrocalc", - "version": "0.06", + "version": "0.07", "description": "Calculates interesting information on the sun like sunset and sunrise and moon cycles for the current day based on your location from MyLocation app", "icon": "astrocalc.png", "tags": "app,sun,moon,cycles,tool,outdoors", diff --git a/apps/ballmaze/ChangeLog b/apps/ballmaze/ChangeLog index de6240f46..fedae2fc5 100644 --- a/apps/ballmaze/ChangeLog +++ b/apps/ballmaze/ChangeLog @@ -1,2 +1,3 @@ 0.01: New App! -0.02: Set LCD timeout for Espruino 2v10 compatibility \ No newline at end of file +0.02: Set LCD timeout for Espruino 2v10 compatibility +0.03: Minor code improvements diff --git a/apps/ballmaze/app.js b/apps/ballmaze/app.js index 2d55887f0..d54cf4372 100644 --- a/apps/ballmaze/app.js +++ b/apps/ballmaze/app.js @@ -25,6 +25,7 @@ 10: "Medium", 16: "Small", 20: "Tiny", 40: "Trivial", }; // even size 1 actually works, but larger mazes take forever to generate + // TODO: should `sizes`, `minSize` and `defaultSize` have been declared outside the if block? if (!BANGLEJS2) { const sizes = [1, 2, 4, 5, 8, 10, 16, 20, 40].reverse(), minSize = 4, defaultSize = 10; } else { diff --git a/apps/ballmaze/metadata.json b/apps/ballmaze/metadata.json index 3223789d4..fc011623a 100644 --- a/apps/ballmaze/metadata.json +++ b/apps/ballmaze/metadata.json @@ -1,7 +1,7 @@ { "id": "ballmaze", "name": "Ball Maze", - "version": "0.02", + "version": "0.03", "description": "Navigate a ball through a maze by tilting your watch.", "icon": "icon.png", "type": "app", diff --git a/apps/banglebridge/ChangeLog b/apps/banglebridge/ChangeLog new file mode 100644 index 000000000..62542be60 --- /dev/null +++ b/apps/banglebridge/ChangeLog @@ -0,0 +1,2 @@ +0.01: New app! +0.02: Minor code improvements diff --git a/apps/banglebridge/metadata.json b/apps/banglebridge/metadata.json index 8a9eaa6e4..86e1face0 100644 --- a/apps/banglebridge/metadata.json +++ b/apps/banglebridge/metadata.json @@ -2,7 +2,7 @@ "id": "banglebridge", "name": "BangleBridge", "shortName": "BangleBridge", - "version": "0.01", + "version": "0.02", "description": "Widget that allows Bangle Js to record pair and end data using Bluetooth Low Energy in combination with the BangleBridge Android App", "icon": "widget.png", "type": "widget", diff --git a/apps/banglebridge/widget.js b/apps/banglebridge/widget.js index 48078de30..692822b39 100644 --- a/apps/banglebridge/widget.js +++ b/apps/banglebridge/widget.js @@ -11,13 +11,13 @@ g.setFont("Vector", 100); //variabangle.Sensorss - let acclS, bttS, compssS, gpsS, hrmS, stepS; //Strings + //let acclS, bttS, compssS, gpsS, hrmS, stepS; //Strings let accelN, compssN, gpsN, hrmN, stepN; //Num - let prueba = 1; + //let prueba = 1; let data = [0, 0, 0, 0, 0, 0]; //Constants for redabangle.Sensors code let storage = require('Storage'); - let deCom = require('heatshrink'); + //let deCom = require('heatshrink'); @@ -129,10 +129,10 @@ finalS = s; } var z = d.getMilliseconds(); - var zFinal = new String(z); - zFinal = zFinal.replace('.', ''); + //var zFinal = new String(z); + //zFinal = zFinal.replace('.', ''); var completeTime = year + "-" + finalMonth + "-" + finalDay + "T" + finalh + ":" + finalM + ":" + finalS + "." + z + "Z"; - var time = h + ":" + ("0" + m).substr(-2); + //var time = h + ":" + ("0" + m).substr(-2); gpsN.time = completeTime; data[5] = gpsN; }, 2 * 1000); diff --git a/apps/banglexercise/ChangeLog b/apps/banglexercise/ChangeLog index 6cf589541..362c24378 100644 --- a/apps/banglexercise/ChangeLog +++ b/apps/banglexercise/ChangeLog @@ -3,3 +3,4 @@ Add more feedback to the user about the exercises Clean up code 0.03: Add software back button on main menu +0.04: Minor code improvements diff --git a/apps/banglexercise/app.js b/apps/banglexercise/app.js index 9659ee81f..c29671258 100644 --- a/apps/banglexercise/app.js +++ b/apps/banglexercise/app.js @@ -11,7 +11,7 @@ let historySlopeY = []; let historySlopeZ = []; let lastZeroPassCameFromPositive; -let lastZeroPassTime = 0; +//let lastZeroPassTime = 0; let lastExerciseCompletionTime = 0; let lastExerciseHalfCompletionTime = 0; @@ -198,7 +198,7 @@ function isValidExercise(slope, t) { } lastZeroPassCameFromPositive = true; - lastZeroPassTime = t; + //lastZeroPassTime = t; } if (p2 > 0 && p1 < 0) { if (lastZeroPassCameFromPositive == true) { @@ -256,7 +256,7 @@ function isValidExercise(slope, t) { } lastZeroPassCameFromPositive = false; - lastZeroPassTime = t; + //lastZeroPassTime = t; } } } @@ -272,7 +272,7 @@ function reset() { historySlopeZ = []; lastZeroPassCameFromPositive = undefined; - lastZeroPassTime = 0; + //lastZeroPassTime = 0; lastExerciseHalfCompletionTime = 0; lastExerciseCompletionTime = 0; exerciseCounter = 0; diff --git a/apps/banglexercise/metadata.json b/apps/banglexercise/metadata.json index f4ce1894b..2638eb195 100644 --- a/apps/banglexercise/metadata.json +++ b/apps/banglexercise/metadata.json @@ -1,7 +1,7 @@ { "id": "banglexercise", "name": "BanglExercise", "shortName":"BanglExercise", - "version":"0.03", + "version": "0.04", "description": "Can automatically track exercises while wearing the Bangle.js watch.", "icon": "app.png", "screenshots": [{"url":"screenshot.png"}], diff --git a/apps/barcode/ChangeLog b/apps/barcode/ChangeLog index 7ab5d8587..4974b7029 100644 --- a/apps/barcode/ChangeLog +++ b/apps/barcode/ChangeLog @@ -8,3 +8,4 @@ 0.08: Step count stored in memory to survive reloads. Now shows step count daily and since last reboot. 0.09: NOW it really should reset daily (instead of every other day...) 0.10: Tell clock widgets to hide. +0.11: Minor code improvements diff --git a/apps/barcode/barcode.app.js b/apps/barcode/barcode.app.js index 0d9df78d5..3242164ae 100644 --- a/apps/barcode/barcode.app.js +++ b/apps/barcode/barcode.app.js @@ -8,8 +8,8 @@ let digitBarHeight = 100; let textBarWidth = 56; let textBarHeight = 20; -let textWidth = 14; -let textHeight = 20; +//let textWidth = 14; +//let textHeight = 20; /* Offsets */ var startOffsetX = 17; @@ -39,7 +39,7 @@ let rightBarsStartY = upperTextBarRightOffsetY + textBarHeight; /* Utilities */ let stepCount = require("Storage").readJSON("stepCount",1); if(stepCount === undefined) stepCount = 0; -let intCaster = num => Number(num); +//let intCaster = num => Number(num); var drawTimeout; @@ -50,7 +50,7 @@ function renderWatch(l) { var d = new Date(); var h = d.getHours(), m = d.getMinutes(); - var time = h + ":" + ("0"+m).substr(-2); + //var time = h + ":" + ("0"+m).substr(-2); //var month = ("0" + (d.getMonth()+1)).slice(-2); var dayOfMonth = ('0' + d.getDate()).slice(-2); var dayOfWeek = d.getDay() || 7; diff --git a/apps/barcode/metadata.json b/apps/barcode/metadata.json index 3f6bf06e6..007be2778 100644 --- a/apps/barcode/metadata.json +++ b/apps/barcode/metadata.json @@ -2,7 +2,7 @@ "name": "Barcode clock", "shortName":"Barcode clock", "icon": "barcode.icon.png", - "version":"0.10", + "version": "0.11", "description": "EAN-8 compatible barcode clock.", "tags": "barcode,ean,ean-8,watchface,clock,clockface", "type": "clock", diff --git a/apps/batchart/ChangeLog b/apps/batchart/ChangeLog index 394622c78..af80ff046 100644 --- a/apps/batchart/ChangeLog +++ b/apps/batchart/ChangeLog @@ -10,3 +10,4 @@ 0.10: Remove widget icon and improve listener and setInterval handling for widget (might help with https://github.com/espruino/BangleApps/issues/381) 0.11: Initial port to the BangleJS2 0.12: Remove debug log +0.13: Minor code improvements diff --git a/apps/batchart/app.js b/apps/batchart/app.js index 8d700d0a1..c25617365 100644 --- a/apps/batchart/app.js +++ b/apps/batchart/app.js @@ -146,7 +146,7 @@ function renderData(dataArray) { const belowMinIndicatorValue = minTemperature - 1; const aboveMaxIndicatorValue = maxTemparature + 1; - var allConsumers = switchableConsumers.none | switchableConsumers.lcd | switchableConsumers.compass | switchableConsumers.bluetooth | switchableConsumers.gps | switchableConsumers.hrm; + //var allConsumers = switchableConsumers.none | switchableConsumers.lcd | switchableConsumers.compass | switchableConsumers.bluetooth | switchableConsumers.gps | switchableConsumers.hrm; for (let i = 0; i < dataArray.length; i++) { const element = dataArray[i]; diff --git a/apps/batchart/metadata.json b/apps/batchart/metadata.json index be01ca767..dda43fac4 100644 --- a/apps/batchart/metadata.json +++ b/apps/batchart/metadata.json @@ -2,7 +2,7 @@ "id": "batchart", "name": "Battery Chart", "shortName": "Battery Chart", - "version": "0.12", + "version": "0.13", "description": "A widget and an app for recording and visualizing battery percentage over time.", "icon": "app.png", "tags": "app,widget,battery,time,record,chart,tool", diff --git a/apps/batchart/widget.js b/apps/batchart/widget.js index b1234f377..40198065b 100644 --- a/apps/batchart/widget.js +++ b/apps/batchart/widget.js @@ -11,10 +11,10 @@ hrm: 16 }; - var batChartFile; // file for battery percentage recording + //var batChartFile; // file for battery percentage recording const recordingInterval10Min = 60 * 10 * 1000; - const recordingInterval1Min = 60 * 1000; //For testing - const recordingInterval10S = 10 * 1000; //For testing + //const recordingInterval1Min = 60 * 1000; //For testing + //const recordingInterval10S = 10 * 1000; //For testing var compassEventReceived = false; var gpsEventReceived = false; diff --git a/apps/battleship/ChangeLog b/apps/battleship/ChangeLog index 5560f00bc..7727f3cc4 100644 --- a/apps/battleship/ChangeLog +++ b/apps/battleship/ChangeLog @@ -1 +1,2 @@ 0.01: New App! +0.02: Minor code improvements diff --git a/apps/battleship/battleship.js b/apps/battleship/battleship.js index 3661ef494..237eca3d2 100644 --- a/apps/battleship/battleship.js +++ b/apps/battleship/battleship.js @@ -1,6 +1,6 @@ const FIELD_WIDTH = [11, 11, 15]; // for each phase const FIELD_HEIGHT = FIELD_WIDTH; -const FIELD_LINE_WIDTH = 2; +//const FIELD_LINE_WIDTH = 2; const FIELD_MARGIN = 2; const FIELD_COUNT_X = 10; const FIELD_COUNT_Y = FIELD_COUNT_X; diff --git a/apps/battleship/metadata.json b/apps/battleship/metadata.json index 12e92c1d7..46399c68f 100644 --- a/apps/battleship/metadata.json +++ b/apps/battleship/metadata.json @@ -1,7 +1,7 @@ { "id": "battleship", "name": "Battleship", - "version": "0.01", + "version": "0.02", "description": "The classic game of battleship", "icon": "battleship-icon.png", "tags": "game", diff --git a/apps/beebclock/ChangeLog b/apps/beebclock/ChangeLog index 84ec7c1d7..4646b4010 100644 --- a/apps/beebclock/ChangeLog +++ b/apps/beebclock/ChangeLog @@ -4,3 +4,4 @@ 0.04: Update to use Bangle.setUI instead of setWatch 0.05: Avoid 'loadWidgets' at LCD on, which will cause memory leak Avoid clearTimeout() usage, as it may break other widgets +0.06: Minor code improvements diff --git a/apps/beebclock/beebclock.js b/apps/beebclock/beebclock.js index c85f68c55..d220096d2 100644 --- a/apps/beebclock/beebclock.js +++ b/apps/beebclock/beebclock.js @@ -108,10 +108,10 @@ for (let h=1; h<=12; h++) { // so we buffer once and minute, and draw the second hand dynamically // (with a bit of flicker) const drawFace = (G) => { - const fw = R1 * 2; - const fh = R1 * 2; - const fw2 = R1; - const fh2 = R1; + //const fw = R1 * 2; + //const fh = R1 * 2; + //const fw2 = R1; + //const fh2 = R1; let hs = []; // Wipe the image and start with white @@ -182,7 +182,7 @@ const drawAll = (force) => { if (!faceImg) force = true; let face_changed = force; - let date_changed = false; + //let date_changed = false; tmp = hours; hours = now.getHours(); @@ -214,7 +214,7 @@ const drawAll = (force) => { tmp = date; date = now.getDate(); if (tmp !== date) { - date_changed = true; + //date_changed = true; face_changed = true; // Should have changed anyway with hour/minute rollover } } diff --git a/apps/beebclock/metadata.json b/apps/beebclock/metadata.json index 31316a80c..5790cf564 100644 --- a/apps/beebclock/metadata.json +++ b/apps/beebclock/metadata.json @@ -1,7 +1,7 @@ { "id": "beebclock", "name": "Beeb Clock", - "version": "0.05", + "version": "0.06", "description": "Clock face that may be coincidentally familiar to BBC viewers", "icon": "beebclock.png", "type": "clock", diff --git a/apps/berlinc/ChangeLog b/apps/berlinc/ChangeLog index 1a0a9c9cf..6820ab11d 100644 --- a/apps/berlinc/ChangeLog +++ b/apps/berlinc/ChangeLog @@ -5,4 +5,5 @@ Now show widgets Make compatible with themes, and Bangle.js 2 0.06: Enable fastloading -0.07: Adds fullscreen mode setting \ No newline at end of file +0.07: Adds fullscreen mode setting +0.08: Minor code improvements diff --git a/apps/berlinc/berlin-clock.js b/apps/berlinc/berlin-clock.js index 9391d2cc1..94fbe5be1 100644 --- a/apps/berlinc/berlin-clock.js +++ b/apps/berlinc/berlin-clock.js @@ -9,7 +9,6 @@ let fullscreen = !!settings.fullscreen; let show_date = false; let show_time = false; -let yy = 0; let rowlights = []; let time_digit = []; diff --git a/apps/berlinc/metadata.json b/apps/berlinc/metadata.json index 85567868b..983602d90 100644 --- a/apps/berlinc/metadata.json +++ b/apps/berlinc/metadata.json @@ -1,7 +1,7 @@ { "id": "berlinc", "name": "Berlin Clock", - "version": "0.07", + "version": "0.08", "description": "Berlin Clock (see https://en.wikipedia.org/wiki/Mengenlehreuhr)", "icon": "berlin-clock.png", "type": "clock", diff --git a/apps/binaryclk/ChangeLog b/apps/binaryclk/ChangeLog index dd35cb918..76a897247 100644 --- a/apps/binaryclk/ChangeLog +++ b/apps/binaryclk/ChangeLog @@ -2,3 +2,4 @@ 0.02: Removed unneeded squares 0.03: Added setting for fullscreen option 0.04: Added settings to hide unused squares and show date +0.05: Minor code improvements diff --git a/apps/binaryclk/app.js b/apps/binaryclk/app.js index 7969fe301..05a2a5d1a 100644 --- a/apps/binaryclk/app.js +++ b/apps/binaryclk/app.js @@ -63,7 +63,7 @@ function draw() { g.clear(); draw(); -var secondInterval = setInterval(draw, 60000); +/*var secondInterval =*/ setInterval(draw, 60000); Bangle.setUI("clock"); if (!settings.fullscreen) { Bangle.loadWidgets(); diff --git a/apps/binaryclk/metadata.json b/apps/binaryclk/metadata.json index b8489885a..83387d2aa 100644 --- a/apps/binaryclk/metadata.json +++ b/apps/binaryclk/metadata.json @@ -1,7 +1,7 @@ { "id": "binaryclk", "name": "Bin Clock", - "version": "0.04", + "version": "0.05", "description": "Clock face to show binary time in 24 hour format", "icon": "app-icon.png", "screenshots": [{"url":"screenshot.png"}], diff --git a/apps/binwatch/ChangeLog b/apps/binwatch/ChangeLog index e355155b3..a7913c299 100644 --- a/apps/binwatch/ChangeLog +++ b/apps/binwatch/ChangeLog @@ -4,3 +4,4 @@ 0.04: corrected format of background image (raw binary) 0.05: move setUI() up before draw() as to not have a false positive 'sanity check' when building on github. +0.06: Minor code improvements diff --git a/apps/binwatch/app.js b/apps/binwatch/app.js index 153bebb32..8e21a06a0 100644 --- a/apps/binwatch/app.js +++ b/apps/binwatch/app.js @@ -63,8 +63,8 @@ const V2_BAT_SIZE_Y = 2; const V2_SCREEN_SIZE_X = 176; const V2_SCREEN_SIZE_Y = 176; const V2_BACKGROUND_IMAGE = "binwatch.bg176.img"; -const V2_BG_COLOR = 0; -const V2_FG_COLOR = 1; +//const V2_BG_COLOR = 0; +//const V2_FG_COLOR = 1; /* Bangle 1: 240 x 240 */ @@ -91,15 +91,15 @@ const V1_BAT_SIZE_Y = 5; const V1_SCREEN_SIZE_X = 240; const V1_SCREEN_SIZE_Y = 240; const V1_BACKGROUND_IMAGE = "binwatch.bg240.img"; -const V1_BG_COLOR = 1; -const V1_FG_COLOR = 0; +//const V1_BG_COLOR = 1; +//const V1_FG_COLOR = 0; /* runtime settings */ var x_step = 0; var y_step = 0; -var time_y_offset = 0; +//var time_y_offset = 0; var hx = 0, hy = 0; var mx = 0, my = 0; var sx = 0, sy = 0; @@ -110,10 +110,9 @@ var bat_pos_x, bat_pos_y, bat_size_x, bat_size_y; var backgroundImage = ""; var screen_size_x = 0; var screen_size_y = 0; -var bg_color = 0; -var fg_color = 1; +//var bg_color = 0; +//var fg_color = 1; -/* global variables */ var showDateTime = 2; /* show noting, time or date */ var cg; @@ -271,7 +270,7 @@ function setRuntimeValues(resolution) { x_step = V1_X_STEP; y_step = V1_Y_STEP; - time_y_offset = V1_TIME_Y_OFFSET; + //time_y_offset = V1_TIME_Y_OFFSET; hx = V1_HX; hy = V1_HY; mx = V1_MX; @@ -298,7 +297,7 @@ function setRuntimeValues(resolution) { x_step = V2_X_STEP; y_step = V2_Y_STEP; - time_y_offset = V2_TIME_Y_OFFSET; + //time_y_offset = V2_TIME_Y_OFFSET; hx = V2_HX; hy = V2_HY; diff --git a/apps/binwatch/metadata.json b/apps/binwatch/metadata.json index 0b4dbc697..85881d46b 100644 --- a/apps/binwatch/metadata.json +++ b/apps/binwatch/metadata.json @@ -3,7 +3,7 @@ "shortName":"BinWatch", "icon": "app.png", "screenshots": [{"url":"screenshot.png"}], - "version":"0.05", + "version": "0.06", "supports": ["BANGLEJS2"], "readme": "README.md", "allow_emulator":true, diff --git a/apps/boot/ChangeLog b/apps/boot/ChangeLog index 6349d9213..95a9ff2c6 100644 --- a/apps/boot/ChangeLog +++ b/apps/boot/ChangeLog @@ -68,3 +68,4 @@ 0.57: Handle the whitelist being disabled 0.58: "Make Connectable" temporarily bypasses the whitelist 0.59: Whitelist: Try to resolve peer addresses using NRF.resolveAddress() - for 2v19 or 2v18 cutting edge builds +0.60: Minor code improvements diff --git a/apps/boot/bootupdate.js b/apps/boot/bootupdate.js index 1b11a3f16..315b60723 100644 --- a/apps/boot/bootupdate.js +++ b/apps/boot/bootupdate.js @@ -4,7 +4,7 @@ of the time. */ { // execute in our own scope so we don't have to free variables... E.showMessage(/*LANG*/"Updating boot0..."); let s = require('Storage').readJSON('setting.json',1)||{}; -const BANGLEJS2 = process.env.HWVERSION==2; // Is Bangle.js 2 +//const BANGLEJS2 = process.env.HWVERSION==2; // Is Bangle.js 2 const FWVERSION = parseFloat(process.env.VERSION.replace("v","").replace(/\.(\d\d)$/,".0$1")); const DEBUG = s.bootDebug; // we can set this to enable debugging output in boot0 let boot = "", bootPost = ""; diff --git a/apps/boot/metadata.json b/apps/boot/metadata.json index 45f531776..07e999797 100644 --- a/apps/boot/metadata.json +++ b/apps/boot/metadata.json @@ -1,7 +1,7 @@ { "id": "boot", "name": "Bootloader", - "version": "0.59", + "version": "0.60", "description": "This is needed by Bangle.js to automatically load the clock, menu, widgets and settings", "icon": "bootloader.png", "type": "bootloader", diff --git a/apps/bradbury/ChangeLog b/apps/bradbury/ChangeLog new file mode 100644 index 000000000..62542be60 --- /dev/null +++ b/apps/bradbury/ChangeLog @@ -0,0 +1,2 @@ +0.01: New app! +0.02: Minor code improvements diff --git a/apps/bradbury/app.js b/apps/bradbury/app.js index 147242689..ae018f87f 100644 --- a/apps/bradbury/app.js +++ b/apps/bradbury/app.js @@ -2,7 +2,7 @@ require("Font7x11Numeric7Seg").add(Graphics); require("Font5x9Numeric7Seg").add(Graphics); require("Font8x12").add(Graphics); require("FontDylex7x13").add(Graphics); -const X = 98, Y = 46; +//const X = 98, Y = 46; var wizible = 0; function getImg() { diff --git a/apps/bradbury/metadata.json b/apps/bradbury/metadata.json index 456daa381..6b4fb2171 100644 --- a/apps/bradbury/metadata.json +++ b/apps/bradbury/metadata.json @@ -3,7 +3,7 @@ "shortName":"Bradbury", "icon": "app.png", "screenshots": [{"url":"screenshot.png"}], - "version":"0.01", + "version": "0.02", "description": "A watch face based on the classic Seiko model worn by one of my favorite authors. I didn't follow the original lcd layout exactly, opting for larger font for more easily readable time, and adding date, battery level, and step count; read from the device. Tapping the screen toggles visibility of widgets.", "type": "clock", "supports":["BANGLEJS2"], diff --git a/apps/breath/ChangeLog b/apps/breath/ChangeLog new file mode 100644 index 000000000..62542be60 --- /dev/null +++ b/apps/breath/ChangeLog @@ -0,0 +1,2 @@ +0.01: New app! +0.02: Minor code improvements diff --git a/apps/breath/app.js b/apps/breath/app.js index 380308739..309189c9a 100644 --- a/apps/breath/app.js +++ b/apps/breath/app.js @@ -4,7 +4,7 @@ var max_radius = 70; var direction = 1; var display_HR = "--"; var first_signal = true; -var interval; +//var interval; var timeout; var settings; var status = 0; @@ -63,7 +63,7 @@ function circle() { g.drawString("<<", 220, 40); status = 7; timeout = setTimeout(function () { - interval = restart_interval(); + /*interval =*/ restart_interval(); }, settings.exhale_pause * 1000); } direction = 0; @@ -77,7 +77,7 @@ function circle() { g.drawString("<<", 220, 40); status = 7; timeout = setTimeout(function () { - interval = restart_interval(); + /*interval =*/ restart_interval(); }, settings.inhale_pause * 1000); } direction = 1; @@ -100,7 +100,7 @@ function restart_interval() { if(direction == 1 && settings.ex_in_ratio == "5:6"){ calc -= calc*0.2; } - interval = setInterval(circle, calc); + /*interval =*/ setInterval(circle, calc); } function update_menu() { diff --git a/apps/breath/metadata.json b/apps/breath/metadata.json index 070a9a79a..993ffc51d 100644 --- a/apps/breath/metadata.json +++ b/apps/breath/metadata.json @@ -2,7 +2,7 @@ "id": "breath", "name": "Breathing App", "shortName": "Breathing App", - "version": "0.01", + "version": "0.02", "description": "app to aid relaxation and train breath syncronicity using haptics and visualisation, also displays HR", "icon": "app-icon.png", "tags": "tools,health", diff --git a/apps/bthome/ChangeLog b/apps/bthome/ChangeLog index 5560f00bc..01d23607d 100644 --- a/apps/bthome/ChangeLog +++ b/apps/bthome/ChangeLog @@ -1 +1,2 @@ 0.01: New App! +0.02: Fix double-button press if you press the next button within 30s (#3243) \ No newline at end of file diff --git a/apps/bthome/boot.js b/apps/bthome/boot.js index 9c02581fe..a95d9b5fe 100644 --- a/apps/bthome/boot.js +++ b/apps/bthome/boot.js @@ -19,12 +19,16 @@ Bangle.btHomeData = []; /* Global function to allow advertising BTHome adverts extras = array of extra data, see require("BTHome").getAdvertisement - can add {n:0/1/2} for different instances - options = { event : an event - advertise fast, and when connected + options = { + event : an event - advertise fast, and when connected } */ Bangle.btHome = function(extras, options) { options = options||{}; - if(extras) { // update with extras + // clear any existing events + Bangle.btHomeData.forEach(d => {if (d.type=="button_event") d.v="none";}); + // update with extras + if (extras) { extras.forEach(extra => { var n = Bangle.btHomeData.find(b=>b.type==extra.type && b.n==extra.n); if (n) Object.assign(n, extra); @@ -60,9 +64,7 @@ Bangle.btHome = function(extras, options) { if (Bangle.btHomeTimeout) clearTimeout(Bangle.btHomeTimeout); Bangle.btHomeTimeout = setTimeout(function() { delete Bangle.btHomeTimeout; - // clear events - Bangle.btHomeData.forEach(d => {if (d.type=="button_event") d.v="none";}); // update Bangle.btHome(); - },updateTimeout); + }, updateTimeout); }; diff --git a/apps/bthome/metadata.json b/apps/bthome/metadata.json index c2767b9cf..6fc4a17c2 100644 --- a/apps/bthome/metadata.json +++ b/apps/bthome/metadata.json @@ -1,7 +1,7 @@ { "id": "bthome", "name": "BTHome", "shortName":"BTHome", - "version":"0.01", + "version":"0.02", "description": "Allow your Bangle to advertise with BTHome and send events to Home Assistant via Bluetooth", "icon": "icon.png", "type": "app", diff --git a/apps/bthrv/ChangeLog b/apps/bthrv/ChangeLog index eefadac78..ef9d84bdb 100644 --- a/apps/bthrv/ChangeLog +++ b/apps/bthrv/ChangeLog @@ -1,3 +1,4 @@ 0.01: New App! 0.02: Write available data on reset or kill 0.03: Buzz short on every finished measurement and longer if all are done +0.04: Minor code improvements diff --git a/apps/bthrv/app.js b/apps/bthrv/app.js index fbd0e2d05..8378ba025 100644 --- a/apps/bthrv/app.js +++ b/apps/bthrv/app.js @@ -1,4 +1,4 @@ -var btm = g.getHeight()-1; +//var btm = g.getHeight()-1; var ui = false; function clear(y){ @@ -10,7 +10,7 @@ var startingTime; var currentSlot = 0; var hrvSlots = [10,20,30,60,120,300]; var hrvValues = {}; -var rrRmsProgress; +//var rrRmsProgress; var rrNumberOfValues = 0; var rrSquared = 0; @@ -120,7 +120,7 @@ function resetHrv(){ } -var settings = require('Storage').readJSON("bthrm.json", true) || {}; +//var settings = require('Storage').readJSON("bthrm.json", true) || {}; g.clear(); Bangle.loadWidgets(); diff --git a/apps/bthrv/metadata.json b/apps/bthrv/metadata.json index 7c57be682..9fff1589c 100644 --- a/apps/bthrv/metadata.json +++ b/apps/bthrv/metadata.json @@ -2,7 +2,7 @@ "id": "bthrv", "name": "Bluetooth Heart Rate variance calculator", "shortName": "BT HRV", - "version": "0.03", + "version": "0.04", "description": "Calculates HRV from a a BT HRM with interval data", "icon": "app.png", "type": "app", diff --git a/apps/calclock/ChangeLog b/apps/calclock/ChangeLog index ee9daa17e..effa87c4b 100644 --- a/apps/calclock/ChangeLog +++ b/apps/calclock/ChangeLog @@ -6,3 +6,4 @@ 0.06: Improved multi-line locations & titles 0.07: Buzz 30, 15 and 1 minute before an event 0.08: No buzz during quiet hours & tweaked 30-minute buzz +0.09: Minor code improvements diff --git a/apps/calclock/calclock.js b/apps/calclock/calclock.js index 5266bf2f4..32cce5fdb 100644 --- a/apps/calclock/calclock.js +++ b/apps/calclock/calclock.js @@ -143,7 +143,7 @@ function redraw() { g.clear(); fullRedraw(); buzzForEvents(); -var minuteInterval = setInterval(redraw, 60 * 1000); +/*var minuteInterval =*/ setInterval(redraw, 60 * 1000); Bangle.setUI("clock"); Bangle.loadWidgets(); diff --git a/apps/calclock/metadata.json b/apps/calclock/metadata.json index 4334a4476..c339e8ce0 100644 --- a/apps/calclock/metadata.json +++ b/apps/calclock/metadata.json @@ -2,7 +2,7 @@ "id": "calclock", "name": "Calendar Clock", "shortName": "CalClock", - "version": "0.08", + "version": "0.09", "description": "Show the current and upcoming events synchronized from Gadgetbridge", "icon": "calclock.png", "type": "clock", diff --git a/apps/calendar/ChangeLog b/apps/calendar/ChangeLog index bd8e6117b..9a4f81491 100644 --- a/apps/calendar/ChangeLog +++ b/apps/calendar/ChangeLog @@ -18,3 +18,4 @@ 0.16: Add menu to fast open settings to edit holidays Display Widgets in menus 0.17: Load holidays before events so the latter is not overpainted +0.18: Minor code improvements diff --git a/apps/calendar/calendar.js b/apps/calendar/calendar.js index 5d7cae240..e140ff576 100644 --- a/apps/calendar/calendar.js +++ b/apps/calendar/calendar.js @@ -33,7 +33,6 @@ const timeutils = require("time_utils"); let startOnSun = ((require("Storage").readJSON("setting.json", true) || {}).firstDayOfWeek || 0) === 0; let events; const dowLbls = function() { - const locale = require('locale').name; const days = startOnSun ? [0, 1, 2, 3, 4, 5, 6] : [1, 2, 3, 4, 5, 6, 0]; const d = new Date(); return days.map(i => { @@ -123,7 +122,6 @@ const calcDays = (month, monthMaxDayMap, dowNorm) => { const days = []; let nextMonthDay = 1; let thisMonthDay = 51; - const month2 = month; let prevMonthDay = monthMaxDayMap[month > 0 ? month - 1 : 11] - dowNorm + 1; for (let i = 0; i < maxDay; i++) { diff --git a/apps/calendar/metadata.json b/apps/calendar/metadata.json index 895f8f7aa..468bceabb 100644 --- a/apps/calendar/metadata.json +++ b/apps/calendar/metadata.json @@ -1,7 +1,7 @@ { "id": "calendar", "name": "Calendar", - "version": "0.17", + "version": "0.18", "description": "Monthly calendar, displays holidays uploaded from the web interface and scheduled events.", "icon": "calendar.png", "screenshots": [{"url":"screenshot_calendar.png"}], diff --git a/apps/calendar/settings.js b/apps/calendar/settings.js index 50beed8c0..051826646 100644 --- a/apps/calendar/settings.js +++ b/apps/calendar/settings.js @@ -27,7 +27,7 @@ const editdate = (i) => { const holiday = holidays[i]; const date = new Date(holiday.date); - const dateStr = require("locale").date(date, 1); + //const dateStr = require("locale").date(date, 1); const menu = { "": { "title" : holiday.name}, "< Back": () => { diff --git a/apps/carcrazy/app.js b/apps/carcrazy/app.js index 2bb9932a7..2fdfc67e7 100644 --- a/apps/carcrazy/app.js +++ b/apps/carcrazy/app.js @@ -166,17 +166,17 @@ var playerCarRightX; var playerCarFrontY; var playerCarFrontY; -var playerCarBackY; +//var playerCarBackY; var playerCarLeftX; var playerCarRightX; var enemyCarFrontY; -var enemyCarBackY; +//var enemyCarBackY; var enemyCarLeftX; var enemyCarRightX; var enemyCarFrontY2; -var enemyCarBackY2; +//var enemyCarBackY2; var enemyCarLeftX2; var enemyCarRightX2; @@ -237,17 +237,17 @@ function draw(){ } playerCarFrontY = playerCarCenterY-carHeight/2; - playerCarBackY = playerCarCenterY+carHeight/2; + //playerCarBackY = playerCarCenterY+carHeight/2; playerCarLeftX = playerCarCenterX-carWidth/2; playerCarRightX = playerCarCenterX+carWidth/2; enemyCarFrontY = enemyPositonCenterY+carHeight/2; - enemyCarBackY = enemyPositonCenterY-carHeight/2; + //enemyCarBackY = enemyPositonCenterY-carHeight/2; enemyCarLeftX = enemyPositonCenterX-carWidth/2; enemyCarRightX = enemyPositonCenterX+carWidth/2; enemyCarFrontY2 = enemyPositonCenterY2+carHeight/2; - enemyCarBackY2 = enemyPositonCenterY2-carHeight/2; + //enemyCarBackY2 = enemyPositonCenterY2-carHeight/2; enemyCarLeftX2 = enemyPositonCenterX2-carWidth/2; enemyCarRightX2 = enemyPositonCenterX2+carWidth/2; diff --git a/apps/cards/ChangeLog b/apps/cards/ChangeLog index 24c1bf8ff..e7e13b8e7 100644 --- a/apps/cards/ChangeLog +++ b/apps/cards/ChangeLog @@ -1,2 +1,4 @@ 0.01: Simple app to display loyalty cards 0.02: Hiding widgets while showing the code +0.03: Added option to use max brightness when showing code +0.04: Minor code improvements diff --git a/apps/cards/app.js b/apps/cards/app.js index 33b4c9e15..c0bacc918 100644 --- a/apps/cards/app.js +++ b/apps/cards/app.js @@ -14,6 +14,14 @@ Bangle.loadWidgets(); Bangle.drawWidgets(); +// get brightness +let brightness; + +function loadBrightness() { + const getBrightness = require('Storage').readJSON("setting.json", 1) || {}; + brightness = getBrightness.brightness || 0.1; +} + //may make it configurable in the future const WHITE=-1 const BLACK=0 @@ -21,10 +29,10 @@ const BLACK=0 const Locale = require("locale"); const widget_utils = require('widget_utils'); -var fontSmall = "6x8"; +//var fontSmall = "6x8"; var fontMedium = g.getFonts().includes("6x15")?"6x15":"6x8:2"; var fontBig = g.getFonts().includes("12x20")?"12x20":"6x8:2"; -var fontLarge = g.getFonts().includes("6x15")?"6x15:2":"6x8:4"; +//var fontLarge = g.getFonts().includes("6x15")?"6x15:2":"6x8:4"; var CARDS = require("Storage").readJSON("android.cards.json",true)||[]; var settings = require("Storage").readJSON("cards.settings.json",true)||{}; @@ -89,6 +97,10 @@ function printLinearCode(binary) { } function showCode(card) { + // set to full bright when the setting is true + if(settings.fullBrightness) { + Bangle.setLCDBrightness(1); + } widget_utils.hide(); E.showScroller(); // keeping it on rising edge would come back twice.. @@ -129,6 +141,10 @@ function showCode(card) { } function showCard(card) { + // reset brightness to old value after maxing it out + if(settings.fullBrightness) { + Bangle.setLCDBrightness(brightness); + } var lines = []; var bodyFont = fontBig; if(!card) return; @@ -136,8 +152,6 @@ function showCard(card) { //var lines = []; if (card.name) lines = g.wrapString(card.name, g.getWidth()-10); var titleCnt = lines.length; - var start = getDate(card.expiration); - var includeDay = true; lines = lines.concat("", /*LANG*/"View code"); var valueLine = lines.length - 1; if (card.expiration) @@ -208,4 +222,7 @@ function showList() { back : () => load() }); } +if(settings.fullBrightness) { + loadBrightness(); +} showList(); diff --git a/apps/cards/metadata.json b/apps/cards/metadata.json index 810741d5f..4bc3c9ae1 100644 --- a/apps/cards/metadata.json +++ b/apps/cards/metadata.json @@ -1,7 +1,7 @@ { "id": "cards", "name": "Cards", - "version": "0.02", + "version": "0.04", "description": "Display loyalty cards", "icon": "app.png", "screenshots": [{"url":"screenshot_cards_overview.png"}, {"url":"screenshot_cards_card1.png"}, {"url":"screenshot_cards_card2.png"}, {"url":"screenshot_cards_barcode.png"}, {"url":"screenshot_cards_qrcode.png"}], diff --git a/apps/cards/settings.js b/apps/cards/settings.js index db0ab56de..451b02204 100644 --- a/apps/cards/settings.js +++ b/apps/cards/settings.js @@ -14,6 +14,13 @@ updateSettings(); } }, + /*LANG*/"Full Brightness" : { + value : !!settings.fullBrightness, + onchange: v => { + settings.fullBrightness = v; + updateSettings(); + } + } }; E.showMenu(mainmenu); }) diff --git a/apps/chimer/ChangeLog b/apps/chimer/ChangeLog index 6c6f5312e..7af6c18ea 100644 --- a/apps/chimer/ChangeLog +++ b/apps/chimer/ChangeLog @@ -2,3 +2,4 @@ 0.02: Fixed some sleep bugs. Added a sleep mode toggle 0.03: Reduce busy-loop and code 0.04: Separate buzz-time and sleep-time +0.05: Minor code improvements diff --git a/apps/chimer/metadata.json b/apps/chimer/metadata.json index cfa0da00f..9d2d0a698 100644 --- a/apps/chimer/metadata.json +++ b/apps/chimer/metadata.json @@ -1,7 +1,7 @@ { "id": "chimer", "name": "Chimer", - "version": "0.04", + "version": "0.05", "description": "A fork of Hour Chime that adds extra features such as: \n - Buzz or beep on every 60, 30 or 15 minutes. \n - Repeat Chime up to 3 times \n - Set hours to disable chime", "icon": "widget.png", "type": "widget", diff --git a/apps/chimer/widget.js b/apps/chimer/widget.js index 3b7de9d7a..d27ecd78f 100644 --- a/apps/chimer/widget.js +++ b/apps/chimer/widget.js @@ -53,9 +53,7 @@ function check() { const now = new Date(), h = now.getHours(), - m = now.getMinutes(), - s = now.getSeconds(), - ms = now.getMilliseconds(); + m = now.getMinutes(); if (settings.sleep && ( h > settings.end || (h >= settings.end && m !== 0) || diff --git a/apps/chrono/ChangeLog b/apps/chrono/ChangeLog index 5560f00bc..7727f3cc4 100644 --- a/apps/chrono/ChangeLog +++ b/apps/chrono/ChangeLog @@ -1 +1,2 @@ 0.01: New App! +0.02: Minor code improvements diff --git a/apps/chrono/chrono.js b/apps/chrono/chrono.js index cd50b8a22..5b9e6eda9 100644 --- a/apps/chrono/chrono.js +++ b/apps/chrono/chrono.js @@ -69,5 +69,5 @@ Bangle.on('touch', function (button) { started = !started; }); -var interval = setInterval(countDown, 1000); +setInterval(countDown, 1000); drawInterface(); \ No newline at end of file diff --git a/apps/chrono/metadata.json b/apps/chrono/metadata.json index 59fc1dbeb..aa8a68b20 100644 --- a/apps/chrono/metadata.json +++ b/apps/chrono/metadata.json @@ -2,7 +2,7 @@ "id": "chrono", "name": "Chrono", "shortName": "Chrono", - "version": "0.01", + "version": "0.02", "description": "Single click BTN1 to add 5 minutes. Single click BTN2 to add 30 seconds. Single click BTN3 to add 5 seconds. Tap to pause or play to timer. Double click BTN1 to reset. When timer finishes the watch vibrates.", "icon": "chrono.png", "tags": "tool", diff --git a/apps/circlesclock/ChangeLog b/apps/circlesclock/ChangeLog index 9838ae409..4e10bfe49 100644 --- a/apps/circlesclock/ChangeLog +++ b/apps/circlesclock/ChangeLog @@ -42,3 +42,4 @@ 0.23: Setting circles colours per clkinfo and not position 0.24: Using suggested color from clock_info if set as default and available 0.25: Use clock_info module as an app +0.26: Minor code improvements diff --git a/apps/circlesclock/app.js b/apps/circlesclock/app.js index 6f76ff013..9be308bb3 100644 --- a/apps/circlesclock/app.js +++ b/apps/circlesclock/app.js @@ -11,7 +11,6 @@ Graphics.prototype.setFontRobotoRegular21 = function(scale) { }; { -let clock_info = require("clock_info"); let locale = require("locale"); let storage = require("Storage"); @@ -26,7 +25,7 @@ const showWidgets = settings.showWidgets || false; const circleCount = settings.circleCount || 3; const showBigWeather = settings.showBigWeather || false; -let now = Math.round(new Date().getTime() / 1000); +//let now = Math.round(new Date().getTime() / 1000); // layout values: let colorFg = g.theme.dark ? '#fff' : '#000'; @@ -87,7 +86,7 @@ let draw = function() { g.setFontAlign(-1, -1); g.drawString(locale.time(new Date(), 1), 2, h1 + 6); } - now = Math.round(new Date().getTime() / 1000); + //now = Math.round(new Date().getTime() / 1000); // date & dow g.setFontRobotoRegular21(); @@ -171,6 +170,7 @@ let getCircleIconColor = function(index, color, percent) { } } +/* let drawEmpty = function(img, w, color) { drawGauge(w, h3, 0, color); drawInnerCircleAndTriangle(w); @@ -179,6 +179,7 @@ let drawEmpty = function(img, w, color) { g.setColor(getGradientColor(color, 0)) .drawImage(img, w - iconOffset, h3 + radiusOuter - iconOffset, {scale: 16/24}); } +*/ let drawCircle = function(index, item, data, clkmenu) { var w = circlePosX[index-1]; diff --git a/apps/circlesclock/metadata.json b/apps/circlesclock/metadata.json index f96a7872c..713b237ac 100644 --- a/apps/circlesclock/metadata.json +++ b/apps/circlesclock/metadata.json @@ -1,7 +1,7 @@ { "id": "circlesclock", "name": "Circles clock", "shortName":"Circles clock", - "version":"0.25", + "version": "0.26", "description": "A clock with three or four circles for different data at the bottom in a probably familiar style", "icon": "app.png", "screenshots": [{"url":"screenshot-dark.png"}, {"url":"screenshot-light.png"}, {"url":"screenshot-dark-4.png"}, {"url":"screenshot-light-4.png"}], diff --git a/apps/circlesclock/settings.js b/apps/circlesclock/settings.js index ae090c1d7..714b48f2e 100644 --- a/apps/circlesclock/settings.js +++ b/apps/circlesclock/settings.js @@ -81,7 +81,7 @@ }; for(var circleId=1; circleId<=4; ++circleId) { const circleName = "circle" + circleId; - const colorKey = circleName + "color"; + //const colorKey = circleName + "color"; const colorizeIconKey = circleName + "colorizeIcon"; menu[/*LANG*/'circle ' + circleId] = { value: settings[colorizeIconKey] || false, diff --git a/apps/cliclockJS2Enhanced/ChangeLog b/apps/cliclockJS2Enhanced/ChangeLog index f4d146d5f..7e0b4fd69 100644 --- a/apps/cliclockJS2Enhanced/ChangeLog +++ b/apps/cliclockJS2Enhanced/ChangeLog @@ -1,3 +1,4 @@ 0.01: Submitted to App Loader 0.02: Removed unneded code, added HID controlls thanks to t0m1o1 for his code :p 0.03: Load widgets after Bangle.setUI to ensure widgets know if they're on a clock or not (fix #970) +0.04: Minor code improvements diff --git a/apps/cliclockJS2Enhanced/app.js b/apps/cliclockJS2Enhanced/app.js index b6172b497..b99ed2542 100644 --- a/apps/cliclockJS2Enhanced/app.js +++ b/apps/cliclockJS2Enhanced/app.js @@ -148,7 +148,7 @@ g.clear(); Bangle.on('lcdPower',function(on) { if (on) drawAll(); }); -var click = setInterval(updateTime, 1000); +/*var click =*/ setInterval(updateTime, 1000); // Show launcher when button pressed Bangle.setUI("clockupdown", btn=>{ drawAll(); // why do we redraw here?? diff --git a/apps/cliclockJS2Enhanced/metadata.json b/apps/cliclockJS2Enhanced/metadata.json index f428650a7..dcbf5da63 100644 --- a/apps/cliclockJS2Enhanced/metadata.json +++ b/apps/cliclockJS2Enhanced/metadata.json @@ -2,7 +2,7 @@ "id": "cliclockJS2Enhanced", "name": "Commandline-Clock JS2 Enhanced", "shortName": "CLI-Clock JS2", - "version": "0.03", + "version": "0.04", "description": "Simple CLI-Styled Clock with enhancements. Modes that are hard to use and unneded are removed (BPM, battery info, memory ect) credit to hughbarney for the original code and design. Also added HID media controlls, just swipe on the clock face to controll the media! Gadgetbride support coming soon(hopefully) Thanks to t0m1o1 for media controls!", "icon": "app.png", "screenshots": [{"url":"screengrab.png"}], diff --git a/apps/clicompleteclk/ChangeLog b/apps/clicompleteclk/ChangeLog index 50c84593e..436549f8a 100644 --- a/apps/clicompleteclk/ChangeLog +++ b/apps/clicompleteclk/ChangeLog @@ -1,3 +1,4 @@ 0.01: New clock! 0.02: Load steps from Health Tracking app (if installed) 0.03: ... +0.04: Minor code improvements diff --git a/apps/clicompleteclk/app.js b/apps/clicompleteclk/app.js index a39b37e58..7472907e1 100644 --- a/apps/clicompleteclk/app.js +++ b/apps/clicompleteclk/app.js @@ -17,8 +17,8 @@ const textColorRed = g.theme.dark ? "#FF0000" : "#FF0000"; let hrtValue; let hrtValueIsOld = false; -let localTempValue; -let weatherTempString; +//let localTempValue; +//let weatherTempString; let lastHeartRateRowIndex; let lastStepsRowIndex; let i = 2; @@ -114,7 +114,7 @@ function drawWeather() { const currentWeather = weatherJson.weather; const weatherTempValue = locale.temp(currentWeather.temp-273.15); - weatherTempString = weatherTempValue; + //weatherTempString = weatherTempValue; writeLineTopic("WTHR", i); writeLine(currentWeather.txt,i); i++; diff --git a/apps/clicompleteclk/metadata.json b/apps/clicompleteclk/metadata.json index 8753c3c37..4d4f7e5ef 100644 --- a/apps/clicompleteclk/metadata.json +++ b/apps/clicompleteclk/metadata.json @@ -2,7 +2,7 @@ "id": "clicompleteclk", "name": "CLI complete clock", "shortName":"CLI cmplt clock", - "version":"0.03", + "version": "0.04", "description": "Command line styled clock with lots of information", "icon": "app.png", "allow_emulator": true, diff --git a/apps/cliock/ChangeLog b/apps/cliock/ChangeLog index 68249b622..83bd2eb39 100644 --- a/apps/cliock/ChangeLog +++ b/apps/cliock/ChangeLog @@ -8,3 +8,4 @@ 0.14: Fix BTN1 (fix #853) Add light/dark theme support 0.15: Load widgets after Bangle.setUI to ensure widgets know if they're on a clock or not (fix #970) +0.16: Minor code improvements diff --git a/apps/cliock/app.js b/apps/cliock/app.js index d9271bf15..c1b3a3106 100644 --- a/apps/cliock/app.js +++ b/apps/cliock/app.js @@ -186,7 +186,7 @@ g.clear(); Bangle.on('lcdPower',function(on) { if (on) drawAll(); }); -var click = setInterval(updateTime, 1000); +/*var click =*/ setInterval(updateTime, 1000); // Show launcher when button pressed Bangle.setUI("clockupdown", btn=>{ if (btn<0) changeInfoMode(); diff --git a/apps/cliock/metadata.json b/apps/cliock/metadata.json index 2df48892e..ff50e3869 100644 --- a/apps/cliock/metadata.json +++ b/apps/cliock/metadata.json @@ -2,7 +2,7 @@ "id": "cliock", "name": "Commandline-Clock", "shortName": "CLI-Clock", - "version": "0.15", + "version": "0.16", "description": "Simple CLI-Styled Clock", "icon": "app.png", "screenshots": [{"url":"screenshot_cli.png"}], diff --git a/apps/clkinfosunrise/ChangeLog b/apps/clkinfosunrise/ChangeLog index 86e7a7fa8..686d2ffb3 100644 --- a/apps/clkinfosunrise/ChangeLog +++ b/apps/clkinfosunrise/ChangeLog @@ -2,3 +2,4 @@ 0.02: Use 'modules/suncalc.js' to avoid it being copied 8 times for different apps Add a 'time' clockinfo that also displays a percentage of day left 0.03: Change 3rd mode to show the time to next sunrise/sunset time (not actual time) +0.04: Minor code improvements diff --git a/apps/clkinfosunrise/clkinfo.js b/apps/clkinfosunrise/clkinfo.js index 22c507f34..f8ea7f4c7 100644 --- a/apps/clkinfosunrise/clkinfo.js +++ b/apps/clkinfosunrise/clkinfo.js @@ -49,7 +49,7 @@ let day = true; let d = date.getTime(); let dayLength = sunset.getTime()-sunrise.getTime(); - let timeUntil, timeTotal; + let timeTotal; if (d < sunrise.getTime()) { day = false; // early morning timePast = sunrise.getTime()-d; diff --git a/apps/clkinfosunrise/metadata.json b/apps/clkinfosunrise/metadata.json index 7bcbb289b..dfba179b1 100644 --- a/apps/clkinfosunrise/metadata.json +++ b/apps/clkinfosunrise/metadata.json @@ -1,6 +1,6 @@ { "id": "clkinfosunrise", "name": "Sunrise Clockinfo", - "version":"0.03", + "version": "0.04", "description": "For clocks that display 'clockinfo' (messages that can be cycled through using the clock_info module) this displays sunrise and sunset based on the location from the 'My Location' app", "icon": "app.png", "type": "clkinfo", diff --git a/apps/color_catalog/ChangeLog b/apps/color_catalog/ChangeLog index b79d0c85b..1ae723feb 100644 --- a/apps/color_catalog/ChangeLog +++ b/apps/color_catalog/ChangeLog @@ -1 +1,2 @@ 0.01: 1st ver,RGB565 and RGB888 colors in a common UI/UX +0.02: Minor code improvements diff --git a/apps/color_catalog/app.js b/apps/color_catalog/app.js index 58951d1c6..d5014bcaa 100644 --- a/apps/color_catalog/app.js +++ b/apps/color_catalog/app.js @@ -11,7 +11,7 @@ var v_model=process.env.BOARD; console.log("device="+v_model); var x_max_screen=g.getWidth();//240; - var y_max_screen=g.getHeight(); //240; + //var y_max_screen=g.getHeight(); //240; var y_wg_bottom=g.getHeight()-25; var y_wg_top=25; if (v_model=='BANGLEJS') { @@ -20,7 +20,7 @@ var v_model=process.env.BOARD; var y_btn2=124; //harcoded for bangle.js cuz it is not the half of } else x_max_usable_area=240; - var contador=1; + //var contador=1; var cont_items=0; var cont_row=0; var v_boxes_row=4; @@ -31,7 +31,7 @@ var v_model=process.env.BOARD; var v_font1size=11; var v_fontsize=13; var v_color_b_area='#111111';//black - var v_color_b_area2=0x5AEB;//Dark + //var v_color_b_area2=0x5AEB;//Dark var v_color_text='#FB0E01'; var v_color_statictxt='#e56e06'; //orange RGB format rrggbb //RGB565 requires only 16 (5+6+5) bits/2 bytes diff --git a/apps/color_catalog/metadata.json b/apps/color_catalog/metadata.json index 3146a146f..0669e6b0b 100644 --- a/apps/color_catalog/metadata.json +++ b/apps/color_catalog/metadata.json @@ -2,7 +2,7 @@ "id": "color_catalog", "name": "Colors Catalog", "shortName": "Colors Catalog", - "version": "0.01", + "version": "0.02", "description": "Displays RGB565 and RGB888 colors, its name and code in screen.", "icon": "app.png", "tags": "Color,input,buttons,touch,UI", diff --git a/apps/colorful_clock/ChangeLog b/apps/colorful_clock/ChangeLog index 54ee389e3..e38a7c5a5 100644 --- a/apps/colorful_clock/ChangeLog +++ b/apps/colorful_clock/ChangeLog @@ -1,3 +1,4 @@ ... 0.03: First update with ChangeLog Added 0.04: Tell clock widgets to hide. +0.05: Minor code improvements diff --git a/apps/colorful_clock/app.js b/apps/colorful_clock/app.js index ba6272e9b..b58892311 100644 --- a/apps/colorful_clock/app.js +++ b/apps/colorful_clock/app.js @@ -120,7 +120,6 @@ let twoPi = 2*Math.PI; let Pi = Math.PI; - let halfPi = Math.PI/2; let sin = Math.sin, cos = Math.cos; diff --git a/apps/colorful_clock/metadata.json b/apps/colorful_clock/metadata.json index 237acf81c..9e77e12c5 100644 --- a/apps/colorful_clock/metadata.json +++ b/apps/colorful_clock/metadata.json @@ -1,7 +1,7 @@ { "id": "colorful_clock", "name": "Colorful Analog Clock", "shortName":"Colorful Clock", - "version":"0.04", + "version": "0.05", "description": "a colorful analog clock", "icon": "app-icon.png", "type": "clock", diff --git a/apps/configurable_clock/ChangeLog b/apps/configurable_clock/ChangeLog index 9d55c1a91..59708756a 100644 --- a/apps/configurable_clock/ChangeLog +++ b/apps/configurable_clock/ChangeLog @@ -1,3 +1,4 @@ ... 0.02: First update with ChangeLog Added 0.03: Tell clock widgets to hide. +0.04: Minor code improvements diff --git a/apps/configurable_clock/app.js b/apps/configurable_clock/app.js index 5c3bf3333..4192954ae 100644 --- a/apps/configurable_clock/app.js +++ b/apps/configurable_clock/app.js @@ -748,7 +748,6 @@ let twoPi = 2*Math.PI, deg2rad = Math.PI/180; let Pi = Math.PI; - let halfPi = Math.PI/2; let sin = Math.sin, cos = Math.cos; diff --git a/apps/configurable_clock/metadata.json b/apps/configurable_clock/metadata.json index 687a5b212..246a5dc21 100644 --- a/apps/configurable_clock/metadata.json +++ b/apps/configurable_clock/metadata.json @@ -1,7 +1,7 @@ { "id": "configurable_clock", "name": "Configurable Analog Clock", "shortName":"Configurable Clock", - "version":"0.03", + "version": "0.04", "description": "an analog clock with several kinds of faces, hands and colors to choose from", "icon": "app-icon.png", "type": "clock", diff --git a/apps/contacts/ChangeLog b/apps/contacts/ChangeLog index 5560f00bc..7727f3cc4 100644 --- a/apps/contacts/ChangeLog +++ b/apps/contacts/ChangeLog @@ -1 +1,2 @@ 0.01: New App! +0.02: Minor code improvements diff --git a/apps/contacts/contacts.app.js b/apps/contacts/contacts.app.js index 85eef625b..a16bd1917 100644 --- a/apps/contacts/contacts.app.js +++ b/apps/contacts/contacts.app.js @@ -2,8 +2,8 @@ var Layout = require("Layout"); -const W = g.getWidth(); -const H = g.getHeight(); +//const W = g.getWidth(); +//const H = g.getHeight(); var wp = require('Storage').readJSON("contacts.json", true) || []; // Use this with corrupted contacts @@ -131,7 +131,6 @@ function removeCard() { } function askPosition(callback) { - let full = ""; showNumpad("dddDDDddd", "", function() { callback(key, ""); }); diff --git a/apps/contacts/metadata.json b/apps/contacts/metadata.json index 1228fd0bf..cbd3bf019 100644 --- a/apps/contacts/metadata.json +++ b/apps/contacts/metadata.json @@ -1,6 +1,6 @@ { "id": "contacts", "name": "Contacts", - "version":"0.01", + "version": "0.02", "description": "Provides means of storing user contacts, viewing/editing them on device and from the App loader", "icon": "app.png", "tags": "tool", diff --git a/apps/contourclock/ChangeLog b/apps/contourclock/ChangeLog index 2fa26b89a..6078b4ff3 100644 --- a/apps/contourclock/ChangeLog +++ b/apps/contourclock/ChangeLog @@ -11,3 +11,4 @@ 0.29: Fixed a bug that would leave old font files in storage. 0.30: Added options to show widgets and date on twist and tap. New fonts. 0.31: Bugfix, no more freeze. +0.32: Minor code improvements diff --git a/apps/contourclock/app.js b/apps/contourclock/app.js index 1a510f014..55d29a3dd 100644 --- a/apps/contourclock/app.js +++ b/apps/contourclock/app.js @@ -2,8 +2,8 @@ let drawTimeout; let extrasTimeout; let onLock; - let onTap; - let onTwist; + //let onTap; + //let onTwist; let settings = require('Storage').readJSON("contourclock.json", true) || {}; if (settings.fontIndex == undefined) { settings.fontIndex = 0; @@ -60,7 +60,6 @@ drawTimeout = undefined; draw(); }, 60000 - (Date.now() % 60000)); - let date = new Date(); g.reset(); if (extrasShown) drawExtras(); else hideExtras(); diff --git a/apps/contourclock/metadata.json b/apps/contourclock/metadata.json index 5c97ce933..61c0f5643 100644 --- a/apps/contourclock/metadata.json +++ b/apps/contourclock/metadata.json @@ -1,7 +1,7 @@ { "id": "contourclock", "name": "Contour Clock", "shortName" : "Contour Clock", - "version":"0.31", + "version": "0.32", "icon": "app.png", "readme": "README.md", "description": "A Minimalist clockface with large Digits.", diff --git a/apps/coretemp/ChangeLog b/apps/coretemp/ChangeLog index 7386bbc35..30c775a49 100644 --- a/apps/coretemp/ChangeLog +++ b/apps/coretemp/ChangeLog @@ -2,3 +2,4 @@ 0.02: Cleanup interface and add settings, widget, add skin temp reporting. 0.03: Move code for recording to this app 0.04: Use default Bangle formatter for booleans +0.05: Minor code improvements diff --git a/apps/coretemp/coretemp.js b/apps/coretemp/coretemp.js index 7cbbe3577..0337891e1 100644 --- a/apps/coretemp/coretemp.js +++ b/apps/coretemp/coretemp.js @@ -1,6 +1,6 @@ // Simply listen for core events and show data -var btm = g.getHeight() - 1; +//var btm = g.getHeight() - 1; var px = g.getWidth() / 2; // Dark or light logo diff --git a/apps/coretemp/metadata.json b/apps/coretemp/metadata.json index 87cb42722..2b7de0bf0 100644 --- a/apps/coretemp/metadata.json +++ b/apps/coretemp/metadata.json @@ -1,7 +1,7 @@ { "id": "coretemp", "name": "CoreTemp", - "version": "0.04", + "version": "0.05", "description": "Display CoreTemp device sensor data", "icon": "coretemp.png", "type": "app", diff --git a/apps/cscsensor/ChangeLog b/apps/cscsensor/ChangeLog index 5264e8d42..c01b35503 100644 --- a/apps/cscsensor/ChangeLog +++ b/apps/cscsensor/ChangeLog @@ -7,3 +7,4 @@ Improve connection code 0.07: Make Bangle.js 2 compatible 0.08: Convert Yes/No On/Off in settings to checkboxes +0.09: Automatically reconnect on error diff --git a/apps/cscsensor/cscsensor.app.js b/apps/cscsensor/cscsensor.app.js index 4ebe7d57e..1ad7a9e98 100644 --- a/apps/cscsensor/cscsensor.app.js +++ b/apps/cscsensor/cscsensor.app.js @@ -226,7 +226,7 @@ function getSensorBatteryLevel(gatt) { function connection_setup() { mySensor.screenInit = true; E.showMessage("Scanning for CSC sensor..."); - NRF.requestDevice({ filters: [{services:["1816"]}]}).then(function(d) { + NRF.requestDevice({ filters: [{services:["1816"]}], maxInterval: 100}).then(function(d) { device = d; E.showMessage("Found device"); return device.gatt.connect(); @@ -249,6 +249,7 @@ function connection_setup() { }).catch(function(e) { E.showMessage(e.toString(), "ERROR"); console.log(e); + setTimeout(connection_setup, 1000); }); } diff --git a/apps/cscsensor/metadata.json b/apps/cscsensor/metadata.json index d7c3add53..5d70251da 100644 --- a/apps/cscsensor/metadata.json +++ b/apps/cscsensor/metadata.json @@ -2,7 +2,7 @@ "id": "cscsensor", "name": "Cycling speed sensor", "shortName": "CSCSensor", - "version": "0.08", + "version": "0.09", "description": "Read BLE enabled cycling speed and cadence sensor and display readings on watch", "icon": "icons8-cycling-48.png", "tags": "outdoors,exercise,ble,bluetooth,bike,cycle,bicycle", diff --git a/apps/cycling/ChangeLog b/apps/cycling/ChangeLog index ec66c5568..b7e50d38d 100644 --- a/apps/cycling/ChangeLog +++ b/apps/cycling/ChangeLog @@ -1 +1,2 @@ 0.01: Initial version +0.02: Minor code improvements diff --git a/apps/cycling/blecsc-emu.js b/apps/cycling/blecsc-emu.js index ca5058545..1a313e08a 100644 --- a/apps/cycling/blecsc-emu.js +++ b/apps/cycling/blecsc-emu.js @@ -1,5 +1,5 @@ // UUID of the Bluetooth CSC Service -const SERVICE_UUID = "1816"; +//const SERVICE_UUID = "1816"; // UUID of the CSC measurement characteristic const MEASUREMENT_UUID = "2a5b"; diff --git a/apps/cycling/metadata.json b/apps/cycling/metadata.json index caf93eda3..95c0ca068 100644 --- a/apps/cycling/metadata.json +++ b/apps/cycling/metadata.json @@ -2,7 +2,7 @@ "id": "cycling", "name": "Bangle Cycling", "shortName": "Cycling", - "version": "0.01", + "version": "0.02", "description": "Display live values from a BLE CSC sensor", "icon": "icons8-cycling-48.png", "tags": "outdoors,exercise,ble,bluetooth", diff --git a/apps/daisy/ChangeLog b/apps/daisy/ChangeLog index 751164c07..e9568acfc 100644 --- a/apps/daisy/ChangeLog +++ b/apps/daisy/ChangeLog @@ -8,3 +8,4 @@ 0.08: fix idle timer always getting set to true 0.09: Use 'modules/suncalc.js' to avoid it being copied 8 times for different apps 0.10: Use widget_utils. +0.11: Minor code improvements diff --git a/apps/daisy/app.js b/apps/daisy/app.js index 3b3975105..cba3e762d 100644 --- a/apps/daisy/app.js +++ b/apps/daisy/app.js @@ -1,6 +1,4 @@ var SunCalc = require("suncalc"); // from modules folder -const storage = require('Storage'); -const locale = require("locale"); const widget_utils = require('widget_utils'); const SETTINGS_FILE = "daisy.json"; const LOCATION_FILE = "mylocation.json"; @@ -196,9 +194,9 @@ function draw() { function drawClock() { var date = new Date(); - var timeStr = require("locale").time(date,1); + //var timeStr = require("locale").time(date,1); var da = date.toString().split(" "); - var time = da[4].substr(0,5); + //var time = da[4].substr(0,5); var hh = da[4].substr(0,2); var mm = da[4].substr(3,2); var steps = getSteps(); diff --git a/apps/daisy/metadata.json b/apps/daisy/metadata.json index 471f8e56f..a292ef777 100644 --- a/apps/daisy/metadata.json +++ b/apps/daisy/metadata.json @@ -1,6 +1,6 @@ { "id": "daisy", "name": "Daisy", - "version":"0.10", + "version": "0.11", "dependencies": {"mylocation":"app"}, "description": "A beautiful digital clock with large ring guage, idle timer and a cyclic information line that includes, day, date, steps, battery, sunrise and sunset times", "icon": "app.png", diff --git a/apps/dane_tcr/ChangeLog b/apps/dane_tcr/ChangeLog index 69424b1f4..05ef79052 100644 --- a/apps/dane_tcr/ChangeLog +++ b/apps/dane_tcr/ChangeLog @@ -6,3 +6,4 @@ 0.06: remove app image as it is unused 0.07: Bump version number for change to apps.json causing 404 on upload 0.08: Use default Bangle formatter for booleans +0.09: Minor code improvements diff --git a/apps/dane_tcr/app.js b/apps/dane_tcr/app.js index ce75c55cb..ce8c98025 100644 --- a/apps/dane_tcr/app.js +++ b/apps/dane_tcr/app.js @@ -1,11 +1,6 @@ var d = require("dane_arwes"); var Arwes = d.default(); -const yOffset = 23; -const width = g.getWidth(); -const height = g.getHeight(); -const xyCenter = width / 2 + 4; - const Storage = require("Storage"); const filename = 'dane_tcr.json'; let settings = Storage.readJSON(filename,1) || { diff --git a/apps/dane_tcr/metadata.json b/apps/dane_tcr/metadata.json index 5527c846d..c6a649f0e 100644 --- a/apps/dane_tcr/metadata.json +++ b/apps/dane_tcr/metadata.json @@ -2,7 +2,7 @@ "id": "dane_tcr", "name": "DANE Touch Launcher", "shortName": "DANE Toucher", - "version": "0.08", + "version": "0.09", "description": "Touch enable left to right launcher in the style of the DANE Watchface", "icon": "app.png", "type": "launch", diff --git a/apps/devstopwatch/ChangeLog b/apps/devstopwatch/ChangeLog index 7e90e061e..c1a645cf8 100644 --- a/apps/devstopwatch/ChangeLog +++ b/apps/devstopwatch/ChangeLog @@ -5,4 +5,5 @@ realigned quick n dirty screen positions help adjusted to fit bangle1 & bangle2 screen-size with widgets fixed bangle2 colors for chrono and last lap highlight - added screen for bangle2 and a small README \ No newline at end of file + added screen for bangle2 and a small README +0.05: Minor code improvements diff --git a/apps/devstopwatch/app.js b/apps/devstopwatch/app.js index d2a4b1117..30424d19d 100644 --- a/apps/devstopwatch/app.js +++ b/apps/devstopwatch/app.js @@ -12,7 +12,7 @@ const FONT = '6x8'; const CHRONO = '/* C H R O N O */'; -var reset = false; +//var reset = false; var currentLap = ''; var chronoInterval; @@ -43,7 +43,7 @@ Bangle.setUI("clockupdown", btn=>{ function resetChrono() { state.laps = [EMPTY_H, EMPTY_H, EMPTY_LAP, EMPTY_LAP, EMPTY_LAP, EMPTY_LAP, EMPTY_LAP]; state.started = false; - reset = true; + //reset = true; state.currentLapIndex = 1; currentLap = ''; @@ -61,7 +61,7 @@ function chronometer() { state.whenStarted = rightNow; state.whenStartedTotal = rightNow; state.started = true; - reset = false; + //reset = false; } currentLap = calculateLap(state.whenStarted); @@ -123,7 +123,7 @@ function printChrono() { g.setColor(g.theme.fg); let suffix = ' '; if (state.currentLapIndex === i) { - let suffix = '*'; + let suffix = '*'; //TODO: Should `let` be removed here? if (process.env.HWVERSION==2) g.setColor("#0ee"); else g.setColor("#f70"); } diff --git a/apps/devstopwatch/metadata.json b/apps/devstopwatch/metadata.json index c4b6c7a67..f7d3e4f06 100644 --- a/apps/devstopwatch/metadata.json +++ b/apps/devstopwatch/metadata.json @@ -2,7 +2,7 @@ "id": "devstopwatch", "name": "Dev Stopwatch", "shortName": "Dev Stopwatch", - "version": "0.04", + "version": "0.05", "description": "Stopwatch with 5 laps supported (cyclically replaced)", "icon": "app.png", "tags": "stopwatch,chrono,timer,chronometer", diff --git a/apps/diceroll/ChangeLog b/apps/diceroll/ChangeLog index 89dff4011..284e78368 100644 --- a/apps/diceroll/ChangeLog +++ b/apps/diceroll/ChangeLog @@ -1 +1,2 @@ -0.01: App created \ No newline at end of file +0.01: App created +0.02: Minor code improvements diff --git a/apps/diceroll/app.js b/apps/diceroll/app.js index d514ce92f..61a3d9917 100644 --- a/apps/diceroll/app.js +++ b/apps/diceroll/app.js @@ -105,4 +105,4 @@ function main() { Bangle.setLCDPower(1); } -var interval = setInterval(main, 300); \ No newline at end of file +setInterval(main, 300); \ No newline at end of file diff --git a/apps/diceroll/metadata.json b/apps/diceroll/metadata.json index 81a2f8bfd..256ad8a80 100644 --- a/apps/diceroll/metadata.json +++ b/apps/diceroll/metadata.json @@ -2,7 +2,7 @@ "name": "Dice-n-Roll", "shortName":"Dice-n-Roll", "icon": "app.png", - "version":"0.01", + "version": "0.02", "description": "A dice app with a few different dice.", "screenshots": [{"url":"diceroll_screenshot.png"}], "tags": "game", diff --git a/apps/distortclk/ChangeLog b/apps/distortclk/ChangeLog index 4c7291526..11be002af 100644 --- a/apps/distortclk/ChangeLog +++ b/apps/distortclk/ChangeLog @@ -1,2 +1,3 @@ 0.01: New face! 0.02: Improved clock +0.03: Minor code improvements diff --git a/apps/distortclk/app.js b/apps/distortclk/app.js index a9fdd1ef2..715899fbb 100644 --- a/apps/distortclk/app.js +++ b/apps/distortclk/app.js @@ -26,7 +26,7 @@ function time() { var d = new Date(); var day = d.getDate(); var time = require("locale").time(d,1); - var date = require("locale").date(d); + //var date = require("locale").date(d); var mo = require("date_utils").month(d.getMonth()+1,0); g.setFontAlign(0,0); diff --git a/apps/distortclk/metadata.json b/apps/distortclk/metadata.json index 125dac590..cd1bf9d4d 100644 --- a/apps/distortclk/metadata.json +++ b/apps/distortclk/metadata.json @@ -2,7 +2,7 @@ "id": "distortclk", "name": "Distort Clock", "shortName":"Distort Clock", - "version": "0.02", + "version": "0.03", "description": "A clockface", "icon": "app.png", "type": "clock", diff --git a/apps/dotclock/ChangeLog b/apps/dotclock/ChangeLog index 563db87e7..cb2e8bd49 100644 --- a/apps/dotclock/ChangeLog +++ b/apps/dotclock/ChangeLog @@ -1,3 +1,4 @@ 0.01: Based on the Analog Clock app, minimal dot 0.02: Remove hardcoded hour buzz (you can install widchime if you miss it) 0.03: Use setUI, adjust for themes and different size screens +0.04: Minor code improvements diff --git a/apps/dotclock/clock-dot.js b/apps/dotclock/clock-dot.js index 66255d1b4..0127cd488 100644 --- a/apps/dotclock/clock-dot.js +++ b/apps/dotclock/clock-dot.js @@ -1,6 +1,5 @@ const big = g.getWidth()>200; const locale = require('locale'); -const p = Math.PI / 2; const pRad = Math.PI / 180; let timer = null; let currentDate = new Date(); diff --git a/apps/dotclock/metadata.json b/apps/dotclock/metadata.json index 396e63917..e8d7415fd 100644 --- a/apps/dotclock/metadata.json +++ b/apps/dotclock/metadata.json @@ -1,7 +1,7 @@ { "id": "dotclock", "name": "Dot Clock", - "version": "0.03", + "version": "0.04", "description": "A Minimal Dot Analog Clock", "icon": "clock-dot.png", "type": "clock", diff --git a/apps/doztime/ChangeLog b/apps/doztime/ChangeLog index c3701b6d8..03c1877b4 100644 --- a/apps/doztime/ChangeLog +++ b/apps/doztime/ChangeLog @@ -5,4 +5,4 @@ 0.05: extraneous comments and code removed display improved now supports Adjust Clock widget, if installed -0.06: minor code improvements +0.06: Minor code improvements \ No newline at end of file diff --git a/apps/doztime/app-bangle1.js b/apps/doztime/app-bangle1.js index 3042e9367..a176ef270 100644 --- a/apps/doztime/app-bangle1.js +++ b/apps/doztime/app-bangle1.js @@ -164,7 +164,7 @@ function drawTime() x = 10368*dt.getHours()+172.8*dt.getMinutes()+2.88*dt.getSeconds()+0.00288*dt.getMilliseconds(); let msg = "00000"+Math.floor(x).toString(12); - let time = msg.substr(-5,3)+"."+msg.substr(-2); + let time = msg.substr(-5,3)+"."+msg.substr(-2); //TODO: should `time` and `wait` have been defined outside the if block? let wait = 347*(1-(x%1)); timeDef = time6; } else { @@ -210,8 +210,8 @@ Bangle.loadWidgets(); Bangle.drawWidgets(); // Functions for weather mode - TODO -function drawWeather() {} -function modeWeather() {} +//function drawWeather() {} +//function modeWeather() {} // Start time on twist Bangle.on('twist', function() { diff --git a/apps/doztime/app-bangle2.js b/apps/doztime/app-bangle2.js index 8a315118f..603ac8904 100644 --- a/apps/doztime/app-bangle2.js +++ b/apps/doztime/app-bangle2.js @@ -125,7 +125,7 @@ function formatDate(res,dateFormat){ } function writeDozTime(text,def){ - let pts = def.pts; + //let pts = def.pts; let x=def.pt0[0]; let y=def.pt0[1]; g_t.clear(); @@ -141,7 +141,7 @@ function writeDozTime(text,def){ function writeDozDate(text,def,colour){ dateColour = colour; - let pts = def.pts; + //let pts = def.pts; let x=def.pt0[0]; let y=def.pt0[1]; g_d.clear(); @@ -174,7 +174,7 @@ function drawTime() x = 10368*dt.getHours()+172.8*dt.getMinutes()+2.88*dt.getSeconds()+0.00288*dt.getMilliseconds(); let msg = "00000"+Math.floor(x).toString(12); - let time = msg.substr(-5,3)+"."+msg.substr(-2); + let time = msg.substr(-5,3)+"."+msg.substr(-2); //TODO: should `time` and `wait` have been defined outside the if block? let wait = 347*(1-(x%1)); timeDef = time6; } else { diff --git a/apps/drinkcounter/ChangeLog b/apps/drinkcounter/ChangeLog index d8d174c4c..0541d11de 100644 --- a/apps/drinkcounter/ChangeLog +++ b/apps/drinkcounter/ChangeLog @@ -1,4 +1,5 @@ 0.10: Initial release - still work in progress 0.15: Added settings and calculations 0.20: Added status saving -0.25: Adopted for Bangle.js 1 - kind of \ No newline at end of file +0.25: Adopted for Bangle.js 1 - kind of +0.26: Minor code improvements diff --git a/apps/drinkcounter/app.js b/apps/drinkcounter/app.js index 323d9fb41..b231930d7 100644 --- a/apps/drinkcounter/app.js +++ b/apps/drinkcounter/app.js @@ -22,7 +22,7 @@ const maxDrinks = 2; // 3 drinks var firstDrinkTime = null; var firstDrinkTimeTime = null; -var confBeerSize; +//var confBeerSize; var confSex; var confWeight; var confWeightUnit; @@ -97,7 +97,7 @@ function loadMySettings() { function def (value, def) {return value !== undefined ? value : def;} var settings = require('Storage').readJSON(SETTINGSFILE, true) || {}; - confBeerSize = def(settings.beerSize, "0.3L"); + //confBeerSize = def(settings.beerSize, "0.3L"); confSex = def(settings.sex, "male"); confWeight = def(settings.weight, 80); confWeightUnit = def(settings.weightUnit, "Kilo"); diff --git a/apps/drinkcounter/metadata.json b/apps/drinkcounter/metadata.json index 2b8d7fe71..315a5845b 100644 --- a/apps/drinkcounter/metadata.json +++ b/apps/drinkcounter/metadata.json @@ -2,7 +2,7 @@ "id": "drinkcounter", "name": "Drink Counter", "shortName": "Drink Counter", - "version": "0.25", + "version": "0.26", "description": "Counts drinks you had for science. Calculates blood alcohol content (BAC)", "allow_emulator":true, "icon": "drinkcounter.png", diff --git a/apps/dtlaunch/ChangeLog b/apps/dtlaunch/ChangeLog index 6c096f45b..5cac5770e 100644 --- a/apps/dtlaunch/ChangeLog +++ b/apps/dtlaunch/ChangeLog @@ -29,3 +29,4 @@ immediately follows the correct theme. when moving pages. Add caching for faster startups. 0.23: Bangle 1: Fix issue with missing icons, added touch screen interactions 0.24: Add buzz-on-interaction setting +0.25: Minor code improvements diff --git a/apps/dtlaunch/app-b2.js b/apps/dtlaunch/app-b2.js index a3ddd2538..2108910fc 100644 --- a/apps/dtlaunch/app-b2.js +++ b/apps/dtlaunch/app-b2.js @@ -42,7 +42,7 @@ let Npages = Math.ceil(Napps/4); let maxPage = Npages-1; let selected = -1; - let oldselected = -1; + //let oldselected = -1; let page = 0; const XOFF = 24; const YOFF = 30; @@ -104,7 +104,7 @@ let swipeListenerDt = function(dirLeftRight, dirUpDown){ updateTimeoutToClock(); selected = -1; - oldselected=-1; + //oldselected=-1; if(settings.swipeExit && dirLeftRight==1) Bangle.showClock(); if (dirUpDown==-1||dirLeftRight==-1){ ++page; if (page>maxPage) page=0; diff --git a/apps/dtlaunch/metadata.json b/apps/dtlaunch/metadata.json index 5e25b61fb..bac0ed369 100644 --- a/apps/dtlaunch/metadata.json +++ b/apps/dtlaunch/metadata.json @@ -1,7 +1,7 @@ { "id": "dtlaunch", "name": "Desktop Launcher", - "version": "0.24", + "version": "0.25", "description": "Desktop style App Launcher with six (four for Bangle 2) apps per page - fast access if you have lots of apps installed.", "screenshots": [{"url":"shot1.png"},{"url":"shot2.png"},{"url":"shot3.png"}], "icon": "icon.png", diff --git a/apps/dwm-clock/ChangeLog b/apps/dwm-clock/ChangeLog index 5560f00bc..7727f3cc4 100644 --- a/apps/dwm-clock/ChangeLog +++ b/apps/dwm-clock/ChangeLog @@ -1 +1,2 @@ 0.01: New App! +0.02: Minor code improvements diff --git a/apps/dwm-clock/app.js b/apps/dwm-clock/app.js index 773777ca5..6d9bd3767 100644 --- a/apps/dwm-clock/app.js +++ b/apps/dwm-clock/app.js @@ -143,7 +143,7 @@ function renderScreen() { } function renderAndQueue() { - timeoutID = setTimeout(renderAndQueue, 60000 - (Date.now() % 60000)); + /*timeoutID =*/ setTimeout(renderAndQueue, 60000 - (Date.now() % 60000)); renderScreen(); } @@ -162,7 +162,7 @@ var now = new Date(); var defLonOffset = getLongitudeOffset().lon; var lonOffset = defLonOffset; -var timeoutID; +//var timeoutID; var timeoutIDTouch; Bangle.on('drag', function(touch) { diff --git a/apps/dwm-clock/metadata.json b/apps/dwm-clock/metadata.json index 677c78f17..2a03c396c 100644 --- a/apps/dwm-clock/metadata.json +++ b/apps/dwm-clock/metadata.json @@ -2,7 +2,7 @@ "id": "dwm-clock", "name": "Daylight World Map Clock", "shortName": "DWM Clock", - "version": "0.01", + "version": "0.02", "description": "A clock with a daylight world map", "readme":"README.md", "icon": "app.png", diff --git a/apps/edisonsball/ChangeLog b/apps/edisonsball/ChangeLog index b71b8bb0d..71bcbf97f 100644 --- a/apps/edisonsball/ChangeLog +++ b/apps/edisonsball/ChangeLog @@ -1,2 +1,3 @@ 0.01: Initial version 0.02: Added BangleJS Two +0.03: Minor code improvements diff --git a/apps/edisonsball/app.js b/apps/edisonsball/app.js index 2aa317829..6e58ffcc1 100644 --- a/apps/edisonsball/app.js +++ b/apps/edisonsball/app.js @@ -104,10 +104,10 @@ function getStandardDeviation (array) { } function checkHR() { - var bpm = currentBPM, isCurrent = true; + var bpm = currentBPM; //isCurrent = true; if (bpm===undefined) { bpm = lastBPM; - isCurrent = false; + //isCurrent = false; } if (bpm===undefined || bpm < lower_limit_BPM || bpm > upper_limit_BPM) bpm = "--"; diff --git a/apps/edisonsball/metadata.json b/apps/edisonsball/metadata.json index dfeb4451e..9fcfe38bf 100644 --- a/apps/edisonsball/metadata.json +++ b/apps/edisonsball/metadata.json @@ -2,7 +2,7 @@ "id": "edisonsball", "name": "Edison's Ball", "shortName": "Edison's Ball", - "version": "0.02", + "version": "0.03", "description": "Hypnagogia/Micro-Sleep alarm for experimental use in exploring sleep transition and combating drowsiness", "icon": "app-icon.png", "tags": "sleep,hyponagogia,quick,nap", diff --git a/apps/encourageclk/ChangeLog b/apps/encourageclk/ChangeLog index 83c07f784..9cb404008 100644 --- a/apps/encourageclk/ChangeLog +++ b/apps/encourageclk/ChangeLog @@ -1,3 +1,4 @@ 0.01: New face :) 0.02: code improvements 0.03: code improvments to queuedraw and draw +0.04: Minor code improvements diff --git a/apps/encourageclk/app.js b/apps/encourageclk/app.js index a78a788ba..1f19cc314 100644 --- a/apps/encourageclk/app.js +++ b/apps/encourageclk/app.js @@ -3,7 +3,6 @@ require("FontHaxorNarrow7x17").add(Graphics); require("FontDylex7x13").add(Graphics); -const storage = require('Storage'); const locale = require("locale"); const dateutil = require("date_utils"); const currentFont=g.getFont(); @@ -52,7 +51,7 @@ function queueDraw() { function draw() { var time = locale.time(d, 1); - var date = locale.date(d); + //var date = locale.date(d); var mo = dateutil.month(d.getMonth() + 1, 1); g.drawImage(bgimg,0,offset); //bg diff --git a/apps/encourageclk/metadata.json b/apps/encourageclk/metadata.json index 4e5d630cf..f3816c9de 100644 --- a/apps/encourageclk/metadata.json +++ b/apps/encourageclk/metadata.json @@ -2,7 +2,7 @@ "id": "encourageclk", "name": "Encouragement & Positivity Clock", "shortName":"Encouragement Clock", - "version": "0.03", + "version": "0.04", "description": "Tap on the watch for a note of encouragement", "icon": "app.png", "type": "clock", diff --git a/apps/f9lander/ChangeLog b/apps/f9lander/ChangeLog index b5a33bd2e..8aed5d989 100644 --- a/apps/f9lander/ChangeLog +++ b/apps/f9lander/ChangeLog @@ -1,3 +1,4 @@ 0.01: New App! 0.02: Add lightning 0.03: Convert Yes/No On/Off in settings to checkboxes +0.04: Minor code improvements diff --git a/apps/f9lander/app.js b/apps/f9lander/app.js index 2f17a5bd5..d195a7c67 100644 --- a/apps/f9lander/app.js +++ b/apps/f9lander/app.js @@ -45,7 +45,7 @@ var booster = { x : g.getWidth()/4 + Math.random()*g.getWidth()/2, var exploded = false; var nExplosions = 0; -var landed = false; +//var landed = false; var lightning = 0; var settings = require("Storage").readJSON('f9settings.json', 1) || {}; diff --git a/apps/f9lander/metadata.json b/apps/f9lander/metadata.json index 5a3887c9e..868b70f71 100644 --- a/apps/f9lander/metadata.json +++ b/apps/f9lander/metadata.json @@ -1,7 +1,7 @@ { "id": "f9lander", "name": "Falcon9 Lander", "shortName":"F9lander", - "version":"0.03", + "version": "0.04", "description": "Land a rocket booster", "icon": "f9lander.png", "screenshots" : [ { "url":"f9lander_screenshot1.png" }, { "url":"f9lander_screenshot2.png" }, { "url":"f9lander_screenshot3.png" }], diff --git a/apps/fclock/ChangeLog b/apps/fclock/ChangeLog index 7e7307c59..f70cedaba 100644 --- a/apps/fclock/ChangeLog +++ b/apps/fclock/ChangeLog @@ -1,3 +1,4 @@ 0.01: First published version of app 0.02: Move to Bangle.setUI to launcher support 0.03: Tell clock widgets to hide. +0.04: Minor code improvements diff --git a/apps/fclock/fclock.app.js b/apps/fclock/fclock.app.js index 838a5578d..b010d0536 100644 --- a/apps/fclock/fclock.app.js +++ b/apps/fclock/fclock.app.js @@ -2,7 +2,7 @@ var minutes; var seconds; var hours; var date; -var first = true; +//var first = true; var locale = require('locale'); var _12hour = (require("Storage").readJSON("setting.json", 1) || {})["12hour"] || false; diff --git a/apps/fclock/metadata.json b/apps/fclock/metadata.json index dffb197a2..0cb48f9ff 100644 --- a/apps/fclock/metadata.json +++ b/apps/fclock/metadata.json @@ -2,7 +2,7 @@ "id": "fclock", "name": "fclock", "shortName": "F Clock", - "version": "0.03", + "version": "0.04", "description": "Simple design of a digital clock", "icon": "app.png", "type": "clock", diff --git a/apps/flightdash/ChangeLog b/apps/flightdash/ChangeLog index 971e5b97e..b0e36941a 100644 --- a/apps/flightdash/ChangeLog +++ b/apps/flightdash/ChangeLog @@ -1 +1,2 @@ 1.00: initial release +1.01: Minor code improvements diff --git a/apps/flightdash/flightdash.app.js b/apps/flightdash/flightdash.app.js index f612836c6..ac0146210 100644 --- a/apps/flightdash/flightdash.app.js +++ b/apps/flightdash/flightdash.app.js @@ -13,7 +13,7 @@ const COLOUR_LIGHT_BLUE = 0x841f; // same as: g.setColor(0.5, 0.5, 1) const APP_NAME = 'flightdash'; const horizontalCenter = g.getWidth() / 2; -const verticalCenter = g.getHeight() / 2; +//const verticalCenter = g.getHeight() / 2; const dataFontHeight = 22; const secondaryFontHeight = 18; @@ -23,7 +23,7 @@ const labelFontHeight = 12; //globals var settings = {}; -var updateInterval; +//var updateInterval; var speed = '-'; var speedPrev = -1; var track = '-'; var trackPrev = -1; diff --git a/apps/flightdash/metadata.json b/apps/flightdash/metadata.json index 0bc23a192..23d7323cc 100644 --- a/apps/flightdash/metadata.json +++ b/apps/flightdash/metadata.json @@ -2,7 +2,7 @@ "id": "flightdash", "name": "Flight Dashboard", "shortName":"Flight-Dash", - "version":"1.00", + "version": "1.01", "description": "Basic flight and navigation instruments", "icon": "flightdash.png", "screenshots": [{ "url": "screenshot.png" }], diff --git a/apps/folderlaunch/README.md b/apps/folderlaunch/README.md index 2caac29c3..b142e6878 100644 --- a/apps/folderlaunch/README.md +++ b/apps/folderlaunch/README.md @@ -33,4 +33,8 @@ Swiping up and down will scroll. Swiping from the left, using the back button, o * Move app here: Display a list of apps. Selecting one moves it into the folder. * One menu entry for each subfolder, which opens the folder management menu for that subfolder. * View apps: Only present if this folder contains apps, Display a menu of all apps in the folder. This is for information only, tapping the apps does nothing. - * Delete folder: Only present if not viewing the root folder. Delete the current folder and move all apps into the parent folder. \ No newline at end of file + * Delete folder: Only present if not viewing the root folder. Delete the current folder and move all apps into the parent folder. + +## Web interface + +Limited editing is possible from the web interface. You can add folders and move applications between folders. \ No newline at end of file diff --git a/apps/folderlaunch/interface.html b/apps/folderlaunch/interface.html new file mode 100644 index 000000000..24d3f448d --- /dev/null +++ b/apps/folderlaunch/interface.html @@ -0,0 +1,234 @@ + + + + + + + + + + + + + + +

Folder Launcher

+
+
+ + + +
+
+
+ + + + + + + + + + +
AppFolderMove to
+
+

Add a new folder

+
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+ + + + + + + + diff --git a/apps/folderlaunch/metadata.json b/apps/folderlaunch/metadata.json index 0cf83abb4..0194fcf66 100644 --- a/apps/folderlaunch/metadata.json +++ b/apps/folderlaunch/metadata.json @@ -10,6 +10,7 @@ "BANGLEJS2" ], "readme": "README.md", + "interface": "interface.html", "storage": [ { "name": "folderlaunch.app.js", diff --git a/apps/followtherecipe/ChangeLog b/apps/followtherecipe/ChangeLog index 9ba6a29bd..68ca62642 100644 --- a/apps/followtherecipe/ChangeLog +++ b/apps/followtherecipe/ChangeLog @@ -1 +1,2 @@ -0.01: New App \ No newline at end of file +0.01: New App +0.02: Minor code improvements diff --git a/apps/followtherecipe/app.js b/apps/followtherecipe/app.js index 8238a6c07..056632e27 100644 --- a/apps/followtherecipe/app.js +++ b/apps/followtherecipe/app.js @@ -1,10 +1,7 @@ -const storage = require("Storage"); const settings = require("Storage").readJSON("followtherecipe.json"); -const locale = require('locale'); -var ENV = process.env; +//const locale = require('locale'); var W = g.getWidth(), H = g.getHeight(); var screen = 0; -var Layout = require("Layout"); let maxLenghtHorizontal = 16; let maxLenghtvertical = 6; diff --git a/apps/followtherecipe/metadata.json b/apps/followtherecipe/metadata.json index 8ffeac2d2..0c1de0817 100644 --- a/apps/followtherecipe/metadata.json +++ b/apps/followtherecipe/metadata.json @@ -3,7 +3,7 @@ "name": "Follow The Recipe", "shortName":"FTR", "icon": "icon.png", - "version": "0.01", + "version": "0.02", "description": "Follow The Recipe (FTR) is a bangle.js app to follow a recipe step by step", "type": "app", "tags": "tool, tools, cook", diff --git a/apps/gallifr/ChangeLog b/apps/gallifr/ChangeLog index 32c1057b0..766a2002a 100644 --- a/apps/gallifr/ChangeLog +++ b/apps/gallifr/ChangeLog @@ -1,3 +1,4 @@ 0.01: First released version 0.02: Changed setWatch to Bangle.setUI 0.03: Tell clock widgets to hide. +0.04: Minor code improvements diff --git a/apps/gallifr/app.js b/apps/gallifr/app.js index 8468eee48..e2356d038 100644 --- a/apps/gallifr/app.js +++ b/apps/gallifr/app.js @@ -3,7 +3,7 @@ // Written May 2020 by Richard Hopkins // based on a skeleton app by Gordon Williams // -const locale = require('locale'); +//const locale = require('locale'); let timer = null; let currentDate = new Date(); const cirRad = 2*Math.PI; diff --git a/apps/gallifr/metadata.json b/apps/gallifr/metadata.json index 96fe243ed..c891744f2 100644 --- a/apps/gallifr/metadata.json +++ b/apps/gallifr/metadata.json @@ -2,7 +2,7 @@ "id": "gallifr", "name": "Time Traveller's Chronometer", "shortName": "Time Travel Clock", - "version": "0.03", + "version": "0.04", "description": "A clock for time travellers. The light pie segment shows the minutes, the black circle, the hour. The dial itself reads 'time' just in case you forget.", "icon": "gallifr.png", "screenshots": [{"url":"screenshot_time.png"}], diff --git a/apps/game1024/ChangeLog b/apps/game1024/ChangeLog index df36b6456..d28664314 100644 --- a/apps/game1024/ChangeLog +++ b/apps/game1024/ChangeLog @@ -9,3 +9,4 @@ 0.09: Added settings menu, removed symbol selection button (*), added highscore reset 0.10: fixed clockmode in settings 0.11: Use default Bangle formatter for booleans +0.12: Minor code improvements diff --git a/apps/game1024/app.js b/apps/game1024/app.js index a82db4352..b440c375c 100644 --- a/apps/game1024/app.js +++ b/apps/game1024/app.js @@ -410,7 +410,6 @@ function addToScore (val) { if (val == 10) mover.gameWon = true; } function createGrid () { - let cn =0; for (let r = 0; r < rows; r++) { for (let c = 0; c < cols; c++) { let x0 = borderWidth + c*(borderWidth + sqWidth) - (rows/2)*(2*borderWidth + sqWidth) + middle.x + Math.floor(sqWidth/3); diff --git a/apps/game1024/metadata.json b/apps/game1024/metadata.json index 45d6e3f61..0206933b3 100644 --- a/apps/game1024/metadata.json +++ b/apps/game1024/metadata.json @@ -1,7 +1,7 @@ { "id": "game1024", "name": "1024 Game", "shortName" : "1024 Game", - "version": "0.11", + "version": "0.12", "icon": "game1024.png", "screenshots": [ {"url":"screenshot.png" } ], "readme":"README.md", diff --git a/apps/gipy/ChangeLog b/apps/gipy/ChangeLog index a80cd42ea..992c69a93 100644 --- a/apps/gipy/ChangeLog +++ b/apps/gipy/ChangeLog @@ -135,3 +135,4 @@ * Fix for files converted from maps2gpx : path was not reduced in size correctly * Experimental ski mode : have a ski slopes map * Fix for path projection display when lost and zoomed out +0.25: Minor code improvements diff --git a/apps/gipy/app.js b/apps/gipy/app.js index 83ce0757a..4bd1adbeb 100644 --- a/apps/gipy/app.js +++ b/apps/gipy/app.js @@ -18,7 +18,7 @@ let Y_OFFSET = 20; // some constants for screen types let MAP = 0; -let HEIGHTS_ZOOMED_IN = 1; +//let HEIGHTS_ZOOMED_IN = 1; let HEIGHTS_FULL = 2; let s = require("Storage"); @@ -1362,7 +1362,7 @@ class Point { } } -let fake_gps_point = 0; +//let fake_gps_point = 0; function drawMenu() { const menu = { diff --git a/apps/gipy/metadata.json b/apps/gipy/metadata.json index 5b416bced..5993e3ee6 100644 --- a/apps/gipy/metadata.json +++ b/apps/gipy/metadata.json @@ -2,7 +2,7 @@ "id": "gipy", "name": "Gipy", "shortName": "Gipy", - "version": "0.24", + "version": "0.25", "description": "Follow gpx files using the gps. Don't get lost in your bike trips and hikes.", "allow_emulator":false, "icon": "gipy.png", diff --git a/apps/glbasic/ChangeLog b/apps/glbasic/ChangeLog index 1f3a1b643..890b7682f 100644 --- a/apps/glbasic/ChangeLog +++ b/apps/glbasic/ChangeLog @@ -1,3 +1,4 @@ 0.20: New App! 0.21: Tell clock widgets to hide. 0.22: Changed font so 5 and 6 are not similar +0.23: Minor code improvements diff --git a/apps/glbasic/GLBasic-Watchface-Bangle.JS2.js b/apps/glbasic/GLBasic-Watchface-Bangle.JS2.js index d51d02a10..57f3269db 100644 --- a/apps/glbasic/GLBasic-Watchface-Bangle.JS2.js +++ b/apps/glbasic/GLBasic-Watchface-Bangle.JS2.js @@ -13,7 +13,7 @@ g.setFontCustom(atob("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/nA/+cD/5wP/nAAAAAAAAPwAA/gA require("Font7x11Numeric7Seg").add(Graphics); -var temperature = 13; +//var temperature = 13; //the following 2 sections are used from waveclk to schedule minutely updates // timeout used to update every minute @@ -57,7 +57,7 @@ function draw(){ drawBackground(); var date = new Date(); var h = date.getHours(), m = date.getMinutes(); - var d = date.getDate(), w = date.getDay(); + var w = date.getDay(); g.setBgColor(0,0,0); g.setColor(1,1,1); diff --git a/apps/glbasic/glbasic.app.js b/apps/glbasic/glbasic.app.js index 4f6c9ffb3..1599abfeb 100644 --- a/apps/glbasic/glbasic.app.js +++ b/apps/glbasic/glbasic.app.js @@ -93,7 +93,7 @@ function drawCal() { const nrgb = ["#000", "#FFF", "#F00", "#0F0", "#00F", "#FF0"]; //fg, r ,g , b const suClr = 5; // sunday color fg const tdyMrkClr = 3; // today bk - const tdyNumClr = 0; // today fg + //const tdyNumClr = 0; // today fg g.setFont("Vector", DAY_NAME_FONT_SIZE + 3); @@ -193,8 +193,7 @@ function draw() { var date = new Date(); var h = date.getHours(), m = date.getMinutes(); - var d = date.getDate(), - w = date.getDay(); // d=1..31; w=0..6 + var d = date.getDate()/*,w = date.getDay()*/; // d=1..31; w=0..6 g.setBgColor(0, 0, 0); g.setColor(1, 1, 1); diff --git a/apps/glbasic/metadata.json b/apps/glbasic/metadata.json index 2636deefa..3bd8b0f81 100644 --- a/apps/glbasic/metadata.json +++ b/apps/glbasic/metadata.json @@ -2,7 +2,7 @@ "id": "glbasic", "name": "GLBasic Clock", "shortName": "GLBasic", - "version": "0.22", + "version": "0.23", "description": "A clock with large numbers", "dependencies": {"widpedom":"app"}, "icon": "icon48.png", diff --git a/apps/gpsrec/ChangeLog b/apps/gpsrec/ChangeLog index 5867140fb..0b58c75f9 100644 --- a/apps/gpsrec/ChangeLog +++ b/apps/gpsrec/ChangeLog @@ -31,3 +31,4 @@ 0.27: Map drawing with light theme (fix #1023) 0.28: Show distance more accurately in conjunction with new locale app (fix #1523) 0.29: Use default Bangle formatter for booleans +0.30: Minor code improvements diff --git a/apps/gpsrec/app.js b/apps/gpsrec/app.js index acd5433b2..b856bb194 100644 --- a/apps/gpsrec/app.js +++ b/apps/gpsrec/app.js @@ -190,7 +190,6 @@ function plotTrack(info) { E.showMessage("Drawing...","GPS Track "+info.fn); g.flip(); // on buffered screens, draw a not saying we're busy g.clear(1); - var s = require("Storage"); var cx = g.getWidth()/2; var cy = 24 + (g.getHeight()-24)/2; g.setColor(1,0.5,0.5); @@ -267,7 +266,6 @@ function plotGraph(info, style) { var infc = new Uint16Array(80); var title; var lt = 0; // last time - var tn = 0; // count for each time period var strt, dur = info.duration; var f = require("Storage").open(filename,"r"); if (f===undefined) return; diff --git a/apps/gpsrec/metadata.json b/apps/gpsrec/metadata.json index 192b05edf..74b08a7d5 100644 --- a/apps/gpsrec/metadata.json +++ b/apps/gpsrec/metadata.json @@ -1,7 +1,7 @@ { "id": "gpsrec", "name": "GPS Recorder", - "version": "0.29", + "version": "0.30", "description": "(NOT RECOMMENDED) - please use the more flexible 'Recorder' app instead. Application that allows you to record a GPS track. Can run in background", "icon": "app.png", "tags": "tool,outdoors,gps,widget", diff --git a/apps/gpstrek/ChangeLog b/apps/gpstrek/ChangeLog index 921000e82..ff6cc3d0d 100644 --- a/apps/gpstrek/ChangeLog +++ b/apps/gpstrek/ChangeLog @@ -18,4 +18,5 @@ Automatically search for new waypoint if moving away from current target 0.11: Adds configuration Draws direction arrows on route - Turn of compass when GPS fix is available \ No newline at end of file + Turn of compass when GPS fix is available +0.12: Minor code improvements diff --git a/apps/gpstrek/app.js b/apps/gpstrek/app.js index eb21498c0..ae91fe0a3 100644 --- a/apps/gpstrek/app.js +++ b/apps/gpstrek/app.js @@ -137,7 +137,7 @@ const loc = require("locale"); let matchFontSize = function(graphics, text, height, width){ graphics.setFontVector(height); - let metrics; + //let metrics; let size = 1; while (graphics.stringMetrics(text).width > 0.90 * width){ size -= 0.05; @@ -671,8 +671,8 @@ let getCompassSlice = function(){ } }; let lastDrawnValue = 0; - const buffers = 4; - let buf = []; + //const buffers = 4; + //let buf = []; return { refresh: function(){ return Math.abs(lastDrawnValue - compassDataSource.getCourse()) > SETTINGS.minCourseChange; diff --git a/apps/gpstrek/metadata.json b/apps/gpstrek/metadata.json index 791360001..585927677 100644 --- a/apps/gpstrek/metadata.json +++ b/apps/gpstrek/metadata.json @@ -1,7 +1,7 @@ { "id": "gpstrek", "name": "GPS Trekking", - "version": "0.11", + "version": "0.12", "description": "Helper for tracking the status/progress during hiking. Do NOT depend on this for navigation!", "icon": "icon.png", "screenshots": [{"url":"screenInit.png"},{"url":"screenMenu.png"},{"url":"screenMap.png"},{"url":"screenLost.png"},{"url":"screenOverview.png"},{"url":"screenOverviewScroll.png"},{"url":"screenSlices.png"},{"url":"screenSlices2.png"},{"url":"screenSlices3.png"}], diff --git a/apps/guitar/ChangeLog b/apps/guitar/ChangeLog index 22c67383d..4f7120ebd 100644 --- a/apps/guitar/ChangeLog +++ b/apps/guitar/ChangeLog @@ -1,2 +1,3 @@ 0.01: New App! -0.02: More Chords, formatting, fret offset support. \ No newline at end of file +0.02: More Chords, formatting, fret offset support. +0.03: Minor code improvements diff --git a/apps/guitar/app.js b/apps/guitar/app.js index 6c172f920..6a339b057 100644 --- a/apps/guitar/app.js +++ b/apps/guitar/app.js @@ -249,8 +249,6 @@ var a9 = [ -var index = 0; -var chords = []; var menu = { "" : { "title" : "Guitar Chords" diff --git a/apps/guitar/metadata.json b/apps/guitar/metadata.json index 6ab3ffc51..0dc6893d6 100644 --- a/apps/guitar/metadata.json +++ b/apps/guitar/metadata.json @@ -1,7 +1,7 @@ { "id": "guitar", "name": "Guitar Chords", "shortName":"Guitar", - "version":"0.02", + "version": "0.03", "description": "Wrist mounted guitar chords", "icon": "app.png", "tags": "guitar, chords", diff --git a/apps/guitarsongs/ChangeLog b/apps/guitarsongs/ChangeLog index dda3f0fd1..9e91c9a5e 100644 --- a/apps/guitarsongs/ChangeLog +++ b/apps/guitarsongs/ChangeLog @@ -1,2 +1,3 @@ 0.01: First Release 0.02: WIP +0.03: Minor code improvements diff --git a/apps/guitarsongs/app.js b/apps/guitarsongs/app.js index a12fa842b..2536e1c46 100644 --- a/apps/guitarsongs/app.js +++ b/apps/guitarsongs/app.js @@ -203,8 +203,8 @@ function drawApp(lyricsLines, chordsDraw, scrollY, chordScrollX) { let currentScrollY = 0; let chordScrollX = 0; -let currentChordScroll = 0; -let lyricsHeight = 0; +//let currentChordScroll = 0; +//let lyricsHeight = 0; function main(song) { const lyrics = song.lyrics; @@ -214,7 +214,7 @@ function main(song) { const R = Bangle.appRect; g.clear(); drawApp(lyricsLines, chordsDraw, currentScrollY, chordScrollX); - lyricsHeight = g.stringMetrics(lyrics).height; + /*lyricsHeight =*/ g.stringMetrics(lyrics).height; Bangle.on('drag', (event) => { currentScrollY = Math.min(0, currentScrollY + event.dy); chordScrollX = Math.max(Math.min(0, chordScrollX + event.dx), -(song.chords.length*chordWidth - R.x2)); diff --git a/apps/guitarsongs/metadata.json b/apps/guitarsongs/metadata.json index cec4be2fd..cdbd1be20 100644 --- a/apps/guitarsongs/metadata.json +++ b/apps/guitarsongs/metadata.json @@ -1,7 +1,7 @@ { "id": "guitarsongs", "name": "Guitar Songs", "shortName":"Guitar Songs", - "version":"0.02", + "version": "0.03", "description": "Songs lyrics and guitar chords", "icon": "app.png", "screenshots": [{"url": "screenshot.png"}], diff --git a/apps/happyclk/ChangeLog b/apps/happyclk/ChangeLog index e87114779..08a4eab8b 100644 --- a/apps/happyclk/ChangeLog +++ b/apps/happyclk/ChangeLog @@ -1,2 +1,3 @@ 0.01: New app! -0.02: Added settings to show/hide widgets and settings for different styles. \ No newline at end of file +0.02: Added settings to show/hide widgets and settings for different styles. +0.03: Minor code improvements diff --git a/apps/happyclk/happyclk.app.js b/apps/happyclk/happyclk.app.js index 8e22b6e1e..866742f3e 100644 --- a/apps/happyclk/happyclk.app.js +++ b/apps/happyclk/happyclk.app.js @@ -77,7 +77,7 @@ var colors = color_map[settings.color]; /************************************************ * Globals */ -var W = g.getWidth(),R=W/2; +var W = g.getWidth(); var H = g.getHeight(); var drawTimeout; diff --git a/apps/happyclk/metadata.json b/apps/happyclk/metadata.json index da7bdcd16..1a93f63c3 100644 --- a/apps/happyclk/metadata.json +++ b/apps/happyclk/metadata.json @@ -3,7 +3,7 @@ "name": "Happy Clock", "shortName":"Happy Clock", "icon": "happyclk.png", - "version":"0.02", + "version": "0.03", "readme": "README.md", "supports": ["BANGLEJS2"], "description": "A happy clock :)", diff --git a/apps/hcclock/ChangeLog b/apps/hcclock/ChangeLog index e2eb18be3..f6cf66374 100644 --- a/apps/hcclock/ChangeLog +++ b/apps/hcclock/ChangeLog @@ -2,4 +2,5 @@ 0.02: Saved settings when switching color scheme 0.03: Added Button 3 opening messages (if app is installed) 0.04: Use `messages` library to check for new messages -0.05: Use `messages` library to open message GUI \ No newline at end of file +0.05: Use `messages` library to open message GUI +0.06: Minor code improvements diff --git a/apps/hcclock/hcclock.app.js b/apps/hcclock/hcclock.app.js index f12a4733e..8cf7b35b5 100644 --- a/apps/hcclock/hcclock.app.js +++ b/apps/hcclock/hcclock.app.js @@ -70,7 +70,7 @@ const numbers = const months = [ "JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP", "OCT", "NOV", "DEC" ]; const interval = 1000; // in ms -const top = 32; +//const top = 32; let ampm = (require("Storage").readJSON("setting.json",1)||{})["12hour"]; diff --git a/apps/hcclock/metadata.json b/apps/hcclock/metadata.json index 407114e25..e8396adb0 100644 --- a/apps/hcclock/metadata.json +++ b/apps/hcclock/metadata.json @@ -1,7 +1,7 @@ { "id": "hcclock", "name": "Hi-Contrast Clock", - "version": "0.05", + "version": "0.06", "description": "Hi-Contrast Clock : A simple yet very bold clock that aims to be readable in high luninosity environments. Uses big 10x5 pixel digits. Use BTN 1 to switch background and foreground colors.", "icon": "hcclock-icon.png", "type": "clock", diff --git a/apps/health/ChangeLog b/apps/health/ChangeLog index 99d8edf72..82b57dd44 100644 --- a/apps/health/ChangeLog +++ b/apps/health/ChangeLog @@ -30,3 +30,4 @@ 0.27: Fix typo in daily summary graph code causing graph not to load Fix daily summaries for 31st of the month 0.28: Calculate distance from steps if myprofile is installed and stride length is set +0.29: Minor code improvements diff --git a/apps/health/lib.js b/apps/health/lib.js index 8f3cc800e..cf2d19963 100644 --- a/apps/health/lib.js +++ b/apps/health/lib.js @@ -1,9 +1,9 @@ const DB_RECORD_LEN = 4; const DB_RECORDS_PER_HR = 6; const DB_RECORDS_PER_DAY = DB_RECORDS_PER_HR*24 + 1/*summary*/; -const DB_RECORDS_PER_MONTH = DB_RECORDS_PER_DAY*31; +//const DB_RECORDS_PER_MONTH = DB_RECORDS_PER_DAY*31; const DB_HEADER_LEN = 8; -const DB_FILE_LEN = DB_HEADER_LEN + DB_RECORDS_PER_MONTH*DB_RECORD_LEN; +//const DB_FILE_LEN = DB_HEADER_LEN + DB_RECORDS_PER_MONTH*DB_RECORD_LEN; function getRecordFN(d) { return "health-"+d.getFullYear()+"-"+(d.getMonth()+1)+".raw"; @@ -70,7 +70,7 @@ exports.readAllRecordsSince = function(d, cb) { // Read daily summaries from the given month exports.readDailySummaries = function(d, cb) { - var rec = getRecordIdx(d); + /*var rec =*/ getRecordIdx(d); var fn = getRecordFN(d); var f = require("Storage").read(fn); if (f===undefined) return; @@ -91,7 +91,7 @@ exports.readDailySummaries = function(d, cb) { // Read all records from the given day exports.readDay = function(d, cb) { - var rec = getRecordIdx(d); + /*var rec =*/ getRecordIdx(d); var fn = getRecordFN(d); var f = require("Storage").read(fn); if (f===undefined) return; diff --git a/apps/health/metadata.json b/apps/health/metadata.json index 4afe4b9d8..1d91a1e56 100644 --- a/apps/health/metadata.json +++ b/apps/health/metadata.json @@ -2,7 +2,7 @@ "id": "health", "name": "Health Tracking", "shortName": "Health", - "version": "0.28", + "version": "0.29", "description": "Logs health data and provides an app to view it", "icon": "app.png", "tags": "tool,system,health", diff --git a/apps/helloworld/ChangeLog b/apps/helloworld/ChangeLog index 6ffdb7f46..969aed43d 100644 --- a/apps/helloworld/ChangeLog +++ b/apps/helloworld/ChangeLog @@ -1,3 +1,4 @@ 0.01: 1st version ! 0.02: Supports bottom widgets and UI based in UI4swatch! 0.03: Added compatibility with BJS2, improvements +0.04: Minor code improvements diff --git a/apps/helloworld/helloworld.app.js b/apps/helloworld/helloworld.app.js index 1b6684f3f..a59f29c78 100644 --- a/apps/helloworld/helloworld.app.js +++ b/apps/helloworld/helloworld.app.js @@ -11,7 +11,7 @@ var a_colors= Array(0xFFFF,0xFD20,0x03E0,0xFFE0,0x7800,0x001F,0x07E0,0x780F,0x07FF,0x7BE0,0x03EF,0xF81F); var x_max_screen=g.getWidth(); - var y_max_screen=g.getHeight(); + //var y_max_screen=g.getHeight(); var y_wg_bottom=g.getHeight()-25; var y_wg_top=25; diff --git a/apps/helloworld/metadata.json b/apps/helloworld/metadata.json index b9dec6b52..3ec5c2a83 100644 --- a/apps/helloworld/metadata.json +++ b/apps/helloworld/metadata.json @@ -2,7 +2,7 @@ "id": "helloworld", "name": "hello, world!", "shortName": "hello world", - "version": "0.03", + "version": "0.04", "description": "A cross cultural hello world!/hola mundo! app with colors and languages", "icon": "app.png", "tags": "input,interface,buttons,touch", diff --git a/apps/henkinen/ChangeLog b/apps/henkinen/ChangeLog index 5560f00bc..7727f3cc4 100644 --- a/apps/henkinen/ChangeLog +++ b/apps/henkinen/ChangeLog @@ -1 +1,2 @@ 0.01: New App! +0.02: Minor code improvements diff --git a/apps/henkinen/app.js b/apps/henkinen/app.js index d7c7bd5ed..15a164431 100644 --- a/apps/henkinen/app.js +++ b/apps/henkinen/app.js @@ -53,7 +53,7 @@ function queueDraw() { // main function function draw() { // make date object - var date = new Date(); + //var date = new Date(); // update current time time += wait - (Date.now() % wait); diff --git a/apps/henkinen/metadata.json b/apps/henkinen/metadata.json index 1f1bb77fc..65efb4445 100644 --- a/apps/henkinen/metadata.json +++ b/apps/henkinen/metadata.json @@ -1,7 +1,7 @@ { "id": "henkinen", "name": "Henkinen - Tiny Breathing Helper", "shortName":"Henkinen", - "version":"0.01", + "version": "0.02", "description": "A tiny app helping you to breath and relax.", "icon": "app.png", "screenshots": [{"url":"screenshot1.png"}], diff --git a/apps/homework/ChangeLog b/apps/homework/ChangeLog index b9a5425d1..a20d255e4 100644 --- a/apps/homework/ChangeLog +++ b/apps/homework/ChangeLog @@ -1,2 +1,3 @@ ... 0.10: First update with ChangeLog Added +0.11: Minor code improvements diff --git a/apps/homework/app.js b/apps/homework/app.js index a6ad331f0..8440f0dee 100644 --- a/apps/homework/app.js +++ b/apps/homework/app.js @@ -1,4 +1,3 @@ -var Layout = require("Layout"); var homework = require("Storage").readJSON("homework.txt", "r"); var mainCheckHomeworkMenu; @@ -18,12 +17,12 @@ function newHomeworkMenu() { var splitsubjects = rawsubjects.split(","); var lastItem = splitsubjects[splitsubjects.length - 1]; var thiscurrentsubject; - var command; + //var command; lastItem = lastItem.slice(0, -1); splitsubjects[splitsubjects.length - 1] = lastItem; for (let i = 0; i < splitsubjects.length; i++) { // loop through array and add to menu thiscurrentsubject = splitsubjects[i]; - command = addNewHomework(thiscurrentsubject); + /*command =*/ addNewHomework(thiscurrentsubject); nhwmn[splitsubjects[i]] = addNewHomework.bind(null, thiscurrentsubject); } nhwmn["Back"] = function() {E.showMenu(mainMenu);}; diff --git a/apps/homework/metadata.json b/apps/homework/metadata.json index d2af99fd4..f440691ef 100644 --- a/apps/homework/metadata.json +++ b/apps/homework/metadata.json @@ -2,7 +2,7 @@ { "id": "homework", "name": "Homework", "shortName":"Homework", - "version":"0.10", + "version": "0.11", "description": "A simple app to manage homework", "icon": "app.png", "tags": "tool", diff --git a/apps/horsey/ChangeLog b/apps/horsey/ChangeLog new file mode 100644 index 000000000..62542be60 --- /dev/null +++ b/apps/horsey/ChangeLog @@ -0,0 +1,2 @@ +0.01: New app! +0.02: Minor code improvements diff --git a/apps/horsey/horse-race.js b/apps/horsey/horse-race.js index bd09e3802..fb4189d1f 100644 --- a/apps/horsey/horse-race.js +++ b/apps/horsey/horse-race.js @@ -32,10 +32,10 @@ function drawPlayers() { g.setFont("6x8"); g.setFontAlign(0,0); var max = mycounter; - var playerCount=0; + //var playerCount=0; for (var player of players) { max = Math.max(player.cnt, mycounter); - playerCount++; + //playerCount++; } var offset = 0; if (max > 200) @@ -50,7 +50,7 @@ function drawPlayers() { g.drawString("You",p-16,y+20); g.drawImage(img, p,y); - var spacing = (120-20)/(playerCount+1); + //var spacing = (120-20)/(playerCount+1); for (var player of players) { y+=45; var p = player.cnt-offset; diff --git a/apps/horsey/metadata.json b/apps/horsey/metadata.json index 256d1f373..d14ade6f3 100644 --- a/apps/horsey/metadata.json +++ b/apps/horsey/metadata.json @@ -1,7 +1,7 @@ { "id": "horsey", "name": "Horse Race!", - "version": "0.01", + "version": "0.02", "description": "Get several friends to start the game, then compete to see who can press BTN1 the most!", "icon": "horse-race.png", "tags": "game", diff --git a/apps/hrm/ChangeLog b/apps/hrm/ChangeLog index b55ba8930..1f7528170 100644 --- a/apps/hrm/ChangeLog +++ b/apps/hrm/ChangeLog @@ -9,3 +9,4 @@ 0.09: Grey out BPM until confidence is over 50% 0.10: Autoscale raw graph to maximum value seen 0.11: Automatic translation of strings. +0.12: Minor code improvements diff --git a/apps/hrm/heartrate.js b/apps/hrm/heartrate.js index 2e5a720e5..4ff21b0d1 100644 --- a/apps/hrm/heartrate.js +++ b/apps/hrm/heartrate.js @@ -57,7 +57,7 @@ function updateScale(){ var rawMax = 0; var scale = 2000; -var MID = (g.getHeight()+80)/2; +//var MID = (g.getHeight()+80)/2; /* On newer (2v10) firmwares we can subscribe to get HRM events as they happen */ Bangle.on('HRM-raw', function(v) { @@ -105,9 +105,9 @@ g.drawString(/*LANG*/"Please wait...",g.getWidth()/2,g.getHeight()/2 - 16); countDown(); -var wasHigh = 0, wasLow = 0; -var lastHigh = getTime(); -var hrmList = []; +//var wasHigh = 0, wasLow = 0; +//var lastHigh = getTime(); +//var hrmList = []; var hrmInfo; function readHRM() { diff --git a/apps/hrm/metadata.json b/apps/hrm/metadata.json index f254b5d23..0c76e6277 100644 --- a/apps/hrm/metadata.json +++ b/apps/hrm/metadata.json @@ -1,7 +1,7 @@ { "id": "hrm", "name": "Heart Rate Monitor", - "version": "0.11", + "version": "0.12", "description": "Measure your heart rate and see live sensor data", "icon": "heartrate.png", "tags": "health", diff --git a/apps/hrrawexp/ChangeLog b/apps/hrrawexp/ChangeLog index bd8df3991..afd00f99a 100644 --- a/apps/hrrawexp/ChangeLog +++ b/apps/hrrawexp/ChangeLog @@ -2,3 +2,4 @@ 0.02: Fixes 0.03: updated to work with new API and additional features added such as longer recording time and additional filtered data 0.04: added support for bangle.js 2 +0.05: Minor code improvements diff --git a/apps/hrrawexp/app.js b/apps/hrrawexp/app.js index d205994df..7de743cf8 100644 --- a/apps/hrrawexp/app.js +++ b/apps/hrrawexp/app.js @@ -5,7 +5,6 @@ var value; var filt; var fileClosed = 0; -var Storage = require("Storage"); var file; var screenSize = g.getHeight(); @@ -122,8 +121,8 @@ function countDown() { g.drawString(fmtMSS(counter), g.getWidth() / 2, g.getHeight() / 2); } -var HRVal = 0; -var HRConfidence = 0; +//var HRVal = 0; +//var HRConfidence = 0; update_timer(); diff --git a/apps/hrrawexp/metadata.json b/apps/hrrawexp/metadata.json index 557b9fd89..485c65ca9 100644 --- a/apps/hrrawexp/metadata.json +++ b/apps/hrrawexp/metadata.json @@ -2,7 +2,7 @@ "id": "hrrawexp", "name": "HRM Data Exporter", "shortName": "HRM Data Exporter", - "version": "0.04", + "version": "0.05", "description": "export raw hrm signal data to a csv file", "icon": "app-icon.png", "tags": "", diff --git a/apps/hworldclock/ChangeLog b/apps/hworldclock/ChangeLog index bd761a1b1..5197c6405 100644 --- a/apps/hworldclock/ChangeLog +++ b/apps/hworldclock/ChangeLog @@ -18,4 +18,5 @@ Remove calls to Bangle.loadWidgets as they are not needed and create warnings 0.32: Added setting to show single timezone small, like where multiple ones are configured 0.33: Tidy up and fix clearInterval(undefined) errors -0.34: Fix 'fast load' so clock doesn't always redraw when screen unlocked/locked \ No newline at end of file +0.34: Fix 'fast load' so clock doesn't always redraw when screen unlocked/locked +0.35: Minor code improvements diff --git a/apps/hworldclock/app.js b/apps/hworldclock/app.js index 615b58e0a..d97b98319 100644 --- a/apps/hworldclock/app.js +++ b/apps/hworldclock/app.js @@ -261,7 +261,7 @@ let draw = function() { if (offsets.length === 1 && !singleOffsetSmall) { let date = [require("locale").dow(new Date(), 1), require("locale").date(new Date(), 1)]; // For a single secondary timezone, draw it bigger and drop time zone to second line - const xOffset = 30; + //const xOffset = 30; g.setFont(font, secondaryTimeFontSize).drawString(`${hours}:${minutes}`, xyCenter, yposTime2, true); g.setFont(font, secondaryTimeZoneFontSize).drawString(offset[OFFSET_TIME_ZONE], xyCenter, yposTime2 + 30, true); diff --git a/apps/hworldclock/metadata.json b/apps/hworldclock/metadata.json index b4efff806..918c11872 100644 --- a/apps/hworldclock/metadata.json +++ b/apps/hworldclock/metadata.json @@ -2,7 +2,7 @@ "id": "hworldclock", "name": "Hanks World Clock", "shortName": "Hanks World Clock", - "version": "0.34", + "version": "0.35", "description": "Current time zone plus up to three others", "allow_emulator":true, "icon": "app.png", diff --git a/apps/icons/ChangeLog b/apps/icons/ChangeLog index 73fce0974..d65ad868c 100644 --- a/apps/icons/ChangeLog +++ b/apps/icons/ChangeLog @@ -1 +1,2 @@ 0.01: New library +0.02: Minor code improvements diff --git a/apps/icons/gen/generate.js b/apps/icons/gen/generate.js index 387826903..edf49e212 100755 --- a/apps/icons/gen/generate.js +++ b/apps/icons/gen/generate.js @@ -16,7 +16,7 @@ const imgOptions = { var PNG = require('png-js'); var IMAGE_BYTES = 76; -var iconTests = []; +//var iconTests = []; var promises = []; diff --git a/apps/icons/metadata.json b/apps/icons/metadata.json index 77b24d98c..196f1ed69 100644 --- a/apps/icons/metadata.json +++ b/apps/icons/metadata.json @@ -1,7 +1,7 @@ { "id": "icons", "name": "Icons", - "version": "0.01", + "version": "0.02", "description": "Library containing useful icons for apps", "icon": "app.png", "type": "module", diff --git a/apps/impwclock/ChangeLog b/apps/impwclock/ChangeLog index 0af7c99d6..f0b8ef1be 100644 --- a/apps/impwclock/ChangeLog +++ b/apps/impwclock/ChangeLog @@ -4,3 +4,4 @@ 0.04: Tweaks for compatibility with BangleJS2 0.05: Time-word now readable on Bangle.js 2 0.06: Tell clock widgets to hide. +0.07: Minor code improvements diff --git a/apps/impwclock/clock-impword.js b/apps/impwclock/clock-impword.js index 6536adaf8..6538fee34 100644 --- a/apps/impwclock/clock-impword.js +++ b/apps/impwclock/clock-impword.js @@ -57,7 +57,7 @@ function drawWordClock() { var h = t.getHours(); var m = t.getMinutes(); var time = ("0" + h).substr(-2) + ":" + ("0" + m).substr(-2); - var day = t.getDay(); + //var day = t.getDay(); var hidx; diff --git a/apps/impwclock/metadata.json b/apps/impwclock/metadata.json index 1b92ea3ae..ae13a741e 100644 --- a/apps/impwclock/metadata.json +++ b/apps/impwclock/metadata.json @@ -1,7 +1,7 @@ { "id": "impwclock", "name": "Imprecise Word Clock", - "version": "0.06", + "version": "0.07", "description": "Imprecise word clock for vacations, weekends, and those who never need accurate time.", "icon": "clock-impword.png", "type": "clock", diff --git a/apps/inspire/ChangeLog b/apps/inspire/ChangeLog index e8e154f2f..34cc82914 100644 --- a/apps/inspire/ChangeLog +++ b/apps/inspire/ChangeLog @@ -1,2 +1,3 @@ 0.01: First public version 0.02: Disable screen lock when breathing +0.03: Minor code improvements diff --git a/apps/inspire/app.js b/apps/inspire/app.js index 818a6af76..b426a5ed3 100644 --- a/apps/inspire/app.js +++ b/apps/inspire/app.js @@ -5,13 +5,13 @@ var h = g.getHeight(); var w2 = w/2; var h2 = h/ 2; var fs = 24; -var tx = (w/3)-10; +//var tx = (w/3)-10; var ty = (h)-fs; var radius = (w/2)-6; var breathing = false; var count = 0; var mode = 0; -var sin = 0; +//var sin = 0; var dragged = 0; var lastTime = Date.now(); diff --git a/apps/inspire/metadata.json b/apps/inspire/metadata.json index 3ffbc40e7..55fdcf418 100644 --- a/apps/inspire/metadata.json +++ b/apps/inspire/metadata.json @@ -2,7 +2,7 @@ "id": "inspire", "name": "Inspire Breathing", "shortName": "Inspire", - "version": "0.02", + "version": "0.03", "description": "exercise breathing every now and then", "icon": "app-icon.png", "tags": "tools,health", diff --git a/apps/invader/ChangeLog b/apps/invader/ChangeLog index 6c5a33e59..87773b1ca 100644 --- a/apps/invader/ChangeLog +++ b/apps/invader/ChangeLog @@ -1,2 +1,3 @@ 0.01: New App! 0.11: Changes... +0.12: Minor code improvements diff --git a/apps/invader/app.js b/apps/invader/app.js index 89e7462f6..d8c7707a4 100644 --- a/apps/invader/app.js +++ b/apps/invader/app.js @@ -28,8 +28,8 @@ var inv_fire_pause = 30; var inv_fired = false; // invader fired state // - explode variables var been_hit = false; // invader hit state -var bx = -32; // blast x -var by = -32; // blast y +//var bx = -32; // blast x +//var by = -32; // blast y var blast_delay = 15; // invader blast delay - pause after explosion var boom_play = false; @@ -49,7 +49,7 @@ var explosion_play = false; var score = 0; // starting score var lives = 3; // starting lives var game_state = 0; // game state - 0 = game not started, 1 = game running, 3 = game over -var ang = 0.1; +//var ang = 0.1; var start_been_pressed = false; // stops double press on restart var fire_been_pressed = false; // stops auto fire @@ -186,8 +186,8 @@ function invader_hit() { blast_delay = 15; boom_play = false; been_hit = false; - bx = -32; // move boom off screen (following invader) - by = -32; + //bx = -32; // move boom off screen (following invader) + //by = -32; // generate a random rounded number between 10 and 142; inv_x = Math.floor(Math.random() * 142) + 10; inv_y = 20; // move invader back up after being hit diff --git a/apps/invader/metadata.json b/apps/invader/metadata.json index bb74f5122..9262ffb40 100644 --- a/apps/invader/metadata.json +++ b/apps/invader/metadata.json @@ -1,7 +1,7 @@ { "id": "invader", "name": "Invader", "shortName":"Invader", - "version":"0.11", + "version": "0.12", "description": "A Space Invader game-like demo - work in progress", "icon": "app.png", "screenshots" : [ { "url":"screenshot_0.png" }, { "url":"screenshot_1.png" }, { "url":"screenshot_2.png" } ], diff --git a/apps/isoclock/ChangeLog b/apps/isoclock/ChangeLog index 7b57ecfa9..739e3061a 100644 --- a/apps/isoclock/ChangeLog +++ b/apps/isoclock/ChangeLog @@ -1,3 +1,4 @@ 0.01: Created app based on digiclock with some small tweaks. 0.02: Swap to Bangle.setUI for launcher/buttons 0.03: Tell clock widgets to hide. +0.04: Minor code improvements diff --git a/apps/isoclock/isoclock.js b/apps/isoclock/isoclock.js index 7526660b9..3893c4af2 100644 --- a/apps/isoclock/isoclock.js +++ b/apps/isoclock/isoclock.js @@ -14,7 +14,7 @@ function draw() { var month = date.getMonth()+1; var dateNum = date.getDate(); var year = date.getFullYear(); - var half = "AM"; + //var half = "AM"; var time = ("0" + h).substr(-2) + ":" + ("0" + m).substr(-2); //convert day into string @@ -54,7 +54,7 @@ function draw() { if (h > 12) { - half = "PM"; + //half = "PM"; h = h - 12; } //reset graphics diff --git a/apps/isoclock/metadata.json b/apps/isoclock/metadata.json index 488afcb41..66ebe2f91 100644 --- a/apps/isoclock/metadata.json +++ b/apps/isoclock/metadata.json @@ -2,7 +2,7 @@ "id": "isoclock", "name": "ISO Compliant Clock Face", "shortName": "ISO Clock", - "version": "0.03", + "version": "0.04", "description": "Tweaked fork of digiclock for ISO date and time", "icon": "isoclock.png", "type": "clock", diff --git a/apps/kanagsec/ChangeLog b/apps/kanagsec/ChangeLog index ed36aeeda..50f590c97 100644 --- a/apps/kanagsec/ChangeLog +++ b/apps/kanagsec/ChangeLog @@ -1,3 +1,4 @@ 0.01: New App! 0.02: Fixes temperature not loading at start. 0.03: reduces energy consumption, fixes bug where app thinks that screen is still unlocked after receiving a message +0.04: Minor code improvements diff --git a/apps/kanagsec/app.js b/apps/kanagsec/app.js index ed44bb057..6de6b2e1f 100644 --- a/apps/kanagsec/app.js +++ b/apps/kanagsec/app.js @@ -40,8 +40,8 @@ function getTemperature() { const storage = require('Storage'); require("Font8x16").add(Graphics); -var IMAGEWIDTH = 176; -var IMAGEHEIGHT = 176; +//var IMAGEWIDTH = 176; +//var IMAGEHEIGHT = 176; var energySave = false; var batteryLvl = E.getBattery() + "%"; var temperature = getTemperature(); diff --git a/apps/kanagsec/metadata.json b/apps/kanagsec/metadata.json index 516b63eef..c00ec9d7a 100644 --- a/apps/kanagsec/metadata.json +++ b/apps/kanagsec/metadata.json @@ -2,7 +2,7 @@ "id": "kanagsec", "name": "Kanagawa clock", "shortName":"kanagawa", - "version":"0.03", + "version": "0.04", "description": "A clock that displays the great wave of kanagawa (image from wikipedia) with seconds in active mode.", "icon": "app.png", "tags": "clock, kanagawa, wave", diff --git a/apps/kanawatch/ChangeLog b/apps/kanawatch/ChangeLog index a50406917..b61964b4d 100644 --- a/apps/kanawatch/ChangeLog +++ b/apps/kanawatch/ChangeLog @@ -9,3 +9,4 @@ 0.09: Optimize loading and rendering times, introduce transition animations 0.10: Swipe up/down for Hiragana/Katakana, right/left for next/prev letter 0.11: Sort by 'AIUEO' instead of 'AEIOU', draw Widgets every minute :? +0.12: Minor code improvements diff --git a/apps/kanawatch/app.js b/apps/kanawatch/app.js index a81852b1b..142dbef06 100644 --- a/apps/kanawatch/app.js +++ b/apps/kanawatch/app.js @@ -1,6 +1,6 @@ -const stripe_width = 32; -const stripe_pos = 40; -const stripe2_pos = 110; +//const stripe_width = 32; +//const stripe_pos = 40; +//const stripe2_pos = 110; const h = g.getHeight(); const w = g.getWidth(); const decompress = require("heatshrink").decompress; @@ -143,7 +143,6 @@ const keys = [ "WA","WO","YO","YU","N", ]; let kana = katakana.KA; -let scroll = 0; // const keys = Object.keys(katakana).sort(); // console.log(keys); let hiramode = false; diff --git a/apps/kanawatch/metadata.json b/apps/kanawatch/metadata.json index f3aaeae92..80d63c982 100644 --- a/apps/kanawatch/metadata.json +++ b/apps/kanawatch/metadata.json @@ -2,7 +2,7 @@ "id": "kanawatch", "name": "Kanawatch", "shortName": "Kanawatch", - "version": "0.11", + "version": "0.12", "type": "clock", "description": "Learn Hiragana and Katakana", "icon": "app.png", diff --git a/apps/kbmulti/ChangeLog b/apps/kbmulti/ChangeLog index 28344678a..f60933fb8 100644 --- a/apps/kbmulti/ChangeLog +++ b/apps/kbmulti/ChangeLog @@ -7,3 +7,4 @@ 0.07: Add compatability with `backswipe` app by using `Bangle.prependListener()` and `E.stopEventPropagation`- requires fw 2v19 or cutting edge versions of 2v18. Falls back on `Bangle.on()` for backwards compatability. +0.08: Minor code improvements diff --git a/apps/kbmulti/lib.js b/apps/kbmulti/lib.js index f979e4473..2f0a1a9ae 100644 --- a/apps/kbmulti/lib.js +++ b/apps/kbmulti/lib.js @@ -44,7 +44,7 @@ exports.input = function(options) { function displayText(hideMarker) { layout.clear(layout.text); - let charsBeforeCursor = textIndex; + //let charsBeforeCursor = textIndex; let charsAfterCursor = Math.min(text.length - textIndex, (textWidth)/2); diff --git a/apps/kbmulti/metadata.json b/apps/kbmulti/metadata.json index 210646a01..b8fa74a45 100644 --- a/apps/kbmulti/metadata.json +++ b/apps/kbmulti/metadata.json @@ -1,6 +1,6 @@ { "id": "kbmulti", "name": "Multitap keyboard", - "version":"0.07", + "version": "0.08", "description": "A library for text input via multitap/T9 style keypad", "icon": "app.png", "type":"textinput", diff --git a/apps/kitchen/ChangeLog b/apps/kitchen/ChangeLog index 4e8c49c50..a2423092c 100644 --- a/apps/kitchen/ChangeLog +++ b/apps/kitchen/ChangeLog @@ -12,3 +12,4 @@ 0.12: Added stepo2 as a replacement for stepo and digi 0.13: Added long press BTN2 toggle gpsrec status in GPS clock 0.14: Move waypoints.json (and editor) to 'waypoints' app +0.15: Minor code improvements diff --git a/apps/kitchen/annex.js b/apps/kitchen/annex.js index d789f5d0c..78de3fc91 100644 --- a/apps/kitchen/annex.js +++ b/apps/kitchen/annex.js @@ -25,5 +25,5 @@ BUF.prototype.flip_red = function(x,y) { this.buf.clear(); } -let bufObj = new BUF(); +/*let bufObj =*/ new BUF(); diff --git a/apps/kitchen/digi.kit.js b/apps/kitchen/digi.kit.js index c3b12baac..cd69e6927 100644 --- a/apps/kitchen/digi.kit.js +++ b/apps/kitchen/digi.kit.js @@ -1,7 +1,6 @@ (() => { function getFace(){ var intervalRefSec; - var buf; var days; var prevInfo; var prevDate; @@ -37,8 +36,8 @@ } function showMem(msg) { - var val = process.memory(); - var str = msg + " " + Math.round(val.usage*100/val.total) + "%"; + //var val = process.memory(); + //var str = msg + " " + Math.round(val.usage*100/val.total) + "%"; //console.log(str); } @@ -59,8 +58,8 @@ if (btn === 2) Bangle.showLauncher(); } - function getGPSfix() { return undefined; } - function setGPSfix(f) {} + //function getGPSfix() { return undefined; } + //function setGPSfix(f) {} function draw() { var d = new Date(); diff --git a/apps/kitchen/metadata.json b/apps/kitchen/metadata.json index b084fa157..88a5705ea 100644 --- a/apps/kitchen/metadata.json +++ b/apps/kitchen/metadata.json @@ -1,7 +1,7 @@ { "id": "kitchen", "name": "Kitchen Combo", - "version": "0.14", + "version": "0.15", "description": "Combination of the Stepo, Walkersclock, Arrow and Waypointer apps into a multiclock format. 'Everything but the kitchen sink'", "icon": "kitchen.png", "type": "clock", diff --git a/apps/lazyclock/ChangeLog b/apps/lazyclock/ChangeLog index a3f125786..5a578042d 100644 --- a/apps/lazyclock/ChangeLog +++ b/apps/lazyclock/ChangeLog @@ -1,3 +1,4 @@ 0.01: Launch app 0.02: Fix bug with the elusive one o'clock monster; Only change template when going over boundaries; Re-jig wording options 0.03: Use Bangle.setUI for launcher/buttons +0.04: Minor code improvements diff --git a/apps/lazyclock/lazyclock-app.js b/apps/lazyclock/lazyclock-app.js index 604448ce6..83de2210c 100644 --- a/apps/lazyclock/lazyclock-app.js +++ b/apps/lazyclock/lazyclock-app.js @@ -209,7 +209,7 @@ function refreshTime(force) { function startClock() { - const secondsToRefresh = refreshTime(); + /*const secondsToRefresh =*/ refreshTime(); } function addEvents() { diff --git a/apps/lazyclock/metadata.json b/apps/lazyclock/metadata.json index c08485fc7..c87344141 100644 --- a/apps/lazyclock/metadata.json +++ b/apps/lazyclock/metadata.json @@ -1,7 +1,7 @@ { "id": "lazyclock", "name": "Lazy Clock", - "version": "0.03", + "version": "0.04", "description": "Tells the time, roughly", "icon": "lazyclock.png", "type": "clock", diff --git a/apps/lcdclock/ChangeLog b/apps/lcdclock/ChangeLog index e81ee5bc4..df68cb17e 100644 --- a/apps/lcdclock/ChangeLog +++ b/apps/lcdclock/ChangeLog @@ -2,4 +2,5 @@ 0.02: Use clock_info module as an app 0.03: clock_info now uses app name to maintain settings specifically for this clock face 0.04: clock_info is loaded before widgets to match other clocks -0.05: fix alignment of clock items caused by 0.04 (fix #2970) \ No newline at end of file +0.05: fix alignment of clock items caused by 0.04 (fix #2970) +0.06: Minor code improvements diff --git a/apps/lcdclock/app.js b/apps/lcdclock/app.js index b4eb25b0b..77e1afdf0 100644 --- a/apps/lcdclock/app.js +++ b/apps/lcdclock/app.js @@ -31,7 +31,7 @@ let draw = function() { }; let clockInfoDraw = (itm, info, options) => { - let texty = options.y+41; + //let texty = options.y+41; g.reset().setFont("7Seg").setColor(g.theme.bg).setBgColor(g.theme.fg); if (options.focus) g.setBgColor("#FF0"); g.clearRect({x:options.x,y:options.y,w:options.w,h:options.h,r:8}); diff --git a/apps/lcdclock/metadata.json b/apps/lcdclock/metadata.json index 83107cf40..d1ab47d8a 100644 --- a/apps/lcdclock/metadata.json +++ b/apps/lcdclock/metadata.json @@ -1,6 +1,6 @@ { "id": "lcdclock", "name": "LCD Clock", - "version":"0.05", + "version": "0.06", "description": "A Casio-style clock, with ClockInfo areas at the top and bottom. Tap them and swipe up/down to toggle between different information", "icon": "app.png", "screenshots": [{"url":"screenshot.png"}], diff --git a/apps/lcdclockplus/ChangeLog b/apps/lcdclockplus/ChangeLog index 2286a7f70..7727f3cc4 100644 --- a/apps/lcdclockplus/ChangeLog +++ b/apps/lcdclockplus/ChangeLog @@ -1 +1,2 @@ -0.01: New App! \ No newline at end of file +0.01: New App! +0.02: Minor code improvements diff --git a/apps/lcdclockplus/app.js b/apps/lcdclockplus/app.js index c809be6bd..4bf48b585 100644 --- a/apps/lcdclockplus/app.js +++ b/apps/lcdclockplus/app.js @@ -43,7 +43,7 @@ let draw = function() { }; let clockInfoDraw = (itm, info, options) => { - let texty = options.y+41; + //let texty = options.y+41; g.reset().setFont("7Seg").setColor(g.theme.bg).setBgColor(g.theme.fg); if (options.focus) g.setBgColor("#FF0"); g.clearRect({x:options.x,y:options.y,w:options.w,h:options.h,r:8}); diff --git a/apps/lcdclockplus/metadata.json b/apps/lcdclockplus/metadata.json index a89efe376..a25d5e6d5 100644 --- a/apps/lcdclockplus/metadata.json +++ b/apps/lcdclockplus/metadata.json @@ -1,6 +1,6 @@ { "id": "lcdclockplus", "name": "LCD Clock Plus", - "version":"0.01", + "version": "0.02", "description": "A Casio-style clock, with four ClockInfo areas at the top and bottom. Tap them and swipe up/down and left/right to toggle between different information.", "icon": "app.png", "screenshots": [{"url":"screenshot.png"},{"url":"screenshot2.png"}], diff --git a/apps/legoremote/ChangeLog b/apps/legoremote/ChangeLog index b86638553..7abdea587 100644 --- a/apps/legoremote/ChangeLog +++ b/apps/legoremote/ChangeLog @@ -1,2 +1,3 @@ 0.01: New App! 0.02: Add more control styles +0.03: Minor code improvements diff --git a/apps/legoremote/app.js b/apps/legoremote/app.js index 40935cabf..48ba9b3ab 100644 --- a/apps/legoremote/app.js +++ b/apps/legoremote/app.js @@ -137,7 +137,7 @@ const CONTROLS = { E.showMenu({ "" : {title:"LEGO Remote", back:()=>load()}, "Linear" : () => startLegoLinear(), - "Normal" : () => startLego(CONTROLS.normal), + "Normal" : () => startLego(CONTROLS.normal), // TODO: Should `startLego` have been called `startLegoButtons` ? "Tank" : () => startLego(CONTROLS.tank), "Marged" : () => startLego(CONTROLS.merged), }); diff --git a/apps/legoremote/metadata.json b/apps/legoremote/metadata.json index 8fe4c4b44..0d45bc696 100644 --- a/apps/legoremote/metadata.json +++ b/apps/legoremote/metadata.json @@ -1,7 +1,7 @@ { "id": "legoremote", "name": "LEGO Remote control", "shortName":"LEGO Remote", - "version":"0.02", + "version": "0.03", "description": "Use your Bangle.js to control LEGO models. See the README for compatibility", "icon": "app.png", "tags": "toy,lego,bluetooth", diff --git a/apps/lifeclk/ChangeLog b/apps/lifeclk/ChangeLog index cdde84463..df5cef47d 100644 --- a/apps/lifeclk/ChangeLog +++ b/apps/lifeclk/ChangeLog @@ -4,3 +4,4 @@ 0.04: Fixed a bug, doesn't run while display's on now 2021-01-18 0.05: Fixed a bug, doesn't count the time it was asleep when calculating the update time 2021-01-19 0.06: Use Bangle.set UI, change to unminified upload to ensure this works ok on Bangle.js +0.07: Minor code improvements diff --git a/apps/lifeclk/app.min.js b/apps/lifeclk/app.min.js index 51a8ff93c..1f8704676 100644 --- a/apps/lifeclk/app.min.js +++ b/apps/lifeclk/app.min.js @@ -200,7 +200,6 @@ function howlong(){ } let lastDate=null; -let lastGen=-1; function improveLetter(textPreBuf, char, x,y){ switch(char){ diff --git a/apps/lifeclk/metadata.json b/apps/lifeclk/metadata.json index 6b62860ae..4fa2a893c 100644 --- a/apps/lifeclk/metadata.json +++ b/apps/lifeclk/metadata.json @@ -2,7 +2,7 @@ "id": "lifeclk", "name": "Game of Life Clock", "shortName": "Conway's Clock", - "version": "0.06", + "version": "0.07", "description": "Modification and clockification of Conway's Game of Life", "icon": "app.png", "type": "clock", diff --git a/apps/lightswitch/ChangeLog b/apps/lightswitch/ChangeLog index a14d85e21..8c4ddb60c 100644 --- a/apps/lightswitch/ChangeLog +++ b/apps/lightswitch/ChangeLog @@ -7,3 +7,4 @@ 0.07: Handle the swipe event that is generated when draging to change light intensity, so it doesn't trigger some other swipe handler. 0.08: Ensure boot code doesn't allocate and leave a gloval variable named 'settings' 0.09: Handle lightswitch logic running before its widget has loaded +0.10: Minor code improvements diff --git a/apps/lightswitch/metadata.json b/apps/lightswitch/metadata.json index 8eef08952..c0472131d 100644 --- a/apps/lightswitch/metadata.json +++ b/apps/lightswitch/metadata.json @@ -2,7 +2,7 @@ "id": "lightswitch", "name": "Light Switch Widget", "shortName": "Light Switch", - "version": "0.09", + "version": "0.10", "description": "A fast way to switch LCD backlight on/off, change the brightness and show the lock status. All in one widget.", "icon": "images/app.png", "screenshots": [ diff --git a/apps/lightswitch/settings.js b/apps/lightswitch/settings.js index e83e51562..09ce9265f 100644 --- a/apps/lightswitch/settings.js +++ b/apps/lightswitch/settings.js @@ -147,7 +147,7 @@ // show main menu function showMain() { - var mainMenu = E.showMenu({ + E.showMenu({ "": { title: "Light Switch" }, diff --git a/apps/limelight/ChangeLog b/apps/limelight/ChangeLog index de8caf9c4..8434039e2 100644 --- a/apps/limelight/ChangeLog +++ b/apps/limelight/ChangeLog @@ -1,4 +1,4 @@ 0.01: first release 0.02: Tell clock widgets to hide. 0.03: Use widget_utils. - +0.04: Minor code improvements diff --git a/apps/limelight/limelight.app.js b/apps/limelight/limelight.app.js index dbc784e23..33a00e9ea 100644 --- a/apps/limelight/limelight.app.js +++ b/apps/limelight/limelight.app.js @@ -114,7 +114,6 @@ let HandOffset = outerBoltRadius + 4; let twoPi = 2*Math.PI, deg2rad = Math.PI/180; let Pi = Math.PI; -let halfPi = Math.PI/2; let sin = Math.sin, cos = Math.cos; diff --git a/apps/limelight/metadata.json b/apps/limelight/metadata.json index 5c6bcfd76..dc96d0f71 100644 --- a/apps/limelight/metadata.json +++ b/apps/limelight/metadata.json @@ -1,7 +1,7 @@ { "id": "limelight", "name": "Limelight", - "version": "0.03", + "version": "0.04", "description": "Simple analogue clock (with configurable fonts) based on the work of @Andreas_Rozek (Simple_Clock)", "icon": "limelight.png", "readme":"README.md", diff --git a/apps/lint_exemptions.js b/apps/lint_exemptions.js new file mode 100644 index 000000000..d9cff2806 --- /dev/null +++ b/apps/lint_exemptions.js @@ -0,0 +1,578 @@ +module.exports = { + "xxlmessage/app.js": { + "hash": "14a9ea1fbcf0e1053df1a77d7ee7acd543f1ed63e26ecf220468c3813f93de4f", + "rules": [ + "no-unused-vars" + ] + }, + "waternet/app.js": { + "hash": "a03fbfc731811f8cc9ea8c96781ff7fe46532c5f9e628b317892069e43b97012", + "rules": [ + "no-unused-vars" + ] + }, + "tabata/tabata.js": { + "hash": "bba68fd35b57afe00adb054d598d8bde74cf2c9cb1d1d7ae27c17e13899383ee", + "rules": [ + "no-unused-vars" + ] + }, + "speedalt2/GPS Adv Sports II.js": { + "hash": "1b0dff5c4ebe0c8042dec9456f809ebaada379357188b8a18dc17a144ee8c071", + "rules": [ + "no-unused-vars" + ] + }, + "timerclk/alarm.alert.js": { + "hash": "2d422f738c044dcf0d6a43712c672dccc0ad4f2d0a877ee11f0a96ec3d939714", + "rules": [ + "no-unused-vars" + ] + }, + "spacew/prep/split.js": { + "hash": "06f25475a3765417e42dc7638ee500b546d3ce75ac28b39b8b836c0aee2ea2cb", + "rules": [ + "no-unused-vars" + ] + }, + "spacew/bench.js": { + "hash": "428a741d8dfba625cb1d2958dab3b6c7b0ca05f582b00e06ec9f7f495658beb6", + "rules": [ + "no-unused-vars" + ] + }, + "spacew/app.js": { + "hash": "6467f44962655f10a649226a2ea180a3662308146d2f19d15903a16ae081d282", + "rules": [ + "no-unused-vars" + ] + }, + "smclock/app.js": { + "hash": "8f338b03c24738793d62b7a2c4d0c2b41ab0538394adc6f3d977776b68ee3287", + "rules": [ + "no-unused-vars" + ] + }, + "sleepphasealarm/app.js": { + "hash": "d234fea5d711ae5a149879e53b28bc9002860c6b6a75285e1fc04093fe400a88", + "rules": [ + "no-unused-vars" + ] + }, + "sleeplog/settings.js": { + "hash": "bd5e3e1382321df6682ef1cb718b0e15ab355422bef77278eb086f213f643021", + "rules": [ + "no-unused-vars" + ] + }, + "showimg/app.js": { + "hash": "98975f1cdec81d982d1ee8ca23e38f6851c12c2ccf57c4503c449d20f747e9cf", + "rules": [ + "no-unused-vars" + ] + }, + "sensible/sensible.js": { + "hash": "4b8b4417c352d7a86f39653c812356c36e56770e44051d645c522f986e98abfe", + "rules": [ + "no-unused-vars" + ] + }, + "rpnsci/app.js": { + "hash": "e5bf536babe9b30e7f40b03826d7052aec98f806a7ab3b80b10438e9bf2cc61b", + "rules": [ + "no-unused-vars" + ] + }, + "recorder/app.js": { + "hash": "64c838b63a756a712555ae54d0bae89f0373ce317c289f7b19a583d3f91d473b", + "rules": [ + "no-unused-vars" + ] + }, + "podadrem/app.js": { + "hash": "8d02fced6187142b7943c63ddefd874700d0a8731d49121de06d211959db58c4", + "rules": [ + "no-unused-vars" + ] + }, + "openstmap/imagefilter.js": { + "hash": "8a71e9a0ecfa94150379c41a5a915cfdac39f8b2e485e5cc1ce4629e85293acd", + "rules": [ + "no-unused-vars" + ] + }, + "mtnclock/app.js": { + "hash": "c48e3ed1a605e6a131e5947718e26cc9481c6eeab36c5670bb74f0c58cb96cd8", + "rules": [ + "no-unused-vars" + ] + }, + "mmonday/manic-monday.js": { + "hash": "2eff38d4d1cde2b9f17800a554da58300a6250de3e014995a6958a11bcb5b76a", + "rules": [ + "no-unused-vars" + ] + }, + "mixdiganclock/mixdiganclock.app.js": { + "hash": "97beda5daa3b6e60f27dcad1230dd49a9c3b3e81cf55d644496c797fbef1256f", + "rules": [ + "no-unused-vars" + ] + }, + "legoremote/app.js": { + "hash": "af12068cd1b84369aa8416a82e9335298f6a4b69b56aa7bc70b9eb0d91e6d78e", + "rules": [ + "no-unused-vars" + ] + }, + "lightswitch/settings.js": { + "hash": "340a664f7f82fbffcb108bfceded78dbbe162717d4e4dda0f08452ca79fa3881", + "rules": [ + "no-unused-vars" + ] + }, + "kbtouch/lib.js": { + "hash": "725b41b792a0f9879257e61cc5c2ba30df777c21137bd2d2e324ab83be7b8012", + "rules": [ + "no-unused-vars" + ] + }, + "jbm8b_IT/app.js": { + "hash": "52df7b9bcac876176d66cbb65f7015cb0b5933ba585a6e3f6b93766bbe19fb11", + "rules": [ + "no-unused-vars" + ] + }, + "jbm8b/app.js": { + "hash": "7ec45c7d21590f8fa9167f4953fa6da40190d0f287f436dac7a2c4b62d82d429", + "rules": [ + "no-unused-vars" + ] + }, + "wristlight/app.js": { + "hash": "422b63acf557ac81beb0f0d08d85a8988a004752e74b50a08e23c97293351d0b", + "rules": [ + "no-unused-vars" + ] + }, + "widhrm/widget.js": { + "hash": "9c5fd63130c579a015f5600862ec1a5032387a41e058950c739c9875bc81c6bf", + "rules": [ + "no-unused-vars" + ] + }, + "waypoints/waypoints.app.js": { + "hash": "ff02639eb8f81784c942093d57d254295e2c78918adb4bcffdf0d0284ebfac55", + "rules": [ + "no-unused-vars" + ] + }, + "timerclk/timer.js": { + "hash": "f44702e61ad833b53fb28d222ff0fbd77d0307c6eb69c5ecebb8626a1cb20ed4", + "rules": [ + "no-unused-vars" + ] + }, + "timerclk/stopwatch.js": { + "hash": "92838c03923e162c0e9ab4f37ca0220a1fee61ed16cba1d38c79d7bdd0e18765", + "rules": [ + "no-unused-vars" + ] + }, + "timerclk/alarm.js": { + "hash": "6f521742cc6a6d6f215e499084a596ffc3494d1e1f950b204368c051a18773de", + "rules": [ + "no-unused-vars" + ] + }, + "speedalt2/app.js": { + "hash": "8cf396b8c2b3a449635274d537ac12dda88a829fd32336e6c2c0cd85e7f56b2d", + "rules": [ + "no-unused-vars" + ] + }, + "skyspy/skyspy.app.js": { + "hash": "49a727a4c052e8c6322a502750ca036b0d58896f476b1cffebe9c53e426c8bcc", + "rules": [ + "no-unused-vars" + ] + }, + "sixths/sixths.app.js": { + "hash": "b4572a529b31a5edcbd6ca5843b91c54abcbf75b2a28e90bd33751f7d6a3ebcd", + "rules": [ + "no-unused-vars" + ] + }, + "scribble/app.js": { + "hash": "6d13abd27bab8009a6bdabe1df2df394bc14aac20c68f67e8f8b085fa6b427cd", + "rules": [ + "no-unused-vars" + ] + }, + "promenu/boot.js": { + "hash": "8b0ed99c61c877348365d9ec50f904744f4694c5e2c0a93200e998955034ed0f", + "rules": [ + "no-unused-vars" + ] + }, + "promenu/bootb2.js": { + "hash": "558ab22819c2bc83ebf97c960c4fa494fccccbc894f1582f28972dbf8f563170", + "rules": [ + "no-unused-vars" + ] + }, + "poweroff/settings.js": { + "hash": "c197afe72c612a4b3825a3a12a628d0f4ed83823da3f28885bbf473037a02506", + "rules": [ + "no-unused-vars" + ] + }, + "oxofocus/app.js": { + "hash": "cd29309373974ef038725e26d8a2ff2634a437c89cdffc3b12defd65a948db75", + "rules": [ + "no-unused-vars" + ] + }, + "orloj/app.js": { + "hash": "9240830a097ba545fdbdb06305817234e30238bf2fbb8fbb47af83897cd588a9", + "rules": [ + "no-unused-vars" + ] + }, + "nixie/m_vatch.js": { + "hash": "36a7fa956f99d5815cd6bac570d2b86833d1d37474d7eef0bb21892bdf6723a8", + "rules": [ + "no-unused-vars" + ] + }, + "moonphase/app.js": { + "hash": "0e78c9ec9e7ab04f22f1838fcf033691024c8734de23f8d8dd51d6f11c30a2f2", + "rules": [ + "no-unused-vars" + ] + }, + "lcars/lcars.app.js": { + "hash": "a305f73ee4e77b6534746ea79e699f700fd3db305f2b0289ef081d8869e1faf1", + "rules": [ + "no-unused-vars" + ] + }, + "widagps/widget.js": { + "hash": "a58cdc481962575ef0aa0bfaedcc1f9de3ce966218c5b16168d8ed8b4b9672b8", + "rules": [ + "no-unused-vars" + ] + }, + "sleeplog/app.js": { + "hash": "336da552e4b04677447cf76a253b40bc259a597ea11d455121933f93afe99794", + "rules": [ + "no-unused-vars" + ] + }, + "recorder/widget.js": { + "hash": "b48698bab90fc4f38f880b6663eda108b8d31ce929ba1d32d815aa4ec8c74bca", + "rules": [ + "no-unused-vars" + ] + }, + "qmsched/app.js": { + "hash": "4b7dbabed6c252021531d6b0449c16a3adc2e405f2ddda33ca0a65f5fa42c663", + "rules": [ + "no-unused-vars" + ] + }, + "runplus/app.js": { + "hash": "fabec449552d17ceb5d510aa058e420757f3caba11999efbe6ebf2ac1a81eb32", + "rules": [ + "no-unused-vars" + ] + }, + "powermanager/boot.js": { + "hash": "662d9d29a80a4f2c2855097b4073a099604f4f6d444c13a33304346c788cc5cb", + "rules": [ + "no-unused-vars" + ] + }, + "ohmcalc/app.js": { + "hash": "ac1ac172c9c4f9c4faf9bc2ce8ad7dd51ecd9a5c38f28a107d39f0c86a836899", + "rules": [ + "no-unused-vars" + ] + }, + "nightwatch/nightwatch.app.js": { + "hash": "9366528bc5bb229cd08e68000a4deebaa27036a18ac5215dce7c38ffa9d69b31", + "rules": [ + "no-unused-vars" + ] + }, + "messagelist/app.js": { + "hash": "a76b5cc3ddcdbd60a9979972f274a717a901ea65e108545b13d415740a71b4e0", + "rules": [ + "no-unused-vars" + ] + }, + "imageclock/app.js": { + "hash": "198ad2d18b41ba30e3ee2545372c84ba443cec7d6f9ce4e9ca494defc9476a8e", + "rules": [ + "no-unused-vars" + ] + }, + "hworldclock/app.js": { + "hash": "e4c34cc76e242541156006952a2cf05427feb0fbe70ae55a1afb9bd0e1d5fae1", + "rules": [ + "no-unused-vars" + ] + }, + "homework/app.js": { + "hash": "f367470e50c9105ee1f48c3193c605293338c35bd1ae1488467404270a20747c", + "rules": [ + "no-unused-vars" + ] + }, + "hidmsicswipe/hidmsicswipe.js": { + "hash": "8c8c2058315c6debaec71b65b1409ebf5725233c72dbcc2ac921bec0d238fd4f", + "rules": [ + "no-unused-vars" + ] + }, + "hidcam/app.js": { + "hash": "29a9e8add8daa19ec5c12bf6b372fe4e59c2b07be30e305e9d75dac55995dffd", + "rules": [ + "no-unused-vars" + ] + }, + "gpstrek/app.js": { + "hash": "9c941a29790dd642579478bf4b19a2afd5473a782d07fafd2c8113b2d7392bec", + "rules": [ + "no-unused-vars" + ] + }, + "gpstouch/gpstouch.app.js": { + "hash": "3492b202c866d6d619298456a48dd8501c4b34f5cce84698e92c62acaf3b8ce4", + "rules": [ + "no-unused-vars" + ] + }, + "gpspoilog/app.js": { + "hash": "38c72e56a4929102f5748ed5e5415a63a31bfd3bf6d853527a10d71a268bc294", + "rules": [ + "no-unused-vars" + ] + }, + "gpsrec/app.js": { + "hash": "4d842608edea63975c7da9db6be2746af8849ea2dcc9135fc7d77e5806701f60", + "rules": [ + "no-unused-vars" + ] + }, + "golfview/maptools.js": { + "hash": "2c3bdb849dce1710863693f2370f7fb32070a7c3bec915d8d2ef8106fda937d8", + "rules": [ + "no-unused-vars" + ] + }, + "golfview/golfview.js": { + "hash": "76d8a7743122a63bd82c8e95c234229261829b465a4bc998cdc9e45860ec7fc4", + "rules": [ + "no-unused-vars" + ] + }, + "golfscore/app.js": { + "hash": "2df86a3f159b72229011f6276ef023c764837b39552b852f1caa431450a06f3a", + "rules": [ + "no-unused-vars" + ] + }, + "geissclk/clock.js": { + "hash": "2e547f904f17995668e351a9031bc4701ddaff71cba4f88ca28d51a4dd4f6154", + "rules": [ + "no-unused-vars" + ] + }, + "gbmusic/app.js": { + "hash": "c36e9ccf6813264000732cf8aae5b16bb63afafb3bdc81f6f98d670c008b3416", + "rules": [ + "no-unused-vars" + ] + }, + "gbdebug/app.js": { + "hash": "5372409dd09a1b165b009afc7dc9af24d4be223ffc6507a3f6e1cbb694a3eeec", + "rules": [ + "no-unused-vars" + ] + }, + "gallery/app.js": { + "hash": "81b119cc61c9d1ae76071f7ef05580f4f93ac60bf97fbdfe418463817e045402", + "rules": [ + "no-unused-vars" + ] + }, + "football/app.js": { + "hash": "a24c293073557c259cffbf4f1340b6c9111832b7230b3e36072f32335ce4047b", + "rules": [ + "no-unused-vars" + ] + }, + "fd6fdetect/app.js": { + "hash": "5fb67c4e3699ed30815b6e316ce669f1b8479aa312bf4d8348e30cdf0a29409f", + "rules": [ + "no-unused-vars" + ] + }, + "dotmatrixclock/app.js": { + "hash": "ad51c66072f5dd799826e1b3b69c6febb6ab93c93b2eb2245b4035c36b496063", + "rules": [ + "no-unused-vars" + ] + }, + "dragboard/lib.js": { + "hash": "e3cbf03054134e9b8e570f02ea5cf0d3e784c8f47d68c85eaa2c5b005291b668", + "rules": [ + "no-unused-vars" + ] + }, + "doztime/app-bangle2.js": { + "hash": "81592fe1bc6537f80d7dbe7b2e8145924d2400f98ea780c68dd5bd9694376c8a", + "rules": [ + "no-unused-vars" + ] + }, + "devstopwatch/app.js": { + "hash": "bb75693cc6ed2ffef0d227a40b53079e06d1ebcc7c2d9eed671b5401a8e06433", + "rules": [ + "no-unused-vars" + ] + }, + "coretemp/settings.js": { + "hash": "b5aa84ecab587b444028b4491b2c2e8f3b2303aa33745265ab629c6ff5141cfb", + "rules": [ + "no-unused-vars" + ] + }, + "coretemp/boot.js": { + "hash": "02ee3a04d7dc485367394a91e570affd712ab919bbb155bdafc00e534d3bcd4a", + "rules": [ + "no-unused-vars" + ] + }, + "configurable_clock/app.js": { + "hash": "09d1d02b63abc4ecea5e00a7372de7150ccfe67c2502ff5d298ec7b8e29c353b", + "rules": [ + "no-unused-vars" + ] + }, + "chronowid/widget.js": { + "hash": "1056a77f508708a6667e7ae3d201add1d747a1ea4eeab2b3b8afce24a97f1e65", + "rules": [ + "no-unused-vars" + ] + }, + "cliclockJS2Enhanced/app.js": { + "hash": "056b4eeddbabbcf0f94db83d188e55dc0008bccb3913af76e31236e74a780aa1", + "rules": [ + "no-unused-vars" + ] + }, + "chrono/chrono.js": { + "hash": "62a4fe13d32528af5107e8008197510115134d749851f8ecfe062c7190b4fc5e", + "rules": [ + "no-unused-vars" + ] + }, + "chess/engine.js": { + "hash": "5ab335ed76f39b69e5b3436325229d8b3bd2c20a5da6d32bcb7c194f79c9f89c", + "rules": [ + "no-unused-vars" + ] + }, + "animclk/create_images.js": { + "hash": "05a222b265effe46b2c7a9cc0822c6c4cd86335d5d3a0cecce5fdd15d5e09b9f", + "rules": [ + "no-unused-vars" + ] + }, + "calculator/app.js": { + "hash": "fcb7c7b6c4ec5ce0f425d2a690baab8da235a12e685fe2680cbd4cf2cfdef0b0", + "rules": [ + "no-unused-vars" + ] + }, + "bthrm/bthrm.js": { + "hash": "0ad6b3150200efa959096d239a136865fc0ee1df0c50ebaae76693c07df7a02e", + "rules": [ + "no-unused-vars" + ] + }, + "bowserWF/app.js": { + "hash": "ec1e9fabf53e16dc91b19d305616ae0dfd879c32c3b1116da97928ebb8d2eb56", + "rules": [ + "no-unused-vars" + ] + }, + "blackjack/blackjack.app.js": { + "hash": "392382463c90b11b31818e974c3198ed4ec4ed681c9668b4a39865ab055d68ad", + "rules": [ + "no-unused-vars" + ] + }, + "blackjack/appb2.js": { + "hash": "d2e866a297811dfec4cba834c996e1e085421820673a038a9a9e9d438e4fabf9", + "rules": [ + "no-unused-vars" + ] + }, + "astral/app.js": { + "hash": "a210269f0d57eb496a3b75cfc4550676f9d7e85a697c77e18f41bf02549179e3", + "rules": [ + "no-unused-vars" + ] + }, + "ballmaze/app.js": { + "hash": "cd493a329063e879f44ead211cbecb4ca25da2d5c40b65ba05d6e9b2b91ff8a5", + "rules": [ + "no-unused-vars" + ] + }, + "astrocalc/astrocalc-app.js": { + "hash": "00e29864b2bfeec7f11bd8509181b26f7916c25dd4a777abfe1fbd555822983d", + "rules": [ + "no-unused-vars" + ] + }, + "HRV/app.js": { + "hash": "265b4b0272c43126670b5026079711354cee0a211096bcd2c18139b7a3ee774a", + "rules": [ + "no-unused-vars" + ] + }, + "locale/locales.js": { + "hash": "bf2fd659e673b34a1ffa98c7ae7ca89de86a4ff9f823244d028e85bc465ed3c7", + "rules": [ + "no-unused-vars" + ] + }, + "sleeplog/lib.js": { + "hash": "755e0d4c02b92181281fd6990df39c9446c73ff896b50b64d7e14cb1c0188556", + "rules": [ + "no-unused-vars" + ] + }, + "doztime/app-bangle1.js": { + "hash": "1e9598c201175180ae77d1c3bc47e8138b339b72eb58782b5057fb7aefdc88a1", + "rules": [ + "no-unused-vars" + ] + }, + "carcrazy/app.js": { + "hash": "fd9f98f4f9e24c63a8fa02918dceab4503edf88e06537922caf86e85884408f3", + "rules": [ + "no-unused-vars" + ] + }, + "a_dndtoggle/a_dndtoggle.app.js": { + "hash": "190b2416e57db0886ffbbe94d86fc05779b69802d9b94561588baeb756cc3d90", + "rules": [ + "no-unused-vars" + ] + } +}; diff --git a/apps/lunaclock/ChangeLog b/apps/lunaclock/ChangeLog index 2286a7f70..7727f3cc4 100644 --- a/apps/lunaclock/ChangeLog +++ b/apps/lunaclock/ChangeLog @@ -1 +1,2 @@ -0.01: New App! \ No newline at end of file +0.01: New App! +0.02: Minor code improvements diff --git a/apps/lunaclock/app.js b/apps/lunaclock/app.js index e73467bc1..63c3a3377 100644 --- a/apps/lunaclock/app.js +++ b/apps/lunaclock/app.js @@ -5,7 +5,7 @@ var MYIMG = { //var IMAGEWIDTH = 176; //var IMAGEHEIGHT = 109; -var IMAGEWIDTH = 176; +//var IMAGEWIDTH = 176; var IMAGEHEIGHT = 176; Graphics.prototype.setFontcustom = function() { diff --git a/apps/lunaclock/metadata.json b/apps/lunaclock/metadata.json index 4e797d8e7..501fe19be 100644 --- a/apps/lunaclock/metadata.json +++ b/apps/lunaclock/metadata.json @@ -1,7 +1,7 @@ { "id": "lunaclock", "name": "Luna Clock", - "version": "0.01", + "version": "0.02", "description": "Simple clock face inspired by the moon.", "icon": "app.png", "screenshots": [{"url":"screenshot.png"}], diff --git a/apps/magnav/ChangeLog b/apps/magnav/ChangeLog index 14a6eb2a2..d2cf3b7af 100644 --- a/apps/magnav/ChangeLog +++ b/apps/magnav/ChangeLog @@ -4,3 +4,4 @@ 0.04: Fix Font size 0.05: Initial portable version 0.06: Outsource tilt compensation to library +0.07: Minor code improvements diff --git a/apps/magnav/magnav_b1.js b/apps/magnav/magnav_b1.js index 0ec49014f..746747401 100644 --- a/apps/magnav/magnav_b1.js +++ b/apps/magnav/magnav_b1.js @@ -59,7 +59,7 @@ function newHeading(m,h){ return hd; } -var candraw = false; +//var candraw = false; var CALIBDATA = require("Storage").readJSON("magnav.json",1)||null; const tiltfixread = require("magnav").tiltfixread; @@ -123,12 +123,12 @@ function startdraw(){ g.fillPoly([120,Yoff+60,110,Yoff+80,130,Yoff+80]); g.setColor(1,1,1); Bangle.drawWidgets(); - candraw = true; + //candraw = true; intervalRef = setInterval(reading,200); } function stopdraw() { - candraw=false; + //candraw=false; if(intervalRef) {clearInterval(intervalRef);} } diff --git a/apps/magnav/magnav_b2.js b/apps/magnav/magnav_b2.js index 319860159..e141336cb 100644 --- a/apps/magnav/magnav_b2.js +++ b/apps/magnav/magnav_b2.js @@ -51,7 +51,7 @@ function newHeading(m,h){ return hd; } -var candraw = false; +//var candraw = false; var CALIBDATA = require("Storage").readJSON("magnav.json",1)||null; const tiltfixread = require("magnav").tiltfixread; @@ -77,13 +77,13 @@ function reading() { g.flip(); } -var calibrating=false; +//var calibrating=false; function docalibrate(first){ - calibrating=true; + //calibrating=true; const title = "Calibrate"; const msg = "takes 20 seconds"; function restart() { - calibrating=false; + //calibrating=false; setButtons(); startdraw(); } @@ -118,12 +118,12 @@ var intervalRef; function startdraw(){ g.clear(1); Bangle.drawWidgets(); - candraw = true; + //candraw = true; intervalRef = setInterval(reading,200); } function stopdraw() { - candraw=false; + //candraw=false; if(intervalRef) {clearInterval(intervalRef);} } diff --git a/apps/magnav/metadata.json b/apps/magnav/metadata.json index bd40a08fd..6bdb9d0b6 100644 --- a/apps/magnav/metadata.json +++ b/apps/magnav/metadata.json @@ -1,7 +1,7 @@ { "id": "magnav", "name": "Navigation Compass", - "version": "0.06", + "version": "0.07", "description": "Compass with linear display as for GPSNAV. Has Tilt compensation and remembers calibration.", "screenshots": [{"url":"screenshot-b2.png"},{"url":"screenshot-light-b2.png"}], "icon": "magnav.png", diff --git a/apps/mandelbrotclock/ChangeLog b/apps/mandelbrotclock/ChangeLog index d7bda0d78..d4092e4b7 100644 --- a/apps/mandelbrotclock/ChangeLog +++ b/apps/mandelbrotclock/ChangeLog @@ -1,2 +1,3 @@ 0.01: Initial Release - \ No newline at end of file + +0.02: Minor code improvements diff --git a/apps/mandelbrotclock/mandelbrotclock.js b/apps/mandelbrotclock/mandelbrotclock.js index 94636056e..ffb0d395c 100644 --- a/apps/mandelbrotclock/mandelbrotclock.js +++ b/apps/mandelbrotclock/mandelbrotclock.js @@ -31,4 +31,4 @@ g.clear(); // draw immediately at first draw(); -var secondInterval = setInterval(draw, 1000); +setInterval(draw, 1000); diff --git a/apps/mandelbrotclock/metadata.json b/apps/mandelbrotclock/metadata.json index 852855184..74eeff57a 100644 --- a/apps/mandelbrotclock/metadata.json +++ b/apps/mandelbrotclock/metadata.json @@ -1,7 +1,7 @@ { "id": "mandelbrotclock", "name": "Mandelbrot Clock", - "version": "0.01", + "version": "0.02", "description": "A mandelbrot set themed clock cool", "icon": "mandelbrotclock.png", "screenshots": [{ "url": "screenshot_mandelbrotclock.png" }], diff --git a/apps/megadenti/ChangeLog b/apps/megadenti/ChangeLog index 7f28ed46d..541dc923e 100644 --- a/apps/megadenti/ChangeLog +++ b/apps/megadenti/ChangeLog @@ -1 +1,2 @@ 0.01: Create New App ! +0.02: Minor code improvements diff --git a/apps/megadenti/app.js b/apps/megadenti/app.js index 72d517935..f13ccedb8 100644 --- a/apps/megadenti/app.js +++ b/apps/megadenti/app.js @@ -1,4 +1,3 @@ -var i = 0; var counter = 10; var counterInterval; diff --git a/apps/megadenti/metadata.json b/apps/megadenti/metadata.json index a44cf067c..38e612576 100644 --- a/apps/megadenti/metadata.json +++ b/apps/megadenti/metadata.json @@ -2,7 +2,7 @@ "name": "Denti", "shortName":"My Denti", "icon": "brush-teeth.png", - "version":"0.01", + "version": "0.02", "description": "This app allows you wash your teeth in an efficent way. A coloured timer guides you while your smile becomes bright!", "tags": "game", "supports": ["BANGLEJS"], diff --git a/apps/messageicons/ChangeLog b/apps/messageicons/ChangeLog index f420615cb..4e8972f7a 100644 --- a/apps/messageicons/ChangeLog +++ b/apps/messageicons/ChangeLog @@ -4,3 +4,5 @@ Store all icons in a separate binary file (much faster lookup) 0.04: Add message icon for 'clock' 0.05: Add message icon for 'jira' +0.06: Add message icon for 'molly' and 'threema libre' +0.07: Minor code improvements diff --git a/apps/messageicons/icons/generate.js b/apps/messageicons/icons/generate.js index b77cfc26e..4b52ae167 100755 --- a/apps/messageicons/icons/generate.js +++ b/apps/messageicons/icons/generate.js @@ -16,7 +16,6 @@ const imgOptions = { var PNG = require('png-js'); var IMAGE_BYTES = 76; -var iconTests = []; var iconImages = []; // array of converted icons var iconIndices = {}; // maps filename -> index in iconImages @@ -72,7 +71,9 @@ Promise.all(promises).then(function() { require("fs").writeFileSync(__dirname+"/../icons.img", Buffer.from(iconData,"binary")); console.log("Saving library"); - require("fs").writeFileSync(__dirname+"/../lib.js", `exports.getImage = function(msg) { + require("fs").writeFileSync(__dirname+"/../lib.js", `// This file is auto-generated - DO NOT MODIFY +// If you want to add icons, change icons/icon_names.json and re-run icons/generate.js +exports.getImage = function(msg) { if (msg.img) return atob(msg.img); let s = (("string"=== typeof msg) ? msg : (msg.src || "")).toLowerCase(); if (msg.id=="music") s="music"; @@ -87,16 +88,15 @@ exports.getColor = function(msg,options) { if (st.iconColorMode == 'mono') return options.default; const s = (("string"=== typeof msg) ? msg : (msg.src || "")).toLowerCase(); return { - // This file is generated by /icons/generate.js. If you need to modify its content, you should do it there instead. - // generic colors, using B2-safe colors - // DO NOT USE BLACK OR WHITE HERE, just leave the declaration out and then the theme's fg color will be used + /* generic colors, using B2-safe colors */ ${ /* DO NOT USE BLACK OR WHITE HERE, just leave the declaration out and then the theme's fg color will be used */"" } "airbnb": "#ff385c", // https://news.airbnb.com/media-assets/category/brand/ "mail": "#ff0", "music": "#f0f", "phone": "#0f0", - "sms message": "#0ff", - // brands, according to https://www.schemecolor.com/?s (picking one for multicolored logos) - // all dithered on B2, but we only use the color for the icons. (Could maybe pick the closest 3-bit color for B2?) + "sms message": "#0ff", ${ /* + brands, according to https://www.schemecolor.com/?s (picking one for multicolored logos) + all dithered on B2, but we only use the color for the icons. (Could maybe pick the closest 3-bit color for B2?) +*/""} "bibel": "#54342c", "bring": "#455a64", "discord": "#5865f2", // https://discord.com/branding diff --git a/apps/messageicons/icons/icon_names.json b/apps/messageicons/icons/icon_names.json index 7c09cd397..de8be9e98 100644 --- a/apps/messageicons/icons/icon_names.json +++ b/apps/messageicons/icons/icon_names.json @@ -80,6 +80,7 @@ { "app":"infinity", "icon":"reddit.png" }, { "app":"slide", "icon":"reddit.png" }, { "app":"signal", "icon":"signal.png" }, + { "app":"molly", "icon":"signal.png" }, { "app":"skype", "icon":"skype.png" }, { "app":"slack", "icon":"slack.png" }, { "app":"snapchat", "icon":"snapchat.png" }, @@ -89,6 +90,7 @@ { "app":"telegram", "icon":"telegram.png" }, { "app":"telegram foss", "icon":"telegram.png" }, { "app":"threema", "icon":"threema.png" }, + { "app":"threema libre", "icon":"threema.png" }, { "app":"tiktok", "icon":"tiktok.png" }, { "app":"to do", "icon":"task.png" }, { "app":"opentasks", "icon":"task.png" }, diff --git a/apps/messageicons/lib.js b/apps/messageicons/lib.js index 306a4ae46..b3ff2d9ff 100644 --- a/apps/messageicons/lib.js +++ b/apps/messageicons/lib.js @@ -1,3 +1,5 @@ +// This file is auto-generated - DO NOT MODIFY +// If you want to add icons, change icons/icon_names.json and re-run icons/generate.js exports.getImage = function(msg) { if (msg.img) return atob(msg.img); let s = (("string"=== typeof msg) ? msg : (msg.src || "")).toLowerCase(); @@ -13,16 +15,12 @@ exports.getColor = function(msg,options) { if (st.iconColorMode == 'mono') return options.default; const s = (("string"=== typeof msg) ? msg : (msg.src || "")).toLowerCase(); return { - // This file is generated by /icons/generate.js. If you need to modify its content, you should do it there instead. - // generic colors, using B2-safe colors - // DO NOT USE BLACK OR WHITE HERE, just leave the declaration out and then the theme's fg color will be used + /* generic colors, using B2-safe colors */ "airbnb": "#ff385c", // https://news.airbnb.com/media-assets/category/brand/ "mail": "#ff0", "music": "#f0f", "phone": "#0f0", - "sms message": "#0ff", - // brands, according to https://www.schemecolor.com/?s (picking one for multicolored logos) - // all dithered on B2, but we only use the color for the icons. (Could maybe pick the closest 3-bit color for B2?) + "sms message": "#0ff", "bibel": "#54342c", "bring": "#455a64", "discord": "#5865f2", // https://discord.com/branding @@ -67,4 +65,4 @@ exports.getColor = function(msg,options) { "youtube": "#f00", // https://www.youtube.com/howyoutubeworks/resources/brand-resources/#logos-icons-and-colors }[s]||options.default; }; - + \ No newline at end of file diff --git a/apps/messageicons/metadata.json b/apps/messageicons/metadata.json index 13f218508..13ae5f232 100644 --- a/apps/messageicons/metadata.json +++ b/apps/messageicons/metadata.json @@ -1,7 +1,7 @@ { "id": "messageicons", "name": "Message Icons", - "version": "0.05", + "version": "0.07", "description": "Library containing a list of icons and colors for apps", "icon": "app.png", "type": "module", diff --git a/apps/messagelist/ChangeLog b/apps/messagelist/ChangeLog index 899e29cb6..25269b1dd 100644 --- a/apps/messagelist/ChangeLog +++ b/apps/messagelist/ChangeLog @@ -2,4 +2,4 @@ 0.02: Fix music updates while app is already open 0.03: Fix invalid use of Bangle.setUI 0.04: Fix app crashing when new message arrives - +0.05: Minor code improvements diff --git a/apps/messagelist/metadata.json b/apps/messagelist/metadata.json index 2f1abe11d..84b0a6489 100644 --- a/apps/messagelist/metadata.json +++ b/apps/messagelist/metadata.json @@ -1,7 +1,7 @@ { "id": "messagelist", "name": "Message List", - "version": "0.04", + "version": "0.05", "description": "Display notifications from iOS and Gadgetbridge/Android as a list", "icon": "app.png", "type": "app", diff --git a/apps/messagelist/settings.js b/apps/messagelist/settings.js index cd2767336..1dc80ade1 100644 --- a/apps/messagelist/settings.js +++ b/apps/messagelist/settings.js @@ -109,7 +109,7 @@ } function showUtilsMenu() { - let m = E.showMenu({ + E.showMenu({ "": {"title": /*LANG*/"Utilities"}, "< Back": () => showMainMenu(), /*LANG*/"Delete all": () => { diff --git a/apps/messages_light/ChangeLog b/apps/messages_light/ChangeLog index 37b9c4c5e..43766ccfd 100644 --- a/apps/messages_light/ChangeLog +++ b/apps/messages_light/ChangeLog @@ -8,4 +8,5 @@ 1.4: new management of events implemented; removed code no longer used (from now the music will be managed by the Messagesgui app) 1.5: Fix graphic bug; View via popup while there are other open apps 1.6: fix for #2689; ( white screen ) -1.7: Fix removal notification from the list of current notifications \ No newline at end of file +1.7: Fix removal notification from the list of current notifications +1.08: Minor code improvements diff --git a/apps/messages_light/messages_light.app.js b/apps/messages_light/messages_light.app.js index fc50cc100..735c85e0c 100644 --- a/apps/messages_light/messages_light.app.js +++ b/apps/messages_light/messages_light.app.js @@ -41,7 +41,7 @@ let EventQueue=[]; //in posizione 0, c'è quello attualmente visualizzato let callInProgress=false; -let justOpened=true; +//let justOpened=true; @@ -506,7 +506,7 @@ let main = function(){ LOG("file event not found! -> ?? open debug text"); setTimeout(_=>{ GB({"t":"notify","id":15754117198411,"src":"Hangouts","title":"A Name","body":"Debug notification \nmessage contents demo demo demo demo"}) },0); } - justOpened=false; + //justOpened=false; }; diff --git a/apps/messages_light/metadata.json b/apps/messages_light/metadata.json index 8c454b33d..cd3f92493 100644 --- a/apps/messages_light/metadata.json +++ b/apps/messages_light/metadata.json @@ -1,7 +1,7 @@ { "id": "messages_light", "name": "Messages Light", - "version": "1.7", + "version": "1.08", "description": "A light implementation of messages App (display notifications from iOS and Gadgetbridge/Android)", "icon": "app.png", "type": "app", diff --git a/apps/minimal_clock/ChangeLog b/apps/minimal_clock/ChangeLog index 54ee389e3..e38a7c5a5 100644 --- a/apps/minimal_clock/ChangeLog +++ b/apps/minimal_clock/ChangeLog @@ -1,3 +1,4 @@ ... 0.03: First update with ChangeLog Added 0.04: Tell clock widgets to hide. +0.05: Minor code improvements diff --git a/apps/minimal_clock/app.js b/apps/minimal_clock/app.js index 47eca3c66..41649a286 100644 --- a/apps/minimal_clock/app.js +++ b/apps/minimal_clock/app.js @@ -120,7 +120,6 @@ let twoPi = 2*Math.PI, deg2rad = Math.PI/180; let Pi = Math.PI; - let halfPi = Math.PI/2; let sin = Math.sin, cos = Math.cos; diff --git a/apps/minimal_clock/metadata.json b/apps/minimal_clock/metadata.json index 3089780ce..9f0a398c8 100644 --- a/apps/minimal_clock/metadata.json +++ b/apps/minimal_clock/metadata.json @@ -1,7 +1,7 @@ { "id": "minimal_clock", "name": "Minimal Analog Clock", "shortName":"Minimal Clock", - "version":"0.04", + "version": "0.05", "description": "a minimal analog clock - just with some hands and no clock face", "icon": "app-icon.png", "type": "clock", diff --git a/apps/moonphase/ChangeLog b/apps/moonphase/ChangeLog index baa668c3c..c9f09e0f5 100644 --- a/apps/moonphase/ChangeLog +++ b/apps/moonphase/ChangeLog @@ -1,2 +1,3 @@ 0.01: New App! -0.02: Added GPS to obtain coordinates, added buttons \ No newline at end of file +0.02: Added GPS to obtain coordinates, added buttons +0.03: Minor code improvements diff --git a/apps/moonphase/app.js b/apps/moonphase/app.js index 321e6ab3f..ff792b250 100644 --- a/apps/moonphase/app.js +++ b/apps/moonphase/app.js @@ -13,7 +13,7 @@ var PI = Math.PI, tan = Math.tan, asin = Math.asin, atan = Math.atan2, - acos = Math.acos, + //acos = Math.acos, rad = PI / 180, dayMs = 1000 * 60 * 60 * 24, J1970 = 2440588, @@ -228,7 +228,7 @@ function getMPhaseSim (offset) { if(dd<10){dd='0'+dd;} var mm = String(date.getMonth() + 1); if(mm<10){mm='0'+mm;} - var yyyy = date.getFullYear(); + //var yyyy = date.getFullYear(); var phase = SunCalc.getMoonIllumination(date); return phase.name; } diff --git a/apps/moonphase/metadata.json b/apps/moonphase/metadata.json index 548518338..0fc963f5b 100644 --- a/apps/moonphase/metadata.json +++ b/apps/moonphase/metadata.json @@ -1,7 +1,7 @@ { "id": "moonphase", "name": "Moonphase", - "version": "0.02", + "version": "0.03", "description": "Shows current moon phase. Now with GPS function.", "icon": "app.png", "tags": "", diff --git a/apps/mtgwatchface/ChangeLog b/apps/mtgwatchface/ChangeLog index 32a3cd454..f0310586c 100644 --- a/apps/mtgwatchface/ChangeLog +++ b/apps/mtgwatchface/ChangeLog @@ -1,2 +1,3 @@ 0.01: New App! 0.02: Support Dark Theme. +0.03: Minor code improvements diff --git a/apps/mtgwatchface/app.js b/apps/mtgwatchface/app.js index 044845fcc..870ea5eef 100644 --- a/apps/mtgwatchface/app.js +++ b/apps/mtgwatchface/app.js @@ -182,6 +182,6 @@ NRF.on('connect', draw); NRF.on('disconnect', draw); Bangle.on("charging", draw); -var redrawTimerId = setInterval(function(){ +setInterval(function(){ draw(); }, 60000); diff --git a/apps/mtgwatchface/metadata.json b/apps/mtgwatchface/metadata.json index ac5fe9287..6b7e75d6c 100644 --- a/apps/mtgwatchface/metadata.json +++ b/apps/mtgwatchface/metadata.json @@ -2,7 +2,7 @@ "id": "mtgwatchface", "name": "MTG Watchface", "shortName": "Magic the Gathering Watch Face", - "version": "0.02", + "version": "0.03", "description": "Magic the Gathering themed watch face. Embrace the inner wizzard. Dispay any of the different types of mana on your watch. Which color are you devoted to today? ", "icon": "icon.png", "screenshots": [ diff --git a/apps/multiclock/ChangeLog b/apps/multiclock/ChangeLog index 50b9049ac..5a481b1d4 100644 --- a/apps/multiclock/ChangeLog +++ b/apps/multiclock/ChangeLog @@ -8,4 +8,4 @@ 0.08: fix minute tick bug 0.09: use setUI clockupdown for controls + fix small display bug in nifty face 0.10: stop widget field from flashing when moving to the dk clock face. - +0.11: Minor code improvements diff --git a/apps/multiclock/dk.face.js b/apps/multiclock/dk.face.js index 3a512f8e5..bd815da96 100644 --- a/apps/multiclock/dk.face.js +++ b/apps/multiclock/dk.face.js @@ -11,9 +11,9 @@ var now=Date(); d=now.toString().split(' '); var min=d[4].substr(3,2); - var sec=d[4].substr(-2); + //var sec=d[4].substr(-2); var tm=d[4].substring(0,5); - var hr=d[4].substr(0,2); + //var hr=d[4].substr(0,2); lastmin=min; g.reset(); g.clearRect(0,24,W-1,H-1); diff --git a/apps/multiclock/metadata.json b/apps/multiclock/metadata.json index cdc84d78f..8ebbef900 100644 --- a/apps/multiclock/metadata.json +++ b/apps/multiclock/metadata.json @@ -1,7 +1,7 @@ { "id": "multiclock", "name": "Multi Clock", - "version": "0.10", + "version": "0.11", "description": "Clock with multiple faces. Switch between faces with BTN1 & BTN3 (Bangle 2 touch top-right, bottom right). For best display set theme Background 2 to cyan or some other bright colour in settings.", "screenshots": [{"url":"screen-ana.png"},{"url":"screen-big.png"},{"url":"screen-td.png"},{"url":"screen-nifty.png"},{"url":"screen-word.png"},{"url":"screen-sec.png"}], "icon": "multiclock.png", diff --git a/apps/nato/ChangeLog b/apps/nato/ChangeLog index 5560f00bc..7727f3cc4 100644 --- a/apps/nato/ChangeLog +++ b/apps/nato/ChangeLog @@ -1 +1,2 @@ 0.01: New App! +0.02: Minor code improvements diff --git a/apps/nato/metadata.json b/apps/nato/metadata.json index 49366e6e7..5dd5b9c9b 100644 --- a/apps/nato/metadata.json +++ b/apps/nato/metadata.json @@ -2,7 +2,7 @@ "id": "nato", "name": "NATO Alphabet", "shortName": "NATOAlphabet", - "version": "0.01", + "version": "0.02", "description": "Learn the NATO Phonetic alphabet plus some numbers.", "icon": "nato.png", "type": "app", diff --git a/apps/nato/nato.js b/apps/nato/nato.js index e9bbd9bba..52cccf6fd 100644 --- a/apps/nato/nato.js +++ b/apps/nato/nato.js @@ -4,7 +4,7 @@ const FONT_NAME = 'Vector12'; const FONT_SIZE = 80; const SCREEN_PIXELS = 240; -const UNIT = 100; +//const UNIT = 100; const NATO_MAP = { A: 'ALFA', B: 'BRAVO', diff --git a/apps/nixie/ChangeLog b/apps/nixie/ChangeLog index 5560f00bc..7727f3cc4 100644 --- a/apps/nixie/ChangeLog +++ b/apps/nixie/ChangeLog @@ -1 +1,2 @@ 0.01: New App! +0.02: Minor code improvements diff --git a/apps/nixie/app.js b/apps/nixie/app.js index a62590f75..2b948b120 100644 --- a/apps/nixie/app.js +++ b/apps/nixie/app.js @@ -5,7 +5,6 @@ const isB2 = g.getWidth() < 200; // global coordinate system const wX = g.getWidth(); const wY = g.getHeight(); -const midX = wX/2, midY = wY/2; // relative positioning: send 0 <= coord < 1 function relX(x) { return Math.floor(x*wX); } function relY(y) { return Math.floor(y*wY); } @@ -13,7 +12,7 @@ function relY(y) { return Math.floor(y*wY); } // colors const col_bg = 0; const col_nm =isB2 ? 1 :"#206040"; -const col_sep = isB2 ? 6 :"#202020"; +//const col_sep = isB2 ? 6 :"#202020"; const col_off = isB2 ? 1 : "#202020"; const col_shad1 = isB2 ? 4 :"#FF0000"; const col_shad2 = isB2 ? 6 :"#FF6000"; @@ -27,16 +26,15 @@ var imgTube = { width : 64, height : 128, bpp : 2, buffer : require("heatshrink").decompress(atob("AE9AB7sQD54AOiFQB5tVsgPN0uoBxkByEFB5kGyIPNhVVB5tpLwKAMoJuOgNQggMJgtVDhsVqtEZ5cVrWlEBcFtWq1WlJxUaBwOq1IgJgIdCqoABEBEC1WVBwTkGKgUGFYIOCgIRDC4kaFoVUOQQKCQ4IgCB4YKDCYIgCq2QgEqHwJLIEoOkgFqB4KaIEoNkB4Z7JHQVqquqD5EVDYQPCVRIPE1IPKgsAtJTCAA8GyEBD4TrKqAPOgNRB5sRB5wfPgAPOiA/RP4IPaiD6BB5oCBB5kAdQIPNH5wPCvIPMBgIPMR4QPcL4QPNgIPQvS/MqtAB59+B9cVB91VL91BF91RF79RB4OVD5wPsH59BB51FB5sQB/0AD7xvPV4elD5wPLqIPOgJPeX/6//X8YPMH5wPPL74PfN55PQB6TfPB5afDB51/D57P/Z/7P/B97vOB5kAB58VoAA=")) }; -var imgTubeBW = { +/*var imgTubeBW = { width : 46, height : 92, bpp : 1, buffer : require("heatshrink").decompress(atob("AD0EAomAAgcCBQkQEykwAgcP/gFD/wKECok4AgcB4A7DgwQEjAFEsYWExg2DhkgAoVAE4kA8AEDgZqEhw+JgA+DCwIKEhhrJCyJELFqBbQIiByLIk6gWZyC3WOSItWOVq3nCywA=")) -}; +};*/ require("Font8x12").add(Graphics); g.setFont("8x12", 1); -let interval = null; -let alarming = false; +//let alarming = false; let nightMode = false; // our scale factor diff --git a/apps/nixie/metadata.json b/apps/nixie/metadata.json index 50f02712b..df8c4653e 100644 --- a/apps/nixie/metadata.json +++ b/apps/nixie/metadata.json @@ -2,7 +2,7 @@ "id": "nixie", "name": "Nixie Clock", "shortName": "Nixie", - "version": "0.01", + "version": "0.02", "description": "A nixie tube clock for both Bangle 1 and 2.", "icon": "nixie.png", "type": "clock", diff --git a/apps/novaclock/ChangeLog b/apps/novaclock/ChangeLog index 8b05ff9ec..35d9f1ea1 100644 --- a/apps/novaclock/ChangeLog +++ b/apps/novaclock/ChangeLog @@ -1,3 +1,4 @@ ... 0.10: First update with ChangeLog Added 0.11: Tell clock widgets to hide. +0.12: Minor code improvements diff --git a/apps/novaclock/app.js b/apps/novaclock/app.js index 13cf3bfb3..bed0737e3 100644 --- a/apps/novaclock/app.js +++ b/apps/novaclock/app.js @@ -247,7 +247,6 @@ g.setFont("6x8", 4); g.setColor("#FFF"); var open = false; var timemode = true; -var clockmode; var novaYPos = -7; Bangle.setUI("clock"); g.clear(); @@ -263,7 +262,7 @@ g.drawImage(star(), 120, -5, {scale:0.8}); -var secondInterval = setInterval(function() { +setInterval(function() { timedraw(); g.drawImage(novaTopRedraw(), -10, novaYPos, { scale: 2.2 diff --git a/apps/novaclock/metadata.json b/apps/novaclock/metadata.json index 69b7627f8..40e41443c 100644 --- a/apps/novaclock/metadata.json +++ b/apps/novaclock/metadata.json @@ -3,7 +3,7 @@ "shortName":"Nova Clock", "icon": "app.png", "type": "clock", - "version":"0.11", + "version": "0.12", "description": "A clock inspired by the Kirby series", "tags": "clock", "supports": ["BANGLEJS2"], diff --git a/apps/numerals/ChangeLog b/apps/numerals/ChangeLog index d6703a96b..f8e76dd62 100644 --- a/apps/numerals/ChangeLog +++ b/apps/numerals/ChangeLog @@ -9,3 +9,4 @@ 0.09: Tweak for faster rendering 0.10: Enhance for use with Bangle2, insert new draw mode 'thickfill' 0.11: Convert Yes/No On/Off in settings to checkboxes +0.12: Minor code improvements diff --git a/apps/numerals/metadata.json b/apps/numerals/metadata.json index 6a1adc810..bcfb623e2 100644 --- a/apps/numerals/metadata.json +++ b/apps/numerals/metadata.json @@ -2,7 +2,7 @@ "id": "numerals", "name": "Numerals Clock", "shortName": "Numerals Clock", - "version": "0.11", + "version": "0.12", "description": "A simple big numerals clock", "icon": "numerals.png", "type": "clock", diff --git a/apps/numerals/numerals.settings.js b/apps/numerals/numerals.settings.js index b4d5d4286..a8d427fee 100644 --- a/apps/numerals/numerals.settings.js +++ b/apps/numerals/numerals.settings.js @@ -14,7 +14,7 @@ if (!numeralsSettings) resetSettings(); let dm = ["fill","frame","framefill","thickframe","thickfill"]; let col = process.env.HWVERSION==1?["rnd","r/g","y/w","o/c","b/y"]:["rnd","r/g","g/b","r/c","m/g"]; - let btn = [[24,"BTN1"],[22,"BTN2"],[23,"BTN3"],[11,"BTN4"],[16,"BTN5"]]; + //let btn = [[24,"BTN1"],[22,"BTN2"],[23,"BTN3"],[11,"BTN4"],[16,"BTN5"]]; var menu={ "" : { "title":"Numerals"}, "Colors": { diff --git a/apps/openwind/ChangeLog b/apps/openwind/ChangeLog index 50dbb9f64..2ae849d58 100644 --- a/apps/openwind/ChangeLog +++ b/apps/openwind/ChangeLog @@ -1,3 +1,4 @@ 0.01: New App! 0.02: Fix true wind computation, add swipe gesture to pause GPS 0.03: Use default Bangle formatter for booleans +0.04: Minor code improvements diff --git a/apps/openwind/app.js b/apps/openwind/app.js index db67804f3..8e9beffb0 100644 --- a/apps/openwind/app.js +++ b/apps/openwind/app.js @@ -1,13 +1,11 @@ OW_CHAR_UUID = '0000cc91-0000-1000-8000-00805f9b34fb'; require("Font7x11Numeric7Seg").add(Graphics); -var gatt = {}; +//var gatt = {}; var cx = g.getWidth()/2; var cy = 24+(g.getHeight()-24)/2; var w = (g.getWidth()-24)/2; -var y1 = 24; -var y2 = g.getHeight()-1; var gps_course = { spd: 0 }; -var course_marker_len = g.getWidth()/4; +//var course_marker_len = g.getWidth()/4; var settings = require("Storage").readJSON('openwindsettings.json', 1) || {}; @@ -81,7 +79,7 @@ function parseDevice(d) { console.log("Found device"); device.gatt.connect().then(function(ga) { console.log("Connected"); - gatt = ga; + //gatt = ga; return ga.getPrimaryService("cc90"); }).then(function(s) { return s.getCharacteristic("cc91"); diff --git a/apps/openwind/metadata.json b/apps/openwind/metadata.json index 5e0a60972..24120f7ae 100644 --- a/apps/openwind/metadata.json +++ b/apps/openwind/metadata.json @@ -1,7 +1,7 @@ { "id": "openwind", "name": "OpenWind", "shortName":"OpenWind", - "version":"0.03", + "version": "0.04", "description": "OpenWind", "icon": "openwind.png", "readme": "README.md", diff --git a/apps/orloj/ChangeLog b/apps/orloj/ChangeLog index 263d4078d..79da4daf2 100644 --- a/apps/orloj/ChangeLog +++ b/apps/orloj/ChangeLog @@ -1 +1,2 @@ 0.01: attempt to import +0.02: Minor code improvements diff --git a/apps/orloj/app.js b/apps/orloj/app.js index 8dd1cd571..166cbdb29 100644 --- a/apps/orloj/app.js +++ b/apps/orloj/app.js @@ -12,7 +12,6 @@ const lon = 14.45; const h = g.getHeight(); const w = g.getWidth(); const sm = 15; -let settings, location, mode = 0; var altitude, temperature; var img_north = Graphics.createImage(` @@ -136,7 +135,6 @@ function fracHour(d) { let twoPi = 2*Math.PI; let Pi = Math.PI; - let halfPi = Math.PI/2; let sin = Math.sin, cos = Math.cos; diff --git a/apps/orloj/metadata.json b/apps/orloj/metadata.json index a59d2e6dd..7c0b320d0 100644 --- a/apps/orloj/metadata.json +++ b/apps/orloj/metadata.json @@ -1,6 +1,6 @@ { "id": "orloj", "name": "Orloj", - "version":"0.01", + "version": "0.02", "description": "Astronomical clock", "icon": "app.png", "readme": "README.md", diff --git a/apps/pastel/ChangeLog b/apps/pastel/ChangeLog index 02cef7774..90956c18a 100644 --- a/apps/pastel/ChangeLog +++ b/apps/pastel/ChangeLog @@ -20,3 +20,4 @@ 0.17: Use default Bangle formatter for booleans 0.18: fix idle option always getting defaulted to true 0.19: Use 'modules/suncalc.js' to avoid it being copied 8 times for different apps +0.20: Minor code improvements diff --git a/apps/pastel/metadata.json b/apps/pastel/metadata.json index cf4bbbe9b..532aa8ccc 100644 --- a/apps/pastel/metadata.json +++ b/apps/pastel/metadata.json @@ -2,7 +2,7 @@ "id": "pastel", "name": "Pastel Clock", "shortName": "Pastel", - "version": "0.19", + "version": "0.20", "description": "A Configurable clock with custom fonts, background and weather display. Has a cyclic information line that includes, day, date, battery, sunrise and sunset times", "icon": "pastel.png", "dependencies": {"mylocation":"app","weather":"app"}, diff --git a/apps/pastel/pastel.app.js b/apps/pastel/pastel.app.js index bc41588d8..5acf488ed 100644 --- a/apps/pastel/pastel.app.js +++ b/apps/pastel/pastel.app.js @@ -20,7 +20,7 @@ let IDLE_MINUTES = 26; // create 1 bit, max contrast, brightness set to 85 var cloudIcon = require("heatshrink").decompress(atob("kEggIfcj+AAYM/8ADBuFwAYPAmADCCAMBwEf8ADBhFwg4aBnEPAYMYjAVBhgDDDoQDHCYc4jwDB+EP///FYIDBMTgA==")); var sunIcon = require("heatshrink").decompress(atob("kEggILIgOAAZkDAYPAgeBwPAgIFBBgPhw4TBp/yAYMcnADBnEcAYMwhgDBsEGgE/AYP8AYYLDCYgbDEYYrD8fHIwI7CIYZLDL54AHA==")); -var sunPartIcon = require("heatshrink").decompress(atob("kEggIHEmADJjEwsEAjkw8EAh0B4EAg35wEAgP+CYMDwv8AYMDBAP2g8HgH+g0DBYMMgPwAYX8gOMEwMG3kAg8OvgSBjg2BgcYGQIcBAY5CBg0Av//HAM///4MYgNBEIMOCoUMDoUAnBwGkEA")); +//var sunPartIcon = require("heatshrink").decompress(atob("kEggIHEmADJjEwsEAjkw8EAh0B4EAg35wEAgP+CYMDwv8AYMDBAP2g8HgH+g0DBYMMgPwAYX8gOMEwMG3kAg8OvgSBjg2BgcYGQIcBAY5CBg0Av//HAM///4MYgNBEIMOCoUMDoUAnBwGkEA")); var snowIcon = require("heatshrink").decompress(atob("kEggITQj/AAYM98ADBsEwAYPAjADCj+AgOAj/gAYMIuEHwEAjEPAYQVChk4AYQhCAYcYBYQTDnEPgEB+EH///IAQACE4IAB8EICIPghwDB4EeBYNAjgDBg8EAYQYCg4bCgZuFA==")); var rainIcon = require("heatshrink").decompress(atob("kEggIPMh+AAYM/8ADBuFwAYPgmADB4EbAYOAj/ggOAhnwg4aBnAeCjEcCIMMjADCDoQDHjAPCnAXCuEP///8EDAYJECAAXBwkAgPDhwDBwUMgEEhkggEOjFgFgMQLYQAOA==")); var errIcon = require("heatshrink").decompress(atob("kEggILIgOAAYsD4ADBg/gAYMGsADBhkwAYsYjADCjgDBmEMAYNxxwDBsOGAYPBwYDEgOBwOAgYDB4EDHYPAgwDBsADDhgDBFIcwjAHBjE4AYMcmADBhhNCKIcG/4AGOw4A==")); @@ -180,12 +180,12 @@ function draw() { function drawClock() { var d = new Date(); var da = d.toString().split(" "); - var time = da[4].substr(0,5); + //var time = da[4].substr(0,5); var hh = da[4].substr(0,2); var mm = da[4].substr(3,2); - var day = da[0]; - var month_day = da[1] + " " + da[2]; + //var day = da[0]; + //var month_day = da[1] + " " + da[2]; // fix hh for 12hr clock var h2 = "0" + parseInt(hh) % 12 || 12; diff --git a/apps/patriotclk/ChangeLog b/apps/patriotclk/ChangeLog index c9f08fcc2..a4ac74482 100644 --- a/apps/patriotclk/ChangeLog +++ b/apps/patriotclk/ChangeLog @@ -1,2 +1,3 @@ 0.01: New App! -0.02: Show the date inside the widget bar \ No newline at end of file +0.02: Show the date inside the widget bar +0.03: Minor code improvements diff --git a/apps/patriotclk/app.js b/apps/patriotclk/app.js index e618b0106..d7468ad9d 100644 --- a/apps/patriotclk/app.js +++ b/apps/patriotclk/app.js @@ -29,7 +29,7 @@ Graphics.prototype.setFontAudiowide = function() { // work out locale-friendly date/time var date = new Date(); var timeStr = require("locale").time(date,1); - var dateStr = require("locale").date(date); + //var dateStr = require("locale").date(date); // draw time g.setFontAlign(0,0).setFont("Audiowide"); // draw a shadow by shifting left/right/up/down diff --git a/apps/patriotclk/metadata.json b/apps/patriotclk/metadata.json index 689f1422d..af8553c83 100644 --- a/apps/patriotclk/metadata.json +++ b/apps/patriotclk/metadata.json @@ -1,7 +1,7 @@ { "id": "patriotclk", "name": "Patriotic Clock", "shortName":"Patriot", - "version":"0.02", + "version": "0.03", "description": "Show your Patriotism with your Country's flag as a clock face (configurable). Swipe down to show widgets and date.", "icon": "app.png", "screenshots": [{"url":"screenshot.png"}], diff --git a/apps/pebblepp/ChangeLog b/apps/pebblepp/ChangeLog index 83be498bd..a250646d5 100644 --- a/apps/pebblepp/ChangeLog +++ b/apps/pebblepp/ChangeLog @@ -2,4 +2,5 @@ 0.02: clock_info now uses app name to maintain settings specifically for this clock face ensure clockinfo text is usppercase (font doesn't render lowercase) 0.03: Use smaller font if clock_info test doesn't fit in area -0.04: Ensure we only scale down clockinfo text if it really won't fit \ No newline at end of file +0.04: Ensure we only scale down clockinfo text if it really won't fit +0.05: Minor code improvements diff --git a/apps/pebblepp/app.js b/apps/pebblepp/app.js index 330d79618..0330b9832 100644 --- a/apps/pebblepp/app.js +++ b/apps/pebblepp/app.js @@ -26,7 +26,7 @@ let drawTimeout; const h = g.getHeight(); const w = g.getWidth(); -const ha = 2*h/5 - 4; +//const ha = 2*h/5 - 4; const h2 = 3*h/5 - 10; const h3 = 7*h/8; diff --git a/apps/pebblepp/metadata.json b/apps/pebblepp/metadata.json index e2be44ea0..d6598b709 100644 --- a/apps/pebblepp/metadata.json +++ b/apps/pebblepp/metadata.json @@ -2,7 +2,7 @@ "id": "pebblepp", "name": "Pebble++ Clock", "shortName": "Pebble++", - "version": "0.04", + "version": "0.05", "description": "A pebble style clock (based on the 'Pebble Clock' app) but with two configurable ClockInfo items at the top", "icon": "app.png", "screenshots": [{"url":"screenshot.png"}], diff --git a/apps/pizzatimer/ChangeLog b/apps/pizzatimer/ChangeLog index 3c3e41a33..3d27619b5 100644 --- a/apps/pizzatimer/ChangeLog +++ b/apps/pizzatimer/ChangeLog @@ -1 +1,2 @@ -0.01: You can now time cooking a Pizza! \ No newline at end of file +0.01: You can now time cooking a Pizza! +0.02: Minor code improvements diff --git a/apps/pizzatimer/app.js b/apps/pizzatimer/app.js index 54928c121..44e2a1058 100644 --- a/apps/pizzatimer/app.js +++ b/apps/pizzatimer/app.js @@ -1,15 +1,15 @@ /* UI GLOBALS */ -const HOUR_SCENE = 0; -const MIN_SCENE = 1; -const SEC_SCENE = 2; +//const HOUR_SCENE = 0; +//const MIN_SCENE = 1; +//const SEC_SCENE = 2; const COUNTDOWN_SCENE = 3; var currentScene = 0; -var btn1Watch; -var btn2Watch; -var btn3Watch; +//var btn1Watch; +//var btn2Watch; +//var btn3Watch; var drawInterval; @@ -203,14 +203,14 @@ function decrementMenuTime() { function setupMenuWatches() { clearWatch(); - btn1Watch = setWatch(incrementMenuTime, BTN1, {repeat: true}); - btn2Watch = setWatch(next, BTN2, {repeat: true}); - btn3Watch = setWatch(decrementMenuTime, BTN3, {repeat: true}); + /*btn1Watch =*/ setWatch(incrementMenuTime, BTN1, {repeat: true}); + /*btn2Watch =*/ setWatch(next, BTN2, {repeat: true}); + /*btn3Watch =*/ setWatch(decrementMenuTime, BTN3, {repeat: true}); } function setupCountdownWatches() { clearWatch(); - btn2Watch = setWatch(main, BTN2, {repeat: true}); + /*btn2Watch =*/ setWatch(main, BTN2, {repeat: true}); } /* scenes */ diff --git a/apps/pizzatimer/metadata.json b/apps/pizzatimer/metadata.json index e960ecacc..29c9cc510 100644 --- a/apps/pizzatimer/metadata.json +++ b/apps/pizzatimer/metadata.json @@ -2,7 +2,7 @@ "id": "pizzatimer", "name": "Pizza Timer", "shortName": "Pizza Timer", - "version": "0.01", + "version": "0.02", "description": "A timer app for when you cook Pizza. Some say it can also time other things", "icon": "pizza.png", "tags": "timer,tool,pizza", diff --git a/apps/planetarium/ChangeLog b/apps/planetarium/ChangeLog index 9ef1f5c5b..9f2d5c936 100644 --- a/apps/planetarium/ChangeLog +++ b/apps/planetarium/ChangeLog @@ -3,3 +3,4 @@ 0.03: Added more stars and constellations. Now it shows 20 constellations. 0.04: Use default Bangle formatter for booleans 0.05: Added more constellations (scorpio and aguila) +0.06: Minor code improvements diff --git a/apps/planetarium/metadata.json b/apps/planetarium/metadata.json index a0327b842..e21f16f86 100644 --- a/apps/planetarium/metadata.json +++ b/apps/planetarium/metadata.json @@ -2,7 +2,7 @@ "id": "planetarium", "name": "Planetarium", "shortName": "Planetarium", - "version": "0.05", + "version": "0.06", "description": "Planetarium showing up to 500 stars using the watch location and time", "icon": "planetarium.png", "tags": "", diff --git a/apps/planetarium/planetarium.app.js b/apps/planetarium/planetarium.app.js index 4763efb82..686be5b62 100644 --- a/apps/planetarium/planetarium.app.js +++ b/apps/planetarium/planetarium.app.js @@ -174,7 +174,7 @@ const size = 240; //Bangle size screen Bangle.setGPSPower(1); -var gps = { fix : 0}; +//var gps = { fix : 0}; var prevSats = 0; g.clear(); @@ -185,7 +185,7 @@ g.setFontAlign(0,0); Bangle.on('GPS',function(gp) { date = new Date(); - gps = gp; + //gps = gp; if (gp.fix) { lat = gp.lat; lon = gp.lon; diff --git a/apps/pokeclk/ChangeLog b/apps/pokeclk/ChangeLog index 5838e596d..ec81a546a 100644 --- a/apps/pokeclk/ChangeLog +++ b/apps/pokeclk/ChangeLog @@ -1,3 +1,4 @@ 0.01: New face :) 0.02: Color image compressed 0.03: Improved clock +0.04: Minor code improvements diff --git a/apps/pokeclk/app.js b/apps/pokeclk/app.js index 7e495f7d2..2f694ea16 100644 --- a/apps/pokeclk/app.js +++ b/apps/pokeclk/app.js @@ -1,9 +1,7 @@ Modules.addCached("Font4x5",function(){exports.add=function(a){a.prototype.setFont4x5=function(){this.setFontCustom(atob("AAAAdBgGAfV8CfyBIiQKrcAMAA6IARcAFXVARxAAwABCEAAIAAGTAPx+BHwAvXoK1+DhPg7W4P1uCEPg/X4O1+ACgACoAIqIBSlAIqIIVQC9VAfR4P1UB0VA/FwP1qD9KAdGYPk+AHwAEHwPk2D4Qg+j4PweB0XA/RAHTeD9FgTWQIfgD4fg8HwPi+DZNgwfAJ1yD8QAwQYI/ABEEACEIIIAB9Hg/VQHRUD8XA/WoP0oB0Zg+T4AfAAQfA+TYPhCD6Pg/B4HRcD9EAdN4P0WBNZAh+APh+DwfA+L4Nk2DB8AnXICfiAGwAj8gIYQAA=="),32,4,5)}}}); -const offset = 25; const width = g.getWidth(); const height = g.getHeight(); -const font = "Vector:12"; var drawTimeout; @@ -41,7 +39,6 @@ function time() { var d = new Date(); var day = d.getDate(); var time = require("locale").time(d,1); - var date = require("locale").date(d); var mo = require("date_utils").month(d.getMonth()+1,1); require("Font4x5").add(Graphics); // time diff --git a/apps/pokeclk/metadata.json b/apps/pokeclk/metadata.json index c022868ec..dfefb1017 100644 --- a/apps/pokeclk/metadata.json +++ b/apps/pokeclk/metadata.json @@ -2,7 +2,7 @@ "id": "pokeclk", "name": "Poketch Clock", "shortName":"Poketch Clock", - "version": "0.03", + "version": "0.04", "description": "A clock based on the Poketch electronic device found in Sinnoh", "icon": "app.png", "type": "clock", diff --git a/apps/polymath/ChangeLog b/apps/polymath/ChangeLog new file mode 100644 index 000000000..62542be60 --- /dev/null +++ b/apps/polymath/ChangeLog @@ -0,0 +1,2 @@ +0.01: New app! +0.02: Minor code improvements diff --git a/apps/polymath/app.js b/apps/polymath/app.js index 592365d48..e7ab0fafd 100644 --- a/apps/polymath/app.js +++ b/apps/polymath/app.js @@ -53,10 +53,9 @@ g.setColor(g.theme.fg); // draw battery g.drawLine(0,2,E.getBattery()*1.75,2); // draw line for 24 h clock var x = g.getWidth() / 2; - var y = g.getHeight() / 2; + //var y = g.getHeight() / 2; var ix; var shade; - var w ; var date = new Date(); for ( ix = 0; ix < 176; ix=ix+4){ shade = 2*Math.PI * ((date.getHours()-6)/24); diff --git a/apps/polymath/metadata.json b/apps/polymath/metadata.json index 7d13f8537..6c4ed4ec0 100644 --- a/apps/polymath/metadata.json +++ b/apps/polymath/metadata.json @@ -2,7 +2,7 @@ "name": "A Polymaths Clock", "shortName":"Polymath", "icon": "app.png", - "version":"0.01", + "version": "0.02", "description": "This is a graphical clock based on Anton Clock with date, day and moon phase. Beta", "screenshots" : [ { "url":"screenshot.png" }, { "url":"polymathclock.jpg" } ], "type":"clock", diff --git a/apps/pong/ChangeLog b/apps/pong/ChangeLog index 198d7bbde..04e697617 100644 --- a/apps/pong/ChangeLog +++ b/apps/pong/ChangeLog @@ -1,3 +1,4 @@ 0.01: New App! 0.02: 2 players local + improve ai 0.03: Keep display on during gameplay +0.04: Minor code improvements diff --git a/apps/pong/app.js b/apps/pong/app.js index 012cd8f81..b01440d7b 100644 --- a/apps/pong/app.js +++ b/apps/pong/app.js @@ -366,7 +366,7 @@ var ai; var ball = new Ball(); var state = 0; var prevScores = [0, 0]; -var playerBle = null; +//var playerBle = null; var startOption = 0; g.clear(); @@ -404,7 +404,7 @@ setWatch(o => { g.fillRect(0, 0, 240, 240); ball.show(true); scores = [0, 0]; - playerBle = null; + //playerBle = null; ball = new Ball(); state = 1; startThatGame(); diff --git a/apps/pong/metadata.json b/apps/pong/metadata.json index 192af8ee6..171ca1185 100644 --- a/apps/pong/metadata.json +++ b/apps/pong/metadata.json @@ -2,7 +2,7 @@ "id": "pong", "name": "Pong", "shortName": "Pong", - "version": "0.03", + "version": "0.04", "description": "A clone of the Atari game Pong", "icon": "pong.png", "type": "app", diff --git a/apps/pooqroman/ChangeLog b/apps/pooqroman/ChangeLog index b21b34b58..10bd00555 100644 --- a/apps/pooqroman/ChangeLog +++ b/apps/pooqroman/ChangeLog @@ -2,3 +2,4 @@ 0.02: Make internal menu time out + small fixes. 0.03: Autolight feature. 0.04: Added adjustment for Bangle.js magnetometer heading fix +0.05: Minor code improvements diff --git a/apps/pooqroman/app.js b/apps/pooqroman/app.js index 7bd749ac4..ec5ddf669 100644 --- a/apps/pooqroman/app.js +++ b/apps/pooqroman/app.js @@ -781,4 +781,4 @@ class Clock { ////////////////////////////////////////////////////////////////////////////// /* Main */ -const clock = new Clock(new Roman(g, events)).start(); +new Clock(new Roman(g, events)).start(); diff --git a/apps/pooqroman/metadata.json b/apps/pooqroman/metadata.json index 0294e22a0..76523daef 100644 --- a/apps/pooqroman/metadata.json +++ b/apps/pooqroman/metadata.json @@ -1,7 +1,7 @@ { "id": "pooqroman", "name": "pooq Roman watch face", "shortName":"pooq Roman", - "version":"0.04", + "version": "0.05", "description": "A classic watch face with a certain dynamicity. Most amusing in 24h mode. Slide up to show more hands, down for less(!). By design does not support standard widgets, sorry!", "icon": "app.png", "type": "clock", diff --git a/apps/pooqroman/resourcer.js b/apps/pooqroman/resourcer.js index 8b95dc834..3b9fed40c 100644 --- a/apps/pooqroman/resourcer.js +++ b/apps/pooqroman/resourcer.js @@ -25,7 +25,6 @@ ////////////////////////////////////////////////////////////////////////////// /* ==ASSETS== */ -const heatshrink = require('heatshrink'); const enc = x => { const d = btoa(require("heatshrink").compress(x)); @@ -90,7 +89,7 @@ const prepFont = (name, data) => { const xoffs = Uint8Array(lines.length); const ypos = Uint16Array(lines.length); ypos.fill(0xffff); - const w0 = lengths[min]; + //const w0 = lengths[min]; let widths = ''; for (c = min, o = 0; c <= max; c++) { for (i = 0, j = offsets[c]; i < lengths[c]; i++) { diff --git a/apps/pooqround/ChangeLog b/apps/pooqround/ChangeLog index bc35b69df..27c33795e 100644 --- a/apps/pooqround/ChangeLog +++ b/apps/pooqround/ChangeLog @@ -1,3 +1,4 @@ 0.00: Initial check-in. 0.01: Add tap-to-decorate feature. Bugfixes. 0.02: Add autorotate while charging. Remove autolight. Tweak fonts. Add some haptic feedback on touchscreen operations. +0.03: Minor code improvements diff --git a/apps/pooqround/app.js b/apps/pooqround/app.js index 06e208e61..e16da666c 100644 --- a/apps/pooqround/app.js +++ b/apps/pooqround/app.js @@ -261,7 +261,7 @@ const lockSI = dec('hMNwMAjkfjHMt/8g1zgOc4FnmEf/AA=='); const batteryI = dec('hERwMAjH/ABw'); const chargeI = dec('g8NwMAgkYsHDh0fw8MmFhwUA'); const HRMI = dec('iERwMAjk4l10t/29/3AIfn+ek6VTlPX9d3/U3/Ef/EP+EH8ED4EBwAA='); -const compassI = dec('hMJwMAhEEg8Dwfh2Pc43BwA='); +//const compassI = dec('hMJwMAhEEg8Dwfh2Pc43BwA='); const y100I = dec('h8RwMAvk5/n6nOwm9w9lnzH+mO4sc4405xk7jE2mEssEd4EbgE+gE4A='); const y100sI = dec('hcKwMAsOWvHZ+c2s1s4uYmcD4EwA'); @@ -367,7 +367,7 @@ class Round { } render(d, rate) { - const g = this.g, b = this.b, bI = this.bI, c = this.c, cI = this.cI, + const g = this.g, b = this.b, bI = this.bI, e = d < this.enhance, state = this.state, options = this.options, cal = options.calendric, res = options.resolution, @@ -378,8 +378,8 @@ class Round { dd = (e || cal > 1) && d.getDate(), dm = (e || cal > 3) && d.getMonth(), dy = (e || cal > 4) && d.getFullYear(); - const xc = this.xc, yc = this.yc, r = this.r, - dlr = xc * 3/4, dlw = 8, dlhw = 4; + const r = this.r; + // Restore saveunders for fast-moving, overdrawing indicators. if (state.sd) g.drawImage.apply(g, state.sd); @@ -409,7 +409,7 @@ class Round { let x = 172, y = 5; x = doLocked(g, x, y, true); x = doPower(g, x, y, true); - x = doHRM(g, x, y, true); + /*x =*/ doHRM(g, x, y, true); if (dy === +dy) { g.setColor(g.theme.fg).drawImage(y100sI, 145, 23); g.setFontCustom.apply(g, y10sF).drawString((dy - u) / 10 % 10, 157, 23); @@ -629,4 +629,4 @@ class Clock { ////////////////////////////////////////////////////////////////////////////// /* Main */ -const clock = new Clock(new Round(g)).start(); +new Clock(new Round(g)).start(); diff --git a/apps/pooqround/metadata.json b/apps/pooqround/metadata.json index 27f98a7b6..2dd3baeef 100644 --- a/apps/pooqround/metadata.json +++ b/apps/pooqround/metadata.json @@ -1,7 +1,7 @@ { "id": "pooqround", "name": "pooq Round watch face", "shortName":"pooq Round", - "version":"0.02", + "version": "0.03", "description": "A 24 hour analogue watchface with high legibility and a novel style.", "icon": "app.png", "type": "clock", diff --git a/apps/pooqround/resourcer.js b/apps/pooqround/resourcer.js index 6b969a102..91b6aa6db 100644 --- a/apps/pooqround/resourcer.js +++ b/apps/pooqround/resourcer.js @@ -25,7 +25,6 @@ ////////////////////////////////////////////////////////////////////////////// /* ==ASSETS== */ -const heatshrink = require('heatshrink'); const enc = x => { const d = btoa(require("heatshrink").compress(x)); @@ -90,7 +89,7 @@ const prepFont = (name, data) => { const xoffs = Uint8Array(lines.length); const ypos = Uint16Array(lines.length); ypos.fill(0xffff); - const w0 = lengths[min]; + //const w0 = lengths[min]; let widths = ''; for (c = min, o = 0; c <= max; c++) { for (i = 0, j = offsets[c]; i < lengths[c]; i++) { diff --git a/apps/powermanager/ChangeLog b/apps/powermanager/ChangeLog index 87bbc80c7..6fc9eb0c4 100644 --- a/apps/powermanager/ChangeLog +++ b/apps/powermanager/ChangeLog @@ -12,3 +12,4 @@ 0.09: Accidental version bump 0.10: Use charging state on boot for auto calibration Log additional timestamp for trace log +0.11: Minor code improvements diff --git a/apps/powermanager/metadata.json b/apps/powermanager/metadata.json index 55c7a662e..1c5900c7e 100644 --- a/apps/powermanager/metadata.json +++ b/apps/powermanager/metadata.json @@ -2,7 +2,7 @@ "id": "powermanager", "name": "Power Manager", "shortName": "Power Manager", - "version": "0.10", + "version": "0.11", "description": "Allow configuration of warnings and thresholds for battery charging and display.", "icon": "app.png", "type": "bootloader", diff --git a/apps/powermanager/widget.js b/apps/powermanager/widget.js index 3147c40ac..da8ed552b 100644 --- a/apps/powermanager/widget.js +++ b/apps/powermanager/widget.js @@ -78,14 +78,12 @@ currently-running apps */ if (s2Timeout) clearTimeout(s2Timeout); if (sTimeout) clearTimeout(sTimeout); - let t,systickNow; + let systickNow; sTimeout = setTimeout(()=>{ systickNow = peek32(0xE000E018); - t = Date.now(); }, nextRefresh - SYSTICKWAIT - 100); s2Timeout = setTimeout(() => { - let tLater = Date.now(); let systickLater = peek32(0xE000E018); systickDiff = systickLater - systickNow; if (systickDiff < 0) systickDiff += SYSTICKMAX; diff --git a/apps/poweroff/ChangeLog b/apps/poweroff/ChangeLog index 38e6128f6..a62a1bc43 100644 --- a/apps/poweroff/ChangeLog +++ b/apps/poweroff/ChangeLog @@ -1,3 +1,4 @@ 0.01: New app! 0.02: Add prompt before shutdown 0.03: Add settings to configure prompt +0.04: Minor code improvements diff --git a/apps/poweroff/app.js b/apps/poweroff/app.js index 6e14b1a44..81e6f52eb 100644 --- a/apps/poweroff/app.js +++ b/apps/poweroff/app.js @@ -1,7 +1,6 @@ { // must be inside our own scope here so that when we are unloaded everything disappears g.clear(); -let confirmed = false; // Helper function default setting let def = function(value, def) { return value !== undefined ? value : def; diff --git a/apps/poweroff/metadata.json b/apps/poweroff/metadata.json index 254127935..9c558bc5b 100644 --- a/apps/poweroff/metadata.json +++ b/apps/poweroff/metadata.json @@ -1,7 +1,7 @@ { "id": "poweroff", "name": "Poweroff", "shortName":"Poweroff", -"version":"0.03", +"version": "0.04", "description": "Simple app to power off your Bangle.js", "icon": "app.png", "tags": "tool, poweroff, shutdown", diff --git a/apps/presentation_timer/ChangeLog b/apps/presentation_timer/ChangeLog index 8acd0ce07..3f9f86018 100644 --- a/apps/presentation_timer/ChangeLog +++ b/apps/presentation_timer/ChangeLog @@ -1,3 +1,4 @@ 0.01: first release 0.02: added interface for configuration from app loader 0.03: merged save state and interpolating non-defined numeric slides +0.04: Minor code improvements diff --git a/apps/presentation_timer/metadata.json b/apps/presentation_timer/metadata.json index 98f6ab89b..1c6627d04 100644 --- a/apps/presentation_timer/metadata.json +++ b/apps/presentation_timer/metadata.json @@ -1,7 +1,7 @@ { "id": "presentation_timer", "name": "Presentation Timer", - "version": "0.03", + "version": "0.04", "description": "A touch based presentation timer for Bangle JS 2", "icon": "presentation_timer.png", "screenshots": [{"url":"screenshot1.png"},{"url":"screenshot2.png"},{"url":"screenshot3.png"},{"url":"screenshot4.png"}], diff --git a/apps/presentation_timer/presentation_timer.app.js b/apps/presentation_timer/presentation_timer.app.js index 33f96a218..bbf1def99 100644 --- a/apps/presentation_timer/presentation_timer.app.js +++ b/apps/presentation_timer/presentation_timer.app.js @@ -148,7 +148,6 @@ function drawTime() { } function draw() { - let last = tCurrent; if (running) tCurrent = Date.now(); g.setColor(g.theme.fg); if (redrawButtons) drawButtons(); diff --git a/apps/presentor/ChangeLog b/apps/presentor/ChangeLog index a42c6594d..92ad08dac 100644 --- a/apps/presentor/ChangeLog +++ b/apps/presentor/ChangeLog @@ -11,4 +11,5 @@ 0.11: Fix mouse move getting stuck. 0.12: Added support for mouse dragging action (click then drag). 0.13: Removed mouse dragging (too buggy/unuseful). -0.14: Bugfix and add pointer mode. Also added default screen when no parts are there. \ No newline at end of file +0.14: Bugfix and add pointer mode. Also added default screen when no parts are there. +0.15: Minor code improvements diff --git a/apps/presentor/app.js b/apps/presentor/app.js index a501b3376..a14c85e04 100644 --- a/apps/presentor/app.js +++ b/apps/presentor/app.js @@ -88,7 +88,7 @@ let trackPadMode = false; let focusMode = false; // Timeout IDs. -let timeoutId = -1; +//let timeoutId = -1; let timeoutHolding = -1; let timeoutDraw = -1; let timeoutSendMouse = -1; diff --git a/apps/presentor/metadata.json b/apps/presentor/metadata.json index e44684fda..0edc07f2b 100644 --- a/apps/presentor/metadata.json +++ b/apps/presentor/metadata.json @@ -1,7 +1,7 @@ { "id": "presentor", "name": "Presentor", - "version": "0.14", + "version": "0.15", "description": "Use your Bangle to present!", "icon": "app.png", "type": "app", diff --git a/apps/recorder/ChangeLog b/apps/recorder/ChangeLog index 0e20a13fc..4757a0373 100644 --- a/apps/recorder/ChangeLog +++ b/apps/recorder/ChangeLog @@ -45,4 +45,5 @@ 0.36: When recording with 1 second periods, log time with one decimal. 0.37: 1 second periods + gps log => log when gps event is received, not with setInterval. -0.38: Tweaks to speed up track rendering \ No newline at end of file +0.38: Tweaks to speed up track rendering +0.39: Minor code improvements diff --git a/apps/recorder/app.js b/apps/recorder/app.js index c02a800d0..7b71e9f3d 100644 --- a/apps/recorder/app.js +++ b/apps/recorder/app.js @@ -31,7 +31,6 @@ function updateSettings() { } function getTrackNumber(filename) { - var trackNum = 0; var matches = filename.match(/^recorder\.log(.*)\.csv$/); if (matches) return matches[1]; return 0; @@ -244,7 +243,6 @@ function plotTrack(info) { "ram" E.showMessage(/*LANG*/"Drawing...",/*LANG*/"Track "+info.fn); g.flip(); // on buffered screens, draw a not saying we're busy g.clear(1); - var s = require("Storage"); var G = g; var W = g.getWidth(); var H = g.getHeight(); @@ -326,7 +324,7 @@ function plotGraph(info, style) { "ram" var infc = new Uint16Array(80); var title; var lt = 0; // last time - var tn = 0; // count for each time period + //var tn = 0; // count for each time period var strt, dur = info.duration; var f = require("Storage").open(filename,"r"); if (f===undefined) return; @@ -416,7 +414,7 @@ function plotGraph(info, style) { "ram" } // draw g.clear(1).setFont("6x8",1); - var r = require("graph").drawLine(g, infn, { + require("graph").drawLine(g, infn, { x:4,y:24, width: g.getWidth()-24, height: g.getHeight()-(24+8), diff --git a/apps/recorder/metadata.json b/apps/recorder/metadata.json index a231a98e9..d8852b46d 100644 --- a/apps/recorder/metadata.json +++ b/apps/recorder/metadata.json @@ -2,7 +2,7 @@ "id": "recorder", "name": "Recorder", "shortName": "Recorder", - "version": "0.38", + "version": "0.39", "description": "Record GPS position, heart rate and more in the background, then download to your PC.", "icon": "app.png", "tags": "tool,outdoors,gps,widget,clkinfo", diff --git a/apps/red7game/red7.js b/apps/red7game/red7.js index fc8116cb8..f98a525ed 100644 --- a/apps/red7game/red7.js +++ b/apps/red7game/red7.js @@ -554,7 +554,7 @@ function shuffleDeck(deckArray) { } var deck = []; -var screen = 1; +//var screen = 1; var startedGame = false; var playerHand = new Hand(); var playerPalette = new Hand(); @@ -619,10 +619,10 @@ function drawScreen1() { Bangle.on('swipe', function(direction){ if(direction === -1) { drawScreen2(); - screen = 2; + //screen = 2; } else if(direction === 1) { drawScreen1(); - screen = 1; + //screen = 1; } }); g.setBgColor(0,0,0); diff --git a/apps/regattatimer/ChangeLog b/apps/regattatimer/ChangeLog new file mode 100644 index 000000000..9f342060d --- /dev/null +++ b/apps/regattatimer/ChangeLog @@ -0,0 +1,7 @@ +0.10: (2024-02-23) initial alpha upload +0.20: (2024-02-23) fixed minor issues with settings +0.30: (2024-03-01) advanced settings, rearanged ui elements, fixed rendering problems +0.31: (2024-03-06) fixed typos in readme, removed some unnecessary code +0.32: replaced icons with "Graphics.createImage" +0.40: Fixing lint warnings for unused vars +0.41: removed no longer required import of "heatshrink" diff --git a/apps/regattatimer/README.md b/apps/regattatimer/README.md new file mode 100644 index 000000000..f93086fe5 --- /dev/null +++ b/apps/regattatimer/README.md @@ -0,0 +1,71 @@ +# Regatta Timer 5-4-1 countdown + +## Modes + +* **Idle** + On startup the application is in idle mode showing a large 5 in the centre of the screen and the time of day below. + `Button` switches to start mode. +* **Start** + During the countdown, the screen changes the layout several times to use as much space as + possible to display the numbers. + When time is up the buzzer sounds and the application switches to race mode. + `Button` switches to idle mode. +* **Race** + Race time, local time, SOA, number reachable GPS satellites and battery level are shown. + `Button` switches to "stopped mode". +* **Stoped** + The race counter stops. + `Button` switches to idle mode. + +## Screenshots + +*Idle mode: showing a big 5 and time of day below* + +![Idle mode: showing a big 5 and time of day below](screenshot-1.png) + +*Start mode: minutes and seconds* + +![Start mode: minutes and seconds](screenshot-2.png) + +*Start mode: seconds* + +![Start mode: seconds](screenshot-3.png) + +*Race mode: elapsed time, time of day, speed, satellites, battery* + +![Race mode: elapsed time, time of day, speed, satellites, battery](screenshot-4.png) + +*Race mode: with german abbreviations* + +![Race mode: with german abbreviations](screenshot-5.png) + +*Settings page: main* + +![Settings page: main](screenshot-6.png) + +*Settings page: choose the theme* + +![Settings page: choose the theme](screenshot-7.png) + +## Localization + +Localization is done by the Bangle.js 2 app "Languages" +* Go to [banglejs.com/apps](https://banglejs.com/apps/) +* Search for app "Languages" +* Click the "arrow up" or "burger" icon +* Choose your language from the dropdown +* Click `upload` + +**Some nautical abbreviations which are not part of the "Languages" app are stored in `translations.json`.** + +## Feedback + +Report bugs or request a feature at [github.com/naden](https://github.com/naden) + +## Roadmap +* add a second coundown layout; mimic a classic regatta chronograph +* add recording of gps course and race time +* add flag icons for start mode screen + +## Created by +© 2021 - 2024 [naden.de](https://naden.de) diff --git a/apps/regattatimer/app-icon.js b/apps/regattatimer/app-icon.js new file mode 100644 index 000000000..71417f0cd --- /dev/null +++ b/apps/regattatimer/app-icon.js @@ -0,0 +1 @@ +require("heatshrink").decompress(atob("mEw4f/8H/A4NgtfgzkgoVg50g40Awg5lnmSpMk4ARMkMkCQNgCJkJCKM////0AQLgNJkBZP5OACB0B5OKjJqNgGJLINOEZprDCJ0rmVJoARMzfAg1JLh8AQCIRNGQPghg1NhQgBghZOhMmoR9ClmSqDXJR4NLAwMhknQEhEsCINwboQRKgG59RuDCJYADLgIRPqVnCJ9CuYROgOSwYjPyUDCJ0IzwRP4mQCIsRlARH8mZWYPJbgK/BCJOSR4OTCIMGCJ8MAoIRIi3btUk3UACJYABLIcapMJCJxZLCKbMFCP4R/COQAo")) diff --git a/apps/regattatimer/app.js b/apps/regattatimer/app.js new file mode 100644 index 000000000..e1ff64b6a --- /dev/null +++ b/apps/regattatimer/app.js @@ -0,0 +1,348 @@ +/** + * Regatta Timer + */ +const Layout = require("Layout"); +const locale = require("locale").name == "system" ? "en" : require("locale").name.substring(0, 2); + +// "Anton" bold font +Graphics.prototype.setFontAnton = function(scale) { + // Actual height 69 (68 - 0) + g.setFontCustom(atob("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAAAAAA/gAAAAAAAAAAP/gAAAAAAAAAH//gAAAAAAAAB///gAAAAAAAAf///gAAAAAAAP////gAAAAAAD/////gAAAAAA//////gAAAAAP//////gAAAAH///////gAAAB////////gAAAf////////gAAP/////////gAD//////////AA//////////gAA/////////4AAA////////+AAAA////////gAAAA///////wAAAAA//////8AAAAAA//////AAAAAAA/////gAAAAAAA////4AAAAAAAA///+AAAAAAAAA///gAAAAAAAAA//wAAAAAAAAAA/8AAAAAAAAAAA/AAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//////AAAAAB///////8AAAAH////////AAAAf////////wAAA/////////4AAB/////////8AAD/////////+AAH//////////AAP//////////gAP//////////gAP//////////gAf//////////wAf//////////wAf//////////wAf//////////wA//8AAAAAB//4A//wAAAAAAf/4A//gAAAAAAP/4A//gAAAAAAP/4A//gAAAAAAP/4A//wAAAAAAf/4A///////////4Af//////////wAf//////////wAf//////////wAf//////////wAP//////////gAP//////////gAH//////////AAH//////////AAD/////////+AAB/////////8AAA/////////4AAAP////////gAAAD///////+AAAAAf//////4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/gAAAAAAAAAAP/gAAAAAAAAAAf/gAAAAAAAAAAf/gAAAAAAAAAAf/AAAAAAAAAAA//AAAAAAAAAAA/+AAAAAAAAAAB/8AAAAAAAAAAD//////////gAH//////////gAP//////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH/4AAAAB/gAAD//4AAAAf/gAAP//4AAAB//gAA///4AAAH//gAB///4AAAf//gAD///4AAA///gAH///4AAD///gAP///4AAH///gAP///4AAP///gAf///4AAf///gAf///4AB////gAf///4AD////gA////4AH////gA////4Af////gA////4A/////gA//wAAB/////gA//gAAH/////gA//gAAP/////gA//gAA///8//gA//gAD///w//gA//wA////g//gA////////A//gA///////8A//gA///////4A//gAf//////wA//gAf//////gA//gAf/////+AA//gAP/////8AA//gAP/////4AA//gAH/////gAA//gAD/////AAA//gAB////8AAA//gAA////wAAA//gAAP///AAAA//gAAD//8AAAA//gAAAP+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB/+AAAAAD/wAAB//8AAAAP/wAAB///AAAA//wAAB///wAAB//wAAB///4AAD//wAAB///8AAH//wAAB///+AAP//wAAB///+AAP//wAAB////AAf//wAAB////AAf//wAAB////gAf//wAAB////gA///wAAB////gA///wAAB////gA///w//AAf//wA//4A//AAA//wA//gA//AAAf/wA//gB//gAAf/wA//gB//gAAf/wA//gD//wAA//wA//wH//8AB//wA///////////gA///////////gA///////////gA///////////gAf//////////AAf//////////AAP//////////AAP/////////+AAH/////////8AAH///+/////4AAD///+f////wAAA///8P////gAAAf//4H///+AAAAH//gB///wAAAAAP4AAH/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/wAAAAAAAAAA//wAAAAAAAAAP//wAAAAAAAAB///wAAAAAAAAf///wAAAAAAAH////wAAAAAAA/////wAAAAAAP/////wAAAAAB//////wAAAAAf//////wAAAAH///////wAAAA////////wAAAP////////wAAA///////H/wAAA//////wH/wAAA/////8AH/wAAA/////AAH/wAAA////gAAH/wAAA///4AAAH/wAAA//+AAAAH/wAAA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gA///////////gAAAAAAAAH/4AAAAAAAAAAH/wAAAAAAAAAAH/wAAAAAAAAAAH/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB//8AAA/////+B///AAA/////+B///wAA/////+B///4AA/////+B///8AA/////+B///8AA/////+B///+AA/////+B////AA/////+B////AA/////+B////AA/////+B////gA/////+B////gA/////+B////gA/////+A////gA//gP/gAAB//wA//gf/AAAA//wA//gf/AAAAf/wA//g//AAAAf/wA//g//AAAA//wA//g//gAAA//wA//g//+AAP//wA//g////////gA//g////////gA//g////////gA//g////////gA//g////////AA//gf///////AA//gf//////+AA//gP//////+AA//gH//////8AA//gD//////4AA//gB//////wAA//gA//////AAAAAAAH////8AAAAAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//////gAAAAB///////+AAAAH////////gAAAf////////4AAB/////////8AAD/////////+AAH//////////AAH//////////gAP//////////gAP//////////gAf//////////wAf//////////wAf//////////wAf//////////wAf//////////4A//wAD/4AAf/4A//gAH/wAAP/4A//gAH/wAAP/4A//gAP/wAAP/4A//gAP/4AAf/4A//wAP/+AD//4A///wP//////4Af//4P//////wAf//4P//////wAf//4P//////wAf//4P//////wAP//4P//////gAP//4H//////gAH//4H//////AAH//4D/////+AAD//4D/////8AAB//4B/////4AAA//4A/////wAAAP/4AP////AAAAB/4AD///4AAAAAAAAAH/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//AAAAAAAAAAA//gAAAAAAAAAA//gAAAAAAAAAA//gAAAAAAADgA//gAAAAAAP/gA//gAAAAAH//gA//gAAAAB///gA//gAAAAP///gA//gAAAD////gA//gAAAf////gA//gAAB/////gA//gAAP/////gA//gAB//////gA//gAH//////gA//gA///////gA//gD///////gA//gf///////gA//h////////gA//n////////gA//////////gAA/////////AAAA////////wAAAA///////4AAAAA///////AAAAAA//////4AAAAAA//////AAAAAAA/////4AAAAAAA/////AAAAAAAA////8AAAAAAAA////gAAAAAAAA///+AAAAAAAAA///4AAAAAAAAA///AAAAAAAAAA//4AAAAAAAAAA/+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//gB///wAAAAP//4H///+AAAA///8P////gAAB///+f////4AAD///+/////8AAH/////////+AAH//////////AAP//////////gAP//////////gAf//////////gAf//////////wAf//////////wAf//////////wA///////////wA//4D//wAB//4A//wB//gAA//4A//gA//gAAf/4A//gA//AAAf/4A//gA//gAAf/4A//wB//gAA//4A///P//8AH//4Af//////////wAf//////////wAf//////////wAf//////////wAf//////////gAP//////////gAP//////////AAH//////////AAD/////////+AAD///+/////8AAB///8f////wAAAf//4P////AAAAH//wD///8AAAAA/+AAf//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH//gAAAAAAAAB///+AA/+AAAAP////gA//wAAAf////wA//4AAB/////4A//8AAD/////8A//+AAD/////+A///AAH/////+A///AAP//////A///gAP//////A///gAf//////A///wAf//////A///wAf//////A///wAf//////A///wA///////AB//4A//4AD//AAP/4A//gAB//AAP/4A//gAA//AAP/4A//gAA/+AAP/4A//gAB/8AAP/4A//wAB/8AAf/4Af//////////wAf//////////wAf//////////wAf//////////wAf//////////wAP//////////gAP//////////gAH//////////AAH/////////+AAD/////////8AAB/////////4AAAf////////wAAAP////////AAAAB///////4AAAAAD/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf/AAB/8AAAAAA//AAD/8AAAAAA//AAD/8AAAAAA//AAD/8AAAAAA//AAD/8AAAAAA//AAD/8AAAAAA//AAD/8AAAAAA//AAD/8AAAAAA//AAD/8AAAAAA//AAD/8AAAAAA//AAD/8AAAAAA//AAD/8AAAAAA//AAD/8AAAAAA//AAD/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=="), 46, atob("EiAnGicnJycnJycnEw=="), 78 + (scale << 8) + (1 << 16)); +}; + +function Regattatimer() { + return { + layout: undefined, + /* + layouts: { + idle: function() { + switch(settings.dial) { + case "Discs": + break; + case "Numeric": + default: + break; + } + }, + start: function(phase) { + switch(settings.dial) { + case "Discs": + break; + case "Numeric": + default: + break; + } + }, + race: function() { + } + }, + */ + mode: "idle", // idle, start, race" + countdown: 300, // 5 minutes + counter: undefined, + interval: undefined, + theme: null, + themes: { + "Light": { + "fgColor": "#000000", + "bgColor": "#FFFF00", + }, + "Dark": { + "fgColor": "#FFFF00", + "bgColor": "#000000", + } + }, + icons: { + "battery": function() { + return Graphics.createImage(` + XXXX +X X +X XX X +X X +X XX X +X X +X XX X +X X +X XX X +X X +XXXXXX`); + }, + "satellites": function() { + return Graphics.createImage(` + X + XoX + XoX + XoX + XoX o X + XoX o o XoX +XoX o o XoX + X o XoX + XoX + XoX + XoX + X`); + }, + }, + settings: Object.assign({ + "debug": false, + "buzzer": true, + "dial": "Numeric", + "gps": true, + "record": false, + "theme": "Dark", + }, require('Storage').readJSON("regattatimer.json", true) || {}), + + translations: Object.assign({ + "de": { + "speed": "FüG", // Fahrt über Grund + "speed_unit": "kn" + }, + "en": { + "speed": "SOA", // SOA speed of advance + "speed_unit": "kn" + } + }, require('Storage').readJSON("translations.json", true) || {}), + + init: function() { + + if(this.settings.debug) { + this.countdown = 1; + } + + this.theme = this.themes[this.settings.theme]; + + Bangle.setLCDPower(1); + Bangle.setLCDTimeout(0); + + // in "idle", "start" or "stoped" mode, a button click (re)starts the countdown + // in "race" mode, a button click stops the counter + var onButtonClick = (function(ev) { + switch(this.mode) { + case "idle": + this.resetCounter(); + this.mode = "start"; + this.setLayoutStartMinSec(); + this.startCounter(); + this.interval = setInterval((function() { + this.startCounter(); + }).bind(this), 1000); + break; + case "stoped": + case "start": + this.resetCounter(); + this.setLayoutIdle(); + break; + case "race": + this.raceCounterStop(); + break; + } + }).bind(this); + + setWatch(onButtonClick, BTN1, true); + + this.setLayoutIdle(); + }, + + onGPS: function(fix) { + if(this.mode == "race") { + if(fix.fix && isFinite(fix.speed)) { + this.layout.clear(layout.speed); + this.layout.speed.label = fix.speed.toFixed(2); + this.layout.render(this.layout.speed); + } + this.layout.satellites.label = fix.satellites; + } + }, + + translate: function(slug) { + return this.translations[locale][slug]; + }, + // during the start phase, the clock counts down 5 4 1 0 minutes + // a button click restarts the countdown + startCounter: function() { + + this.counter --; + + if(this.counter >= 0) { + var counterMinutes = parseInt(this.counter / 60); + + if(counterMinutes > 0) { + this.layout.minutes.label = counterMinutes; + // this.layout.seconds.label = "0".concat(this.counter - counterMinutes * 60).toString().slice(-2); + this.layout.seconds.label = this.padZeroLeft(this.counter - counterMinutes * 60); + this.layout.render(); + } + else { + this.setLayoutStartSec(); + this.layout.seconds.label = this.counter.toString(); + this.layout.render(); + } + // this keeps the watch LCD lit up + g.flip(); + } + // time is up + else { + this.raceCounterStart(); + } + }, + padZeroLeft: function(str) { + return str.toString().padStart(2, "0"); + }, + formatTime: function(time) { + var + minutes = parseInt(time / 60), + seconds = time - (minutes * 60); + + return this.padZeroLeft(parseInt(time / 3600)) + ":" + this.padZeroLeft(minutes) + ":" + this.padZeroLeft(seconds); + }, + raceCounter: function() { + + if(this.counter % 60 == 0) { + this.layout.clear(this.layout.battery); + this.layout.battery.label = E.getBattery() + "%"; + this.layout.render(this.layout.battery); + } + + this.counter ++; + + this.layout.racetime.label = this.formatTime(this.counter); + this.layout.daytime.label = require("locale").time(new Date(), 1); + this.layout.render(); + + // keeps the watch screen lit up + g.flip(); + }, + raceCounterStop: function() { + if(this.interval) { + clearInterval(this.interval); + this.interval = undefined; + } + this.mode = "stoped"; + }, + raceCounterStart: function() { + if(this.interval) { + clearInterval(this.interval); + this.interval = undefined; + } + + if(this.settings.buzzer) { + Bangle.buzz(); + } + + this.counter = 0; + // switch to race mode + this.mode = "race"; + this.setLayoutRace(); + this.raceCounter(); + this.interval = setInterval((function() { + this.raceCounter(); + }).bind(this), 1000); + }, + + resetCounter: function() { + if(this.interval) { + clearInterval(this.interval); + this.interval = undefined; + } + this.counter = this.countdown; + }, + + setLayoutIdle: function() { + + g.clear(); + + this.mode = "idle"; + + this.layout = new Layout({ + type: "v", + bgCol: this.theme.bgColor, + c: [ + { + type: "v", + c: [ + {type: "txt", font: "Anton", label: "5", col: this.theme.fgColor, id: "minutes", fillx: 1, filly: 1}, + {type: "txt", font: "20%", label: "--:--", col: this.theme.fgColor, id: "daytime", fillx: 1, filly: 1} + ] + } + ]}, {lazy: true}); + + this.interval = setInterval((function() { + this.layout.daytime.label = require("locale").time(new Date(), 1); + this.layout.render(); + + // keeps the watch screen lit up + g.flip(); + }).bind(this), 1000); + }, + setLayoutStartMinSec: function() { + g.clear(); + + this.layout = new Layout({ + type: "v", + bgCol: this.theme.bgColor, + c: [ + { + type: "h", + c: [ + {type: "txt", font: "Anton", label: "4", col: this.theme.fgColor, id: "minutes", fillx: 1, filly: 1}, + {type: "txt", font: "Anton", label: "59", col: this.theme.fgColor, id: "seconds", fillx: 1, filly: 1}, + ] + } + ]}, {lazy: true} + ); + }, + setLayoutStartSec: function() { + g.clear(); + + this.layout = new Layout({ + type: "v", + bgCol: this.theme.bgColor, + c:[ + {type: "txt", font: "Anton", label: "", fillx: true, filly: true, col: this.theme.fgColor, id: "seconds"}, + ]}, {lazy: true}); + }, + setLayoutRace: function() { + g.clear(); + + this.layout = new Layout({ + type: "v", + bgCol: this.theme.bgColor, + c: [ + {type: "txt", font: "20%", label: "00:00:00", col: this.theme.fgColor, pad: 4, filly: 1, fillx: 1, id: "racetime"}, + {type: "txt", font: "15%", label: "-", col: this.theme.fgColor, pad: 4, filly:1, fillx:1, id: "daytime"}, + // horizontal + {type: "h", c: [ + {type: "txt", font: "10%", label: this.translate("speed"), col: this.theme.fgColor, pad:4, fillx:1, filly:1}, + {type: "txt", font: "20%", label: "0", col: this.theme.fgColor, pad:4, fillx:1, filly:1, id: "speed"}, + {type: "txt", font: "10%", label: this.translate("speed_unit"), col: this.theme.fgColor, pad:4, fillx:1, filly:1}, + ]}, + {type: "h", c: [ + {type:"img", pad: 2, col: this.theme.fgColor, bgCol: this.theme.bgColor, src: this.icons.satellites()}, + {type: "txt", font: "10%", label: "0", col: this.theme.fgColor, pad: 2, filly:1, id: "satellites"}, + // hacky, use empty element with fillx to push the other elments to the left an right side + {type: undefined, pad: 2, fillx: 1}, + {type:"img", pad: 2, col: this.theme.fgColor, bgCol: this.theme.bgColor, src: this.icons.battery()}, + {type: "txt", font: "10%", label: "-", col: this.theme.fgColor, pad: 2, filly: 1, id: "battery"}, + ]} + ]}, {lazy: true}); + } + }; +} + +var regattatimer = Regattatimer(); +regattatimer.init(); + +if(regattatimer.settings.gps) { + Bangle.setGPSPower(1); + Bangle.on('GPS', regattatimer.onGPS.bind(regattatimer)); +} + +Bangle.on('kill', function() { + Bangle.setLCDPower(0); + Bangle.setLCDTimeout(10); + /* + if(regattatimer.settings.gps) { + Bangle.setGPSPower(0); + } + */ +}); diff --git a/apps/regattatimer/icon.png b/apps/regattatimer/icon.png new file mode 100644 index 000000000..5ae5f1381 Binary files /dev/null and b/apps/regattatimer/icon.png differ diff --git a/apps/regattatimer/metadata.json b/apps/regattatimer/metadata.json new file mode 100644 index 000000000..3249bb775 --- /dev/null +++ b/apps/regattatimer/metadata.json @@ -0,0 +1,18 @@ +{ + "id": "regattatimer", + "name": "Regatta Timer", + "shortName": "RegattaTimer", + "version": "0.41", + "description": "Regatta Timer with 5-4-1 Countdown", + "icon": "icon.png", + "tags": "tool,outdoors,sailing,race,regatta,boat,timer", + "supports": ["BANGLEJS2"], + "readme": "README.md", + "storage": [ + {"name": "regattatimer.app.js", "url": "app.js"}, + {"name": "regattatimer.settings.js", "url": "settings.js"}, + {"name": "regattatimer.img", "url": "app-icon.js", "evaluate": true} + ], + "data": [{"name": "regattatimer.json"}], + "screenshots": [{"url": "screenshot.png"},{"url": "screenshot-1.png"},{"url": "screenshot-2.png"},{"url": "screenshot-3.png"},{"url": "screenshot-4.png"},{"url": "screenshot-5.png"},{"url": "screenshot-6.png"},{"url": "screenshot-7.png"}] +} diff --git a/apps/regattatimer/regattatimer.json b/apps/regattatimer/regattatimer.json new file mode 100644 index 000000000..e2ea78f76 --- /dev/null +++ b/apps/regattatimer/regattatimer.json @@ -0,0 +1,8 @@ +{ + "debug": false, + "buzzer": true, + "dial": "Numeric", + "gps": true, + "record": false, + "theme": "Dark" +} diff --git a/apps/regattatimer/regattatimer.translations.json b/apps/regattatimer/regattatimer.translations.json new file mode 100644 index 000000000..e89eeddf8 --- /dev/null +++ b/apps/regattatimer/regattatimer.translations.json @@ -0,0 +1,10 @@ +{ + "de": { + "speed": "FüG", + "speed_unit": "kn" + }, + "en": { + "speed": "SOA", + "speed_unit": "kn" + } +} diff --git a/apps/regattatimer/screenshot-1.png b/apps/regattatimer/screenshot-1.png new file mode 100644 index 000000000..6888ccd62 Binary files /dev/null and b/apps/regattatimer/screenshot-1.png differ diff --git a/apps/regattatimer/screenshot-2.png b/apps/regattatimer/screenshot-2.png new file mode 100644 index 000000000..bde59766d Binary files /dev/null and b/apps/regattatimer/screenshot-2.png differ diff --git a/apps/regattatimer/screenshot-3.png b/apps/regattatimer/screenshot-3.png new file mode 100644 index 000000000..4416a0fc8 Binary files /dev/null and b/apps/regattatimer/screenshot-3.png differ diff --git a/apps/regattatimer/screenshot-4.png b/apps/regattatimer/screenshot-4.png new file mode 100644 index 000000000..23cb79ac7 Binary files /dev/null and b/apps/regattatimer/screenshot-4.png differ diff --git a/apps/regattatimer/screenshot-5.png b/apps/regattatimer/screenshot-5.png new file mode 100644 index 000000000..49613d8c0 Binary files /dev/null and b/apps/regattatimer/screenshot-5.png differ diff --git a/apps/regattatimer/screenshot-6.png b/apps/regattatimer/screenshot-6.png new file mode 100644 index 000000000..391eaafd2 Binary files /dev/null and b/apps/regattatimer/screenshot-6.png differ diff --git a/apps/regattatimer/screenshot-7.png b/apps/regattatimer/screenshot-7.png new file mode 100644 index 000000000..e1f96005f Binary files /dev/null and b/apps/regattatimer/screenshot-7.png differ diff --git a/apps/regattatimer/screenshot.png b/apps/regattatimer/screenshot.png new file mode 100644 index 000000000..23cb79ac7 Binary files /dev/null and b/apps/regattatimer/screenshot.png differ diff --git a/apps/regattatimer/settings.js b/apps/regattatimer/settings.js new file mode 100644 index 000000000..7e43322ba --- /dev/null +++ b/apps/regattatimer/settings.js @@ -0,0 +1,74 @@ +(function(back) { + var + file = "regattatimer.json", + storage = require("Storage"), + /*dials = ["Numeric", "Discs"],*/ + themes = ["Light", "Dark"], + settings = Object.assign({ + "debug": false, + "buzzer": true, + "dial": "Numeric", + "gps": true, + "record": false, + "theme": "Dark", + }, storage.readJSON(file, true) || {}); + + function save(key, value) { + settings[key] = value; + storage.writeJSON(file, settings); + } + + E.showMenu({ + "" : { "title" : "Regatta Timer" }, + "< Back" : () => back(), + "GPS": { + value: !!settings.gps, // !! converts undefined to false + onchange: v => { + save("gps", v); + } + }, + "THEME": { + value: themes.indexOf(settings.theme), + min: 0, + max: themes.length - 1, + step: 1, + wrap: true, + format: v => themes[v], + onchange: (d) => { + save("theme", themes[d]); + } + }, + "BUZZER": { + value: !!settings.buzzer, // !! converts undefined to false + onchange: v => { + save("buzzer", v); + } + }, + /* + "DIAL": { + value: dials.indexOf(settings.dial), + min: 0, + max: dials.length - 1, + step: 1, + wrap: true, + format: v => dials[v], + onchange: (d) => { + save("dial", dials[d]); + } + }, + "RECORD": { + value: !!settings.record, // 0| converts undefined to 0 + onchange: v => { + settings.record = v; + save("record", v); + } + }, + */ + "DEBUG": { + value: !!settings.debug, // 0| converts undefined to 0 + onchange: v => { + save("debug", v); + } + }, + }); +}) diff --git a/apps/rellotge/ChangeLog b/apps/rellotge/ChangeLog new file mode 100644 index 000000000..0ffefec44 --- /dev/null +++ b/apps/rellotge/ChangeLog @@ -0,0 +1,6 @@ +0.10: Llançament inicial +0.20: Esmenat problema amb les hores passada l'hora en punt (apareixia l'hora anterior) +0.30: Redisseny de l'aplicatiu, text alineat a l'esquerra, font canviada, treiem dades innecessàries +0.40: Afegits suggeriments de l'usuari @bobrippling al codi +0.50: Fixing lint warnings for unused vars +0.60: Fixes typos, BTN1 to show launcher and show app icon \ No newline at end of file diff --git a/apps/rellotge/README.md b/apps/rellotge/README.md new file mode 100644 index 000000000..2cc015f9a --- /dev/null +++ b/apps/rellotge/README.md @@ -0,0 +1,5 @@ +# Rellotge, una aplicació per llegir l'hora en català + +Ara ja pots llegir l'hora en català com un professional amb aquesta aplicació. Domina els quarts, els mitjos quarts, tocats i ben tocats en cada moment del dia! + +Tiu ĉi apo permesas vin indiki kioma horo estas laŭ la kataluna tradicia sistemo. diff --git a/apps/rellotge/icona.js b/apps/rellotge/icona.js new file mode 100644 index 000000000..91a5b1460 --- /dev/null +++ b/apps/rellotge/icona.js @@ -0,0 +1 @@ +require("heatshrink").decompress(atob("mEwwcCpMkyQC/AX4CepASPiVIxIRQyIRQyQRRo3btu2ARRZBAIIRQpMbCKEiI54GBCKKSMCIdkyYRP8mSuxZNp4RBpwRMy////ypObEZl//o4BmRHMv/8CKE9AwJrNrMlLJwYDPpwRBybpPkmZa6HJCJ8mfaCMKCItIKxRZFowRQkwRPyJELI4mJCKAOMCIYQPAX4C/ASIA=")) diff --git a/apps/rellotge/icona.png b/apps/rellotge/icona.png new file mode 100644 index 000000000..258cdecab Binary files /dev/null and b/apps/rellotge/icona.png differ diff --git a/apps/rellotge/metadata.json b/apps/rellotge/metadata.json new file mode 100644 index 000000000..b961c36f2 --- /dev/null +++ b/apps/rellotge/metadata.json @@ -0,0 +1,15 @@ +{ "id": "rellotge", + "name": "Rellotge en catala", + "shortName":"Rellotge", + "version":"0.60", + "description": "A clock with traditional naming of hours in Catalan", + "icon": "icona.png", + "readme": "README.md", + "type": "clock", + "tags": "", + "supports" : ["BANGLEJS2"], + "storage": [ + {"name":"rellotge.app.js","url":"rellotge.js"}, + {"name":"rellotge.img","url":"icona.js","evaluate":true} + ] +} diff --git a/apps/rellotge/rellotge.js b/apps/rellotge/rellotge.js new file mode 100644 index 000000000..437766167 --- /dev/null +++ b/apps/rellotge/rellotge.js @@ -0,0 +1,107 @@ +// Example application code +// Taken from https://github.com/espruino/BangleApps/blob/master/apps/sclock/clock-simple.js +(function() { + + const timeFontSize = 1; + const dateFontSize = 2; + const font = "12x20"; + + const xyCenter = g.getWidth() /9; + const yposTime = 55; + const yposDate = 130; + const leshores = ["Les dotze","La una","Les dues","Les tres","Les quatre","Les cinc","Les sis","Les set","Les vuit","Les nou","Les deu","Les onze","Les dotze","La una","Les dues","Les tres","Les quatre","Les cinc","Les sis","Les set","Les vuit","Les nou","Les deu","Les onze","Les dotze"]; + const leshores2 = ["d\'una\r\nel mati","de dues\r\ndel mati","de tres\r\ndel mati","de quatre\r\ndel mati","de cinc\r\ndel mati","de sis\r\ndel mati","de set\r\ndel mati","de vuit\r\ndel mati","de nou\r\ndel mati","de deu\r\ndel mati","d'onze\r\ndel mati","de dotze\r\ndel mati","d'una\r\nde la tarda","de dues\r\nde la tarda","de tres\r\nde la tarda","de quatre\r\nde la tarda","de cinc\r\nde la tarda","de sis\r\nde la tarda","de set\r\nde la tarda","de vuit\r\nde la tarda","de nou\r\ndel vespre","de deu\r\ndel vespre","d'onze\r\ndel vespre","de dotze"]; + + function drawSimpleClock() { + g.clearRect(Bangle.appRect); + // get date + var d = new Date(); + var m = d.getMinutes(); + + // drawSting centered + g.setFontAlign(-1, 0); + + // draw time + if (m >= 0 && m < 2) { + t = leshores[d.getHours()] + "\r\nen punt"; + } else if (m >= 2 && m < 5) { + t = leshores[d.getHours()] + "\r\ntocades"; + } else if (m >= 5 && m < 7) { + t = leshores[d.getHours()] + "\r\nben tocades"; + } else if (m >= 7 && m < 10) { + t = "Mig quart\r\n" + leshores2[d.getHours()]; + } else if (m >= 10 && m < 12) { + t = "Mig quart\r\ntocat\r\n" + leshores2[d.getHours()]; + } else if (m >= 12 && m < 15) { + t = "Mig quart\r\nben tocat\r\n" + leshores2[d.getHours()]; + } else if (m >= 15 && m < 17) { + t = "Un quart\r\n" + leshores2[d.getHours()]; + } else if (m >= 17 && m < 20) { + t = "Un quart\r\ntocat\r\n" + leshores2[d.getHours()]; + } else if (m >= 20 && m < 22) { + t = "Un quart\r\nben tocat\r\n" + leshores2[d.getHours()]; + } else if (m >= 22 && m < 25) { + t = "Un quart i mig\r\n" + leshores2[d.getHours()]; + } else if (m >= 25 && m < 27) { + t = "Un quart i mig\r\ntocat\r\n" + leshores2[d.getHours()]; + } else if (m >= 27 && m < 30) { + t = "Un quart i mig\r\nben tocat\r\n" + leshores2[d.getHours()]; + } else if (m >= 30 && m < 32) { + t = "Dos quarts\r\n" + leshores2[d.getHours()]; + } else if (m >= 32 && m < 35) { + t = "Dos quarts\r\ntocats\r\n" + leshores2[d.getHours()]; + } else if (m >= 35 && m < 37) { + t = "Dos quarts\r\nben tocats\r\n" + leshores2[d.getHours()]; + } else if (m >= 37 && m < 40) { + t = "Dos quarts i mig\r\n" + leshores2[d.getHours()]; + } else if (m >= 40 && m < 42) { + t = "Dos quarts i mig\r\ntocats\r\n" + leshores2[d.getHours()]; + } else if (m >= 42 && m < 45) { + t = "Dos quarts i mig\r\nben tocats\r\n" + leshores2[d.getHours()]; + } else if (m >= 45 && m < 47) { + t = "Tres quarts\r\n" + leshores2[d.getHours()]; + } else if (m >= 47 && m < 50) { + t = "Tres quarts\r\ntocats\r\n" + leshores2[d.getHours()]; + } else if (m >= 50 && m < 52) { + t = "Tres quarts\r\nben tocats\r\n" + leshores2[d.getHours()]; + } else if (m >= 52 && m < 55) { + t = "Tres quarts i mig\r\n" + leshores2[d.getHours()]; + } else if (m >= 55 && m < 57) { + t = "Tres quarts i mig\r\ntocats\r\n" + leshores2[d.getHours()]; + } else if (m >= 57) { + t = "Tres quarts i mig\r\nben tocats\r\n" + leshores2[d.getHours()]; + } + g.setFont(font, timeFontSize); + g.drawString(t, xyCenter, yposTime, true); + + // draw Hours + g.setFont(font, dateFontSize); + var mu = ""; + if (m < 10) {mu = "0"+m;} else {mu = m;} + + g.drawString(d.getHours()+":"+mu, xyCenter, yposDate, true); + } + + // handle switch display on by pressing BTN1 + function onLcd(on) { + if (on) { + Bangle.drawWidgets(); + //drawSimpleClock(); + Bangle.removeListener('lcdPower', onLcd); + } + } + Bangle.on('lcdPower', onLcd); + Bangle.setUI("clock"); + Bangle.loadWidgets(); + require("widget_utils").swipeOn(); + + // clean app screen + g.clear(); + + // refesh every 60 sec + setInterval(drawSimpleClock, 60E3); + + // draw now + drawSimpleClock(); + +})(); diff --git a/apps/rolex/ChangeLog b/apps/rolex/ChangeLog index 447b084f6..8e7d73e06 100644 --- a/apps/rolex/ChangeLog +++ b/apps/rolex/ChangeLog @@ -3,3 +3,4 @@ 0.03: Made images 2 bit and fixed theme honoring 0.04: Fixed date font alignment and changed date font to match a real Rolex 0.05: Tell clock widget to hide. +0.06: Minor code improvements diff --git a/apps/rolex/app.js b/apps/rolex/app.js index fe9e534d6..adb38f451 100644 --- a/apps/rolex/app.js +++ b/apps/rolex/app.js @@ -96,7 +96,6 @@ function drawHands() { let twoPi = 2*Math.PI; let Pi = Math.PI; - let halfPi = Math.PI/2; let hourAngle = (hour+(min/60))/12 * twoPi - Pi; let minAngle = (min/60) * twoPi - Pi; diff --git a/apps/rolex/metadata.json b/apps/rolex/metadata.json index e8627246c..e5a06f55b 100644 --- a/apps/rolex/metadata.json +++ b/apps/rolex/metadata.json @@ -3,7 +3,7 @@ "shortName":"rolex", "icon": "rolex.png", "screenshots": [{"url":"screenshot1.png"}], - "version":"0.05", + "version": "0.06", "description": "A rolex like watch face", "tags": "clock", "type": "clock", diff --git a/apps/rpnsci/ChangeLog b/apps/rpnsci/ChangeLog index 35ba8b130..0ca422dbe 100644 --- a/apps/rpnsci/ChangeLog +++ b/apps/rpnsci/ChangeLog @@ -1,3 +1,4 @@ 0.01: New app! 0.02: Bug fixes -0.03: Submitted to the app loader \ No newline at end of file +0.03: Submitted to the app loader +0.04: Minor code improvements diff --git a/apps/rpnsci/app.js b/apps/rpnsci/app.js index 5c98770c4..b38848563 100644 --- a/apps/rpnsci/app.js +++ b/apps/rpnsci/app.js @@ -303,7 +303,7 @@ let y = 0; let z = 0; let t = 0; let memJSON = storage.readJSON(MEMORY_FILE); -if (memJSON) { +if (memJSON) { // TODO: `memory` should probably be declared outside the if blocks? let memory = memJSON; } else { let memory = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]; diff --git a/apps/rpnsci/metadata.json b/apps/rpnsci/metadata.json index 0c52aa8a7..6352d6258 100644 --- a/apps/rpnsci/metadata.json +++ b/apps/rpnsci/metadata.json @@ -3,7 +3,7 @@ "name": "RPN Scientific Calculator", "shortName": "Calculator", "icon": "icon.png", - "version": "0.03", + "version": "0.04", "description": "RPN scientific calculator with memory function.", "tags": "", "supports": [ diff --git a/apps/run/ChangeLog b/apps/run/ChangeLog index 22ab6c22f..ba46d9d06 100644 --- a/apps/run/ChangeLog +++ b/apps/run/ChangeLog @@ -15,4 +15,5 @@ 0.14: Fix Bangle.js 1 issue where after the 'overwrite track' menu, the start/stop button stopped working 0.15: Keep run state between runs (allowing you to exit and restart the app) 0.16: Added ability to resume a run that was stopped previously (fix #1907) -0.17: Ensure screen redraws after "Resume run?" menu (#3044) \ No newline at end of file +0.17: Ensure screen redraws after "Resume run?" menu (#3044) +0.18: Minor code improvements diff --git a/apps/run/app.js b/apps/run/app.js index 0e2d78288..98b879e29 100644 --- a/apps/run/app.js +++ b/apps/run/app.js @@ -89,7 +89,7 @@ function onStartStop() { } } - promise = promise.then(() => { + promise.then(() => { if (running) { if (shouldResume) exs.resume() diff --git a/apps/run/metadata.json b/apps/run/metadata.json index 07fb9b85e..3b1c42e0c 100644 --- a/apps/run/metadata.json +++ b/apps/run/metadata.json @@ -1,6 +1,6 @@ { "id": "run", "name": "Run", - "version":"0.17", + "version": "0.18", "description": "Displays distance, time, steps, cadence, pace and more for runners.", "icon": "app.png", "tags": "run,running,fitness,outdoors,gps", diff --git a/apps/runplus/ChangeLog b/apps/runplus/ChangeLog index 96800175a..093c0cf9a 100644 --- a/apps/runplus/ChangeLog +++ b/apps/runplus/ChangeLog @@ -22,4 +22,5 @@ Write to correct settings file, fixing settings not working. 0.20: Tweak HRM min/max defaults. Extend min/max intervals in settings. Fix another typo. 0.21: Rebase on "Run" app ver. 0.16. -0.22: Ensure screen redraws after "Resume run?" menu (#3044) \ No newline at end of file +0.22: Ensure screen redraws after "Resume run?" menu (#3044) +0.23: Minor code improvements diff --git a/apps/runplus/karvonen.js b/apps/runplus/karvonen.js index de81494bb..42c4734a8 100644 --- a/apps/runplus/karvonen.js +++ b/apps/runplus/karvonen.js @@ -54,7 +54,6 @@ //Test input to verify the zones work. The following value for "hr" has to be deleted and replaced with the Heart Rate Monitor input. let hr = exsHrmStats.getValue(); - let hr1 = hr; // These letiables display next and previous HR zone. //get the hrzones right. The calculation of the Heart rate zones here is based on the Karvonen method //60-70% of HRR+minHR = zone2. //70-80% of HRR+minHR = zone3. //80-90% of HRR+minHR = zone4. //90-99% of HRR+minHR = zone5. //=>99% of HRR+minHR = serious risk of heart attack @@ -157,7 +156,6 @@ function getZoneAlert() { const HRzonemax = require("graphics_utils"); - let centreX1,centreY1,maxRadius1 = 1; let minRadius = 0.40 * R.h; let startAngle1 = HRzonemax.degreesToRadians(-90); let endAngle1 = HRzonemax.degreesToRadians(270); diff --git a/apps/runplus/metadata.json b/apps/runplus/metadata.json index 16c6101ca..109cfbf99 100644 --- a/apps/runplus/metadata.json +++ b/apps/runplus/metadata.json @@ -1,7 +1,7 @@ { "id": "runplus", "name": "Run+", - "version": "0.22", + "version": "0.23", "description": "Displays distance, time, steps, cadence, pace and more for runners. Based on the Run app, but extended with additional screen for heart rate interval training.", "icon": "app.png", "tags": "run,running,fitness,outdoors,gps,karvonen,karvonnen", diff --git a/apps/ruuviwatch/ChangeLog b/apps/ruuviwatch/ChangeLog index 7a1d5db21..7eaf8c202 100644 --- a/apps/ruuviwatch/ChangeLog +++ b/apps/ruuviwatch/ChangeLog @@ -1,4 +1,5 @@ 0.01: Hello Ruuvi Watch! 0.02: Clear gfx on startup. 0.03: Improve design and code, reduce flicker. -0.04: Ability to rename tags. Sauna, Fridge & Freezer alert. Support °F based on locale. \ No newline at end of file +0.04: Ability to rename tags. Sauna, Fridge & Freezer alert. Support °F based on locale. +0.05: Minor code improvements diff --git a/apps/ruuviwatch/metadata.json b/apps/ruuviwatch/metadata.json index eab9f64bf..c88e6d9e6 100644 --- a/apps/ruuviwatch/metadata.json +++ b/apps/ruuviwatch/metadata.json @@ -2,7 +2,7 @@ "name": "Ruuvi Watch", "shortName":"Ruuvi Watch", "icon": "ruuviwatch.png", - "version":"0.04", + "version": "0.05", "description": "Keep an eye on RuuviTag devices (https://ruuvi.com). For RuuviTags using the v5 format.", "readme":"README.md", "tags": "bluetooth", diff --git a/apps/ruuviwatch/ruuviwatch.app.js b/apps/ruuviwatch/ruuviwatch.app.js index 249303382..90d83d0c7 100644 --- a/apps/ruuviwatch/ruuviwatch.app.js +++ b/apps/ruuviwatch/ruuviwatch.app.js @@ -486,6 +486,6 @@ g.drawImage( g.setFont(FONT_M); g.drawString("Ruuvi Watch", CENTER, HUMID_PRESSURE_Y); -var ageInterval = setInterval(redrawAge, 1000); -var scanInterval = setInterval(scan, SCAN_FREQ); +setInterval(redrawAge, 1000); +setInterval(scan, SCAN_FREQ); scan(); diff --git a/apps/sched/ChangeLog b/apps/sched/ChangeLog index 1d1c53ac1..98cedd5ad 100644 --- a/apps/sched/ChangeLog +++ b/apps/sched/ChangeLog @@ -24,3 +24,4 @@ 0.21: Fix crash in clock_info 0.22: Dated event repeat option 0.23: Allow buzzing forever when an alarm fires +0.24: Emit alarmReload when alarms change (used by widalarm) diff --git a/apps/sched/interface.html b/apps/sched/interface.html index 62e45676b..73ceff3c1 100644 --- a/apps/sched/interface.html +++ b/apps/sched/interface.html @@ -2,6 +2,26 @@ +