+ Enter in your weights for each exercise, start light and keep consistent with your training. The weight increment field is how much the app will increase your weights for an exercise if you successfully complete all the reps and sets for an exercise. Make sure its a value that matches the weights in your gym.
+
+
+ For more information on how to train this program refer the Stronglifts website
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/buffgym/buffgym.png b/apps/buffgym/buffgym.png
new file mode 100755
index 000000000..9bde64cc4
Binary files /dev/null and b/apps/buffgym/buffgym.png differ
diff --git a/apps/calculator/ChangeLog b/apps/calculator/ChangeLog
new file mode 100644
index 000000000..3b9b23270
--- /dev/null
+++ b/apps/calculator/ChangeLog
@@ -0,0 +1,2 @@
+0.01: New App!
+0.02: fix precision rounding issue + no reset when equals pressed
diff --git a/apps/calculator/README.md b/apps/calculator/README.md
new file mode 100644
index 000000000..b25d355bf
--- /dev/null
+++ b/apps/calculator/README.md
@@ -0,0 +1,23 @@
+# Calculator
+
+Basic calculator reminiscent of MacOs's one. Handy for small calculus.
+
+
+
+## Features
+
+- add / substract / divide / multiply
+- handles floats
+- basic memory button
+
+## Controls
+
+- UP: BTN1
+- DOWN: BTN3
+- LEFT: BTN4
+- RIGHT: BTN5
+- SELECT: BTN2
+
+## Creator
+
+
diff --git a/apps/calculator/app.js b/apps/calculator/app.js
new file mode 100644
index 000000000..a736b715d
--- /dev/null
+++ b/apps/calculator/app.js
@@ -0,0 +1,392 @@
+/**
+ * BangleJS Calculator
+ *
+ * Original Author: Frederic Rousseau https://github.com/fredericrous
+ * Created: April 2020
+ */
+
+g.clear();
+Graphics.prototype.setFont7x11Numeric7Seg = function() {
+ this.setFontCustom(atob("ACAB70AYAwBgC94AAAAAAAAAAB7wAAPQhhDCGELwAAAAhDCGEMIXvAAeACAEAIAQPeAA8CEMIYQwhA8AB70IYQwhhCB4AAAIAQAgBAB7wAHvQhhDCGEL3gAPAhDCGEMIXvAAe9CCEEIIQPeAA94EIIQQghA8AB70AYAwBgCAAAAHgQghBCCF7wAHvQhhDCGEIAAAPehBCCEEIAAAAA=="), 46, atob("AgAHBwcHBwcHBwcHAAAAAAAAAAcHBwcHBw=="), 11);
+};
+
+var DEFAULT_SELECTION = '5';
+var BOTTOM_MARGIN = 10;
+var RIGHT_MARGIN = 20;
+var COLORS = {
+ // [normal, selected]
+ DEFAULT: ['#7F8183', '#A6A6A7'],
+ OPERATOR: ['#F99D1C', '#CA7F2A'],
+ SPECIAL: ['#65686C', '#7F8183']
+};
+
+var keys = {
+ '0': {
+ xy: [0, 200, 120, 240],
+ trbl: '2.00'
+ },
+ '.': {
+ xy: [120, 200, 180, 240],
+ trbl: '3=.0'
+ },
+ '=': {
+ xy: [181, 200, 240, 240],
+ trbl: '+==.',
+ color: COLORS.OPERATOR
+ },
+ '1': {
+ xy: [0, 160, 60, 200],
+ trbl: '4201'
+ },
+ '2': {
+ xy: [60, 160, 120, 200],
+ trbl: '5301'
+ },
+ '3': {
+ xy: [120, 160, 180, 200],
+ trbl: '6+.2'
+ },
+ '+': {
+ xy: [181, 160, 240, 200],
+ trbl: '-+=3',
+ color: COLORS.OPERATOR
+ },
+ '4': {
+ xy: [0, 120, 60, 160],
+ trbl: '7514'
+ },
+ '5': {
+ xy: [60, 120, 120, 160],
+ trbl: '8624'
+ },
+ '6': {
+ xy: [120, 120, 180, 160],
+ trbl: '9-35'
+ },
+ '-': {
+ xy: [181, 120, 240, 160],
+ trbl: '*-+6',
+ color: COLORS.OPERATOR
+ },
+ '7': {
+ xy: [0, 80, 60, 120],
+ trbl: 'R847'
+ },
+ '8': {
+ xy: [60, 80, 120, 120],
+ trbl: 'N957'
+ },
+ '9': {
+ xy: [120, 80, 180, 120],
+ trbl: '%*68'
+ },
+ '*': {
+ xy: [181, 80, 240, 120],
+ trbl: '/*-9',
+ color: COLORS.OPERATOR
+ },
+ 'R': {
+ xy: [0, 40, 60, 79],
+ trbl: 'RN7R',
+ color: COLORS.SPECIAL,
+ val: 'AC'
+ },
+ 'N': {
+ xy: [60, 40, 120, 79],
+ trbl: 'N%8R',
+ color: COLORS.SPECIAL,
+ val: '+/-'
+ },
+ '%': {
+ xy: [120, 40, 180, 79],
+ trbl: '%/9N',
+ color: COLORS.SPECIAL
+ },
+ '/': {
+ xy: [181, 40, 240, 79],
+ trbl: '//*%',
+ color: COLORS.OPERATOR
+ }
+};
+
+var selected = DEFAULT_SELECTION;
+var prevSelected = DEFAULT_SELECTION;
+var prevNumber = null;
+var currNumber = null;
+var operator = null;
+var results = null;
+var isDecimal = false;
+var hasPressedEquals = false;
+
+function drawKey(name, k, selected) {
+ var rMargin = 0;
+ var bMargin = 0;
+ var color = k.color || COLORS.DEFAULT;
+ g.setColor(color[selected ? 1 : 0]);
+ g.setFont('Vector', 20);
+ g.fillRect(k.xy[0], k.xy[1], k.xy[2], k.xy[3]);
+ g.setColor(-1);
+ // correct margins to center the texts
+ if (name == '0') {
+ rMargin = (RIGHT_MARGIN * 2) - 7;
+ } else if (name === '/') {
+ rMargin = 5;
+ } else if (name === '*') {
+ bMargin = 5;
+ rMargin = 3;
+ } else if (name === '-') {
+ rMargin = 3;
+ } else if (name === 'R' || name === 'N') {
+ rMargin = k.val === 'C' ? 0 : -9;
+ } else if (name === '%') {
+ rMargin = -3;
+ }
+ g.drawString(k.val || name, k.xy[0] + RIGHT_MARGIN + rMargin, k.xy[1] + BOTTOM_MARGIN + bMargin);
+}
+
+function getIntWithPrecision(x) {
+ var xStr = x.toString();
+ var xRadix = xStr.indexOf('.');
+ var xPrecision = xRadix === -1 ? 0 : xStr.length - xRadix - 1;
+ return {
+ num: Number(xStr.replace('.', '')),
+ p: xPrecision
+ };
+}
+
+function multiply(x, y) {
+ var xNum = getIntWithPrecision(x);
+ var yNum = getIntWithPrecision(y);
+ return xNum.num * yNum.num / Math.pow(10, xNum.p + yNum.p);
+}
+
+function divide(x, y) {
+ var xNum = getIntWithPrecision(x);
+ var yNum = getIntWithPrecision(y);
+ return xNum.num / yNum.num / Math.pow(10, xNum.p - yNum.p);
+}
+
+function sum(x, y) {
+ let xNum = getIntWithPrecision(x);
+ let yNum = getIntWithPrecision(y);
+
+ let diffPrecision = Math.abs(xNum.p - yNum.p);
+ if (diffPrecision > 0) {
+ if (xNum.p > yNum.p) {
+ yNum.num = yNum.num * Math.pow(10, diffPrecision);
+ } else {
+ xNum.num = xNum.num * Math.pow(10, diffPrecision);
+ }
+ }
+ return (xNum.num + yNum.num) / Math.pow(10, Math.max(xNum.p, yNum.p));
+}
+
+function subtract(x, y) {
+ return sum(x, -y);
+}
+
+function doMath(x, y, operator) {
+ switch (operator) {
+ case '/':
+ return divide(x, y);
+ case '*':
+ return multiply(x, y);
+ case '+':
+ return sum(x, y);
+ case '-':
+ return subtract(x, y);
+ }
+}
+
+function displayOutput(num) {
+ var len;
+ var minusMarge = 0;
+ g.setColor(0);
+ g.fillRect(0, 0, 240, 39);
+ g.setColor(-1);
+ if (num === Infinity || num === -Infinity || isNaN(num)) {
+ // handle division by 0
+ if (num === Infinity) {
+ num = 'INFINITY';
+ } else if (num === -Infinity) {
+ num = '-INFINITY';
+ } else {
+ num = 'NOT A NUMBER';
+ minusMarge = -25;
+ }
+ len = (num + '').length;
+ currNumber = null;
+ results = null;
+ isDecimal = false;
+ hasPressedEquals = false;
+ prevNumber = null;
+ operator = null;
+ keys.R.val = 'AC';
+ drawKey('R', keys.R);
+ g.setFont('Vector', 22);
+ } else {
+ // might not be a number due to display of dot "."
+ var numNumeric = Number(num);
+
+ if (typeof num === 'string') {
+ if (num.indexOf('.') !== -1) {
+ // display a 0 before a lonely dot
+ if (numNumeric == 0) {
+ num = '0.';
+ }
+ } else {
+ // remove preceding 0
+ while (num.length > 1 && num[0] === '0')
+ num = num.substr(1);
+ }
+ }
+
+ len = (num + '').length;
+ if (numNumeric < 0 || (numNumeric === 0 && 1/numNumeric === -Infinity)) {
+ // minus is not available in font 7x11Numeric7Seg, we use Vector
+ g.setFont('Vector', 20);
+ g.drawString('-', 220 - (len * 15), 10);
+ minusMarge = 15;
+ }
+ g.setFont('7x11Numeric7Seg', 2);
+ }
+ g.drawString(num, 220 - (len * 15) + minusMarge, 10);
+}
+var wasPressedEquals = false;
+var hasPressedNumber = false;
+function calculatorLogic(x) {
+ if (wasPressedEquals && hasPressedNumber !== false) {
+ prevNumber = null;
+ currNumber = hasPressedNumber;
+ wasPressedEquals = false;
+ hasPressedNumber = false;
+ return;
+ }
+ if (hasPressedEquals) {
+ if (hasPressedNumber) {
+ prevNumber = null;
+ hasPressedNumber = false;
+ operator = null;
+ } else {
+ currNumber = null;
+ prevNumber = results;
+ }
+ hasPressedEquals = false;
+ wasPressedEquals = true;
+ }
+
+ if (currNumber == null && operator != null && '/*-+'.indexOf(x) !== -1) {
+ operator = x;
+ displayOutput(prevNumber);
+ } else if (prevNumber != null && currNumber != null && operator != null) {
+ // we execute the calculus only when there was a previous number entered before and an operator
+ results = doMath(prevNumber, currNumber, operator);
+ operator = x;
+ prevNumber = results;
+ currNumber = null;
+ displayOutput(results);
+ } else if (prevNumber == null && currNumber != null && operator == null) {
+ // no operator yet, save the current number for later use when an operator is pressed
+ operator = x;
+ prevNumber = currNumber;
+ currNumber = null;
+ displayOutput(prevNumber);
+ } else if (prevNumber == null && currNumber == null && operator == null) {
+ displayOutput(0);
+ }
+}
+
+function buttonPress(val) {
+ switch (val) {
+ case 'R':
+ currNumber = null;
+ results = null;
+ isDecimal = false;
+ hasPressedEquals = false;
+ if (keys.R.val == 'AC') {
+ prevNumber = null;
+ operator = null;
+ } else {
+ keys.R.val = 'AC';
+ drawKey('R', keys.R, true);
+ }
+ wasPressedEquals = false;
+ hasPressedNumber = false;
+ displayOutput(0);
+ break;
+ case '%':
+ if (results != null) {
+ displayOutput(results /= 100);
+ } else if (currNumber != null) {
+ displayOutput(currNumber /= 100);
+ }
+ hasPressedNumber = false;
+ break;
+ case 'N':
+ if (results != null) {
+ displayOutput(results *= -1);
+ } else {
+ displayOutput(currNumber *= -1);
+ }
+ break;
+ case '/':
+ case '*':
+ case '-':
+ case '+':
+ calculatorLogic(val);
+ hasPressedNumber = false;
+ break;
+ case '.':
+ keys.R.val = 'C';
+ drawKey('R', keys.R);
+ isDecimal = true;
+ displayOutput(currNumber == null ? 0 + '.' : currNumber + '.');
+ break;
+ case '=':
+ if (prevNumber != null && currNumber != null && operator != null) {
+ results = doMath(prevNumber, currNumber, operator);
+ prevNumber = results;
+ displayOutput(results);
+ hasPressedEquals = 1;
+ }
+ hasPressedNumber = false;
+ break;
+ default:
+ keys.R.val = 'C';
+ drawKey('R', keys.R);
+ const is0Negative = (currNumber === 0 && 1/currNumber === -Infinity);
+ if (isDecimal) {
+ currNumber = currNumber == null || hasPressedEquals === 1 ? 0 + '.' + val : currNumber + '.' + val;
+ isDecimal = false;
+ } else {
+ currNumber = currNumber == null || hasPressedEquals === 1 ? val : (is0Negative ? '-' + val : currNumber + val);
+ }
+ if (hasPressedEquals === 1) {
+ hasPressedEquals = 2;
+ }
+ hasPressedNumber = currNumber;
+ displayOutput(currNumber);
+ break;
+ }
+}
+
+for (var k in keys) {
+ if (keys.hasOwnProperty(k)) {
+ drawKey(k, keys[k], k == '5');
+ }
+}
+g.setFont('7x11Numeric7Seg', 2.8);
+g.drawString('0', 205, 10);
+
+function moveDirection(d) {
+ drawKey(selected, keys[selected]);
+ prevSelected = selected;
+ selected = (d === 0 && selected == '0' && prevSelected === '1') ? '1' : keys[selected].trbl[d];
+ drawKey(selected, keys[selected], true);
+}
+
+setWatch(_ => moveDirection(0), BTN1, {repeat: true, debounce: 100});
+setWatch(_ => moveDirection(2), BTN3, {repeat: true, debounce: 100});
+setWatch(_ => moveDirection(3), BTN4, {repeat: true, debounce: 100});
+setWatch(_ => moveDirection(1), BTN5, {repeat: true, debounce: 100});
+setWatch(_ => buttonPress(selected), BTN2, {repeat: true, debounce: 100});
diff --git a/apps/calculator/calculator-icon.js b/apps/calculator/calculator-icon.js
new file mode 100644
index 000000000..94158e7d2
--- /dev/null
+++ b/apps/calculator/calculator-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwhBC/AC8r6/XlYvr64CEF9UrMIIv/R/7vTMwIAmlUklQGDroAFqwHGBRgJBqwMDq+k5nNABAWDC4QZFERAvGBQOBF5I0FCYNW1mImWs6+sDoQsDAYIJEAAeB2eB1mBA4QvF43P6/GF4mB6+BAQYlEro3BAAI3FDAezBYgvE43O64DBF4hbCAAMrGAIiFBYRUEHogaBxA6CF4vXLwPHF4giEDIIkDDgI2BFoI6FBgYWCF5PPF4rSBKwVWI4bAFFgdcYAykBX5HX53NFwfNfwIkDAQYAGBBAKCIIYABd4y9DAAJ9CAD9dF4gAGCIi8BABLXBBRQLEF4vHRwgvEERQ6DHpgvH66PB65fUBpZfJ4/G6wxBMIaPbL5QvB6/WF6hqNF5KPDF6jkGd6JeBF5AAdF4oAGDBeH1mHAAwIBF8esABQvdWQonDX4YvIYAq/GXobvNF4hfKCwwvF43GF5AXGL44vJLwgvE453DMIYuFR5JiHI4yPHRoaREIwpIFF7TvbR5BJCX5IvMADgvcroABF6vG4wvIX46DKBZYvEFwPHGAgZHERALRF4YuBHYIwEFxxfPF5CDDF6ZfLDAyPFFwovFKRYvV47vDAgIvRR5aOFL4orCFwbvHADYvEAA4YLdRYvQ45eBR5C6UF5vHX4LvJF8PGZYXXGAYvnLYYvfZ4xfXd6AvKGAK/RDAKNTF4wAG44="))
diff --git a/apps/calculator/calculator.png b/apps/calculator/calculator.png
new file mode 100644
index 000000000..8362c9200
Binary files /dev/null and b/apps/calculator/calculator.png differ
diff --git a/apps/calculator/tests.html b/apps/calculator/tests.html
new file mode 100644
index 000000000..1cbfdf617
--- /dev/null
+++ b/apps/calculator/tests.html
@@ -0,0 +1,273 @@
+
+
+
+
+
+ Calculator tests
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/calendar/ChangeLog b/apps/calendar/ChangeLog
new file mode 100644
index 000000000..3cf79ffe8
--- /dev/null
+++ b/apps/calendar/ChangeLog
@@ -0,0 +1 @@
+0.01: Basic calendar
diff --git a/apps/calendar/README.md b/apps/calendar/README.md
new file mode 100644
index 000000000..19a60afc0
--- /dev/null
+++ b/apps/calendar/README.md
@@ -0,0 +1,8 @@
+# Calendar
+
+Basic calendar
+
+## Usage
+
+- Use `BTN4` (left screen tap) to go to the previous month
+- Use `BTN5` (right screen tap) to go to the next month
diff --git a/apps/calendar/calendar-icon.js b/apps/calendar/calendar-icon.js
new file mode 100644
index 000000000..ed1bf3667
--- /dev/null
+++ b/apps/calendar/calendar-icon.js
@@ -0,0 +1,5 @@
+require("heatshrink").decompress(
+ atob(
+ "mEwxH+AH4A/ADuIUCARRDhgePCKIv13YAEDoYJFAA4RJFyQvcGBYRGy4dDy4uLCJgv/DoOBDgOBF5oRLF6IeBDgIvNCJYvQDwQuNCJovRADov/F9OsAEgv/F/4vhwIACAqYv/F/4vnd94vvX/4v/F/7vvF96//F/4v/d94v/F/4wsFxQwjFxgA/AH4A/AH4AZA=="
+ )
+)
diff --git a/apps/calendar/calendar.js b/apps/calendar/calendar.js
new file mode 100644
index 000000000..720986162
--- /dev/null
+++ b/apps/calendar/calendar.js
@@ -0,0 +1,160 @@
+const maxX = 240;
+const maxY = 240;
+const rowN = 7;
+const colN = 7;
+const headerH = maxY / 7;
+const rowH = (maxY - headerH) / rowN;
+const colW = maxX / colN;
+const color1 = "#035AA6";
+const color2 = "#4192D9";
+const color3 = "#026873";
+const color4 = "#038C8C";
+const color5 = "#03A696";
+const black = "#000000";
+const white = "#ffffff";
+const gray1 = "#444444";
+const gray2 = "#888888";
+const gray3 = "#bbbbbb";
+const red = "#d41706";
+
+function drawCalendar(date) {
+ g.setBgColor(color4);
+ g.clearRect(0, 0, maxX, maxY);
+ g.setBgColor(color1);
+ g.clearRect(0, 0, maxX, headerH);
+ g.setBgColor(color2);
+ g.clearRect(0, headerH, maxX, headerH + rowH);
+ g.setBgColor(color3);
+ g.clearRect(colW * 5, headerH + rowH, maxX, maxY);
+ for (let y = headerH; y < maxY; y += rowH) {
+ g.drawLine(0, y, maxX, y);
+ }
+ for (let x = 0; x < maxX; x += colW) {
+ g.drawLine(x, headerH, x, maxY);
+ }
+
+ const month = date.getMonth();
+ const year = date.getFullYear();
+ const monthMap = {
+ 0: "January",
+ 1: "February",
+ 2: "March",
+ 3: "April",
+ 4: "May",
+ 5: "June",
+ 6: "July",
+ 7: "August",
+ 8: "September",
+ 9: "October",
+ 10: "November",
+ 11: "December"
+ };
+ g.setFontAlign(0, 0);
+ g.setFont("6x8", 2);
+ g.setColor(white);
+ g.drawString(`${monthMap[month]} ${year}`, maxX / 2, headerH / 2);
+ g.drawPoly([10, headerH / 2, 20, 10, 20, headerH - 10], true);
+ g.drawPoly(
+ [maxX - 10, headerH / 2, maxX - 20, 10, maxX - 20, headerH - 10],
+ true
+ );
+
+ g.setFont("6x8", 2);
+ const dowLbls = ["Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"];
+ dowLbls.forEach((lbl, i) => {
+ g.drawString(lbl, i * colW + colW / 2, headerH + rowH / 2);
+ });
+
+ date.setDate(1);
+ const dow = date.getDay();
+ const dowNorm = dow === 0 ? 7 : dow;
+
+ const monthMaxDayMap = {
+ 0: 31,
+ 1: (2020 - year) % 4 === 0 ? 29 : 28,
+ 2: 31,
+ 3: 30,
+ 4: 31,
+ 5: 30,
+ 6: 31,
+ 7: 31,
+ 8: 30,
+ 9: 31,
+ 10: 30,
+ 11: 31
+ };
+
+ let days = [];
+ let nextMonthDay = 1;
+ let thisMonthDay = 51;
+ let prevMonthDay = monthMaxDayMap[month > 0 ? month - 1 : 11] - dowNorm;
+ for (let i = 0; i < colN * (rowN - 1) + 1; i++) {
+ if (i < dowNorm) {
+ days.push(prevMonthDay);
+ prevMonthDay++;
+ } else if (thisMonthDay <= monthMaxDayMap[month] + 50) {
+ days.push(thisMonthDay);
+ thisMonthDay++;
+ } else {
+ days.push(nextMonthDay);
+ nextMonthDay++;
+ }
+ }
+
+ let i = 0;
+ for (y = 0; y < rowN - 1; y++) {
+ for (x = 0; x < colN; x++) {
+ i++;
+ const day = days[i];
+ const isToday =
+ today.year === year && today.month === month && today.day === day - 50;
+ if (isToday) {
+ g.setColor(red);
+ g.drawRect(
+ x * colW,
+ y * rowH + headerH + rowH,
+ x * colW + colW - 1,
+ y * rowH + headerH + rowH + rowH
+ );
+ }
+ g.setColor(day < 50 ? gray3 : white);
+ g.drawString(
+ (day > 50 ? day - 50 : day).toString(),
+ x * colW + colW / 2,
+ headerH + rowH + y * rowH + rowH / 2
+ );
+ }
+ }
+}
+
+const date = new Date();
+const today = {
+ day: date.getDate(),
+ month: date.getMonth(),
+ year: date.getFullYear()
+};
+drawCalendar(date);
+clearWatch();
+setWatch(
+ () => {
+ const month = date.getMonth();
+ const prevMonth = month > 0 ? month - 1 : 11;
+ if (prevMonth === 11) date.setFullYear(date.getFullYear() - 1);
+ date.setMonth(prevMonth);
+ drawCalendar(date);
+ },
+ BTN4,
+ { repeat: true }
+);
+setWatch(
+ () => {
+ const month = date.getMonth();
+ const prevMonth = month < 11 ? month + 1 : 0;
+ if (prevMonth === 0) date.setFullYear(date.getFullYear() + 1);
+ date.setMonth(month + 1);
+ drawCalendar(date);
+ },
+ BTN5,
+ { repeat: true }
+);
+setWatch(Bangle.showLauncher, BTN2, { repeat: false, edge: "falling" });
diff --git a/apps/calendar/calendar.png b/apps/calendar/calendar.png
new file mode 100644
index 000000000..056cab3b7
Binary files /dev/null and b/apps/calendar/calendar.png differ
diff --git a/apps/chrono/chrono-icon.js b/apps/chrono/chrono-icon.js
new file mode 100644
index 000000000..580713825
--- /dev/null
+++ b/apps/chrono/chrono-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwglihGIxAWUwADBDCYTDhAXSFwQEGIxowBL4QXTx///AXWF6qnBwCTDO6EIF4KnEDwLWO/4QFx7FNdwQQEGwP4GBYUB/4QBDIYXMIgQAEDIIKCVwItJFggFEx4uKCAQUBX4QDC/B2KhASCAQP/AQQcDLpQlCLgQsCCoIGBC5IkCFon/xwxCDgIXJFwYxFHIR3ILwIkBCIeIFwQHBHgReIJAgCBOoP+MYZIHhB1EDgIRBA4ZIJC4LrEMYvoAgQXJxHvI4gtDC5OIF4QSDbYY3EC5QAKG4QXNPwg0BSBAJCIQhLCDwgXKIAwXUMo4XPFwrwKC4YOCUooVCR453DIxIXJU4IqDxwXJa45FDdgxnEC40IC4TbINQYXIRQZwDAAXv/xuBCwoXBVAgXDA4wXGSARcEC4o7BRwx4DOon+C4YiCLwxIDDAobDEYJGIGAYYBxDAD9AJDC5IwCDIYACJARGIDAapDaooWLDAZhEAoIWNMggADCqAAPA"))
\ No newline at end of file
diff --git a/apps/chrono/chrono.js b/apps/chrono/chrono.js
new file mode 100644
index 000000000..cd50b8a22
--- /dev/null
+++ b/apps/chrono/chrono.js
@@ -0,0 +1,73 @@
+function msToTime(duration) {
+ var milliseconds = parseInt((duration % 1000) / 100),
+ seconds = Math.floor((duration / 1000) % 60),
+ minutes = Math.floor((duration / (1000 * 60)) % 60),
+ hours = Math.floor((duration / (1000 * 60 * 60)) % 24);
+
+ hours = (hours < 10) ? "0" + hours : hours;
+ minutes = (minutes < 10) ? "0" + minutes : minutes;
+ seconds = (seconds < 10) ? "0" + seconds : seconds;
+
+ return hours + ":" + minutes + ":" + seconds;
+}
+
+
+var counter = 0;
+var started = false;
+
+function drawInterface() {
+ g.clear();
+ g.setFontAlign(0, 0);
+ g.setFont("6x8", 2);
+ g.drawString("+5m", g.getWidth() - 30, 30);
+ g.drawString("+30s", g.getWidth() - 30, g.getHeight() / 2);
+ g.drawString("+5s", g.getWidth() - 30, g.getHeight() - 30);
+
+ g.setFontAlign(0, 0); // center font
+ g.setFont("6x8", 3);
+ // draw the current counter value
+
+ g.drawString(msToTime(counter * 1000), g.getWidth() / 2 - 30, g.getHeight() / 2);
+ // optional - this keeps the watch LCD lit up
+ g.flip();
+}
+
+function countDown() {
+ if (counter > 0) {
+ if (started) {
+ counter--;
+ drawInterface();
+ }
+ } else {
+ if (started) {
+ Bangle.buzz();
+ }
+ }
+}
+
+setWatch((p) => {
+ if (p.time - p.lastTime < 0.1) {
+ counter = 0;
+ started = false;
+ } else {
+ counter += 60 * 5;
+ }
+ drawInterface();
+}, BTN1, { repeat: true });
+
+setWatch(() => {
+ counter += 30;
+ drawInterface();
+}, BTN2, { repeat: true });
+
+setWatch(() => {
+ counter += 5;
+ drawInterface();
+}, BTN3, { repeat: true });
+
+Bangle.on('touch', function (button) {
+ started = !started;
+});
+
+var interval = setInterval(countDown, 1000);
+drawInterface();
\ No newline at end of file
diff --git a/apps/chrono/chrono.png b/apps/chrono/chrono.png
new file mode 100644
index 000000000..c1aaf180d
Binary files /dev/null and b/apps/chrono/chrono.png differ
diff --git a/apps/chronowid/ChangeLog b/apps/chronowid/ChangeLog
new file mode 100644
index 000000000..e173467a1
--- /dev/null
+++ b/apps/chronowid/ChangeLog
@@ -0,0 +1,3 @@
+0.01: New widget and app!
+0.02: Setting to reset values, timer buzzes at 00:00 and not later (see readme)
+0.03: Display only minutes:seconds when less than 1 hour left
\ No newline at end of file
diff --git a/apps/chronowid/README.md b/apps/chronowid/README.md
new file mode 100644
index 000000000..f422dd956
--- /dev/null
+++ b/apps/chronowid/README.md
@@ -0,0 +1,38 @@
+# Chronometer Widget
+
+Chronometer (timer) that runs as a widget.
+The advantage is, that you can still see your normal watchface and other widgets when the timer is running.
+The widget is always active, but only shown when the timer is on.
+Hours, minutes, seconds and timer status can be set with an app.
+
+Depending on when you start the timer, it may alert up to 0,999 seconds early. This is because it checks only for full seconds. When there is less than one seconds left, it buzzes. This cannot be avoided without checking more than every second, which I would like to avoid.
+
+## Screenshots
+
+TBD
+
+## Features
+
+* Using other apps does not interrupt the timer, no need to keep the widget open (BUT: there will be no buzz when the time is up, for that the widget has to be loaded)
+* Target time is saved to a file and timer picks up again when widget is loaded again.
+
+## Settings
+
+There are no settings section in the settings app, timer can be set using an app.
+
+* Reset values: Reset hours, minutes, seconds to 0; set timer on to false; write to settings file
+* Hours: Set the hours for the timer
+* Minutes: Set the minutes for the timer
+* Seconds: Set the seconds for the timer
+* Timer on: Starts the timer and displays the widget when set to 'On'. You have to leave the app to load the widget which starts the timer. The widget is always there, but only visible when timer is on.
+
+
+## Releases
+
+* Offifical app loader: https://github.com/espruino/BangleApps/tree/master/apps/chronowid (https://banglejs.com/apps/)
+* Forked app loader: https://github.com/Purple-Tentacle/BangleApps/tree/master/apps/chronowid (https://purple-tentacle.github.io/BangleApps/index.html#)
+* Development: https://github.com/Purple-Tentacle/BangleAppsDev/tree/master/apps/chronowid
+
+## Requests
+
+If you have any feature requests, please write here: http://forum.espruino.com/conversations/345972/
\ No newline at end of file
diff --git a/apps/chronowid/app-icon.js b/apps/chronowid/app-icon.js
new file mode 100644
index 000000000..db2010218
--- /dev/null
+++ b/apps/chronowid/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwIFCn/8BYYFRABcD4AFFgIFCh/wgeAAoP//8HCYMDAoPD8EAg4FB8PwgEf+EP/H4HQOAgP8uEAvwfBv0ggBFCn4CB/EBwEfgEB+AFBh+AgfgAoI1BIoQJB4AHBAoXgg4uBAIIFCCYQFGh5rDJQJUBK4IFCNYIFVDoopDGoJiBHYYFKVYRZBWIYDBA4IFBNIQzBG4IbBToKkBAQKVFUIYICVoQUCXIQmCYoIsCaITqDAoLvDNYUAA="))
\ No newline at end of file
diff --git a/apps/chronowid/app.js b/apps/chronowid/app.js
new file mode 100644
index 000000000..0cacdee23
--- /dev/null
+++ b/apps/chronowid/app.js
@@ -0,0 +1,98 @@
+g.clear();
+Bangle.loadWidgets();
+Bangle.drawWidgets();
+
+const storage = require('Storage');
+const boolFormat = v => v ? "On" : "Off";
+let settingsChronowid;
+
+function updateSettings() {
+ var now = new Date();
+ const goal = new Date(now.getFullYear(), now.getMonth(), now.getDate(),
+ now.getHours() + settingsChronowid.hours, now.getMinutes() + settingsChronowid.minutes, now.getSeconds() + settingsChronowid.seconds);
+ settingsChronowid.goal = goal.getTime();
+ storage.writeJSON('chronowid.json', settingsChronowid);
+}
+
+function resetSettings() {
+ settingsChronowid = {
+ hours : 0,
+ minutes : 0,
+ seconds : 0,
+ started : false,
+ counter : 0,
+ goal : 0,
+ };
+ updateSettings();
+}
+
+settingsChronowid = storage.readJSON('chronowid.json',1);
+if (!settingsChronowid) resetSettings();
+
+E.on('kill', () => {
+ updateSettings();
+});
+
+function showMenu() {
+ const timerMenu = {
+ '': {
+ 'title': 'Set timer',
+ 'predraw': function() {
+ timerMenu.hours.value = settingsChronowid.hours;
+ timerMenu.minutes.value = settingsChronowid.minutes;
+ timerMenu.seconds.value = settingsChronowid.seconds;
+ timerMenu.started.value = settingsChronowid.started;
+ }
+ },
+ 'Reset values': function() {
+ settingsChronowid.hours = 0;
+ settingsChronowid.minutes = 0;
+ settingsChronowid.seconds = 0;
+ settingsChronowid.started = false;
+ updateSettings();
+ showMenu();
+ },
+ 'Hours': {
+ value: settingsChronowid.hours,
+ min: 0,
+ max: 24,
+ step: 1,
+ onchange: v => {
+ settingsChronowid.hours = v;
+ updateSettings();
+ }
+ },
+ 'Minutes': {
+ value: settingsChronowid.minutes,
+ min: 0,
+ max: 59,
+ step: 1,
+ onchange: v => {
+ settingsChronowid.minutes = v;
+ updateSettings();
+ }
+ },
+ 'Seconds': {
+ value: settingsChronowid.seconds,
+ min: 0,
+ max: 59,
+ step: 1,
+ onchange: v => {
+ settingsChronowid.seconds = v;
+ updateSettings();
+ }
+ },
+ 'Timer on': {
+ value: settingsChronowid.started,
+ format: boolFormat,
+ onchange: v => {
+ settingsChronowid.started = v;
+ updateSettings();
+ }
+ },
+ };
+ timerMenu['-Exit-'] = ()=>{load();};
+ return E.showMenu(timerMenu);
+}
+
+showMenu();
\ No newline at end of file
diff --git a/apps/chronowid/app.png b/apps/chronowid/app.png
new file mode 100644
index 000000000..5ac7a480c
Binary files /dev/null and b/apps/chronowid/app.png differ
diff --git a/apps/chronowid/widget.js b/apps/chronowid/widget.js
new file mode 100644
index 000000000..f0e785efd
--- /dev/null
+++ b/apps/chronowid/widget.js
@@ -0,0 +1,93 @@
+(() => {
+ const storage = require('Storage');
+ settingsChronowid = storage.readJSON("chronowid.json",1)||{}; //read settingsChronowid from file
+ var height = 23;
+ var width = 58;
+ var interval = 0; //used for the 1 second interval timer
+ var now = new Date();
+
+ var time = 0;
+ var diff = settingsChronowid.goal - now;
+
+ //Convert ms to time
+ function getTime(t) {
+ var milliseconds = parseInt((t % 1000) / 100),
+ seconds = Math.floor((t / 1000) % 60),
+ minutes = Math.floor((t / (1000 * 60)) % 60),
+ hours = Math.floor((t / (1000 * 60 * 60)) % 24);
+
+ hours = (hours < 10) ? "0" + hours : hours;
+ minutes = (minutes < 10) ? "0" + minutes : minutes;
+ seconds = (seconds < 10) ? "0" + seconds : seconds;
+
+ return hours + ":" + minutes + ":" + seconds;
+ }
+
+ function printDebug() {
+ print ("Nowtime: " + getTime(now));
+ print ("Now: " + now);
+ print ("Goaltime: " + getTime(settingsChronowid.goal));
+ print ("Goal: " + settingsChronowid.goal);
+ print("Difftime: " + getTime(diff));
+ print("Diff: " + diff);
+ print ("Started: " + settingsChronowid.started);
+ print ("----");
+ }
+
+ //counts down, calculates and displays
+ function countDown() {
+ now = new Date();
+ diff = settingsChronowid.goal - now; //calculate difference
+ WIDGETS["chronowid"].draw();
+ //time is up
+ if (settingsChronowid.started && diff < 1000) {
+ Bangle.buzz(1500);
+ //write timer off to file
+ settingsChronowid.started = false;
+ storage.writeJSON('chronowid.json', settingsChronowid);
+ clearInterval(interval); //stop interval
+ }
+ //printDebug();
+ }
+
+ // draw your widget
+ function draw() {
+ if (!settingsChronowid.started) {
+ width = 0;
+ return; //do not draw anything if timer is not started
+ }
+ g.reset();
+ if (diff >= 0) {
+ if (diff < 3600000) { //less than 1 hour left
+ width = 58;
+ g.clearRect(this.x,this.y,this.x+width,this.y+height);
+ g.setFont("6x8", 2);
+ g.drawString(getTime(diff).substring(3), this.x+1, this.y+5); //remove hour part 00:00:00 -> 00:00
+ }
+ if (diff >= 3600000) { //one hour or more left
+ width = 48;
+ g.clearRect(this.x,this.y,this.x+width,this.y+height);
+ g.setFont("6x8", 1);
+ g.drawString(getTime(diff), this.x+1, this.y+((height/2)-4)); //display hour 00:00:00
+ }
+ }
+ // not needed anymoe, because we check if diff < 1000 now, so 00:00 is displayed.
+ // else {
+ // width = 58;
+ // g.clearRect(this.x,this.y,this.x+width,this.y+height);
+ // g.setFont("6x8", 2);
+ // g.drawString("END", this.x+15, this.y+5);
+ // }
+ }
+
+ if (settingsChronowid.started) interval = setInterval(countDown, 1000); //start countdown each second
+
+ // add the widget
+ WIDGETS["chronowid"]={area:"bl",width:width,draw:draw,reload:function() {
+ reload();
+ Bangle.drawWidgets(); // relayout all widgets
+ }};
+
+ //printDebug();
+ countDown();
+})();
\ No newline at end of file
diff --git a/apps/clickms/click-master.js b/apps/clickms/click-master.js
index b9f76364b..55027e733 100644
--- a/apps/clickms/click-master.js
+++ b/apps/clickms/click-master.js
@@ -7,12 +7,12 @@ setWatch(x=>{
},BTN1,{repeat:true});
function updateAdvertising() {
-try {
- NRF.setAdvertising({},{
- manufacturer: 0x0590,
- manufacturerData: new Uint8Array([mycounter>>8,mycounter&255])
- });
-} catch(e){}
+ try {
+ NRF.setAdvertising({},{
+ manufacturer: 0x0590,
+ manufacturerData: new Uint8Array([mycounter>>8,mycounter&255])
+ });
+ } catch(e){}
}
function drawPlayers() {
diff --git a/apps/cliock/ChangeLog b/apps/cliock/ChangeLog
new file mode 100644
index 000000000..59f07c400
--- /dev/null
+++ b/apps/cliock/ChangeLog
@@ -0,0 +1,2 @@
+0.07: Submitted to App Loader
+0.08: Fixes issue where face would redraw on wake leading to all memory being used and watch crashing.
diff --git a/apps/cliock/app-icon.js b/apps/cliock/app-icon.js
new file mode 100644
index 000000000..fab023339
--- /dev/null
+++ b/apps/cliock/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("kEgwkBiIA/ACBhLB6gqKB6g//B6I4DiDqCB40QB4MBAoIXDB40BAIIPNG44PLAoQvMB5RPEB5JvEBAav1f7wA/ABoA=="))
diff --git a/apps/cliock/app.js b/apps/cliock/app.js
new file mode 100644
index 000000000..a94b7264d
--- /dev/null
+++ b/apps/cliock/app.js
@@ -0,0 +1,51 @@
+var fontsize = 3;
+var locale = require("locale");
+var marginTop = 40;
+var flag = false;
+var WeekDays = ["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"];
+
+function drawAll(){
+ updateTime();
+ updateRest(new Date());
+}
+
+function updateRest(now){
+ let date = locale.date(now,false);
+ writeLine(WeekDays[now.getDay()],1);
+ writeLine(date,2);
+}
+function updateTime(){
+ if (!Bangle.isLCDOn()) return;
+ let now = new Date();
+ let h = now.getHours();
+ let m = now.getMinutes();
+ h = h>=10?h:"0"+h;
+ m = m>=10?m:"0"+m;
+ writeLine(h+":"+m,0);
+ writeLine(flag?" ":"_",3);
+ flag = !flag;
+ if(now.getMinutes() == 0)
+ updateRest(now);
+}
+function writeLineStart(line){
+ g.drawString(">",4,marginTop+line*30);
+}
+function writeLine(str,line){
+ g.setFont("6x8",fontsize);
+ g.setColor(0,1,0);
+ g.setFontAlign(-1,-1);
+ g.clearRect(0,marginTop+line*30,((str.length+1)*20),marginTop+25+line*30);
+ writeLineStart(line);
+ g.drawString(str,25,marginTop+line*30);
+}
+
+g.clear();
+Bangle.loadWidgets();
+Bangle.drawWidgets();
+drawAll();
+Bangle.on('lcdPower',function(on) {
+ if (on)
+ drawAll();
+});
+var click = setInterval(updateTime, 1000);
+setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});
diff --git a/apps/cliock/app.png b/apps/cliock/app.png
new file mode 100644
index 000000000..4ad2d056d
Binary files /dev/null and b/apps/cliock/app.png differ
diff --git a/apps/clock2x3/clock2x3-app.js b/apps/clock2x3/clock2x3-app.js
index 511a7662b..4caec28cb 100644
--- a/apps/clock2x3/clock2x3-app.js
+++ b/apps/clock2x3/clock2x3-app.js
@@ -14,9 +14,9 @@ const x21=x20+pw+ps;
const x30=x21+pw+ds;
const x31=x30+pw+ps;
const xSpace=[[x00,x01], // all pixel x spacing
- [x10,x11],
- [x20,x21],
- [x30,x31]];
+ [x10,x11],
+ [x20,x21],
+ [x30,x31]];
const y0=oy; // y spacing
const y1=y0+pw+ps;
@@ -24,35 +24,35 @@ const y2=y1+pw+ps;
const ySpace=[y0, y1, y2];
const pixels = [[[0,0], // digit on/off pixels
- [1,1],
- [1,1]],
- [[0,1], // digit 1
- [0,1],
- [0,1]],
- [[0,1],
- [1,0],
- [1,1]],
- [[1,1],
- [0,1],
- [1,1]],
- [[1,0],
- [1,1],
- [0,1]],
- [[1,1],
- [1,0],
- [0,1]],
- [[1,0],
- [1,1],
- [1,1]],
- [[1,1],
- [0,1],
- [0,1]],
- [[1,1],
- [1,1],
- [1,1]],
- [[1,1],
- [1,1],
- [0,1]]];
+ [1,1],
+ [1,1]],
+[[0,1], // digit 1
+ [0,1],
+ [0,1]],
+[[0,1],
+ [1,0],
+ [1,1]],
+[[1,1],
+ [0,1],
+ [1,1]],
+[[1,0],
+ [1,1],
+ [0,1]],
+[[1,1],
+ [1,0],
+ [0,1]],
+[[1,0],
+ [1,1],
+ [1,1]],
+[[1,1],
+ [0,1],
+ [0,1]],
+[[1,1],
+ [1,1],
+ [1,1]],
+[[1,1],
+ [1,1],
+ [0,1]]];
let idTimeout = null;
diff --git a/apps/compass/ChangeLog b/apps/compass/ChangeLog
new file mode 100644
index 000000000..e70a5688b
--- /dev/null
+++ b/apps/compass/ChangeLog
@@ -0,0 +1,3 @@
+0.01: New App!
+0.02: Show text if uncalibrated
+0.03: Eliminate flickering
\ No newline at end of file
diff --git a/apps/compass/compass.js b/apps/compass/compass.js
index 10895e3cd..9b7ed56b7 100644
--- a/apps/compass/compass.js
+++ b/apps/compass/compass.js
@@ -1,34 +1,60 @@
-g.clear();
-g.setColor(0,0.5,1);
-g.fillCircle(120,130,80,80);
-g.setColor(0,0,0);
-g.fillCircle(120,130,70,70);
-
-function arrow(r,c) {
- r=r*Math.PI/180;
- var p = Math.PI/2;
- g.setColor(c);
- g.fillPoly([
- 120+60*Math.sin(r), 130-60*Math.cos(r),
- 120+10*Math.sin(r+p), 130-10*Math.cos(r+p),
- 120+10*Math.sin(r+-p), 130-10*Math.cos(r-p),
- ]);
-}
-
-var oldHeading = 0;
-Bangle.on('mag', function(m) {
- if (!Bangle.isLCDOn()) return;
- g.setFont("6x8",3);
- g.setColor(0);
- g.fillRect(70,0,170,24);
- g.setColor(0xffff);
- g.setFontAlign(0,0);
- g.drawString(isNaN(m.heading)?"---":Math.round(m.heading),120,12);
- g.setColor(0,0,0);
- arrow(oldHeading,0);
- arrow(oldHeading+180,0);
- arrow(m.heading,0xF800);
- arrow(m.heading+180,0x001F);
- oldHeading = m.heading;
-});
-Bangle.setCompassPower(1);
+var tg = Graphics.createArrayBuffer(120,20,1,{msb:true});
+var timg = {
+ width:tg.getWidth(),
+ height:tg.getHeight(),
+ bpp:1,
+ buffer:tg.buffer
+};
+
+var ag = Graphics.createArrayBuffer(160,160,2,{msb:true});
+var aimg = {
+ width:ag.getWidth(),
+ height:ag.getHeight(),
+ bpp:2,
+ buffer:ag.buffer,
+ palette:new Uint16Array([0,0x03FF,0xF800,0x001F])
+};
+ag.setColor(1);
+ag.fillCircle(80,80,79,79);
+ag.setColor(0);
+ag.fillCircle(80,80,69,69);
+
+function arrow(r,c) {
+ r=r*Math.PI/180;
+ var p = Math.PI/2;
+ ag.setColor(c);
+ ag.fillPoly([
+ 80+60*Math.sin(r), 80-60*Math.cos(r),
+ 80+10*Math.sin(r+p), 80-10*Math.cos(r+p),
+ 80+10*Math.sin(r-p), 80-10*Math.cos(r-p),
+ ]);
+}
+
+var oldHeading = 0;
+Bangle.on('mag', function(m) {
+ if (!Bangle.isLCDOn()) return;
+ tg.clear();
+ tg.setFont("6x8",1);
+ tg.setColor(1);
+ if (isNaN(m.heading)) {
+ tg.setFontAlign(0,-1);
+ tg.setFont("6x8",1);
+ tg.drawString("Uncalibrated",60,4);
+ tg.drawString("turn 360° around",60,12);
+ }
+ else {
+ tg.setFontAlign(0,0);
+ tg.setFont("6x8",2);
+ tg.drawString(Math.round(m.heading),60,12);
+ }
+ g.drawImage(timg,0,0,{scale:2});
+
+ ag.setColor(0);
+ arrow(oldHeading,0);
+ arrow(oldHeading+180,0);
+ arrow(m.heading,2);
+ arrow(m.heading+180,3);
+ g.drawImage(aimg,40,50);
+ oldHeading = m.heading;
+});
+Bangle.setCompassPower(1);
diff --git a/apps/cprassist/ChangeLog b/apps/cprassist/ChangeLog
new file mode 100644
index 000000000..5560f00bc
--- /dev/null
+++ b/apps/cprassist/ChangeLog
@@ -0,0 +1 @@
+0.01: New App!
diff --git a/apps/cprassist/README.md b/apps/cprassist/README.md
new file mode 100644
index 000000000..569f61149
--- /dev/null
+++ b/apps/cprassist/README.md
@@ -0,0 +1,24 @@
+# CPR Assist
+
+Provides assistance while performing a CPR
+
+## Usage
+
+The app alternates between the phases for
+chest compression and rescue breaths in an in an endless loop.
+In the chest compression phase the the watch will provide a
+buzz at a rate of 100 rpm for 30 repetitions.
+A longer buzz introduces an interval of 4 seconds to perform
+2 rescue breaths.
+A ratio of chest compressions to rescue breaths is also
+displayed in the bottom of the screen.
+
+The number of repetitions for chest compression and
+rescue breaths, the rpm rate and the duration of the
+rescue breath phase can be adjusted in the settings.
+See e.g. [CPR on Wikipedia](https://en.wikipedia.org/wiki/Cardiopulmonary_resuscitation)
+for futher information and updates on the recommendations.
+
+## Attributions
+
+Icon source: https://commons.wikimedia.org/wiki/File:ISO_7010_E003_-_First_aid_sign.svg
diff --git a/apps/cprassist/cprassist-icon.js b/apps/cprassist/cprassist-icon.js
new file mode 100644
index 000000000..ec4667a8c
--- /dev/null
+++ b/apps/cprassist/cprassist-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwhC/AH4Arg93AB1wC/dxkQACi4XRuf/AAU3C/4X/C+sTmYABn4XD+YICmIXJl4TDAA/yC/4X/C+LXXAAdzC4c3BQgX/C/4X0uMiAAUXC6IAKC+wA/AH4AkA=="))
diff --git a/apps/cprassist/cprassist-icon.png b/apps/cprassist/cprassist-icon.png
new file mode 100644
index 000000000..c39962aaa
Binary files /dev/null and b/apps/cprassist/cprassist-icon.png differ
diff --git a/apps/cprassist/cprassist.js b/apps/cprassist/cprassist.js
new file mode 100644
index 000000000..862ae54d6
--- /dev/null
+++ b/apps/cprassist/cprassist.js
@@ -0,0 +1,79 @@
+const SETTINGS_FILE = 'cprassist.settings.json';
+const SHORT_BUZZ_PERIOD = 80;
+const LONG_BUZZ_PERIOD = 800;
+
+Bangle.setLCDTimeout(undefined); // do not deaktivate display while running this app
+
+let settings;
+
+function setting(key) {
+ const DEFAULTS = {
+ 'compression_count': 30,
+ 'breath_count': 2,
+ 'compression_rpm': 100,
+ 'breath_period_sec': 4
+ };
+ if (!settings) {
+ const storage = require("Storage");
+ settings = storage.readJSON(SETTINGS_FILE, 1) || {};
+ }
+ return (key in settings)
+ ? settings[key]
+ : DEFAULTS[key];
+}
+
+let counter = setting('compression_count');
+
+function provideFeedback() {
+ let period = counter > 0
+ ? SHORT_BUZZ_PERIOD
+ : LONG_BUZZ_PERIOD;
+ try {
+ Bangle.buzz(period, 1.0);
+ } catch(err) {
+ }
+}
+
+function drawHeart() {
+ g.fillCircle(40, 92, 12);
+ g.fillCircle(60, 92, 12);
+ g.fillPoly([29, 98, 50, 120, 71, 98]);
+}
+
+function updateScreen() {
+ const colors = [0xFFFF, 0x9492];
+ g.reset().clearRect(0, 50, 250, 150);
+ if (counter > 0) {
+ g.setFont("Vector", 40).setFontAlign(0, 0);
+ g.setColor(colors[counter%2]);
+ drawHeart();
+ g.drawString(counter + "", g.getWidth()/2, 100);
+ } else {
+ g.setFont("Vector", 20).setFontAlign(0, 0);
+ g.drawString("RESCUE", g.getWidth()/2, 70);
+ g.drawString("BREATHS", g.getWidth()/2, 120);
+ }
+}
+
+function tick() {
+ provideFeedback();
+ updateScreen();
+ if (counter == 0) {
+ var reset = function() {
+ counter = setting('compression_count');
+ clearInterval(interval);
+ interval = setInterval(tick, 60000/setting('compression_rpm'));
+ };
+ clearInterval(interval);
+ interval = setInterval(reset, setting('breath_period_sec')*1000);
+ }
+ counter -= 1;
+}
+
+interval = setInterval(tick, 60000/setting('compression_rpm'));
+
+g.clear(1).setFont("6x8");
+g.drawString(setting('compression_count') + ' / ' + setting('breath_count'), 30, 200);
+
+Bangle.loadWidgets();
+Bangle.drawWidgets();
diff --git a/apps/cprassist/settings.js b/apps/cprassist/settings.js
new file mode 100644
index 000000000..5776baa0b
--- /dev/null
+++ b/apps/cprassist/settings.js
@@ -0,0 +1,64 @@
+// This file should contain exactly one function, which shows the app's settings
+/**
+ * @param {function} back Use back() to return to settings menu
+ */
+(function(back) {
+ const SETTINGS_FILE = 'cprassist.settings.json';
+
+ // initialize with default settings...
+ let s = {
+ 'compression_count': 30,
+ 'breath_count': 2,
+ 'compression_rpm': 100,
+ 'breath_period_sec': 4
+ };
+ // ...and overwrite them with any saved values
+ // This way saved values are preserved if a new version adds more settings
+ const storage = require('Storage');
+ const saved = storage.readJSON(SETTINGS_FILE, 1) || {};
+ for (const key in saved) {
+ s[key] = saved[key];
+ }
+
+ // creates a function to safe a specific setting
+ function save(key) {
+ return function(value) {
+ s[key] = value;
+ storage.write(SETTINGS_FILE, s);
+ };
+ }
+
+ const menu = {
+ '': { 'title': 'CPR Assist' },
+ '< Back': back,
+ 'chest compr.': {
+ value: s.compression_count,
+ min: 1,
+ max: 200,
+ step: 1,
+ onchange: save('compression_count'),
+ },
+ 'rescue breaths': {
+ value: s.breath_count,
+ min: 0,
+ max: 100,
+ step: 1,
+ onchange: save('breath_count'),
+ },
+ 'rpm': {
+ value: s.compression_rpm,
+ min: 1,
+ max: 200,
+ step: 10,
+ onchange: save('compression_rpm'),
+ },
+ 'breaths period': {
+ value: s.breath_period_sec,
+ min: 1,
+ max: 60,
+ step: 1,
+ onchange: save('breath_period_sec'),
+ }
+ };
+ E.showMenu(menu);
+});
diff --git a/apps/cube/cube-icon.js b/apps/cube/cube-icon.js
index 5ff0a2154..72a4ba4d9 100644
--- a/apps/cube/cube-icon.js
+++ b/apps/cube/cube-icon.js
@@ -1 +1 @@
- require("heatshrink").decompress(atob("/4AYv4CB+YdZABPvEkYA/AGv3EkfPAQP+DrI"))
+require("heatshrink").decompress(atob("/4AYv4CB+YdZABPvEkYA/AGv3EkfPAQP+DrI"))
diff --git a/apps/cube/cube.js b/apps/cube/cube.js
index 7e0e70edf..426171469 100644
--- a/apps/cube/cube.js
+++ b/apps/cube/cube.js
@@ -2,9 +2,9 @@ var rx = 0, ry = 0;
function draw() {
var rcx=Math.cos(rx),
- rsx=Math.sin(rx),
- rcy=Math.cos(ry),
- rsy=Math.sin(ry);
+ rsx=Math.sin(rx),
+ rcy=Math.cos(ry),
+ rsy=Math.sin(ry);
function p(x,y,z) {
var t;
t = x*rcy + z*rsy;
diff --git a/apps/custom/custom.html b/apps/custom/custom.html
new file mode 100644
index 000000000..5a5dbbecd
--- /dev/null
+++ b/apps/custom/custom.html
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Type your javascript code here
+
+
Then click
+
+
+
+
diff --git a/apps/custom/custom.png b/apps/custom/custom.png
new file mode 100644
index 000000000..722ceb9ee
Binary files /dev/null and b/apps/custom/custom.png differ
diff --git a/apps/dane/ChangeLog b/apps/dane/ChangeLog
new file mode 100644
index 000000000..419109ec1
--- /dev/null
+++ b/apps/dane/ChangeLog
@@ -0,0 +1,5 @@
+0.01: New App!
+0.04: Added Icon to watchface
+0.05: bugfix
+0.06: moved and resized icon
+0.07: Added Description
\ No newline at end of file
diff --git a/apps/dane/app-icon.js b/apps/dane/app-icon.js
new file mode 100644
index 000000000..4deb12640
--- /dev/null
+++ b/apps/dane/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("l8wxH+AH4A/AH4A/AFUvl8Cu4AEgUCBQIrfFQMRAAe/Aw4xbDYIlBiUS7AjCAAY5BBYMSiJkBGC4sCicTiRQJHoUSCAIwBF6sv30SikUiRMMMIISD7AvTl/YiYtPF40TF6R4BicVFqAWDF4MViaPRIwQWTF4O/IwiKRCoMRUiZHEDJ5cXJAxeOOQuQhQuShWQJIe/JJkviIuC74tTFwORRqKLD+3cmVLpsLFZtNAANKhXeDYKNOu4uEmdlDwVNBoNlsoDDmoKBhYQChcyFycVFwOTFwJcBpomBhYjCmouBAwYMCmZdBa4d3FyonBKoIoCAwIECLooucEIIjCRIYuFms1Lqq7CFwS7DLQQsDhYrBHIZdHXZkCdQpQDXoIQDFwIDBeoQQCpYuSl8RFwMT70KCRYAIhUSFwMTiMvFxm/CQUSFyp5Did3Fxi8DOBwuLDSEv7ETfoRCNDI13DIMT34ZPIYSgOaxJ3SIgZeTC7COBdgMCC58vOoakWiQvQFoQTBFqgvEiURF5gRDOKIdIDwMRiO/axMCBoMRLQItXF4Z9B7F3BxF37BZBAAQnRIYobDMAKqIl5aDAA5zJFwaCBAA6PBFxQQEAAYKBFxjSCU4IECA4YuJCAoAEFx0UikTAAIEBAwQuKCIoADFxsCI5RdiUAoAEVgIVJABRDHAH4A/AH4A/ADAA="))
\ No newline at end of file
diff --git a/apps/dane/app.js b/apps/dane/app.js
new file mode 100644
index 000000000..5f7a48fbc
--- /dev/null
+++ b/apps/dane/app.js
@@ -0,0 +1,163 @@
+const font = "6x8";
+const timeFontSize = 4;
+const dateFontSize = 3;
+const smallFontSize = 2;
+const yOffset = 23;
+const xyCenter = g.getWidth()/2;
+const cornerSize = 14;
+const cornerOffset = 3;
+const borderWidth = 1;
+const yposTime = 27+yOffset;
+const yposDate = 65+yOffset;
+
+const mainColor = "#26dafd";
+const mainColorDark = "#029dbb";
+const mainColorLight = "#8bebfe";
+
+const secondaryColor = "#df9527";
+const secondaryColorDark = "#8b5c15";
+const secondaryColorLight = "#ecc180";
+
+const success = "#00ff00";
+const successDark = "#000900";
+const successLight = "#060f06";
+
+const alert = "#ff0000";
+const alertDark = "#090000";
+const alertLight = "#0f0606";
+
+var img = {
+ width : 120, height : 120, bpp : 8,
+ transparent : 254,
+ buffer : require("heatshrink").decompress(atob("/wA/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AAdCABhN/OFM8ABU2P35zkM4U2hkAABwSBCwJ6/OjZxBgxyPABAZBPgJ6/OqbnBOg8rAAJyNCBEGhk2PX51PmBhHOhEGmwACPRQXFCoL1DOP51HdIh0IhkwnhcDAAoKBm0wDwYdEDwp5/Oo8MKxjQEABwiEkp5/Oxs2OpBTDOgwjOEyEMPHrJFJwxPCmx0QPRM8PIQpJFQjs8JZLEDJa55EUYMGFpMwPG5ICgzsQUrimCkryKnh40OyYxfPAQxIGQMGPGZ2EIZJ2iPCLxyOwRBMO0Z4/IIp2yPH4/Dhg9JHwJ2nPAg5Mgx3sFgMwgEqHhMMO1B4EeBQ7EO1U8HZSzBni0rHh0AmyzqHPB4FmDwLgC1BHGsMB4J3uWxY/Ed2ivBO1h4DmxAOG00MV2jwYmBBld354DmB3LeEo0Bgzu9eCMGIcYzOm1DoZ3wPAUMeF4yNg8Bnp3zGYM3gEHO5U2eEIhBdxcHg52zO4U9gJ3JPAMMO8U2O5k3odEO+VEPAKxBO5UAnh3tHgM9oh30AAMNO4tWO4s2O79CoUGdxcHn1EotFO+NFO4M3O5R4BgxXBO708dxR3BhB2Co1AO+J4BnCzBO/U4OwdAoIACN8goDAAVAow2Bnx3FAApTBnh3fmx3FljuFO4NGsmzAAWPxOJstlLpGJx4LGBIWJSIgIBCIVBsuPFYYsCsjwCO+ApEO5NlJAJ0BAAllegwRCPAwJC2YVEOIJ/BAAOJT4YoDeAVEhB3roVCdwsrqx3IJgJSDZYNlcoTbGNo53EDop3GBglBoB3KJAhUBmx3mmR3Fn53ILYjlDA4LQCMwYKDO4SCCDYQkEFQILDO40yd5h3nAAkHhx3BoB3EN4ZWHOgIGBPQQKE2YLBOIh3SnEHPBJ37boZWEOYJnCO44LBxKGCO5AWBAAZ4BO/53GDYhcGOQp8DNwoPBQ4Z3GAAINBAANlO/53TB4J3EAogREsrwCd59FO/53FPAhlHLggVENw4QCSRQABoB3/O5ZWGMIIABNAJ8BAAIMEPomPCAJ3Nox3+hB3HAAZeCKwQOCdwTwDO5ATCRYR38PAJ3Pox3HNIOPNIZ8BQozjBBpB+BO44cFoFAO6E8O782PBR3GJoIADdohpCAoIoEPAQJBO4YKCeAZ3FB4IVBAAVkeAJ3vnh3Mnx3BZgZ6DJoLmFOwoABO4ZpBsoLFx53CRQQqEAAKbBO/0HnFFotAoBvDNo4AXD4opEAAIyBGwNEm53Lg1CO79Cgx3MohBBoxyeACZ2Boh2KO+M3H4NFO2R3OgEAmx2ePAU2EoJ4Jho/Boh3zGoNDO5k8O90HodDO2Z3Boc9O5cMoR3hoUMO5UBO4J40GoM3gJ3IZAM2O0DwNg8Anp33IoMkO5M8O8c8O5IyBmFCO+lCoRELgwOBGUcMGRUAGUZDSO5TuleBozDPGQzBmxDKd0jwPmB31IRLunGocGVhh4wGIM8dxUMIE4nBmw2IVoZ3ymDuyG4cMG5TwwdxYIBmw+qHBjwvU4S2Khg9rWJrwuFoM2HhMGHfSyCWdlCOxU8O9p4LA4M2PFQqCgx2IHIZ2sPBy1CH8x2/PGwlBnkMO3p4zEYU8dpMGO2q8EIoJGFAwMwPEIhCmx2HGAMGVMZIYmBABg54GeQQtiOw7sCO25KEnkMIYJMEYAJKdFQQpHAAMMUgR25PAlCmx5GAoR5BFLM8gx1IUIh27PAp5BJYRUCKIgoXEYZ0EToZ2/PA7MBeYZ5DmBPWoTtBOos2ngxFO/5FGPQUwPAcMO64cEOhB2xnh3XPITPDKCocBDYZ1JPCEwO78MO7JbEZKqTGABhBLnk2O78Amw1KJBp3bmwaCHIwASDoJ3ggw+aO4c8O+M8hgbBhg2UIB0wIKx3DDQI2YLYLZCACEMZIIADO8YAEhgAEGgoAHlZ3bDgQAWlYaCO8QmDH7B3WmAcCGyoXCO9AAZgEMICdCoUMGrh3DPDp3iICR3/d+42BO8J2cO/53/IDU8GykGO/88O+g1ggB2dIIgAdO64AeO/cwmwACGyoZDADU8VqhBPEoIADoQATG7IuUGsBCjHswA/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A1"))
+}
+
+
+function drawTopLeftCorner(x,y) {
+ g.setColor(mainColor);
+ var x1 = x-cornerOffset;
+ var y1 = y-cornerOffset;
+ g.fillRect(x1,y1,x1+cornerSize,y1+cornerSize);
+ g.setColor("#000000");
+ g.fillRect(x,y,x+cornerSize-cornerOffset,y+cornerSize-cornerOffset);
+}
+function drawTopRightCorner(x,y) {
+ g.setColor(mainColor);
+ var x1 = x+cornerOffset;
+ var y1 = y-cornerOffset;
+ g.fillRect(x1,y1,x1-cornerSize,y1+cornerSize);
+ g.setColor("#000000");
+ g.fillRect(x,y,x-cornerSize-cornerOffset,y+cornerSize-cornerOffset);
+}
+function drawBottomLeftCorner(x,y) {
+ g.setColor(mainColor);
+ var x1 = x-cornerOffset;
+ var y1 = y+cornerOffset;
+ g.fillRect(x1,y1,x1+cornerSize,y1-cornerSize);
+ g.setColor("#000000");
+ g.fillRect(x,y,x+cornerSize-cornerOffset,y-cornerSize+cornerOffset);
+}
+function drawBottomRightCorner(x,y) {
+ g.setColor(mainColor);
+ var x1 = x+cornerOffset;
+ var y1 = y+cornerOffset;
+ g.fillRect(x1,y1,x1-cornerSize,y1-cornerSize);
+ g.setColor("#000000");
+ g.fillRect(x,y,x-cornerSize+cornerOffset,y-cornerSize+cornerOffset);
+}
+
+function drawFrame(x1,y1,x2,y2) {
+ drawTopLeftCorner(x1,y1);
+ drawTopRightCorner(x2,y1);
+ drawBottomLeftCorner(x1,y2);
+ drawBottomRightCorner(x2,y2);
+ g.setColor(mainColorDark);
+ g.drawRect(x1,y1,x2,y2);
+ g.setColor("#000000");
+ g.fillRect(x1+borderWidth,y1+borderWidth,x2-borderWidth,y2-borderWidth);
+}
+function drawTopFrame(x1,y1,x2,y2) {
+
+ drawBottomLeftCorner(x1,y2);
+ drawBottomRightCorner(x2,y2);
+ g.setColor(mainColorDark);
+ g.drawRect(x1,y1,x2,y2);
+ g.setColor("#000000");
+ g.fillRect(x1+borderWidth,y1+borderWidth,x2-borderWidth,y2-borderWidth);
+}
+function drawBottomFrame(x1,y1,x2,y2) {
+ drawTopLeftCorner(x1,y1);
+ drawTopRightCorner(x2,y1);
+ g.setColor(mainColorDark);
+ g.drawRect(x1,y1,x2,y2);
+ g.setColor("#000000");
+ g.fillRect(x1+borderWidth,y1+borderWidth,x2-borderWidth,y2-borderWidth);
+}
+
+function getUTCTime(d) {
+ return d.toUTCString().split(' ')[4].split(':').map(function(d){return Number(d);});
+}
+
+
+
+
+
+function drawTimeText() {
+ g.setFontAlign(0, 0);
+ var d = new Date();
+ var da = d.toString().split(" ");
+ var dutc = getUTCTime(d);
+
+ var time = da[4].split(":");
+ var hours = time[0],
+ minutes = time[1],
+ seconds = time[2];
+ g.setColor(mainColor);
+ g.setFont(font, timeFontSize);
+ g.drawString(`${hours}:${minutes}:${seconds}`, xyCenter, yposTime, true);
+ g.setFont(font, smallFontSize);
+}
+function drawDateText() {
+ g.setFontAlign(0, 0);
+ var d = new Date();
+ g.setFont(font, dateFontSize);
+ g.drawString(`${d.getDate()}.${d.getMonth()+1}.${d.getFullYear()}`, xyCenter, yposDate, true);
+}
+
+
+
+function drawClock() {
+ // main frame
+ drawFrame(3,10+yOffset,g.getWidth()-3,g.getHeight()-3);
+ // time frame
+ drawTopFrame(20,10+yOffset,220,46+yOffset);
+ // date frame
+ drawTopFrame(28,46+yOffset,212,46+yOffset+35);
+
+ // texts
+ drawTimeText();
+ drawDateText();
+ g.drawImage(img,g.getWidth()/2-(img.width/2),g.getHeight()/2);
+}
+function updateClock() {
+ drawTimeText();
+ drawDateText();
+}
+
+
+Bangle.on('lcdPower', function(on) {
+ if (on) drawClock();
+});
+g.clear();
+
+Bangle.loadWidgets();
+Bangle.drawWidgets();
+
+
+drawClock();
+
+
+setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});
+
+// refesh every 100 milliseconds
+setInterval(updateClock, 100);
diff --git a/apps/dane/app.png b/apps/dane/app.png
new file mode 100644
index 000000000..ee4f8403a
Binary files /dev/null and b/apps/dane/app.png differ
diff --git a/apps/daysl/ChangeLog b/apps/daysl/ChangeLog
new file mode 100644
index 000000000..c3faf0092
--- /dev/null
+++ b/apps/daysl/ChangeLog
@@ -0,0 +1,3 @@
+0.01: New Widget!
+0.02: Improved calculation, new image for app
+0.03: Improved display of number
diff --git a/apps/daysl/app-icon.js b/apps/daysl/app-icon.js
new file mode 100644
index 000000000..bdc0da744
--- /dev/null
+++ b/apps/daysl/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwgmIAH4A/AH4A/AEEAAAgGOC/4XLAgoGIDgYXTwEIBY4JEAw8YCIOAEY4+EAwwTCL44XNO5IX/C6i6LC8YABa5AXOF67vIwA5DAw5GDMhg7HjAXWIwQLFZIoGNC/4XKAH4A/AH4A/ADoA="))
\ No newline at end of file
diff --git a/apps/daysl/app.js b/apps/daysl/app.js
new file mode 100644
index 000000000..56f85e615
--- /dev/null
+++ b/apps/daysl/app.js
@@ -0,0 +1,67 @@
+g.clear();
+Bangle.loadWidgets();
+Bangle.drawWidgets();
+
+const storage = require('Storage');
+let settings;
+
+function updateSettings() {
+ storage.write('daysleft.json', settings);
+}
+
+function resetSettings() {
+ settings = {
+ day : 17,
+ month : 6,
+ year: 1981
+ };
+ updateSettings();
+}
+
+settings = storage.readJSON('daysleft.json',1);
+if (!settings) resetSettings();
+
+function showMenu() {
+ const datemenu = {
+ '': {
+ 'title': 'Set Date',
+ 'predraw': function() {
+ datemenu.Date.value = settings.day;
+ datemenu.Month.value = settings.month;
+ datemenu.Year.value = settings.year;
+ }
+ },
+ 'Day': {
+ value: settings.day,
+ min: 1,
+ max: 31,
+ step: 1,
+ onchange: v => {
+ settings.day = v;
+ updateSettings();
+ }
+ },
+ 'Month': {
+ value: settings.month,
+ min: 1,
+ max: 12,
+ step: 1,
+ onchange: v => {
+ settings.month = v;
+ updateSettings();
+ }
+ },
+ 'Year': {
+ value: settings.year,
+ step: 1,
+ onchange: v => {
+ settings.year = v;
+ updateSettings();
+ }
+ }
+ };
+ datemenu['-Exit-'] = ()=>{load();};
+ return E.showMenu(datemenu);
+}
+
+showMenu();
\ No newline at end of file
diff --git a/apps/daysl/app.png b/apps/daysl/app.png
new file mode 100644
index 000000000..42839ae59
Binary files /dev/null and b/apps/daysl/app.png differ
diff --git a/apps/daysl/widget.js b/apps/daysl/widget.js
new file mode 100644
index 000000000..4edbc3230
--- /dev/null
+++ b/apps/daysl/widget.js
@@ -0,0 +1,84 @@
+const storage = require('Storage');
+let settings;
+let height = 23;
+let width = 34;
+
+var debug = 0; //1 = show debug info
+
+//write settings to file
+function updateSettings() {
+ storage.write('daysleft.json', settings);
+}
+
+//Define standard settings
+function resetSettings() {
+ settings = {
+ day : 17,
+ month : 6,
+ year: 2020
+ };
+ updateSettings();
+}
+
+settings = storage.readJSON('daysleft.json',1); //read storage
+if (!settings) resetSettings(); //if settings file was not found, set to standard
+
+var dd = settings.day,
+ mm = settings.month-1, //-1 because month is zero-based
+ yy = settings.year;
+
+const oneDay = 24 * 60 * 60 * 1000; // hours*minutes*seconds*milliseconds
+const targetDate = new Date(yy, mm, dd); //is 00:00
+const today = new Date(); //includes current time
+
+const currentYear = today.getFullYear();
+const currentMonth = today.getMonth();
+const currentDay = today.getDate();
+const todayMorning = new Date (currentYear, currentMonth, currentDay, 0, 0, 0); //create date object with today, but 00:00:00
+
+const diffDays = (targetDate - todayMorning) / oneDay; //calculate day difference
+
+function drawWidget() {
+ if (debug == 1) g.drawRect(this.x,this.y,this.x+width,this.y+height); //draw rectangle around widget area
+ g.reset();
+
+ //define font size and string position
+ //small if number has more than 3 digits (positive number)
+ if (diffDays >= 1000) {
+ g.setFont("6x8", 1);
+ g.drawString(diffDays,this.x+10,this.y+7);
+ }
+ //large if number has 3 digits (positive number)
+ if (diffDays <= 999 && diffDays >= 100) {
+ g.setFont("6x8", 2);
+ g.drawString(diffDays,this.x,this.y+4);
+ }
+ //large if number has 2 digits (positive number)
+ if (diffDays <= 99 && diffDays >= 10) {
+ g.setFont("6x8", 2);
+ g.drawString(diffDays,this.x+6,this.y+4);
+ }
+ //large if number has 1 digit (positive number)
+ if (diffDays <= 9 && diffDays >= 0) {
+ g.setFont("6x8", 2);
+ g.drawString(diffDays,this.x+13,this.y+4);
+ }
+ //large if number has 1 digit (negative number)
+ if (diffDays <= -1 && diffDays >= -9) {
+ g.setFont("6x8", 2);
+ g.drawString(diffDays,this.x+5,this.y+4);
+ }
+ //large if number has 2 digits (negative number)
+ if (diffDays <= -10 && diffDays >= -99) {
+ g.setFont("6x8", 2);
+ g.drawString(diffDays,this.x,this.y+4);
+ }
+ //large if number has 3 digits or more (negative number)
+ if (diffDays <= -100) {
+ g.setFont("6x8", 1);
+ g.drawString(diffDays,this.x,this.y+7);
+ }
+}
+
+//draw widget
+WIDGETS["daysl"]={area:"tl",width:width,draw:drawWidget};
\ No newline at end of file
diff --git a/apps/dclock/ChangeLog b/apps/dclock/ChangeLog
new file mode 100644
index 000000000..edf7da4c2
--- /dev/null
+++ b/apps/dclock/ChangeLog
@@ -0,0 +1,9 @@
+0.01: branched from simple clock and added seconds
+0.02: add timestamp (tst)
+0.03: fix timestamp round to whole number
+0.04: add iso datetime and move day of the week (d) / month names (m)
+0.05: add beats (@)
+0.06: tidy up
+0.07: add days in current month (md) and days since new moon (l)
+0.08: update icon
+0.09: Use localised month and day of the week from locale
diff --git a/apps/dclock/clock-dev-icon.js b/apps/dclock/clock-dev-icon.js
new file mode 100644
index 000000000..f36dcaee3
--- /dev/null
+++ b/apps/dclock/clock-dev-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwkEIf4A5/8wgf/AwUB/8gh/zA4QMCl/xA4cAichgIaBiEDgMgmECDQMAkMA+EgiYvDkQJBkcQgMQDwMggUiiECG4MikEBmQWCgURiEREQIXBCIMxkIIBAoMSiQ4BGoIABKgPykRSBI4JfC+c/iARBl8zmBfEAAUvIgIAUkbAtgalB+ADDBIKSBHgUgmYJCAAa6BmCoBAYMiBIMRC4UQmEAAoQvFmUDAYUSmcxWIKMBEQKrBOw0yh8wmcyj4nBIYQDB+cwBAQA/ABUxgUDkBqBgchkMiiUikMRgSOBkR3BkEhC4MgiQHBiADBC4UQAYMRiUxkECAAITBC4MSiUQF4MTiQTBBAIDBkcCiMxkUTAYIvCAH4A/AH4AKiIPPgMxiESgUQgECgMBdAMiiUgC48ikUBiEBiIXDGQURiIbBF48RkAvCEwIvCkERgQMBRHpDBOoRhBNoJOBJIkiKYMjgcTOoMhLQMQmMDDIMjQQInEC4MhiUSkQHCC4MAkAXCiUjiZ5UiR5jLwLaBAQJ1BAgIAMCgMxMwMgkciAoMjC5pqBRwPxCoMiiUyGBsgiBBBiESVAKzBf+YACA=="))
\ No newline at end of file
diff --git a/apps/dclock/clock-dev.js b/apps/dclock/clock-dev.js
new file mode 100644
index 000000000..d2c08726a
--- /dev/null
+++ b/apps/dclock/clock-dev.js
@@ -0,0 +1,112 @@
+var locale = require("locale");
+/* jshint esversion: 6 */
+const timeFontSize = 4;
+const dateFontSize = 3;
+const smallFontSize = 2;
+const font = "6x8";
+
+const xyCenter = g.getWidth() / 2;
+const yposTime = 50;
+const yposDate = 85;
+const yposTst = 115;
+const yposDml = 170;
+const yposDayMonth = 195;
+const yposGMT = 220;
+
+// Check settings for what type our clock should be
+var is12Hour = (require("Storage").readJSON("setting.json",1)||{})["12hour"];
+
+function getUTCTime(d) {
+ return d.toUTCString().split(' ')[4].split(':').map(function(d){return Number(d)});
+}
+
+function drawSimpleClock() {
+ // get date
+ var d = new Date();
+ var da = d.toString().split(" ");
+ var dutc = getUTCTime(d);
+
+ g.reset(); // default draw styles
+ // drawSting centered
+ g.setFontAlign(0, 0);
+
+ // draw time
+ var time = da[4].split(":");
+ var hours = time[0],
+ minutes = time[1],
+ seconds = time[2];
+
+ var meridian = "";
+ if (is12Hour) {
+ hours = parseInt(hours,10);
+ meridian = "AM";
+ if (hours == 0) {
+ hours = 12;
+ meridian = "AM";
+ } else if (hours >= 12) {
+ meridian = "PM";
+ if (hours>12) hours -= 12;
+ }
+ hours = (" "+hours).substr(-2);
+ }
+
+ // Time
+ g.setFont(font, timeFontSize);
+ g.drawString(`${hours}:${minutes}:${seconds}`, xyCenter, yposTime, true);
+ g.setFont(font, smallFontSize);
+ g.drawString(meridian, xyCenter + 102, yposTime + 10, true);
+
+ // Date String
+ g.setFont(font, dateFontSize);
+ g.drawString(`${d.getFullYear()}-${d.getMonth()+1}-${d.getDate()}`, xyCenter, yposDate, true);
+
+ // Timestamp
+ var tst = Math.round(d.getTime());
+ g.setFont(font, smallFontSize);
+ g.drawString(`tst:${tst}`, xyCenter, yposTst, true);
+
+ //Days in month
+ var dom = new Date(d.getFullYear(), d.getMonth()+1, 0).getDate();
+
+ //Days since full moon
+ var knownnew = new Date(2020,02,24,09,28,0);
+
+ // Get millisecond difference and divide down to cycles
+ var cycles = (d.getTime()-knownnew.getTime())/1000/60/60/24/29.53;
+
+ // Multiply decimal component back into days since new moon
+ var sincenew = (cycles % 1)*29.53;
+
+ // Draw days in month and sime since new moon
+ g.setFont(font, smallFontSize);
+ g.drawString(`md:${dom} l:${sincenew.toFixed(2)}`, xyCenter, yposDml, true);
+
+ // draw Month name, Day of the week and beats
+ var beats = Math.floor((((dutc[0] + 1) % 24) + dutc[1] / 60 + dutc[2] / 3600) * 1000 / 24);
+ g.setFont(font, smallFontSize);
+ g.drawString(`m:${locale.month(d,true)} d:${locale.dow(d,true)} @${beats}`, xyCenter, yposDayMonth, true);
+
+ // draw gmt
+ var gmt = da[5];
+ g.setFont(font, smallFontSize);
+ g.drawString(gmt, xyCenter, yposGMT, true);
+}
+
+// handle switch display on by pressing BTN1
+Bangle.on('lcdPower', function(on) {
+ if (on) drawSimpleClock();
+});
+
+// clean app screen
+g.clear();
+Bangle.loadWidgets();
+Bangle.drawWidgets();
+
+// refesh every 100 milliseconds
+setInterval(drawSimpleClock, 100);
+
+// draw now
+drawSimpleClock();
+
+// Show launcher when middle button pressed
+setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});
\ No newline at end of file
diff --git a/apps/dclock/clock-dev.png b/apps/dclock/clock-dev.png
new file mode 100644
index 000000000..0cfbff44c
Binary files /dev/null and b/apps/dclock/clock-dev.png differ
diff --git a/apps/demoapp/app.js b/apps/demoapp/app.js
index cb3136196..13c043587 100644
--- a/apps/demoapp/app.js
+++ b/apps/demoapp/app.js
@@ -27,22 +27,22 @@ var scenes = [
"| __|_ -| . | _| | | | | . |\n"+
"|____|___| _|_| |___|_|_|_|___|\n"+
" |_| espruino.com\n\n",
- "The JavaScript Interpreter for uCs\n",
- " * On-chip JS Interpreter",
- " * GPS, Acclerometer, Compass",
- " * 64 MHz, 64kB RAM, 512kB + 4MB Flash",
- " * 240x240 IPS LCD",
- " * Speaker & Vibration motor",
- " * Bluetooth LE",
- " * 1 week battery life",
- "",
- "Includes:",
- " * Tensorflow AI",
- " * Bluetooth LE central & periph",
- " * Graphics Library",
- " * VT100 terminal",
- "","",""
- ];
+ "The JavaScript Interpreter for uCs\n",
+ " * On-chip JS Interpreter",
+ " * GPS, Acclerometer, Compass",
+ " * 64 MHz, 64kB RAM, 512kB + 4MB Flash",
+ " * 240x240 IPS LCD",
+ " * Speaker & Vibration motor",
+ " * Bluetooth LE",
+ " * 1 week battery life",
+ "",
+ "Includes:",
+ " * Tensorflow AI",
+ " * Bluetooth LE central & periph",
+ " * Graphics Library",
+ " * VT100 terminal",
+ "","",""
+ ];
var n=0;
var i = setInterval(function() {
Terminal.println(txt[n]);
@@ -62,19 +62,19 @@ var scenes = [
function() {
var img = require("heatshrink").decompress(atob("oNBxH+5wA/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AHGpAAoQKv4ADCBQAeqsrAAejBw9/B4oABqt/IGepHw5CEQspALH5hBC5pAvv4/MAALFkIBWpPI6IHqpAu0Z3GfYOpRYdPQEhALYIp2FBYNVI4JAvvL4LH0yBYAFJAQQQ5Ay1JAFftBAQBYxCDv+qIGiCHIQiGnIBfOv5BJIQRAyIJkrvKEkIBrFBB4qEGIGRCNYsZAQIQV/IZDEiICRCDQVJAUIQVPC4lVIF6yJQYpAZ5t/FYvNIBepqtVIJGjIDoqBDY2pdYo3DfAhBIQLmpvIcDvIrC5oJEIAhTCGQmj5qgEC4t5e7YrBqt5BI6UFBg15v4XHbQwAQb4oAKv7NKABdVRoYATUAwnICqjZFIMdVE4+jXI4XGYCxBFFZN/M5OpCxUrvJ/ZFYmjvNVAAY+KCwpDBC6YAV5vNC9oA/AH4A/AHYA=="));
- g.clear();
- y = 0;
- var step = 4;
- var i = setInterval(function() {
- y+=step;
g.clear();
- g.drawImage(img,60,60,{rotate:Math.sin(y*0.03)*0.5});
- g.flip();
- }, 20);
- Bangle.setLCDMode("120x120");
- return function() {
- if (i) clearInterval(i);
- };
+ y = 0;
+ var step = 4;
+ var i = setInterval(function() {
+ y+=step;
+ g.clear();
+ g.drawImage(img,60,60,{rotate:Math.sin(y*0.03)*0.5});
+ g.flip();
+ }, 20);
+ Bangle.setLCDMode("120x120");
+ return function() {
+ if (i) clearInterval(i);
+ };
},
function() {
var rx = 0, ry = 0;
@@ -82,9 +82,9 @@ var scenes = [
// draw a cube
function draw() {
var rcx=Math.cos(rx),
- rsx=Math.sin(rx),
- rcy=Math.cos(ry),
- rsy=Math.sin(ry);
+ rsx=Math.sin(rx),
+ rcy=Math.cos(ry),
+ rsy=Math.sin(ry);
// Project 3D coordinates into 2D
function p(x,y,z) {
var t;
@@ -149,7 +149,7 @@ var scenes = [
y+=step;
g.scroll(0,1);
g.drawImage(img,Math.random()*240,Math.random()*240,
- {rotate:Math.random()*6.3, scale:0.5+Math.random()});
+ {rotate:Math.random()*6.3, scale:0.5+Math.random()});
}, 1);
Bangle.setLCDMode();
return function() {
diff --git a/apps/devstopwatch/ChangeLog b/apps/devstopwatch/ChangeLog
new file mode 100644
index 000000000..e7c9e714a
--- /dev/null
+++ b/apps/devstopwatch/ChangeLog
@@ -0,0 +1 @@
+0.01: App created
diff --git a/apps/devstopwatch/app-icon.js b/apps/devstopwatch/app-icon.js
new file mode 100644
index 000000000..c31177034
--- /dev/null
+++ b/apps/devstopwatch/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwxH+AH4A/AH4A/AAc1AAwvpApIv/SDTCteV6MuSRY8bEowEGAxYuXKRYODBQYwWJ5KOINxTkVWxZaFMQoARrNZAg4SPCZgcJDSQQDFy4vEBhFlsoVRFzAvEGIowXPBoKBxIADDCJeMBxYvEGApgTqdTAQYOJF4wwDDRwgGC4gvKwetAAgvFDwYvRNhQACvunF4enDZ4vUAgmD04ADF64ACZZQFDvoAEDZwvNCwt3u4FFSwgvWEQQCFBgwLIDZAvbAAgvgAYIkIFpQLEF6IsFC6AaJCiBjGF6IWUMA55XMCgwSIiowMDpYuYPAwaDAoQhHBIYuWC4ocNCSQdMRwofGBIqeNABubAAIFFAAwSIGLwHDBxgwcKwoLJGMSQKAH4A/AH4A+"))
diff --git a/apps/devstopwatch/app.js b/apps/devstopwatch/app.js
new file mode 100644
index 000000000..cf7186c98
--- /dev/null
+++ b/apps/devstopwatch/app.js
@@ -0,0 +1,159 @@
+const EMPTY_LAP = '--:--:---';
+const EMPTY_H = '00:00:000';
+const MAX_LAPS = 6;
+const XY_CENTER = g.getWidth() / 2;
+const Y_CHRONO = 40;
+const Y_HEADER = 80;
+const Y_LAPS = 125;
+const Y_BTN3 = 225;
+const FONT = '6x8';
+const CHRONO = '/* C H R O N O */';
+
+var laps = [EMPTY_LAP, EMPTY_LAP, EMPTY_LAP, EMPTY_LAP, EMPTY_LAP, EMPTY_LAP, EMPTY_LAP];
+var started = false;
+var reset = false;
+var whenStarted;
+var whenStartedTotal;
+var currentLapIndex = 1;
+var currentLap = '';
+var chronoInterval;
+
+// Set laps.
+setWatch(() => {
+
+ reset = false;
+
+ if (started) {
+ changeLap();
+ } else {
+ if (!reset) {
+ chronoInterval = setInterval(chronometer, 10);
+ }
+ }
+}, BTN1, { repeat: true, edge: 'rising' });
+
+// Reset chronometre.
+setWatch(() => { resetChrono(); }, BTN3, { repeat: true, edge: 'rising' });
+
+// Show launcher when middle button pressed.
+setWatch(Bangle.showLauncher, BTN2, { repeat: false, edge: 'falling' });
+
+function resetChrono() {
+ laps = [EMPTY_H, EMPTY_H, EMPTY_LAP, EMPTY_LAP, EMPTY_LAP, EMPTY_LAP, EMPTY_LAP];
+ started = false;
+ reset = true;
+ currentLapIndex = 1;
+ currentLap = '';
+
+ if (chronoInterval !== undefined) {
+ clearInterval(chronoInterval);
+ }
+
+ printChrono();
+}
+
+function chronometer() {
+
+ if (!started) {
+ var rightNow = Date.now();
+ whenStarted = rightNow;
+ whenStartedTotal = rightNow;
+ started = true;
+ reset = false;
+ }
+
+ currentLap = calculateLap(whenStarted);
+ total = calculateLap(whenStartedTotal);
+
+ laps[0] = total;
+ laps[1] = currentLap;
+ printChrono();
+}
+
+function changeLap() {
+
+ currentLapIndex++;
+
+ if ((currentLapIndex) > MAX_LAPS) {
+ currentLapIndex = 2;
+ }
+
+ laps[currentLapIndex] = currentLap;
+ whenStarted = Date.now();
+}
+
+function calculateLap(whenStarted) {
+
+ var now = Date.now();
+ var diffTime = now - whenStarted;
+ var dateDiffTime = new Date(diffTime);
+
+ var millis = padStart(dateDiffTime.getMilliseconds().toString(), 3);
+ var seconds = padStart(dateDiffTime.getSeconds().toString(), 2);
+ var minutes = padStart(dateDiffTime.getMinutes().toString(), 2);
+
+ return `${minutes}:${seconds}:${millis}`;
+}
+
+function printChrono() {
+
+ g.reset();
+ g.setFontAlign(0, 0);
+
+ var print = '';
+
+ g.setFont(FONT, 2);
+ print = CHRONO;
+ g.drawString(print, XY_CENTER, Y_CHRONO, true);
+
+ g.setColor(0, 220, 0);
+ g.setFont(FONT, 3);
+ print = ` T ${laps[0]}\n`;
+ print += ` C ${laps[1]}\n`;
+ g.drawString(print, XY_CENTER, Y_HEADER, true);
+
+ g.setColor(255, 255, 255);
+ g.setFont(FONT, 2);
+
+ for (var i = 2; i < MAX_LAPS + 1; i++) {
+
+ g.setColor(255, 255, 255);
+ let suffix = ' ';
+ if (currentLapIndex === i) {
+ let suffix = '*';
+ g.setColor(255, 200, 0);
+ }
+
+ const lapLine = `L${i - 1} ${laps[i]} ${suffix}\n`;
+ g.drawString(lapLine, XY_CENTER, Y_LAPS + (15 * (i - 1)), true);
+ }
+
+ g.setColor(255, 255, 255);
+ g.setFont(FONT, 1);
+ print = 'Press 3 to reset';
+ g.drawString(print, XY_CENTER, Y_BTN3, true);
+
+ g.flip();
+}
+
+function padStart(value, size) {
+
+ var result = '';
+ var pads = size - value.length;
+
+ if (pads > 0) {
+ for (var i = 0; i < pads; i++) {
+ result += '0';
+ }
+ }
+
+ result += value;
+ return result;
+}
+
+// Clean app screen.
+g.clear();
+Bangle.loadWidgets();
+Bangle.drawWidgets();
+
+resetChrono();
diff --git a/apps/devstopwatch/app.png b/apps/devstopwatch/app.png
new file mode 100644
index 000000000..b0feeebc9
Binary files /dev/null and b/apps/devstopwatch/app.png differ
diff --git a/apps/dotclock/ChangeLog b/apps/dotclock/ChangeLog
new file mode 100644
index 000000000..26f95bbde
--- /dev/null
+++ b/apps/dotclock/ChangeLog
@@ -0,0 +1 @@
+0.01: Based on the Analog Clock app, minimal dot interface
\ No newline at end of file
diff --git a/apps/dotclock/clock-dot-icon.js b/apps/dotclock/clock-dot-icon.js
new file mode 100644
index 000000000..7098cb51f
--- /dev/null
+++ b/apps/dotclock/clock-dot-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwkBIf4A/AGUJyAXtACeZBCAOJh/wC6IADC4gA/XEINJC64A/AHcP+ACD/4CBTB0Ph8A+ACBAIKoKC65HKC4gA/AAfACysM5gvjTBgNKC64A/AEWZBCAXdADa4XaH4A/AAgA=="))
diff --git a/apps/dotclock/clock-dot.js b/apps/dotclock/clock-dot.js
new file mode 100644
index 000000000..a4b3f260f
--- /dev/null
+++ b/apps/dotclock/clock-dot.js
@@ -0,0 +1,162 @@
+let g;
+let Bangle;
+
+const locale = require('locale');
+const p = Math.PI / 2;
+const pRad = Math.PI / 180;
+const faceWidth = 100; // watch face radius
+let timer = null;
+let currentDate = new Date();
+let hourRadius = 60;
+let minRadius = 80;
+const centerPx = g.getWidth() / 2;
+
+const seconds = (angle) => {
+ const a = angle * pRad;
+ const x = centerPx + Math.sin(a) * faceWidth;
+ const y = centerPx - Math.cos(a) * faceWidth;
+
+ // if 15 degrees, make hour marker larger
+ const radius = (angle % 15) ? 2 : 4;
+ g.fillCircle(x, y, radius);
+};
+
+const hourDot = (angle,radius) => {
+ const a = angle * pRad;
+ const x = centerPx + Math.sin(a) * hourRadius;
+ const y = centerPx - Math.cos(a) * hourRadius;
+ g.fillCircle(x, y, radius);
+};
+
+const minDot = (angle,radius) => {
+ const a = angle * pRad;
+ const x = centerPx + Math.sin(a) * minRadius;
+ const y = centerPx - Math.cos(a) * minRadius;
+ g.fillCircle(x, y, radius);
+};
+
+const drawAll = () => {
+ g.clear();
+ currentDate = new Date();
+ // draw hands first
+ onMinute();
+ // draw seconds
+ const currentSec = currentDate.getSeconds();
+ // draw all secs
+
+ for (let i = 0; i < 60; i++) {
+ if (i > currentSec) {
+ g.setColor(0, 0, 0.6);
+ } else {
+ g.setColor(0.3, 0.3, 1);
+ }
+ seconds((360 * i) / 60);
+ }
+ onSecond();
+};
+
+const resetSeconds = () => {
+ g.setColor(0, 0, 0.6);
+ for (let i = 0; i < 60; i++) {
+ seconds((360 * i) / 60);
+ }
+};
+
+const drawMin = () => {
+ g.setColor(0.5, 0.5, 0.5);
+ for (let i = 0; i < 60; i++) {
+ minDot((360 * i) / 60,1);
+ }
+};
+
+const drawHour = () => {
+ g.setColor(0.5, 0.5, 0.5);
+ for (let i = 0; i < 12; i++) {
+ hourDot((360 * 5 * i) / 60,1);
+ }
+};
+
+const onSecond = () => {
+ g.setColor(0.3, 0.3, 1);
+ seconds((360 * currentDate.getSeconds()) / 60);
+ if (currentDate.getSeconds() === 59) {
+ resetSeconds();
+ onMinute();
+ }
+ g.setColor(1, 0.7, 0.2);
+ currentDate = new Date();
+ seconds((360 * currentDate.getSeconds()) / 60);
+ g.setColor(1, 1, 1);
+};
+
+const drawDate = () => {
+ g.reset();
+ g.setColor(1, 1, 1);
+ g.setFont('6x8', 2);
+
+ const dayString = locale.dow(currentDate, true);
+ // pad left date
+ const dateString = ((currentDate.getDate() < 10) ? '0' : '') + currentDate.getDate().toString();
+ const dateDisplay = `${dayString} ${dateString}`;
+ // console.log(`${dayString}|${dateString}`);
+ // center date
+ const l = (g.getWidth() - g.stringWidth(dateDisplay)) / 2;
+ const t = centerPx - 6 ;
+ g.drawString(dateDisplay, l, t);
+ // console.log(l, t);
+};
+const onMinute = () => {
+ if (currentDate.getHours() === 0 && currentDate.getMinutes() === 0) {
+ g.clear();
+ resetSeconds();
+ }
+ // clear existing hands
+ g.setColor(0, 0, 0);
+ hourDot((360 * currentDate.getHours()) / 12,4);
+ minDot((360 * currentDate.getMinutes()) / 60,3);
+
+ // Hour
+ drawHour();
+ // Minute
+ drawMin();
+
+ // get new date, then draw new hands
+ currentDate = new Date();
+ g.setColor(1, 0, 0);
+ // Hour
+ hourDot((360 * currentDate.getHours()) / 12,4);
+ g.setColor(1, 0.9, 0.9);
+ // Minute
+ minDot((360 * currentDate.getMinutes()) / 60,3);
+ if (currentDate.getHours() >= 0 && currentDate.getMinutes() === 0) {
+ Bangle.buzz();
+ }
+ drawDate();
+};
+
+const startTimers = () => {
+ timer = setInterval(onSecond, 1000);
+};
+
+Bangle.on('lcdPower', (on) => {
+ if (on) {
+ // g.clear();
+ drawAll();
+ startTimers();
+ Bangle.drawWidgets();
+ } else {
+ if (timer) {
+ clearInterval(timer);
+ }
+ }
+});
+
+g.clear();
+resetSeconds();
+startTimers();
+drawAll();
+Bangle.loadWidgets();
+Bangle.drawWidgets();
+
+// Show launcher when middle button pressed
+setWatch(Bangle.showLauncher, BTN2, { repeat: false, edge: "falling" });
diff --git a/apps/dotclock/clock-dot.png b/apps/dotclock/clock-dot.png
new file mode 100644
index 000000000..702ac9065
Binary files /dev/null and b/apps/dotclock/clock-dot.png differ
diff --git a/apps/dotmatrixclock/ChangeLog b/apps/dotmatrixclock/ChangeLog
new file mode 100644
index 000000000..7ab9e14a9
--- /dev/null
+++ b/apps/dotmatrixclock/ChangeLog
@@ -0,0 +1 @@
+0.01: Create dotmatrix clock app
diff --git a/apps/dotmatrixclock/README.md b/apps/dotmatrixclock/README.md
new file mode 100644
index 000000000..3af48efc6
--- /dev/null
+++ b/apps/dotmatrixclock/README.md
@@ -0,0 +1,28 @@
+# Dotmatrix clock
+
+A clock face simulating the classic dotmatrix displays. Shows time, date, compass, and heart rate.
+
+
+
+## Features
+
+* Easy to read digits
+* Simulated white-on-blue dotmatrix display
+* Compass
+* Heart rate monitor
+* Multiple colour palletes, swipe to change
+
+## Usage
+
+### Sensor readings
+
+When the display is activated by 'flipping' the watch up, the compass and heart sensors will be activated automatically, but if
+you activate the LCD through a button press, then the sensors will remain off until you press button-1.
+
+### Colours
+
+The display defaults to blue, but you can change this to orange by swiping the screen
+
+## Requests
+
+If you have any feature requests, please send an email to the author paulcockrell@gmail.com`
diff --git a/apps/dotmatrixclock/app.js b/apps/dotmatrixclock/app.js
new file mode 100755
index 000000000..ba34d4885
--- /dev/null
+++ b/apps/dotmatrixclock/app.js
@@ -0,0 +1,354 @@
+/**
+ * BangleJS DotMatrixCLOCK
+ *
+ * + Original Author: Paul Cockrell https://github.com/paulcockrell
+ * + Created: May 2020
+ */
+const storage = require('Storage');
+const settings = (storage.readJSON('setting.json', 1) || {});
+const is12Hour = settings["12hour"] || false;
+const timeout = settings.timeout || 20;
+
+const font7x7 = {
+ "empty": "00000000",
+ "0": "3E61514945433E",
+ "1": "1808080808081C",
+ "2": "7E01013E40407F",
+ "3": "7E01013E01017E",
+ "4": "4141417F010101",
+ "5": "7F40407E01017E",
+ "6": "3E40407E41413E",
+ "7": "3F010202040408",
+ "8": "3E41413E41413E",
+ "9": "3E41413F01013E",
+};
+
+const font5x5 = {
+ "empty": "00000000",
+ "-": "0000FF0000",
+ "0": "0E1915130E",
+ "1": "0C0404040E",
+ "2": "1E010E101F",
+ "3": "1E010E011E",
+ "4": "11111F0101",
+ "5": "1F101E011E",
+ "6": "0E101E110E",
+ "7": "1F01020408",
+ "8": "0E110E110E",
+ "9": "0E110F010E",
+ "A": "040A0E1111",
+ "B": "1E111E111E",
+ "C": "0F1010100F",
+ "D": "1E1111111E",
+ "E": "1F101E101F",
+ "F": "1F101E1010",
+ "G": "0F1013110E",
+ "H": "11111F1111",
+ "I": "0E0404040E",
+ "J": "1F0404140C",
+ "L": "101010101F",
+ "M": "111B151111",
+ "N": "1119151311",
+ "O": "0E1111110E",
+ "P": "1E111E1010",
+ "R": "1E111E1111",
+ "S": "0F100E011E",
+ "T": "1F04040404",
+ "U": "111111110E",
+ "V": "1111110A04",
+ "W": "111115150A",
+ "Y": "110A040404",
+};
+
+// Char renderer
+const COLORS = {
+ blue: {
+ BG: "#0297fe",
+ DARK: "#3b3ce8",
+ LIGHT: "#E9ffff",
+ },
+ orange: {
+ BG: "#f7b336",
+ DARK: "#ac721e",
+ LIGHT: "#f6fc0f",
+ }
+};
+
+let selectedColor = "blue";
+let displayTimeoutRef, sensorTimeoutRef;
+
+// Example
+// binToHex(["0111110", "1000000", "1000000", "1111110", "1000001", "1000001", "0111110"])
+function binToHex(bins) {
+ return bins.map(bin => ("00" + (parseInt(bin, 2).toString(16))).substr(-2).toUpperCase()).join("");
+}
+
+// Example
+// hexToBin("3E40407E41413E")
+function hexToBin(hexStr) {
+ const regEx = new RegExp("..", "g");
+ const bin = hexStr
+ .replace(regEx, el => el + '_')
+ .slice(0, -1)
+ .split('_')
+ .map(hex => ("00000000" + (parseInt(hex, 16)).toString(2)).substr(-8));
+
+ return bin;
+}
+
+function drawPixel(opts) {
+ g.setColor(opts.color);
+ g.fillRect(opts.x, opts.y, opts.x + opts.w, opts.y + opts.h);
+}
+
+function drawGrid(pos, dims, charAsBin, opts) {
+ const defaultOpts = {
+ pxlW: 5,
+ pxlH: 5,
+ gap: 1,
+ offColor: COLORS[selectedColor].DARK,
+ onColor: COLORS[selectedColor].LIGHT
+ };
+ const pxl = Object.assign({}, defaultOpts, opts);
+
+ for (let rowY = 0; rowY < dims.rows; rowY++) {
+ const y = pos.y + ((pxl.pxlH + pxl.gap) * rowY);
+
+ for (let colX = 7; colX > (7 - dims.cols); colX--) {
+ const x = pos.x + ((pxl.pxlW + pxl.gap) * colX);
+ const color = (charAsBin && parseInt(charAsBin[rowY][colX])) ? pxl.onColor : pxl.offColor;
+
+ drawPixel({
+ x: x,
+ y: y,
+ w: pxl.pxlW,
+ h: pxl.pxlH,
+ color: color,
+ });
+ }
+ }
+}
+
+function drawFont(str, font, x, y) {
+ let fontMap, rows, cols;
+
+ switch(font) {
+ case "7x7":
+ fontMap = font7x7;
+ rows = cols = 7;
+ break;
+ case "5x5":
+ fontMap = font5x5;
+ rows = cols = 5;
+ break;
+ default:
+ throw "Unknown font type: " + font;
+ }
+
+ const pxlW = 2;
+ const pxlH = 2;
+ const gap = 2;
+ const gutter = 3;
+ const charArr = str.split("");
+ const gridWidthTotal = (rows * (pxlW + gap)) + gutter;
+ for (let i = 0; i < charArr.length; i++) {
+ const charAsBin = fontMap.hasOwnProperty(charArr[i])?
+ hexToBin(fontMap[charArr[i]]):
+ fontMap.empty;
+
+ drawGrid(
+ {x: x + (i * gridWidthTotal), y: y},
+ {rows: rows, cols: cols},
+ charAsBin,
+ {pxlW: pxlW, pxlH: pxlH, gap: gap}
+ );
+ }
+}
+
+function drawTitles() {
+ g.setColor("#ffffff");
+ g.setFont("6x8");
+ g.drawString("COMPASS", 52, 49);
+ g.drawString("HEART", 122, 49);
+ g.drawString("TIME", 52, 94);
+ g.drawString("DATE", 52, 144);
+}
+
+function drawCompass(lastHeading) {
+ const directions = [
+ 'N',
+ 'NE',
+ 'E',
+ 'SE',
+ 'S',
+ 'SW',
+ 'W',
+ 'NW'
+ ];
+ const cps = Bangle.getCompass();
+ let angle = cps.heading;
+ let heading = angle?
+ directions[Math.round(((angle %= 360) < 0 ? angle + 360 : angle) / 45) % 8]:
+ "-- ";
+
+ heading = (heading + " ").slice(0, 3);
+ if (lastHeading != heading) drawFont(heading, "5x5", 40, 67);
+ setTimeout(drawCompass.bind(null, heading), 1000 * 2);
+}
+
+function drawHeart(hrm) {
+ drawFont((" " + (hrm ? hrm.bpm : "---")).slice(-3), "5x5", 109, 67);
+}
+
+function drawTime(lastHrs, lastMns, toggle) {
+ const date = new Date();
+ const h = date.getHours();
+ const hrs = ("00" + ((is12Hour && h > 12) ? h - 12 : h)).substr(-2);
+ const mns = ("00" + date.getMinutes()).substr(-2);
+
+ if (lastHrs != hrs) {
+ drawFont(hrs, "7x7", 48, 109);
+ }
+ if (lastMns != mns) {
+ drawFont(mns, "7x7", 124, 109);
+ }
+
+ const color = toggle? COLORS[selectedColor].LIGHT : COLORS[selectedColor].DARK;
+
+ // This should toggle on/off per second
+ drawPixel({
+ color: color,
+ x: 118, y: 118,
+ w: 2, h: 2,
+ });
+ drawPixel({
+ color: color,
+ x: 118, y: 125,
+ w: 2, h: 2,
+ });
+
+ setTimeout(drawTime.bind(null, hrs, mns, !toggle), 1000);
+}
+
+function drawDate(lastDate) {
+ const locale = require('locale');
+ const date = new Date();
+
+ if (lastDate != date.toISOString().split('T')[0]) {
+ const dow = locale.dow(date, 1).toUpperCase();
+ const dayNum = ("00" + date.getDate()).slice(-2);
+ const mon = locale.month(date).toUpperCase().slice(0, 3);
+ const yr = date.getFullYear().toString().slice(-2);
+ drawFont(dow + " " + dayNum, "5x5", 40, 159);
+ drawFont(mon + " " + yr, "5x5", 40, 189);
+ }
+
+ setTimeout(drawDate.bind(null, date.toISOString().split('T')), 1000 * 60);
+}
+
+function setSensors(state) {
+ // Already reading sensors and trying to activate sensors, do nothing
+ if (sensorTimeoutRef && state === 1) return;
+
+ // If we are activating the sensors, turn them off again in one minute
+ if (state === 1) {
+ sensorTimeoutRef = setTimeout(() => { setSensors(0); }, 1000 * 60);
+ } else {
+ if (sensorTimeoutRef) {
+ clearInterval(sensorTimeoutRef);
+ sensorTimeoutRef = null;
+ }
+ // Bit nasty, but we only redraw the heart value on sensor callback
+ // but we want to blank out when sensor is off, but no callback for
+ // that so force redraw here
+ drawHeart();
+ }
+
+ Bangle.setHRMPower(state);
+ Bangle.setCompassPower(state);
+}
+
+function drawScreen() {
+ g.setBgColor(COLORS[selectedColor].BG);
+ g.clearRect(0, 24, g.getWidth(), g.getHeight());
+
+ // Draw components
+ drawTitles();
+ drawCompass();
+ drawHeart();
+ drawTime();
+ drawDate();
+}
+
+function clearTimers(){
+ if (displayTimeoutRef) {
+ clearInterval(displayTimeoutRef);
+ displayTimeoutRef = null;
+ }
+
+ if (sensorTimeoutRef) {
+ clearInterval(sensorTimeoutRef);
+ sensorTimeoutRef = null;
+ }
+}
+
+function resetDisplayTimeout() {
+ if (displayTimeoutRef) clearInterval(displayTimeoutRef);
+ Bangle.setLCDPower(true);
+
+ displayTimeoutRef = setTimeout(() => {
+ if (Bangle.isLCDOn()) Bangle.setLCDPower(false);
+ clearTimers();
+ }, 1000 * timeout);
+}
+
+// Turn sensors on
+setSensors(1);
+
+// Reset screen
+g.clear();
+
+// Load and draw widgets
+Bangle.loadWidgets();
+Bangle.drawWidgets();
+
+// Draw screen
+drawScreen();
+resetDisplayTimeout();
+
+// Setup callbacks
+Bangle.on('swipe', (sDir) => {
+ selectedColor = selectedColor === "blue" ? "orange" : "blue";
+ resetDisplayTimeout();
+ drawScreen();
+});
+
+Bangle.on('HRM', drawHeart);
+
+setWatch(() => {
+ setSensors(1);
+ resetDisplayTimeout();
+}, BTN1, {repeat: true, edge: "falling"});
+
+setWatch(() => {
+ setSensors(0);
+ clearTimers();
+ Bangle.setLCDMode();
+ Bangle.showLauncher();
+}, BTN2, {repeat: false, edge: "falling"});
+
+Bangle.on('lcdPower', (on) => {
+ if(on) {
+ resetDisplayTimeout();
+ } else {
+ clearTimers();
+ setSensors(0);
+ }
+});
+
+Bangle.on('faceUp', (up) => {
+ if (up && !Bangle.isLCDOn()) {
+ setSensors(1);
+ resetDisplayTimeout();
+ }
+});
\ No newline at end of file
diff --git a/apps/dotmatrixclock/dotmatrix-clock-screen-shot.png b/apps/dotmatrixclock/dotmatrix-clock-screen-shot.png
new file mode 100755
index 000000000..e6218f4c9
Binary files /dev/null and b/apps/dotmatrixclock/dotmatrix-clock-screen-shot.png differ
diff --git a/apps/dotmatrixclock/dotmatrixclock-icon.js b/apps/dotmatrixclock/dotmatrixclock-icon.js
new file mode 100644
index 000000000..8773839e1
--- /dev/null
+++ b/apps/dotmatrixclock/dotmatrixclock-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwxH+AAmBAEgrFAAZelFo+s1krAEcAE4IuFHIIJBAEXXE4KSEF84nCF4WBgErBYoAfEoaTBF42zF8PXF5QNBi4AgMIYv/F9nX64CDAw4ACl8vBIgGGF/4AOEgKPfI4xfoF96P/R/6PdACAv/F/4v/F/4v/F8HX68Xl8vAwIDCBIQADBIQQDBoQQDF/4AOGQqPbLAxmGL5gGDF/4AfF/6PRBIQQDSwwv/ABwoCR7xYGMwxfhF94AeF/4vr1nXBoIAf64mCF4gJEF8IkCF4YABFYQLDAEItBwIuCF9InBF4iSBwMrAEgnBFwgACXsIADFo4ABqwAkFQg="))
diff --git a/apps/dotmatrixclock/dotmatrixclock.png b/apps/dotmatrixclock/dotmatrixclock.png
new file mode 100755
index 000000000..ab2637520
Binary files /dev/null and b/apps/dotmatrixclock/dotmatrixclock.png differ
diff --git a/apps/espruinoctrl/ChangeLog b/apps/espruinoctrl/ChangeLog
new file mode 100644
index 000000000..5560f00bc
--- /dev/null
+++ b/apps/espruinoctrl/ChangeLog
@@ -0,0 +1 @@
+0.01: New App!
diff --git a/apps/espruinoctrl/README.md b/apps/espruinoctrl/README.md
new file mode 100644
index 000000000..a7bca662c
--- /dev/null
+++ b/apps/espruinoctrl/README.md
@@ -0,0 +1,28 @@
+# Espruino Control
+
+Send commands to other Espruino devices via the Bluetooth UART interface.
+
+## Customising
+
+Click the customise button and you can customise your commands
+with 4 options:
+
+
+* **Title** - The title of the menu item that will be displayed
+* **Command** - The JS command to execute, eg. `LED.toggle()`
+* **MAC Address** - If specified, of the form `aa:bb:cc:dd:ee:ff`. The device
+with this address will be connected to directly. If not specified a menu
+showing available Espruino devices is popped up.
+* **RX** - If checked, the app will display any data received from the
+device being connected to. Use this if you want to print data - eg: `print(E.getBattery())`
+
+When done, click 'Upload'. Your changes will be saved to local storage
+so they'll be remembered next time you upload from the same device.s
+
+## Usage
+
+Simply load the app and you'll see a menu with the menu items
+you defined. Select one and you'll be able to connect to the device
+and send the command.
+
+If a command should wait for a response then
diff --git a/apps/espruinoctrl/app-icon.js b/apps/espruinoctrl/app-icon.js
new file mode 100644
index 000000000..70d2dd062
--- /dev/null
+++ b/apps/espruinoctrl/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwhH+AH4A/AH4A/AH4AFwIuuAAIllAAYIGF041IF34AKqwuuAANXF9QuCAANdGHqQgGBwvdGCIud5mjGB4udAAIwPFz3MSR61VFxQwNci4vGeh4uXGAguHGBK3WGA4AIegtXc69dGBxoBGAouWO4IwNe4gwZa4YwLFwikEFzAwLFwwwCFzQwKFw68YGB4AdF5AwmF5IwlF5QwkF5Yw/F8IwEL9WBB4IuuADwuzGxAugFAgliGBYutAH4A/AH4A/ADA="))
diff --git a/apps/espruinoctrl/app.png b/apps/espruinoctrl/app.png
new file mode 100644
index 000000000..900861e43
Binary files /dev/null and b/apps/espruinoctrl/app.png differ
diff --git a/apps/espruinoctrl/custom.html b/apps/espruinoctrl/custom.html
new file mode 100644
index 000000000..e6297cf2e
--- /dev/null
+++ b/apps/espruinoctrl/custom.html
@@ -0,0 +1,275 @@
+
+
+
+
+
+
+
+
+
Enter the menu items you'd like to see appear in the app below. MAC Address is the MAC address
+ of the device to use. If it isn't specified then a menu will be presented showing available devices.
+
+
+
+
+
Title
+
Command
+
MAC Address
+
RX
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/files/ChangeLog b/apps/files/ChangeLog
new file mode 100644
index 000000000..b4037a733
--- /dev/null
+++ b/apps/files/ChangeLog
@@ -0,0 +1,5 @@
+0.02: Fix deletion of apps - now use files list in app.info (fix #262)
+0.03: Add support for data files
+0.04: Add functionality to sort apps manually or alphabetically ascending/descending.
+0.05: Tweaks to help with memory usage
+0.06: Reduce memory usage
\ No newline at end of file
diff --git a/apps/files/files.js b/apps/files/files.js
index 31353cf96..9e6c97702 100644
--- a/apps/files/files.js
+++ b/apps/files/files.js
@@ -1,9 +1,7 @@
-const storage = require('Storage');
+const store = require('Storage');
const boolFormat = (v) => v ? "On" : "Off";
-let m;
-
function showMainMenu() {
const mainmenu = {
'': {
@@ -12,50 +10,104 @@ function showMainMenu() {
'Free': {
value: undefined,
format: (v) => {
- return storage.getFree();
+ return store.getFree();
},
onchange: () => {}
},
'Compact': () => {
E.showMessage('Compacting...');
try {
- storage.compact();
+ store.compact();
} catch (e) {
}
- m = showMainMenu();
+ showMainMenu();
},
- 'Apps': ()=> m = showApps(),
+ 'Apps': ()=> showApps(),
+ 'Sort Apps': () => showSortAppsMenu(),
'< Back': ()=> {load();}
};
- return E.showMenu(mainmenu);
+ E.showMenu(mainmenu);
}
-function eraseApp(app) {
+function isGlob(f) {
+ return /[?*]/.test(f);
+}
+
+function globToRegex(pattern) {
+ const ESCAPE = '.*+-?^${}()|[]\\';
+ const regex = pattern.replace(/./g, c => {
+ switch (c) {
+ case '?': return '.';
+ case '*': return '.*';
+ default: return ESCAPE.includes(c) ? ('\\' + c) : c;
+ }
+ });
+ return new RegExp('^'+regex+'$');
+}
+
+function eraseFiles(info) {
+ info.files.split(",").forEach(f=>store.erase(f));
+}
+
+function eraseData(info) {
+ if(!info.data) return;
+ const d=info.data.split(';'),
+ files=d[0].split(','),
+ sFiles=(d[1]||'').split(',');
+ let erase = f=>store.erase(f);
+ files.forEach(f=>{
+ if (!isGlob(f)) erase(f);
+ else store.list(globToRegex(f)).forEach(erase);
+ });
+ erase = sf=>store.open(sf,'r').erase();
+ sFiles.forEach(sf=>{
+ if (!isGlob(sf)) erase(sf);
+ else store.list(globToRegex(sf+'\u0001'))
+ .forEach(fs=>erase(fs.substring(0,fs.length-1)));
+ });
+}
+function eraseApp(app, files,data) {
E.showMessage('Erasing\n' + app.name + '...');
- storage.erase(app['']);
- storage.erase(app.icon);
- storage.erase(app.src);
+ var info = store.readJSON(app.id + ".info", 1)||{};
+ if (files) eraseFiles(info);
+ if (data) eraseData(info);
+}
+function eraseOne(app, files,data){
+ E.showPrompt('Erase\n'+app.name+'?').then((v) => {
+ if (v) {
+ Bangle.buzz(100, 1);
+ eraseApp(app, files, data);
+ showApps();
+ } else {
+ showAppMenu(app);
+ }
+ });
+}
+function eraseAll(apps, files,data) {
+ E.showPrompt('Erase all?').then((v) => {
+ if (v) {
+ Bangle.buzz(100, 1);
+ apps.forEach(app => eraseApp(app, files, data));
+ }
+ showApps();
+ });
}
function showAppMenu(app) {
- const appmenu = {
+ let appmenu = {
'': {
'title': app.name,
},
- '< Back': () => m = showApps(),
- 'Erase': () => {
- E.showPrompt('Erase\n' + app.name + '?').then((v) => {
- if (v) {
- Bangle.buzz(100, 1);
- eraseApp(app);
- m = showApps();
- } else {
- m = showAppMenu(app)
- }
- });
- }
+ '< Back': () => showApps(),
};
- return E.showMenu(appmenu);
+ if (app.hasData) {
+ appmenu['Erase Completely'] = () => eraseOne(app, true, true);
+ appmenu['Erase App,Keep Data'] = () => eraseOne(app, true, false);
+ appmenu['Only Erase Data'] = () => eraseOne(app, false, true);
+ } else {
+ appmenu['Erase'] = () => eraseOne(app, true, false);
+ }
+ E.showMenu(appmenu);
}
function showApps() {
@@ -63,30 +115,28 @@ function showApps() {
'': {
'title': 'Apps',
},
- '< Back': () => m = showMainMenu(),
+ '< Back': () => showMainMenu(),
};
- var list = storage.list(/\.info$/).filter((a)=> {
+ var list = store.list(/\.info$/).filter((a)=> {
return a !== 'setting.info';
- }).sort().map((app) => {
- var ret = storage.readJSON(app,1)||{};
- ret[''] = app;
- return ret;
- });
+ }).map((a)=> {
+ let app = store.readJSON(a, 1) || {};
+ return {id: app.id, name: app.name, hasData: !!app.data};
+ }).sort(sortHelper());
if (list.length > 0) {
list.reduce((menu, app) => {
- menu[app.name] = () => m = showAppMenu(app);
+ menu[app.name] = () => showAppMenu(app);
return menu;
}, appsmenu);
appsmenu['Erase All'] = () => {
- E.showPrompt('Erase all?').then((v) => {
- if (v) {
- Bangle.buzz(100, 1);
- for (var n = 0; n < list.length; n++)
- eraseApp(list[n]);
- }
- m = showApps();
+ E.showMenu({
+ '': {'title': 'Erase All'},
+ 'Erase Everything': () => eraseAll(list, true, true),
+ 'Erase Apps,Keep Data': () => eraseAll(list, true, false),
+ 'Only Erase Data': () => eraseAll(list, false, true),
+ '< Back': () => showApps(),
});
};
} else {
@@ -96,7 +146,82 @@ function showApps() {
onchange: ()=> {}
};
}
- return E.showMenu(appsmenu);
+ E.showMenu(appsmenu);
}
-m = showMainMenu();
+function showSortAppsMenu() {
+ const sorterMenu = {
+ '': {
+ 'title': 'App Sorter',
+ },
+ '< Back': () => showMainMenu(),
+ 'Sort: manually': ()=> showSortAppsManually(),
+ 'Sort: alph. ASC': () => {
+ E.showMessage('Sorting:\nAlphabetically\nascending ...');
+ sortAlphabet(false);
+ },
+ 'Sort: alph. DESC': () => {
+ E.showMessage('Sorting:\nAlphabetically\ndescending ...');
+ sortAlphabet(true);
+ }
+ };
+ E.showMenu(sorterMenu);
+}
+
+function showSortAppsManually() {
+ const appsSorterMenu = {
+ '': {
+ 'title': 'Sort: manually',
+ },
+ '< Back': () => showSortAppsMenu(),
+ };
+ let appList = getAppsList();
+ if (appList.length > 0) {
+ appList.reduce((menu, app) => {
+ menu[app.name] = {
+ value: app.sortorder || 0,
+ min: 0,
+ max: appList.length,
+ step: 1,
+ onchange: val => setSortorder(app, val)
+ };
+ return menu;
+ }, appsSorterMenu);
+ } else {
+ appsSorterMenu['...No Apps...'] = {
+ value: undefined,
+ format: ()=> '',
+ onchange: ()=> {}
+ };
+ }
+ E.showMenu(appsSorterMenu);
+}
+
+function setSortorder(app, val) {
+ app = store.readJSON(app.id + '.info', 1);
+ app.sortorder = val;
+ store.write(app.id + '.info', JSON.stringify(app));
+}
+
+function getAppsList() {
+ return store.list('.info').map((a)=> {
+ let app = store.readJSON(a, 1) || {};
+ if (app.type !== 'widget') {
+ return {id: app.id, name: app.name, sortorder: app.sortorder};
+ }
+ }).filter((a) => a).sort(sortHelper());
+}
+
+function sortAlphabet(desc) {
+ let appsSorted = desc ? getAppsList().reverse() : getAppsList();
+ appsSorted.forEach((a, i) => {
+ setSortorder(a, i);
+ });
+ showSortAppsMenu();
+}
+
+function sortHelper() {
+ return (a, b) => (a.name > b.name) - (a.name < b.name);
+}
+
+showMainMenu();
diff --git a/apps/findphone/ChangeLog b/apps/findphone/ChangeLog
new file mode 100644
index 000000000..9297fc6c7
--- /dev/null
+++ b/apps/findphone/ChangeLog
@@ -0,0 +1 @@
+0.01: First Version
\ No newline at end of file
diff --git a/apps/findphone/README.md b/apps/findphone/README.md
new file mode 100644
index 000000000..870847222
--- /dev/null
+++ b/apps/findphone/README.md
@@ -0,0 +1,9 @@
+# Find Phone
+
+Ring your phone via GadgetBridge if you lost it somewhere.
+
+1. Enable HID in settings
+2. Connect GadgetBridge
+3. Lose phone
+4. Open app
+5. Click any button or screen
diff --git a/apps/findphone/app-icon.js b/apps/findphone/app-icon.js
new file mode 100644
index 000000000..95a73755e
--- /dev/null
+++ b/apps/findphone/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwkCkQA/AEp0JCxkgC5KJMUpYXMgf/AA0wC5sPC4/wC/4XhxAXXwQXtlBIJC5URC4QwIC5PxFgQXT/QUCC6fwC4ZgIC5E/+EYCgJ4JC4/zwfwhAXTnGIC9pHXO66nY//4a63xFYTvUiJeCC6cAOxQXNFxIXllAWIC5oAKC+EDC48wC5oAKC9EBiAXokBGJgQXLMBQWMAH4AZA="))
\ No newline at end of file
diff --git a/apps/findphone/app.js b/apps/findphone/app.js
new file mode 100644
index 000000000..a532e3b50
--- /dev/null
+++ b/apps/findphone/app.js
@@ -0,0 +1,33 @@
+var storage = require('Storage');
+
+//notify your phone
+function find(){
+ Bluetooth.println(JSON.stringify({t:"findPhone", n:true}));
+}
+
+//init graphics
+g.clear();
+require("Font8x12").add(Graphics);
+g.setFont("8x12",3);
+g.setFontAlign(0,0);
+g.flip();
+
+//init settings
+const settings = storage.readJSON('setting.json',1) || { HID: false };
+
+//check if HID enabled and show message
+if (settings.HID=="kb" || settings.HID=="kbmedia") {
+ g.setColor(0x03E0);
+ g.drawString("click to find", g.getWidth()/2, g.getHeight()/2);
+
+ //register all buttons and screen to find phone
+ setWatch(find, BTN1);
+ setWatch(find, BTN2);
+ setWatch(find, BTN3);
+ setWatch(find, BTN4);
+ setWatch(find, BTN5);
+
+}else{
+ g.setColor(0xf800);
+ g.drawString("enable HID!", g.getWidth()/2, g.getHeight()/2);
+}
\ No newline at end of file
diff --git a/apps/findphone/app.png b/apps/findphone/app.png
new file mode 100644
index 000000000..70d891396
Binary files /dev/null and b/apps/findphone/app.png differ
diff --git a/apps/flagrse/README.md b/apps/flagrse/README.md
new file mode 100644
index 000000000..819ebde36
--- /dev/null
+++ b/apps/flagrse/README.md
@@ -0,0 +1,76 @@
+# Espruino Flag Raiser
+
+An app to send a command to another Espruino to cause it to raise a flag.
+
+For this to work, you need to upload the following code to another
+bluetooth Espruino device (the one with the flag attached) :
+
+```
+var FLAG_PIN = D14;
+
+var s = require("servo").connect(FLAG_PIN);
+s.move(1,3000); // move to position 1 over 3 seconds
+
+var timeout;
+function flag() {
+ if (timeout) clearTimeout();
+ s.move(0.2,2000);
+ timeout = setTimeout(function() {
+ timeout = undefined;
+ s.move(1,2000);
+ },2000);
+}
+
+setWatch(flag, BTN, {repeat:true});
+
+NRF.setServices({
+ "3e440001-f5bb-357d-719d-179272e4d4d9": {
+ "3e440002-f5bb-357d-719d-179272e4d4d9": {
+ value : [0],
+ maxLen : 1,
+ writable : true,
+ onWrite : function(evt) {
+ flag();
+ }
+ }
+ }
+}, { uart : false });
+NRF.setAdvertising({}, {name:"Flag"});
+```
+
+## Wiring
+
+This is designed for an [MDBT42Q Breakout board](http://www.espruino.com/MDBT42Q)
+but should work on any Bluetooth LE Espruino device - you just need to change `FLAG_PIN`
+to the name of the pin that's connected to the servo motor.
+
+However, as designed:
+
+* Get an [MDBT42Q Breakout board](http://www.espruino.com/MDBT42Q)
+* Connect `GND` to GND (black) of a 3.7v LiPo battery
+* Connect `Vin` to positive (red) of the battery
+* Take a servo motor and:
+ * Connect the Black wire to `GND` (LiPo GND)
+ * Connect the Red wire to `Vin` (LiPo 3.7v)
+ * Connect the White wire to `D14` on the MDBT42Q
+
+## How does it work?
+
+The code above changes the advertised name of the Espruino device to be
+`Flag` (which the app then searches for).
+
+Then, it adds a service UUID `3e440001-f5bb-357d-719d-179272e4d4d9` (this
+is just a random number we made up) with characteristic `3e440002-f5bb-357d-719d-179272e4d4d9`
+(the same UUID with the second 16 bits incremented). When the characteristic
+is written (with any data), `flag()` is called, which raises the flag.
+
+`flag()` itself uses the [servo module](http://www.espruino.com/Servo+Motors)
+to allow the servo motor to be controlled easily.
+
+You might find the [Espruino About Bluetooth LE page](http://www.espruino.com/About+Bluetooth+LE)
+is useful as an introduction to services and characteristics.
+
+### Don't want to use a servo motor?
+
+No problem, just replace `flag()` with a function that controls whatever you need
+it to.
diff --git a/apps/flagrse/app.js b/apps/flagrse/app.js
index e7e8e2445..e03e4fb07 100644
--- a/apps/flagrse/app.js
+++ b/apps/flagrse/app.js
@@ -5,15 +5,15 @@ function redraw() {
g.drawImage(img, 120-96, 120-96, {scale:2});
}
- // Code for button (Puck.js)
- var busy = false;
+// Code for button (Puck.js)
+var busy = false;
var lastTry = getTime();
function flag() {
E.showMessage("Working...");
if (busy && lastTry+5bbot))
gameStop();
});
@@ -100,7 +101,7 @@ Bangle.on('touch', function(button) {
if (!running) {
gameStart();
} else {
- birdvy -= 4;
+ birdvy -= 4;
}
});
diff --git a/apps/gallifr/ChangeLog b/apps/gallifr/ChangeLog
new file mode 100644
index 000000000..c785cbd67
--- /dev/null
+++ b/apps/gallifr/ChangeLog
@@ -0,0 +1 @@
+0.01: First released version
diff --git a/apps/gallifr/README.md b/apps/gallifr/README.md
new file mode 100644
index 000000000..b88a3cb53
--- /dev/null
+++ b/apps/gallifr/README.md
@@ -0,0 +1,20 @@
+# Time Traveller's Clock
+
+The time travelling wristwatch is for those who are so attuned to the ebb and flow of time that they no longer require antiquated numbers to read the time.
+
+For those that need some tuition in the ways of the time traveller, the light coloured segment of the pie chart provides a traditional readout of minute. The black sphere that revolves around the edge of the display provides an indication of the hour.
+
+## Features
+
+The following aspects are customisable using the App Loader Menu system:
+
+1. Colour; the dial has four colour schemes:
+- shades of green
+- shades of red
+- shades of blue
+- a 1980's scheme
+2. Widgets; these can be turned on or off - when turned off, the dial uses the whole screen and is slightly larger
+3. Decoration; for those attuned to the time streams, the dial itself reads 'time'. For those who don't need to be reminded what the dial is for, this can be optionally turned off.
+
+## Code description
+The code includes some functions that others may find useful in creating their own applications. These are explained in my robot-building blog [here](https://k9-build.blogspot.com/).
\ No newline at end of file
diff --git a/apps/gallifr/app-icon.js b/apps/gallifr/app-icon.js
new file mode 100644
index 000000000..f0b27e1c8
--- /dev/null
+++ b/apps/gallifr/app-icon.js
@@ -0,0 +1 @@
+E.toArrayBuffer(atob("MDAIAAAAAAAAAAAAAAAABgYAAAAAAAYGDAwSGBgYGBISBgAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAwMEhISGBgYHh4eHh4eHhgSDAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABhgYEhIYGBgYEhIYHh4eHh4eHh4eHhgMAAAGAAAAAAAAAAAAAAAAAAAAAAAGAAASHh4eGBISEhISEhIYHh4eHh4eHh4eHh4eGAYABgAAAAAAAAAAAAAAAAAAAAYADBgeHh4eGBIYEhISEhIYHh4eHh4eHh4eHh4eHh4SAAYAAAAAAAAAAAAAAAAABgAMHh4eHh4eHhgSEhIYGBgYHh4eHh4eHh4eHh4eHh4eEgAGAAAAAAAAAAAAAAAGABIeHh4eHh4eHhgSGBgSEhIMEhgYHh4eHh4eHh4eHh4eHhIABgAAAAAAAAAAAAYAEh4eHh4eHh4eHh4SEgwAAAAAAAAAABIYHh4eHh4eHh4eHh4SAAYAAAAAAAAABgAMHh4eHh4eHh4eHhIGAAAMEhISGB4YEgAABhIeHh4eHh4eHh4eEgAGAAAAAAAAAAweHh4eHh4eHh4YDAAABhIYGBgYHh4eHhgGAAAMGB4eHh4eHh4eHhIABgAAAAAAABgeHh4eHh4eHhISGAAMGBgSEhIYHh4eHh4eDAASEgweHh4eHh4eHh4MAAAAAAYAEh4eHh4eHh4eBhIeDAAeHhISGBgYHh4eHh4eGAAGHhIAHh4eHh4eHh4YAAAAAAAGHh4eHh4eHh4GEh4YABgeHhgSEhIMEhgeHh4eHhgAEh4SBh4eHh4eHh4eEgAGBgAYHh4eHh4eHhISHh4MDB4eHhgSDAAAAAAMHh4eHh4AAB4eEgweHh4eHh4eHgAAAAYeHh4eHh4eGBIeHh4AEh4eHh4MABISGBgADB4eHh4SABgeHgwSHh4eHh4eHhIAABIeHh4eHh4eBh4eHhgAGB4eHhgADBgYHh4SABgeHh4YABgeHhgAHh4eHh4eHhgAABgeHh4eHh4SEh4eHhgAGB4eHhgAEhgYHh4YABgeHh4YABIeHh4MEh4eHh4eHh4MBh4eHh4eHh4MHh4eHhgAGB4eHhgAEhgYHh4YABgeHh4YABgeHh4YAB4eHh4eHh4SDB4eHh4eHhgSHh4eHhgAGB4eHh4ADBIYHh4MAB4eHh4YABgeHh4eDBIeHh4eHh4YEh4eHh4eHhIYHh4eHhgADB4eHh4YAAYSEgwAGB4eHh4SAAweHh4eEgYYHh4eHh4YGB4eHh4eHgwYHh4eHh4MAB4eHh4eGAYAAAYYHh4eHh4AEh4YGBgSAAAAABgeHh4eGB4eHh4eHgweHh4eHh4YABIeHh4eHh4YGB4eHh4eHhIAGB4eGAAAEgYSEgAYHh4eGB4eHh4eGBIeHh4eHh4eDAAYHh4eHh4eHh4eHh4eGAASHh4eGAAYHgwYHgYAHh4eGB4eHh4eGAweHh4eHh4MAAYAGB4eHh4eHh4eHh4YAAweHh4eEgAeHgwYHhIAGB4eHh4eHh4eGAweHh4eGAYMGB4MABIeHh4eHh4eHhIADB4eHh4eEgAeHgwYHhIAGB4eHh4eHh4eGAweHhgSEhgeHh4YAAAADBIYGBIMAAASHh4eHh4eGAAYHgweHgwGHh4eHh4eHh4eGAYeGBgeHh4eHh4MABgSDAAAAAAMEhgeHh4eHh4eHgwAEgwYEgAYHh4eGB4eHh4eGAAYHh4eHh4eHhgAGB4eHh4YGB4eHh4eHh4eHh4eHh4MAAAAABgeHh4YGB4eHh4YGAYSHh4eHh4eHgASHh4eHh4eHh4eHh4eHh4eHh4eHh4eEgwYHh4eHh4YEh4YEgwYHhIMHh4eHh4eDBIeHh4eHh4eHh4eHh4eHh4eHh4eHh4eEhgeHh4eHh4SDBIAEh4eHh4AGB4eHh4YEh4eHh4eHh4YGB4eHh4eHh4eHh4eHh4eDB4eHh4eHh4MAAwYHh4eHh4SDB4eHhgGEhgYHh4YEhgSEhgYGB4eHh4eHh4eHh4SEh4eHh4eHh4GABgeHh4eHh4eABgeDAAAAAAABgwYHh4eHh4eGBIYHh4eHh4eHh4GHh4eHh4eHhgAABIeHh4eHh4eGAwGAAYAAAYGAAASHh4eHh4eHh4SEh4eHh4eHhIYHh4eHh4eHhIAAAAYHh4eHh4eGAAABgAAAAAAAAYAEh4eHh4eHh4eGBIeHh4eEhIeHh4eHh4eGAAABgASHh4eHh4eDAAGAAAAAAAAAAAGABgeHh4eHh4eHhIYHh4SBh4eHh4eHh4eEgAGAAYAGB4eHh4YAAAAAAAAAAAAAAAGABIeHh4eHh4eHh4SHhIGHh4eHh4eHh4YAAAAAAAABh4eHh4YAAYAAAAAAAAAAAAGAAweHh4eHh4eHh4YDBIeHh4eHh4eHh4GAAAAAAAGABIeHh4MAAAAAAAAAAAAAAAGAAYeHh4eHh4eHh4SGB4eHh4eHh4eHhIABgAAAAAABgASHhIABgAAAAAAAAAAAAAGAAweHh4eHh4eHh4eHh4eHh4eHh4eEgAGAAAAAAAAAAAADAYSAAAAAAAAAAAAAAAGABIeHh4eHh4eHh4eHh4eHh4eHh4YAAAAAAAAAAAAAAAAABIeBgAGAAAAAAAAAAAGABgeHh4eHh4eHh4eHh4eHh4eHhgAAAAAAAAAAAAAAAAAAAAYGAAAAAAAAAAAAAYADB4eHh4eHh4eHh4eHh4eHh4eEgAAAAAAAAAAAAAAAAAAAAAAEgwAAAAABgYGBgAAGB4eHh4eHh4eHh4eHh4eHh4SAAAAAAAAAAAAAAAAAAAAAAAAAAYGAAAAAAAAAAweHh4eHh4eHh4eHh4eHh4eGAYABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAYMDAwSGB4eHh4eHh4eHh4eHh4eHhgSAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYMEhgeHh4eHh4eHh4eHh4eHh4YEgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYMEhgYHh4eHh4eGBgSDAYAAAAGAAAAAAAAAAAAAAAA"))
\ No newline at end of file
diff --git a/apps/gallifr/app.js b/apps/gallifr/app.js
new file mode 100644
index 000000000..281988ad7
--- /dev/null
+++ b/apps/gallifr/app.js
@@ -0,0 +1,247 @@
+//
+// Time Travellers Watch
+// Written May 2020 by Richard Hopkins
+// based on a skeleton app by Gordon Williams
+//
+const locale = require('locale');
+let timer = null;
+let currentDate = new Date();
+const cirRad = 2*Math.PI;
+const proportion = 0.3; // relative size of hour hand
+const thickness = 4; // thickness of decorative lines
+// retrieve settings from menu
+let settings = require('Storage').readJSON('gallifr.json',1)||{};
+const decoration = !settings.decoration;
+const widgets = !settings.widgets;
+if (widgets) {
+ widgetHeight = 24;}
+else {
+ widgetHeight = 0;}
+const colours = ["green","red","blue","80s"];
+const colour = colours[settings.colour];
+const centerX = Math.round(g.getWidth() / 2);
+const centerY = widgetHeight + Math.round((g.getHeight()-widgetHeight) / 2);
+const radius = Math.round(Math.min(g.getWidth()/2,(g.getHeight()-widgetHeight) / 2));
+
+const drawSegment = (params) => {
+ angle1 = params.start/360*cirRad;
+ angle2 = (params.start + params.arc)/360*cirRad;
+ segRadius = Math.round(params.radius*radius);
+ x = centerX + (params.x * radius);
+ y = centerY - (params.y *radius);
+ g.setColor(0,0,0);
+ incr = cirRad/15;
+ for (i = angle1; i < angle2; i=i+incr) {
+ brush = thickness * (angle2-angle1) /angle2;
+ points = [
+ x + Math.sin(i) * (segRadius+brush),
+ y - Math.cos(i) * (segRadius+brush),
+ x + Math.sin(i+incr) * (segRadius+brush),
+ y - Math.cos(i+incr) * (segRadius+brush),
+ x + Math.sin(i+incr) * (segRadius-brush),
+ y - Math.cos(i+incr) * (segRadius-brush),
+ x + Math.sin(i) * (segRadius-brush),
+ y - Math.cos(i) * (segRadius-brush)
+ ];
+ g.fillPoly(points);
+ }
+};
+
+const drawThickLine = (params) => {
+ g.setColor(0,0,0);
+ from = {
+ x: centerX + (params.fromX * radius),
+ y: centerY - (params.fromY * radius)
+ };
+ to = {
+ x: centerX + (params.toX * radius),
+ y: centerY - (params.toY * radius)
+ };
+ vec = {};
+ vec.x = to.x - from.x;
+ vec.y = to.y - from.y;
+ pVec = {};
+ pVec.x = vec.y;
+ pVec.y = -vec.x;
+ length = Math.sqrt(pVec.x * pVec.x + pVec.y * pVec.y);
+ nVec = {};
+ nVec.x = pVec.x / length;
+ nVec.y = pVec.y / length;
+ array = [
+ from.x + nVec.x * thickness,
+ from.y + nVec.y * thickness,
+ from.x - nVec.x * thickness,
+ from.y - nVec.y * thickness,
+ to.x + nVec.x * thickness,
+ to.y + nVec.y * thickness,
+ to.x - nVec.x * thickness,
+ to.y - nVec.y * thickness
+ ];
+ g.fillPoly(array);
+};
+
+
+
+const drawHands = () => {
+ drawMinuteHand();
+ drawHourHand();
+ if (decoration) {
+ drawDecoration();
+ }
+};
+
+const drawDecoration = () => {
+ params = {
+ start: 210,
+ arc: 295,
+ radius: 0.7,
+ x: 0,
+ y: 0
+ };
+ drawSegment(params);
+ params = {
+ start: 290,
+ arc: 135,
+ radius: 0.4,
+ x: 0,
+ y: -0.7
+ };
+ drawSegment(params);
+ params = {
+ start: 0,
+ arc: 360,
+ radius: 0.4,
+ x: 0,
+ y: 0.3
+ };
+ drawSegment(params);
+ params = {
+ start: 0,
+ arc: 360,
+ radius: 0.15,
+ x: 0,
+ y: 0.3
+ };
+ drawSegment(params);
+ params = {
+ start: 0,
+ arc: 360,
+ radius: 0.15,
+ x: 0.7,
+ y: 0
+ };
+ drawSegment(params);
+ params = {
+ fromX: 0.4,
+ fromY: 0.2,
+ toX: 0.6,
+ toY: 0.1
+ };
+ drawThickLine(params);
+ params = {
+ fromX: -0.2,
+ fromY: -0.05,
+ toX: -0.7,
+ toY: -0.7
+ };
+ drawThickLine(params);
+ params = {
+ fromX: -0.3,
+ fromY: 0.05,
+ toX: -0.95,
+ toY: -0.3
+ };
+ drawThickLine(params);
+};
+
+const drawMinuteHand = () => {
+ angle = currentDate.getMinutes()/60 * cirRad;
+ //angle = currentDate.getSeconds()/60 * cirRad;
+ switch(colour) {
+ case "red":
+ g.setColor(1,0,0);
+ break;
+ case "green":
+ g.setColor(0,1,0);
+ break;
+ case "blue":
+ g.setColor(0,0,1);
+ break;
+ case "80s":
+ g.setColor(1,0,0);
+ break;
+ default:
+ g.setColor(0,1,0);
+ }
+
+ var points = [centerX,centerY];
+ for (i = 0; i < angle; i=i+cirRad/60) {
+ points.push(Math.round(centerX + Math.sin(i) * radius),
+ Math.round(centerY - Math.cos(i) * radius));
+ }
+ g.fillPoly(points);
+};
+
+const drawHourHand = () => {
+ g.setColor(0,0,0);
+ //angle = currentDate.getMinutes()/60 * cirRad;
+ angle = currentDate.getHours()/12 * cirRad;
+ g.fillCircle(
+ Math.round(centerX + Math.sin(angle) * radius * (1-proportion)),
+ Math.round(centerY - Math.cos(angle) * radius * (1-proportion)),
+ radius * proportion
+ );
+};
+
+const drawClockFace = () => {
+ switch(colour) {
+ case "red":
+ g.setColor(0.8,0.3,0);
+ break;
+ case "green":
+ g.setColor(0.1,0.7,0);
+ break;
+ case "blue":
+ g.setColor(0,0.3,0.8);
+ break;
+ case "80s":
+ g.setColor(1,1,1);
+ break;
+ default:
+ g.setColor(0.1,0.7,0);
+ }
+ g.fillCircle(centerX,centerY,radius*0.98);
+};
+
+const drawAll = () => {
+ currentDate = new Date();
+ g.clear();
+ if (widgets) {Bangle.drawWidgets();}
+ drawClockFace();
+ drawHands();
+};
+
+
+const startTimers = () => {
+ //timer = setInterval(drawAll, 1000);
+ timer = setInterval(drawAll, 1000*20);
+};
+
+Bangle.on('lcdPower', (on) => {
+ if (on) {
+ startTimers();
+ drawAll();
+ } else {
+ if (timer) {
+ clearInterval(timer);
+ }
+ }
+});
+
+g.clear();
+startTimers();
+Bangle.loadWidgets();
+drawAll();
+
+// Show launcher when middle button pressed
+setWatch(Bangle.showLauncher, BTN2, { repeat: false, edge: "falling" });
diff --git a/apps/gallifr/gallifr.png b/apps/gallifr/gallifr.png
new file mode 100644
index 000000000..9bb50e3cd
Binary files /dev/null and b/apps/gallifr/gallifr.png differ
diff --git a/apps/gallifr/settings.js b/apps/gallifr/settings.js
new file mode 100644
index 000000000..feb6b0ffc
--- /dev/null
+++ b/apps/gallifr/settings.js
@@ -0,0 +1,33 @@
+// make sure to enclose the function in parentheses
+(function (back) {
+ let settings = require('Storage').readJSON('gallifr.json',1)||{};
+ let colours = ["green","red","blue","80s"];
+ let onoff = ["on","off"];
+ function save(key, value) {
+ settings[key] = value;
+ require('Storage').writeJSON('gallifr.json',settings);
+ }
+ const appMenu = {
+ '': {'title': 'Clock Settings'},
+ '< Back': back,
+ 'Colour': {
+ value: 0|settings['colour'],
+ min:0,max:3,
+ format: m => colours[m],
+ onchange: m => {save('colour', m)}
+ },
+ 'Widgets': {
+ value: 0|settings['widgets'],
+ min:0,max:1,
+ format: m => onoff[m],
+ onchange: m => {save('widgets', m)}
+ },
+ 'Decoration': {
+ value: 0|settings['decoration'],
+ min:0,max:1,
+ format: m => onoff[m],
+ onchange: m => {save('decoration', m)}
+ }
+ };
+ E.showMenu(appMenu)
+})
diff --git a/apps/gbridge/ChangeLog b/apps/gbridge/ChangeLog
index 28789ec04..8277b3479 100644
--- a/apps/gbridge/ChangeLog
+++ b/apps/gbridge/ChangeLog
@@ -2,3 +2,15 @@
0.02: Increase contrast (darker notification background, white text)
0.03: Gadgetbridge widget now shows connection state
0.04: Tweaks for variable size widget system
+0.05: Show incoming call notification
+ Optimize animation, limit title length
+0.06: Gadgetbridge App 'Connected' state is no longer toggleable
+0.07: Move configuration to settings menu
+0.08: Don't turn on LCD at start of every song
+0.09: Update Bluetooth connection state automatically
+0.10: Make widget play well with other Gadgetbridge widgets/apps
+0.11: Report battery status on connect and at regular intervals
+0.12: Setting to show/hide icon
+0.13: Modified to use the 'notify' library
+0.14: Added 'find' event handling
+0.15: Don't keep LCD on while playing music
\ No newline at end of file
diff --git a/apps/gbridge/PROTOCOL.md b/apps/gbridge/PROTOCOL.md
new file mode 100644
index 000000000..1fd0ddb4a
--- /dev/null
+++ b/apps/gbridge/PROTOCOL.md
@@ -0,0 +1,178 @@
+# Watch -> Phone
+
+## show toast
+
+```
+{ "t": "info", "msg": "message" }
+```
+
+t can be one of "info", "warn", "error"
+
+## report battery level
+
+```
+{ "t": "status", "bat": 30, "volt": 30 }
+```
+
+* bat is in range 0 to 100
+* volt is optional and should be greater than 0
+
+## find phone
+
+```
+{ "t": "findPhone", "n": true }
+```
+
+n is an boolean and toggles the find phone function
+
+## control music player
+
+```
+{ "t": "music", "n": "play" }
+```
+
+n can be one of "play", "pause", "playpause", "next", "previous", "volumeup", "volumedown", "forward", "rewind"
+
+## control phone call
+
+```
+{ "t": "call", "n": "accept"}
+```
+
+n can be one of "accept", "end", "incoming", "outcoming", "reject", "start", "ignore"
+
+## react to notifications
+
+Send a response to a notification from phone
+
+```
+{
+ "t": "notify",
+ "n": "dismiss",
+ "id": 2,
+ "tel": "+491234",
+ "msg": "message",
+}
+```
+
+* n can be one of "dismiss", "dismiss all", "open", "mute", "reply"
+* id, tel and message are optional
+
+# Phone -> Watch
+
+## show notification
+
+```
+{
+ "t": "notify",
+ "id": 2,
+ "src": "app",
+ "title": "titel",
+ "subject": "subject",
+ "body": "message body",
+ "sender": "sender",
+ "tel": "+491234"
+ }
+```
+
+## notification deleted
+
+This event is send when the user skipped a notification
+
+```
+{ "t": "notify-", "id": 2 }
+```
+
+## set alarm
+
+```
+{
+ "t": "alarm",
+ "d": [
+ { "h": 13, "m": 37 },
+ { "h": 8, "m": 0 }
+ ]
+}
+```
+
+## call state changed
+
+```
+{
+ "t": "call",
+ "cmd": "accept",
+ "name": "name",
+ "number": "+491234"
+}
+```
+
+cmd can be one of "", "undefined", "accept", "incoming", "outgoing", "reject", "start", "end"
+
+## music state changed
+
+```
+{
+ "t": "musicstate",
+ "state": "play",
+ "position": 40,
+ "shuffle": 0,
+ "repeat": 1
+}
+```
+
+## set music info
+
+```
+{
+ "t": "musicinfo",
+ "artist": "artist",
+ "album": "album",
+ "track": "track",
+ "dur": 1,
+ "c": 2,
+ "n" 3
+}
+```
+
+* dur is the duration of the track
+* c is the track count
+* n is the track number
+
+## find device
+
+```
+{
+ "t": "find",
+ "n": true
+}
+```
+
+n toggles find device functionality
+
+## set constant vibration
+
+```
+{
+ "t": "vibrate",
+ "n": 2
+}
+```
+
+n is the intensity
+
+## send weather
+
+```
+{
+ "t": "weather",
+ "temp": 10,
+ "hum": 71,
+ "txt": "condition",
+ "wind": 13,
+ "loc": "location"
+}
+```
+
+* hum is the humidity
+* txt is the weather condition
+* loc is the location
diff --git a/apps/gbridge/app.js b/apps/gbridge/app.js
deleted file mode 100644
index 45dc0e33d..000000000
--- a/apps/gbridge/app.js
+++ /dev/null
@@ -1,19 +0,0 @@
-function gb(j) {
- Bluetooth.println(JSON.stringify(j));
-}
-
-var mainmenu = {
- "" : { "title" : "Gadgetbridge" },
- "Connected" : { value : NRF.getSecurityStatus().connected },
- "Find Phone" : function() { E.showMenu(findPhone); },
- "Exit" : ()=> {load();},
-};
-
-var findPhone = {
- "" : { "title" : "-- Find Phone --" },
- "On" : _=>gb({t:"findPhone",n:true}),
- "Off" : _=>gb({t:"findPhone",n:false}),
- "< Back" : function() { E.showMenu(mainmenu); },
-};
-
-E.showMenu(mainmenu);
diff --git a/apps/gbridge/settings.js b/apps/gbridge/settings.js
new file mode 100644
index 000000000..d1ecb594b
--- /dev/null
+++ b/apps/gbridge/settings.js
@@ -0,0 +1,44 @@
+(function(back) {
+ function gb(j) {
+ Bluetooth.println(JSON.stringify(j));
+ }
+ function settings() {
+ let settings = require('Storage').readJSON("gbridge.json", true) || {};
+ if (!("showIcon" in settings)) {
+ settings.showIcon = true;
+ }
+ return settings
+ }
+ function updateSetting(setting, value) {
+ let settings = require('Storage').readJSON("gbridge.json", true) || {};
+ settings[setting] = value
+ require('Storage').write('gbridge.json', settings);
+ }
+ function setIcon(visible) {
+ updateSetting('showIcon', visible);
+ // need to re-layout widgets
+ WIDGETS["gbridgew"].reload();
+ g.clear();
+ Bangle.drawWidgets();
+ }
+ var mainmenu = {
+ "" : { "title" : "Gadgetbridge" },
+ "Connected" : { value : NRF.getSecurityStatus().connected?"Yes":"No" },
+ "Show Icon" : {
+ value: settings().showIcon,
+ format: v => v?"Yes":"No",
+ onchange: setIcon
+ },
+ "Find Phone" : function() { E.showMenu(findPhone); },
+ "< Back" : back,
+ };
+
+ var findPhone = {
+ "" : { "title" : "-- Find Phone --" },
+ "On" : _=>gb({t:"findPhone",n:true}),
+ "Off" : _=>gb({t:"findPhone",n:false}),
+ "< Back" : function() { E.showMenu(mainmenu); },
+ };
+
+ E.showMenu(mainmenu);
+})
diff --git a/apps/gbridge/widget.js b/apps/gbridge/widget.js
index a787d7e0b..b2f169985 100644
--- a/apps/gbridge/widget.js
+++ b/apps/gbridge/widget.js
@@ -1,125 +1,146 @@
-(function() {
- var musicState = "stop";
- var musicInfo = {"artist":"","album":"","track":""};
- var scrollPos = 0;
- function gb(j) {
- Bluetooth.println(JSON.stringify(j));
- }
- function show(size,render) {
- var oldMode = Bangle.getLCDMode();
- Bangle.setLCDMode("direct");
- g.setClipRect(0,240,239,319);
- g.setColor("#222222");
- g.fillRect(1,241,238,318);
- render(320-size);
- g.setColor("#ffffff");
- g.fillRect(0,240,1,319);
- g.fillRect(238,240,239,319);
- g.fillRect(2,318,238,319);
- Bangle.setLCDPower(1); // light up
- Bangle.setLCDMode(oldMode); // clears cliprect
- function anim() {
- scrollPos-=2;
- if (scrollPos<-size) scrollPos=-size;
- Bangle.setLCDOffset(scrollPos);
- if (scrollPos>-size) setTimeout(anim,10);
- }
- anim();
- }
- function hide() {
- function anim() {
- scrollPos+=4;
- if (scrollPos>0) scrollPos=0;
- Bangle.setLCDOffset(scrollPos);
- if (scrollPos<0) setTimeout(anim,10);
- }
- anim();
- }
+(() => {
+ const state = {
+ music: "stop",
- Bangle.on('touch',function() {
- if (scrollPos) hide();
- });
- Bangle.on('swipe',function(dir) {
- if (musicState=="play") {
- gb({t:"music",n:dir>0?"next":"previous"});
- }
- });
- gb({t:"status",bat:E.getBattery()});
+ musicInfo: {
+ artist: "",
+ album: "",
+ track: ""
+ },
- global.GB = function(j) {
- switch (j.t) {
- case "notify":
- show(80,function(y) {
- // TODO: icon based on src?
- var x = 120;
- g.setFontAlign(0,0);
- g.setFont("6x8",1);
- g.setColor("#40d040");
- g.drawString(j.src,x,y+7);
- g.setColor("#ffffff");
- g.setFont("6x8",2);
- g.drawString(j.title,x,y+25);
- g.setFont("6x8",1);
- g.setColor("#ffffff");
- // split text up a word boundaries
- var txt = j.body.split("\n");
- var MAXCHARS = 38;
- for (var i=0;iMAXCHARS) {
- var p = MAXCHARS;
- while (p>MAXCHARS-8 && !" \t-_".includes(l[p]))
- p--;
- if (p==MAXCHARS-8) p=MAXCHARS;
- txt[i] = l.substr(0,p);
- txt.splice(i+1,0,l.substr(p));
- }
- }
- g.setFontAlign(-1,-1);
- g.drawString(txt.join("\n"),10,y+40);
- Bangle.buzz();
- });
- break;
- case "musicinfo":
- musicInfo = j;
- break;
- case "musicstate":
- musicState = j.state;
- if (musicState=="play")
- show(40,function(y) {
- g.setColor("#ffffff");
- g.drawImage( require("heatshrink").decompress(atob("jEYwILI/EAv/8gP/ARcMgOAASN8h+A/kfwP8n4CD/E/gHgjg/HA=")),8,y+8);
- g.setFontAlign(-1,-1);
- g.setFont("6x8",1);
- var x = 40;
- g.setFont("4x6",2);
- g.setColor("#ffffff");
- g.drawString(musicInfo.artist,x,y+8);
- g.setFont("6x8",1);
- g.setColor("#ffffff");
- g.drawString(musicInfo.track,x,y+22);
- });
- if (musicState=="pause")
- hide();
- break;
- }
+ scrollPos: 0
};
-function draw() {
- g.setColor(-1);
- if (NRF.getSecurityStatus().connected)
- g.drawImage(require("heatshrink").decompress(atob("i0WwgHExAABCIwJCBYwJEBYkIBQ2ACgvzCwoECx/z/AKDD4WD+YLBEIYKCx//+cvnAKCBwU/mc4/8/HYv//Ev+Y4EEAePn43DBQkzn4rCEIoABBIwKHO4cjmczK42I6mqlqEEBQeIBQaDED4IgDUhi6KaBbmIA==")),this.x+1,this.y+1);
- else
- g.drawImage(require("heatshrink").decompress(atob("i0WwQFC1WgAgYFDAgIFClQFCwEK1W/AoIPB1f+CAMq1f7/WqwQPB/fq1Gq1/+/4dC/2/CAIaB/YbBAAO///qAoX/B4QbBDQQ7BDQQrBAAWoIIIACIIIVC0ECB4cACAZiBAoRtCAoIDBA")),this.x+1,this.y+1);
-}
-function changed() {
- WIDGETS["gbridgew"].draw();
- g.flip();// turns screen on
-}
-NRF.on('connected',changed);
-NRF.on('disconnected',changed);
+ function settings() {
+ let settings = require('Storage').readJSON("gbridge.json", true) || {};
+ if (!("showIcon" in settings)) {
+ settings.showIcon = true;
+ }
+ return settings
+ }
-WIDGETS["gbridgew"]={area:"tl",width:24,draw:draw};
+ function gbSend(message) {
+ Bluetooth.println("");
+ Bluetooth.println(JSON.stringify(message));
+ }
+ function handleNotificationEvent(event) {
+ require("notify").show(event);
+ Bangle.buzz();
+ }
+
+ function updateMusic(options){
+ if (state.music === "play") {
+ require("notify").show(Object.assign({size:40, render:y => {
+ g.setColor(-1);
+ g.drawImage(require("heatshrink").decompress(atob("jEYwILI/EAv/8gP/ARcMgOAASN8h+A/kfwP8n4CD/E/gHgjg/HA=")), 8, y + 8);
+ g.setFontAlign(-1, -1);
+ var x = 40;
+ g.setFont("4x6", 2).drawString(state.musicInfo.artist, x, y + 8);
+ g.setFont("6x8", 1).drawString(state.musicInfo.track, x, y + 22);
+ }}, options));
+ }
+
+ if (state.music === "pause") {
+ require("notify").hide();
+ }
+ }
+ function handleMusicStateUpdate(event) {
+ if (state.music !== event.state) {
+ state.music = event.state
+ updateMusic({on: true});
+ }
+ }
+ function handleMusicInfoUpdate(event) {
+ state.musicInfo = event;
+ updateMusic({on: false});
+ }
+
+ function handleCallEvent(event) {
+ if (event.cmd === "accept") {
+ require("notify").show({
+ size: 55, title: event.name,
+ body: event.number, icon:require("heatshrink").decompress(atob("jEYwIMJj4CCwACJh4CCCIMOAQMGAQMHAQMDAQMBCIMB4PwgHz/EAn4CBj4CBg4CBgACCAAw="))});
+ Bangle.buzz();
+ }
+ }
+
+ function handleFindEvent(event) {
+ if (state.find) {
+ clearInterval(state.find);
+ delete state.find;
+ }
+ if (event.n)
+ state.find = setInterval(_=>{
+ Bangle.buzz();
+ setTimeout(_=>Bangle.beep(), 1000);
+ },2000);
+ }
+
+ var _GB = global.GB;
+ global.GB = (event) => {
+ switch (event.t) {
+ case "notify":
+ handleNotificationEvent(event);
+ break;
+ case "musicinfo":
+ handleMusicInfoUpdate(event);
+ break;
+ case "musicstate":
+ handleMusicStateUpdate(event);
+ break;
+ case "call":
+ handleCallEvent(event);
+ break;
+ case "find":
+ handleFindEvent(event);
+ break;
+ }
+ if(_GB)setTimeout(_GB,0,event);
+ };
+
+ Bangle.on("swipe", (dir) => {
+ if (state.music === "play") {
+ const command = dir > 0 ? "next" : "previous"
+ gbSend({ t: "music", n: command });
+ }
+ });
+
+ function draw() {
+ g.setColor(-1);
+ if (NRF.getSecurityStatus().connected)
+ g.drawImage(require("heatshrink").decompress(atob("i0WwgHExAABCIwJCBYwJEBYkIBQ2ACgvzCwoECx/z/AKDD4WD+YLBEIYKCx//+cvnAKCBwU/mc4/8/HYv//Ev+Y4EEAePn43DBQkzn4rCEIoABBIwKHO4cjmczK42I6mqlqEEBQeIBQaDED4IgDUhi6KaBbmIA==")), this.x + 1, this.y + 1);
+ else
+ g.drawImage(require("heatshrink").decompress(atob("i0WwQFC1WgAgYFDAgIFClQFCwEK1W/AoIPB1f+CAMq1f7/WqwQPB/fq1Gq1/+/4dC/2/CAIaB/YbBAAO///qAoX/B4QbBDQQ7BDQQrBAAWoIIIACIIIVC0ECB4cACAZiBAoRtCAoIDBA")), this.x + 1, this.y + 1);
+ }
+
+ function changedConnectionState() {
+ WIDGETS["gbridgew"].draw();
+ g.flip(); // turns screen on
+ }
+
+ function reload() {
+ NRF.removeListener("connect", changedConnectionState);
+ NRF.removeListener("disconnect", changedConnectionState);
+ if (settings().showIcon) {
+ WIDGETS["gbridgew"].width = 24;
+ WIDGETS["gbridgew"].draw = draw;
+ NRF.on("connect", changedConnectionState);
+ NRF.on("disconnect", changedConnectionState);
+ } else {
+ WIDGETS["gbridgew"].width = 0;
+ WIDGETS["gbridgew"].draw = ()=>{};
+ }
+ }
+
+ WIDGETS["gbridgew"] = {area: "tl", width: 24, draw: draw, reload: reload};
+ reload();
+
+ function sendBattery() {
+ gbSend({ t: "status", bat: E.getBattery() });
+ }
+
+ NRF.on("connect", () => setTimeout(sendBattery, 2000));
+ setInterval(sendBattery, 10*60*1000);
+ sendBattery();
})();
diff --git a/apps/getup/ChangeLog b/apps/getup/ChangeLog
new file mode 100644
index 000000000..9297fc6c7
--- /dev/null
+++ b/apps/getup/ChangeLog
@@ -0,0 +1 @@
+0.01: First Version
\ No newline at end of file
diff --git a/apps/getup/README.md b/apps/getup/README.md
new file mode 100644
index 000000000..b92bedb7c
--- /dev/null
+++ b/apps/getup/README.md
@@ -0,0 +1,7 @@
+# Get Up
+
+Reminds you to getup every x minutes (default: 20).
+
+Sitting to long is dangerous!
+
+Sit and move time configurable in settings.
diff --git a/apps/getup/app-icon.js b/apps/getup/app-icon.js
new file mode 100644
index 000000000..09010684e
--- /dev/null
+++ b/apps/getup/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwxH+AH4A/AH4A75wACCJugAAguaGBouFGCwuF53NFxem6PX6/R0wwVF4xgJEwOsFoMrlYDB1gwUL55dCFQIvE65hUL54jBRgQvF6JgaRxQpCF4SUC67BV5ouLF40yGAOBF64ANR4vXwJhCR6oABq4ACF5TvDAAOsL4LvS4wuGGBi6DGIYuSAAQvGMJiSC6JdSGAovPGAQAFXSQvDrgrBqwvMGAzqTF4d/F4owLADKQGmQv/F7eAF4UySQQwn0ZcCq0ylkySFYyDMEgvDvQwFAAYvk0aLBqy/CAAaUhSAi+BX4QzCAwJkgF4eAX4gzDSsIvDeIzFlGAhhEF9QAHBwIwvF8IwSF7oxMF8gALSEQwRF/4v/YH4v/GD4usAH4A/AH4ARA="))
diff --git a/apps/getup/app.js b/apps/getup/app.js
new file mode 100644
index 000000000..3a22aa410
--- /dev/null
+++ b/apps/getup/app.js
@@ -0,0 +1,45 @@
+//init settings
+const storage = require("Storage");
+const SETTINGS_FILE = 'getup.settings.json';
+
+function setting(key) {
+ const DEFAULTS = {
+ 'sitTime' : 20,
+ 'moveTime' : 1
+ }
+ if (!settings) {
+ loadSettings();
+ }
+ return (key in settings) ? settings[key] : DEFAULTS[key];
+}
+
+let settings;
+
+function loadSettings() {
+ settings = storage.readJSON(SETTINGS_FILE, 1) || {};
+}
+
+//vibrate, draw move message and start timer for sitting message
+function remind() {
+ Bangle.buzz(1000,1);
+ g.clear();
+ g.setFont("8x12",4);
+ g.setColor(0x03E0);
+ g.drawString("MOVE!", g.getWidth()/2, g.getHeight()/2);
+ setTimeout(print_message,setting("moveTime") * 60000);
+}
+//draw sitting message and start timer for reminder
+function print_message(){
+ g.clear();
+ g.setFont("8x12",2);
+ g.setColor(0xF800);
+ g.drawString("sitting is dangerous!", g.getWidth()/2, g.getHeight()/2);
+ setTimeout(remind,setting("sitTime") * 60000);
+}
+
+//init graphics
+require("Font8x12").add(Graphics);
+g.setFontAlign(0,0);
+g.flip();
+
+print_message();
diff --git a/apps/getup/app.png b/apps/getup/app.png
new file mode 100644
index 000000000..fec421183
Binary files /dev/null and b/apps/getup/app.png differ
diff --git a/apps/getup/settings.js b/apps/getup/settings.js
new file mode 100644
index 000000000..f34262f2a
--- /dev/null
+++ b/apps/getup/settings.js
@@ -0,0 +1,48 @@
+// This file should contain exactly one function, which shows the app's settings
+/**
+ * @param {function} back Use back() to return to settings menu
+ */
+(function(back) {
+ const SETTINGS_FILE = 'getup.settings.json';
+
+ // initialize with default settings...
+ let s = {
+ 'sitTime' : 20,
+ 'moveTime' : 1
+ };
+ // ...and overwrite them with any saved values
+ // This way saved values are preserved if a new version adds more settings
+ const storage = require('Storage');
+ const saved = storage.readJSON(SETTINGS_FILE, 1) || {};
+ for (const key in saved) {
+ s[key] = saved[key];
+ }
+
+ // creates a function to safe a specific setting, e.g. save('color')(1)
+ function save(key) {
+ return function (value) {
+ s[key] = value;
+ storage.write(SETTINGS_FILE, s);
+ };
+ }
+
+ const menu = {
+ '': { 'title': 'Get Up' },
+ '< Back': back,
+ 'Sit time (min)': {
+ value: s.sitTime,
+ min: 0,
+ max: 10000,
+ step: 1,
+ onchange: save('sitTime'),
+ },
+ 'Move time (min)': {
+ value: s.moveTime,
+ min: 0,
+ max: 5000,
+ step: 1,
+ onchange: save('moveTime'),
+ },
+ };
+ E.showMenu(menu);
+});
diff --git a/apps/gpsautotime/widget.js b/apps/gpsautotime/widget.js
new file mode 100644
index 000000000..a1d1b2b08
--- /dev/null
+++ b/apps/gpsautotime/widget.js
@@ -0,0 +1,33 @@
+(() => {
+ var lastTimeSet = 0;
+
+ Bangle.on('GPS',function(fix) {
+ if (fix.fix) {
+ var curTime = fix.time.getTime()/1000;
+ setTime(curTime);
+ lastTimeSet = curTime;
+
+ WIDGETS["gpsAutoTime"].draw(WIDGETS["gpsAutoTime"]);
+ }
+ });
+
+ // add your widget
+ WIDGETS["gpsAutoTime"]={
+ area:"tl", // tl (top left), tr (top right), bl (bottom left), br (bottom right)
+ width: 28, // width of the widget
+ draw: function() {
+ g.reset(); // reset the graphics context to defaults (color/font/etc)
+ g.setFont("6x8");
+ if ((getTime() - lastTimeSet) <= 60) {
+ // time is uptodate
+ g.setColor('#00ff00'); // green
+ }
+ g.drawString("auto", this.x, this.y);
+ g.drawString("time", this.x, this.y+10);
+ }
+ };
+
+ setInterval(function() {
+ WIDGETS["gpsAutoTime"].draw(WIDGETS["gpsAutoTime"]);
+ }, 1*60000); // update every minute
+})()
diff --git a/apps/gpsautotime/widget.png b/apps/gpsautotime/widget.png
new file mode 100644
index 000000000..6f6e23f2f
Binary files /dev/null and b/apps/gpsautotime/widget.png differ
diff --git a/apps/gpsinfo/ChangeLog b/apps/gpsinfo/ChangeLog
index 50d79e72d..90ace259c 100644
--- a/apps/gpsinfo/ChangeLog
+++ b/apps/gpsinfo/ChangeLog
@@ -1 +1,2 @@
0.02: Ensure screen doesn't display garbage at startup
+0.03: Show number of satellites while waiting for fix
\ No newline at end of file
diff --git a/apps/gpsinfo/gps-info.js b/apps/gpsinfo/gps-info.js
index f7daf245a..836e3a71b 100644
--- a/apps/gpsinfo/gps-info.js
+++ b/apps/gpsinfo/gps-info.js
@@ -52,7 +52,11 @@ function onGPS(fix) {
g.setFont("6x8", 2);
g.drawString("Waiting for GPS", 120, 80);
nofix = (nofix+1) % 4;
- g.drawString(".".repeat(nofix) + " ".repeat(4-nofix), 120, 120)
+ g.drawString(".".repeat(nofix) + " ".repeat(4-nofix), 120, 120);
+ // Show number of satellites:
+ g.setFontAlign(0,0);
+ g.setFont("6x8");
+ g.drawString(fix.satellites+" satellites", 120, 100);
}
g.flip();
}
diff --git a/apps/gpsnav/ChangeLog b/apps/gpsnav/ChangeLog
new file mode 100644
index 000000000..d28ad53ac
--- /dev/null
+++ b/apps/gpsnav/ChangeLog
@@ -0,0 +1,4 @@
+0.01: New App!
+0.02: Add SCREENACCESS interface
+0.03: Add Waypoint Editor
+
diff --git a/apps/gpsnav/README.md b/apps/gpsnav/README.md
new file mode 100644
index 000000000..af239b233
--- /dev/null
+++ b/apps/gpsnav/README.md
@@ -0,0 +1,62 @@
+## gpsnav - navigate to waypoints
+
+The app is aimed at small boat navigation although it can also be used to mark the location of your car, bicycle etc and then get directions back to it. Please note that it would be foolish in the extreme to rely on this as your only boat navigation aid!
+
+The app displays direction of travel (course), speed, direction to waypoint (bearing) and distance to waypoint. The screen shot below is before the app has got a GPS fix.
+
+
+
+The large digits are the course and speed. The top of the display is a linear compass which displays the direction of travel when a fix is received and you are moving. The blue text is the name of the current waypoint. NONE means that there is no waypoint set and so bearing and distance will remain at 0. To select a waypoint, press BTN2 (middle) and wait for the blue text to turn white. Then use BTN1 and BTN3 to select a waypoint. The waypoint choice is fixed by pressing BTN2 again. In the screen shot below a waypoint giving the location of Stone Henge has been selected.
+
+
+
+The display shows that Stone Henge is 108.75Km from the location where I made the screenshot and the direction is 255 degrees - approximately west. The display shows that I am currently moving approximately north - albeit slowly!. The position of the blue circle indicates that I need to turn left to get on course to Stone Henge. When the circle and red triangle line up you are on course and course will equal bearing.
+
+### Marking Waypoints
+
+The app lets you mark your current location as follows. There are vacant slots in the waypoint file which can be allocated a location. In the distributed waypoint file these are labelled WP0 to WP4. Select one of these - WP2 is shown below.
+
+
+
+Bearing and distance are both zero as WP1 has currently no GPS location associated with it. To mark the location, press BTN2.
+
+
+
+The app indicates that WP2 is now marked by adding the prefix @ to it's name. The distance should be small as shown in the screen shot as you have just marked your current location.
+
+### Waypoint JSON file
+
+When the app is loaded from the app loader, a file named `waypoints.json` is loaded along with the javascript etc. The file has the following contents:
+
+```
+[
+ {
+ "name":"NONE"
+ },
+ {
+ "name":"No10",
+ "lat":51.5032,
+ "lon":-0.1269
+ },
+ {
+ "name":"Stone",
+ "lat":51.1788,
+ "lon":-1.8260
+ },
+ { "name":"WP0" },
+ { "name":"WP1" },
+ { "name":"WP2" },
+ { "name":"WP3" },
+ { "name":"WP4" }
+]
+```
+
+The file contains the initial NONE waypoint which is useful if you just want to display course and speed. The next two entries are waypoints to No 10 Downing Street and to Stone Henge - obtained from Google Maps. The last five entries are entries which can be *marked*.
+
+You add and delete entries using the Web IDE to load and then save the file from and to watch storage. The app itself does not limit the number of entries although it does load the entire file into RAM which will obviously limit this.
+
+### Waypoint Editor
+
+Clicking on the download icon of gpsnav in the app loader invokes the waypoint editor. The editor downloads and displays the current `waypoints.json` file. Clicking the `Edit` button beside an entry causes the entry to be deleted from the list and displayed in the edit boxes. It can be restored - by clicking the `Add waypoint` button. A new markable entry is created by using the `Add name` button. The edited `waypoints.json` file is uploaded to the Bangle by clicking the `Upload` button.
+
+*Please report bugs etc. by raising an issue [here](https://github.com/jeffmer/JeffsBangleAppsDev). *
\ No newline at end of file
diff --git a/apps/gpsnav/app-icon.js b/apps/gpsnav/app-icon.js
new file mode 100644
index 000000000..890981d5a
--- /dev/null
+++ b/apps/gpsnav/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwhC/AFmACysDC9+IC6szC/8AgUgLwYXBPAgLDAA8kC5MyC5cyogXHmYiDURMkDAMzC4JgBmcyoAXMGANCC4YDBkgXMHwVEC4hQDC5kyF4kjJ4QAMOgMjC4eCohGNMARbCC4ODkilLAAQSBCYJ3EmYVLhAWCCgQaCAAUwCpowCFwYADIRAYHC4wZFRQIAGnAhJXgwAFxAYHwC9JFwiQCFhIZISAQwDX5sCoQTCDYUjUpAAFglElAXDmS9JAAtEoUyC4ckkbvMC4QQBC4YeBC5sEB4IXEkgfBJBkEH4QXCCYMkoQXMHwcIC4ZQCUpYMDC4oiBC5YEDC40AkCRNAAIXBCJ4X2URgAJhAXvCyoA/ACoA="))
\ No newline at end of file
diff --git a/apps/gpsnav/app.js b/apps/gpsnav/app.js
new file mode 100644
index 000000000..1e70b0cd3
--- /dev/null
+++ b/apps/gpsnav/app.js
@@ -0,0 +1,250 @@
+const Yoff = 40;
+var pal2color = new Uint16Array([0x0000,0xffff,0x07ff,0xC618],0,2);
+var buf = Graphics.createArrayBuffer(240,50,2,{msb:true});
+var candraw = true;
+
+function flip(b,y) {
+ g.drawImage({width:240,height:50,bpp:2,buffer:b.buffer, palette:pal2color},0,y);
+ b.clear();
+}
+
+var brg=0;
+var wpindex=0;
+const labels = ["N","NE","E","SE","S","SW","W","NW"];
+
+function drawCompass(course) {
+ if (!candraw) return;
+ buf.setColor(1);
+ buf.setFont("Vector",16);
+ var start = course-90;
+ if (start<0) start+=360;
+ buf.fillRect(28,45,212,49);
+ var xpos = 30;
+ var frag = 15 - start%15;
+ if (frag<15) xpos+=frag; else frag = 0;
+ for (var i=frag;i<=180-frag;i+=15){
+ var res = start + i;
+ if (res%90==0) {
+ buf.drawString(labels[Math.floor(res/45)%8],xpos-8,0);
+ buf.fillRect(xpos-2,25,xpos+2,45);
+ } else if (res%45==0) {
+ buf.drawString(labels[Math.floor(res/45)%8],xpos-12,0);
+ buf.fillRect(xpos-2,30,xpos+2,45);
+ } else if (res%15==0) {
+ buf.fillRect(xpos,35,xpos+1,45);
+ }
+ xpos+=15;
+ }
+ if (wpindex!=0) {
+ var bpos = brg - course;
+ if (bpos>180) bpos -=360;
+ if (bpos<-180) bpos +=360;
+ bpos+=120;
+ if (bpos<30) bpos = 14;
+ if (bpos>210) bpos = 226;
+ buf.setColor(2);
+ buf.fillCircle(bpos,40,8);
+ }
+ flip(buf,Yoff);
+}
+
+//displayed heading
+var heading = 0;
+function newHeading(m,h){
+ var s = Math.abs(m - h);
+ var delta = 1;
+ if (s<2) return h;
+ if (m > h){
+ if (s >= 180) { delta = -1; s = 360 - s;}
+ } else if (m <= h){
+ if (s < 180) delta = -1;
+ else s = 360 -s;
+ }
+ delta = delta * (1 + Math.round(s/15));
+ heading+=delta;
+ if (heading<0) heading += 360;
+ if (heading>360) heading -= 360;
+ return heading;
+}
+
+var course =0;
+var speed = 0;
+var satellites = 0;
+var wp;
+var dist=0;
+
+function radians(a) {
+ return a*Math.PI/180;
+}
+
+function degrees(a) {
+ var d = a*180/Math.PI;
+ return (d+360)%360;
+}
+
+function bearing(a,b){
+ var delta = radians(b.lon-a.lon);
+ var alat = radians(a.lat);
+ var blat = radians(b.lat);
+ var y = Math.sin(delta) * Math.cos(blat);
+ var x = Math.cos(alat)*Math.sin(blat) -
+ Math.sin(alat)*Math.cos(blat)*Math.cos(delta);
+ return Math.round(degrees(Math.atan2(y, x)));
+}
+
+function distance(a,b){
+ var x = radians(a.lon-b.lon) * Math.cos(radians((a.lat+b.lat)/2));
+ var y = radians(b.lat-a.lat);
+ return Math.round(Math.sqrt(x*x + y*y) * 6371000);
+}
+
+var selected = false;
+
+function drawN(){
+ buf.setColor(1);
+ buf.setFont("6x8",2);
+ buf.drawString("o",100,0);
+ buf.setFont("6x8",1);
+ buf.drawString("kph",220,40);
+ buf.setFont("Vector",40);
+ var cs = course.toString();
+ cs = course<10?"00"+cs : course<100 ?"0"+cs : cs;
+ buf.drawString(cs,10,0);
+ var txt = (speed<10) ? speed.toFixed(1) : Math.round(speed);
+ buf.drawString(txt,140,4);
+ flip(buf,Yoff+70);
+ buf.setColor(1);
+ buf.setFont("Vector",20);
+ var bs = brg.toString();
+ bs = brg<10?"00"+bs : brg<100 ?"0"+bs : bs;
+ buf.setColor(3);
+ buf.drawString("Brg: ",0,0);
+ buf.drawString("Dist: ",0,30);
+ buf.setColor(selected?1:2);
+ buf.drawString(wp.name,140,0);
+ buf.setColor(1);
+ buf.drawString(bs,60,0);
+ if (dist<1000)
+ buf.drawString(dist.toString()+"m",60,30);
+ else
+ buf.drawString((dist/1000).toFixed(2)+"Km",60,30);
+ flip(buf,Yoff+130);
+ g.setFont("6x8",1);
+ g.setColor(0,0,0);
+ g.fillRect(10,230,60,239);
+ g.setColor(1,1,1);
+ g.drawString("Sats " + satellites.toString(),10,230);
+}
+
+var savedfix;
+
+function onGPS(fix) {
+ savedfix = fix;
+ if (fix!==undefined){
+ course = isNaN(fix.course) ? course : Math.round(fix.course);
+ speed = isNaN(fix.speed) ? speed : fix.speed;
+ satellites = fix.satellites;
+ }
+ if (candraw) {
+ if (fix!==undefined && fix.fix==1){
+ dist = distance(fix,wp);
+ if (isNaN(dist)) dist = 0;
+ brg = bearing(fix,wp);
+ if (isNaN(brg)) brg = 0;
+ }
+ drawN();
+ }
+}
+
+var intervalRef;
+
+function stopdraw() {
+ candraw=false;
+ if(intervalRef) {clearInterval(intervalRef);}
+}
+
+function startTimers() {
+ candraw=true;
+ intervalRefSec = setInterval(function() {
+ newHeading(course,heading);
+ if (course!=heading) drawCompass(heading);
+ },200);
+}
+
+function drawAll(){
+ g.setColor(1,0.5,0.5);
+ g.fillPoly([120,Yoff+50,110,Yoff+70,130,Yoff+70]);
+ g.setColor(1,1,1);
+ drawN();
+ drawCompass(heading);
+}
+
+function startdraw(){
+ g.clear();
+ Bangle.drawWidgets();
+ startTimers();
+ drawAll();
+}
+
+function setButtons(){
+ setWatch(nextwp.bind(null,-1), BTN1, {repeat:true,edge:"falling"});
+ setWatch(doselect, BTN2, {repeat:true,edge:"falling"});
+ setWatch(nextwp.bind(null,1), BTN3, {repeat:true,edge:"falling"});
+}
+
+var SCREENACCESS = {
+ withApp:true,
+ request:function(){
+ this.withApp=false;
+ stopdraw();
+ clearWatch();
+ },
+ release:function(){
+ this.withApp=true;
+ startdraw();
+ setButtons();
+ }
+}
+
+Bangle.on('lcdPower',function(on) {
+ if (!SCREENACCESS.withApp) return;
+ if (on) {
+ startdraw();
+ } else {
+ stopdraw();
+ }
+});
+
+var waypoints = require("Storage").readJSON("waypoints.json")||[{name:"NONE"}];
+wp=waypoints[0];
+
+function nextwp(inc){
+ if (!selected) return;
+ wpindex+=inc;
+ if (wpindex>=waypoints.length) wpindex=0;
+ if (wpindex<0) wpindex = waypoints.length-1;
+ wp = waypoints[wpindex];
+ drawN();
+}
+
+function doselect(){
+ if (selected && waypoints[wpindex].lat===undefined && savedfix.fix) {
+ waypoints[wpindex] ={name:"@"+wp.name, lat:savedfix.lat, lon:savedfix.lon};
+ wp = waypoints[wpindex];
+ require("Storage").writeJSON("waypoints.json", waypoints);
+ }
+ selected=!selected;
+ drawN();
+}
+
+g.clear();
+Bangle.setLCDBrightness(1);
+Bangle.loadWidgets();
+Bangle.drawWidgets();
+// load widgets can turn off GPS
+Bangle.setGPSPower(1);
+drawAll();
+startTimers();
+Bangle.on('GPS', onGPS);
+// Toggle selected
+setButtons();
diff --git a/apps/gpsnav/first_screen.jpg b/apps/gpsnav/first_screen.jpg
new file mode 100644
index 000000000..34fbe1b50
Binary files /dev/null and b/apps/gpsnav/first_screen.jpg differ
diff --git a/apps/gpsnav/gpsnav.jpg b/apps/gpsnav/gpsnav.jpg
new file mode 100644
index 000000000..975fe3903
Binary files /dev/null and b/apps/gpsnav/gpsnav.jpg differ
diff --git a/apps/gpsnav/icon.png b/apps/gpsnav/icon.png
new file mode 100644
index 000000000..f899683d1
Binary files /dev/null and b/apps/gpsnav/icon.png differ
diff --git a/apps/gpsnav/marked_screen.jpg b/apps/gpsnav/marked_screen.jpg
new file mode 100644
index 000000000..accd3b15f
Binary files /dev/null and b/apps/gpsnav/marked_screen.jpg differ
diff --git a/apps/gpsnav/select_screen.jpg b/apps/gpsnav/select_screen.jpg
new file mode 100644
index 000000000..8e42411b0
Binary files /dev/null and b/apps/gpsnav/select_screen.jpg differ
diff --git a/apps/gpsnav/waypoint_screen.jpg b/apps/gpsnav/waypoint_screen.jpg
new file mode 100644
index 000000000..f4c946ee6
Binary files /dev/null and b/apps/gpsnav/waypoint_screen.jpg differ
diff --git a/apps/gpsnav/waypoints.html b/apps/gpsnav/waypoints.html
new file mode 100644
index 000000000..483b933f4
--- /dev/null
+++ b/apps/gpsnav/waypoints.html
@@ -0,0 +1,170 @@
+
+
+
+
+
+
+
+
List of waypoints
+
+
+
+
Name
+
Lat.
+
Long.
+
Actions
+
+
+
+
+
+
+
+
Add a new waypoint
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/apps/gpsnav/waypoints.json b/apps/gpsnav/waypoints.json
new file mode 100644
index 000000000..98a670c0d
--- /dev/null
+++ b/apps/gpsnav/waypoints.json
@@ -0,0 +1,20 @@
+[
+ {
+ "name":"NONE"
+ },
+ {
+ "name":"No10",
+ "lat":51.5032,
+ "lon":-0.1269
+ },
+ {
+ "name":"Stone",
+ "lat":51.1788,
+ "lon":-1.8260
+ },
+ { "name":"WP0" },
+ { "name":"WP1" },
+ { "name":"WP2" },
+ { "name":"WP3" },
+ { "name":"WP4" }
+]
\ No newline at end of file
diff --git a/apps/gpspoilog/ChangeLog b/apps/gpspoilog/ChangeLog
new file mode 100644
index 000000000..5560f00bc
--- /dev/null
+++ b/apps/gpspoilog/ChangeLog
@@ -0,0 +1 @@
+0.01: New App!
diff --git a/apps/gpspoilog/app-icon.js b/apps/gpspoilog/app-icon.js
new file mode 100644
index 000000000..89f8d1bd7
--- /dev/null
+++ b/apps/gpspoilog/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwxH+AH4A/AEeGAAwttGMotLGMItPGLwuTGDQuVGDIfHq9RAAgvfDw+AFwtRq4weFZYAIwAvYJIguPSowvavl8F8qpFF6wwSF44AFvl9vo3GF8l80+t1unGAovkvovDvovrAAQvqR4IACR9TviGAovHABIuXF/4vgGAmAFx+AFzDxGACYvVGDAuWF+AwWFzAvwGCguaGCYucF+AwQFzwvwGBwugGBouiF+AwKF0gwJF0wwHF1AvwGAguqGAYusAH4A/AFI="))
diff --git a/apps/gpspoilog/app.js b/apps/gpspoilog/app.js
new file mode 100644
index 000000000..2da0c0e7e
--- /dev/null
+++ b/apps/gpspoilog/app.js
@@ -0,0 +1,67 @@
+var menuItems = {
+ "":{title:"GPS POI Log"},
+ " ":{value:"No Fix"},
+ "Tree" : ()=>addItem("Tree"),
+ "Gate" : ()=>addItem("Gate"),
+ "Flower" : ()=>addItem("Flower"),
+ "Plant" : ()=>addItem("Plant"),
+ "Bus Stop" : ()=>addItem("Bus Stop"),
+ "Pub" : ()=>addItem("Pub")
+};
+
+var menu = E.showMenu(menuItems);
+var gps = { fix : 0};
+var gpsCount = 0;
+var file = require("Storage").open("gpspoilog.csv","a");
+
+function setStatus(msg) {
+ menuItems[" "].value = msg;
+ menu.draw();
+}
+
+Bangle.on('GPS',function(g) {
+ gps = g;
+ gpsCount++;
+ var msg;
+ if (g.fix) {
+ msg = g.satellites + " Satellites";
+ } else {
+ msg = "No Fix";
+ }
+ setStatus(msg+" "+"-\\|/"[gpsCount&3]);
+});
+
+
+function addItem(name) {
+ if (!gps.fix) {
+ setStatus("Ignored - no fix");
+ return; // don't do anything as no fix
+ }
+ // The fields we want to put in out CSV file
+ var csv = [
+ 0|getTime(), // Time to the nearest second
+ gps.lat,
+ gps.lon,
+ gps.alt,
+ name
+ ];
+ // Write data here
+ file.write(csv.join(",")+"\n");
+ setStatus("Written");
+}
+
+
+Bangle.loadWidgets();
+Bangle.drawWidgets();
+Bangle.setGPSPower(1);
+
+
+
+function getData(callback) {
+ var f = require("Storage").open("gpspoilog.csv","r");
+ var l = f.readLine();
+ while (l!==undefined) {
+ callback(l);
+ l = f.readLine();
+ }
+}
diff --git a/apps/gpspoilog/app.png b/apps/gpspoilog/app.png
new file mode 100644
index 000000000..b323bb283
Binary files /dev/null and b/apps/gpspoilog/app.png differ
diff --git a/apps/gpspoilog/interface.html b/apps/gpspoilog/interface.html
new file mode 100644
index 000000000..ef3cc7688
--- /dev/null
+++ b/apps/gpspoilog/interface.html
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/gpsrec/ChangeLog b/apps/gpsrec/ChangeLog
index 9a47bdd9a..8e4a8931c 100644
--- a/apps/gpsrec/ChangeLog
+++ b/apps/gpsrec/ChangeLog
@@ -4,3 +4,11 @@
0.04: Properly Fix GPS time display in gpsrec app
0.05: Tweaks for variable size widget system
0.06: Ensure widget update itself (fix #118) and change to using icons
+0.07: Added @jeffmer's awesome track viewer
+0.08: Don't overwrite existing settings on app update
+ Clean up recorded tracks on app removal
+0.09: Change default GPS period to 10 (1 is overkill for most uses and makes things slow)
+ Added RAM keyword to functions & other tweaks to speed up rendering
+ Going 'back' from track view now doesn't load again
+0.10: Can now graph altitude & speed
+0.11: Ensure we don't turn GPS off if it was previously on (eg from another app/widget)
diff --git a/apps/gpsrec/app-settings.json b/apps/gpsrec/app-settings.json
index 7e1c8ee72..4265e46ec 100644
--- a/apps/gpsrec/app-settings.json
+++ b/apps/gpsrec/app-settings.json
@@ -1,5 +1,5 @@
{
"recording":false,
"file":0,
- "period":1
+ "period":10
}
diff --git a/apps/gpsrec/app.js b/apps/gpsrec/app.js
index 58b4295a6..10aa0ebbf 100644
--- a/apps/gpsrec/app.js
+++ b/apps/gpsrec/app.js
@@ -60,7 +60,7 @@ function viewTracks() {
for (var n=0;n<36;n++) {
var f = require("Storage").open(getFN(n),"r");
if (f.readLine()!==undefined) {
- menu["Track "+n] = viewTrack.bind(null,n);
+ menu["Track "+n] = viewTrack.bind(null,n,false);
found = true;
}
}
@@ -70,27 +70,74 @@ function viewTracks() {
return E.showMenu(menu);
}
-function viewTrack(n) {
+function getTrackInfo(fn) {
+ "ram"
+ var filename = getFN(fn);
+ var minLat = 90;
+ var maxLat = -90;
+ var minLong = 180;
+ var maxLong = -180;
+ var starttime, duration=0;
+ var f = require("Storage").open(filename,"r");
+ if (f===undefined) return;
+ var l = f.readLine(f);
+ var nl = 0, c, n;
+ if (l!==undefined) {
+ c = l.split(",");
+ starttime = parseInt(c[0]);
+ }
+ // pushed this loop together to try and bump loading speed a little
+ while(l!==undefined) {
+ ++nl;c=l.split(",");
+ n = +c[1];if(n>maxLat)maxLat=n;if(nmaxLong)maxLong=n;if(nylen ? 200/xlen : 200/ylen;
+ return {
+ fn : fn,
+ filename : filename,
+ time : new Date(starttime),
+ records : nl,
+ minLat : minLat, maxLat : maxLat,
+ minLong : minLong, maxLong : maxLong,
+ lfactor : lfactor,
+ scale : scale,
+ duration : Math.round(duration/1000)
+ };
+}
+
+function asTime(v){
+ var mins = Math.floor(v/60);
+ var secs = v-mins*60;
+ return ""+mins.toString()+"m "+secs.toString()+"s";
+}
+
+function viewTrack(n, info) {
+ if (!info) {
+ E.showMessage("Loading...","GPS Track "+n);
+ info = getTrackInfo(n);
+ }
const menu = {
'': { 'title': 'GPS Track '+n }
};
- var trackCount = 0;
- var trackTime;
- var f = require("Storage").open(getFN(n),"r");
- var l = f.readLine();
- if (l!==undefined) {
- var c = l.split(",");
- trackTime = new Date(parseInt(c[0]));
- }
- while (l!==undefined) {
- trackCount++;
- // TODO: min/max/length of track?
- l = f.readLine();
- }
- if (trackTime)
- menu[" "+trackTime.toISOString().substr(0,16).replace("T"," ")] = function(){};
- menu[trackCount+" records"] = function(){};
- // TODO: option to draw it? Just scan through, project using min/max
+ if (info.time)
+ menu[info.time.toISOString().substr(0,16).replace("T"," ")] = function(){};
+ menu["Duration"] = { value : asTime(info.duration)};
+ menu["Records"] = { value : ""+info.records };
+ menu['Plot Map'] = function() {
+ plotTrack(info);
+ };
+ menu['Plot Alt.'] = function() {
+ plotGraph(info, "altitude");
+ };
+ menu['Plot Speed'] = function() {
+ plotGraph(info, "speed");
+ };
menu['Erase'] = function() {
E.showPrompt("Delete Track?").then(function(v) {
if (v) {
@@ -100,11 +147,164 @@ function viewTrack(n) {
f.erase();
viewTracks();
} else
- viewTrack(n);
+ viewTrack(n, info);
});
};
menu['< Back'] = viewTracks;
return E.showMenu(menu);
}
+function plotTrack(info) {
+ "ram"
+
+ function radians(a) {
+ return a*Math.PI/180;
+ }
+
+ function distance(lat1,long1,lat2,long2){
+ var x = radians(long1-long2) * Math.cos(radians((lat1+lat2)/2));
+ var y = radians(lat2-lat1);
+ return Math.sqrt(x*x + y*y) * 6371000;
+ }
+
+ E.showMenu(); // remove menu
+ g.setColor(1,0.5,0.5);
+ g.setFont("Vector",16);
+ g.fillRect(9,80,11,120);
+ g.fillPoly([9,60,19,80,0,80]);
+ g.setColor(1,1,1);
+ g.drawString("N",2,40);
+ g.drawString("Track"+info.fn.toString()+" - Loading",10,220);
+ g.setColor(0,0,0);
+ g.fillRect(0,220,239,239);
+ g.setColor(1,1,1);
+ g.drawString(asTime(info.duration),10,220);
+ var f = require("Storage").open(info.filename,"r");
+ if (f===undefined) return;
+ var l = f.readLine(f);
+ var ox=0;
+ var oy=0;
+ var olat,olong,dist=0;
+ var i=0;
+ var c = l.split(",");
+ var lat = +c[1];
+ var long = +c[2];
+ var x = 30 + Math.round((long-info.minLong)*info.lfactor*info.scale);
+ var y = 210 - Math.round((lat - info.minLat)*info.scale);
+ g.moveTo(x,y);
+ g.setColor(0,1,0);
+ g.fillCircle(x,y,5);
+ g.setColor(1,1,1);
+ l = f.readLine(f);
+ while(l!==undefined) {
+ c = l.split(",");
+ lat = +c[1];
+ long = +c[2];
+ x = 30 + Math.round((long-info.minLong)*info.lfactor*info.scale);
+ y = 210 - Math.round((lat - info.minLat)*info.scale);
+ g.lineTo(x,y);
+ var d = distance(olat,olong,lat,long);
+ if (!isNaN(d)) dist+=d;
+ olat = lat;
+ olong = long;
+ ox = x;
+ oy = y;
+ l = f.readLine(f);
+ }
+ g.setColor(1,0,0);
+ g.fillCircle(ox,oy,5);
+ g.setColor(1,1,1);
+ g.drawString(require("locale").distance(dist),120,220);
+ g.setFont("6x8",2);
+ g.setFontAlign(0,0,3);
+ g.drawString("Back",230,200);
+ setWatch(function() {
+ viewTrack(info.fn, info);
+ }, BTN3);
+ g.flip();
+}
+
+function plotGraph(info, style) {
+ "ram"
+ E.showMenu(); // remove menu
+ E.showMessage("Calculating...","GPS Track "+info.fn);
+ var filename = getFN(info.fn);
+ var infn = new Float32Array(200);
+ var infc = new Uint16Array(200);
+ 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;
+ var l = f.readLine(f);
+ var nl = 0, c, i;
+ if (l!==undefined) {
+ c = l.split(",");
+ strt = c[0]/1000;
+ }
+ if (style=="altitude") {
+ title = "Altitude (m)";
+ while(l!==undefined) {
+ ++nl;c=l.split(",");
+ i = Math.round(200*(c[0]/1000 - strt)/dur);
+ infn[i]+=+c[3];
+ infc[i]++;
+ l = f.readLine(f);
+ }
+ } else if (style=="speed") {
+ title = "Speed (m/s)";
+ var p,lp = Bangle.project({lat:c[1],lon:c[2]});
+ var t,dx,dy,d,lt = c[0]/1000;
+ while(l!==undefined) {
+ ++nl;c=l.split(",");
+ i = Math.round(200*(c[0]/1000 - strt)/dur);
+ t = c[0]/1000;
+ p = Bangle.project({lat:c[1],lon:c[2]});
+ dx = p.x-lp.x;
+ dy = p.y-lp.y;
+ d = Math.sqrt(dx*dx+dy*dy);
+ if (t!=lt) {
+ infn[i]+=d / (t-lt); // speed
+ infc[i]++;
+ }
+ lp = p;
+ lt = t;
+ l = f.readLine(f);
+ }
+ } else throw new Error("Unknown type");
+ var min=100000,max=-100000;
+ for (var i=0;i0) infn[i]/=infc[i];
+ var n = infn[i];
+ if (n>max) max=n;
+ if (n 8) {
+ grid*=2;
+ }
+ // draw
+ g.clear(1).setFont("6x8",1);
+ var r = require("graph").drawLine(g, infn, {
+ x:4,y:0,
+ width: g.getWidth()-24,
+ height: g.getHeight()-8,
+ axes : true,
+ gridy : grid,
+ gridx : 50,
+ title: title,
+ xlabel : x=>Math.round(x*dur/(60*infn.length))+" min" // minutes
+ });
+ g.setFont("6x8",2);
+ g.setFontAlign(0,0,3);
+ g.drawString("Back",230,200);
+ setWatch(function() {
+ viewTrack(info.fn, info);
+ }, BTN3);
+ g.flip();
+}
+
showMainMenu();
diff --git a/apps/gpsrec/interface.html b/apps/gpsrec/interface.html
index b87d75b3c..bc8dc48e1 100644
--- a/apps/gpsrec/interface.html
+++ b/apps/gpsrec/interface.html
@@ -5,32 +5,9 @@
-
+
+## Features
+
+- add / substract / divide / multiply
+- handles floats
+- basic memory button
+
+## Controls
+
+- UP: BTN1
+- DOWN: BTN3
+- LEFT: BTN4
+- RIGHT: BTN5
+- SELECT: BTN2
+
+## Creator
+
+