If ok, Click
+ @@ -195,21 +196,12 @@ Bangle.on('mag', function(m) { Bangle.setCompassPower(1); Bangle.setGPSPower(1); g.clear();`; - var json = JSON.stringify({ - name:"Beer Compass", - icon:"*beer", - src:"-beer" -}); var icon = `require("heatshrink").decompress(atob("mEwghC/AB0O/4AG8AXNgYXHmAXl94XH+AXNn4XH/wXW+YX/C6oWHAAIXN7sz9vdAAoXN9sznvuAAXf/vuC53jC4Xd7wXQ93jn3u9vv9vt7wXT/4tBAgIXQ7wvCC4PgC5sO6czIQJfBC6PumaPDC6wwCC50NYAJcBVgIDBCxrAFbgYXP7yoDF6TADL4YXPVAIXCRyAXC7wXW9zwBC6cNC9zABC4gWQC653CR4fQC6x3TF6gXXI4M9d6wAEC9EN73dAAZfQgczAAkwC/4XXAH4"))`; - - window.postMessage({ - id : "beer", - + sendCustomizedApp({ storage:[ - {name:"-beer", content:app}, - {name:"+beer", content:json}, - {name:"*beer", content:icon, evaluate:true}, + {name:"beer.app.js", content:app}, + {name:"beer.img", content:icon, evaluate:true}, ] }); }); diff --git a/apps/berlinc/berlin-clock.json b/apps/berlinc/berlin-clock.json deleted file mode 100644 index 7c0d6e411..000000000 --- a/apps/berlinc/berlin-clock.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name":"Berlin Clock", - "type":"clock", - "icon":"*berlinc", - "src":"-berlinc" -} diff --git a/apps/blescan/blescan.json b/apps/blescan/blescan.json deleted file mode 100644 index d9e7f28f1..000000000 --- a/apps/blescan/blescan.json +++ /dev/null @@ -1,7 +0,0 @@ - -{ - "name": "BLE Scanner", - "type":"app", - "icon": "*blescan", - "src": "-blescan" -} diff --git a/apps/blobclk/clock-blob.json b/apps/blobclk/clock-blob.json deleted file mode 100644 index b548acd80..000000000 --- a/apps/blobclk/clock-blob.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name":"Large Clock", - "type":"clock", - "icon":"*blobclk", - "src":"-blobclk", - "sortorder":-10 -} diff --git a/apps/boldclk/bold_clock.json b/apps/boldclk/bold_clock.json deleted file mode 100644 index 45ceede6b..000000000 --- a/apps/boldclk/bold_clock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name":"Bold Clock", - "type":"clock", - "icon":"*boldclk", - "src":"-boldclk", - "sortorder":-10 -} \ No newline at end of file diff --git a/apps/boot/ChangeLog b/apps/boot/ChangeLog index e1bb12a32..7ab79a5a5 100644 --- a/apps/boot/ChangeLog +++ b/apps/boot/ChangeLog @@ -1,2 +1,15 @@ 0.02: Attempt to reset state of the interpreter better before loading an app 0.03: Fix issue switching clockfaces via menu +0.04: Add alarm functionality +0.05: Add Welcome screen on boot +0.06: Disable GPS time log messages, add (default=1) setting to hide log messages +0.07: Fix issues with alarm scheduling +0.08: Fix issues if BLE=off, 'Make Connectable' is chosen, and the loader resets Bangle.js (fix #108) +0.09: Only check GPS for time after a fresh boot +0.10: Stop users calling save() (fix #125) + If Debug info is set to 'show' don't move to Terminal if connected! +0.11: Added vibrate as beep workaround +0.12: Add an event on BTN2 to open launcher when no clock detected (fix #147) +0.13: Now automatically load *.boot.js at startup + Move alarm code into alarm.boot.js +0.14: Move welcome loaders to *.boot.js diff --git a/apps/boot/boot0.js b/apps/boot/boot0.js index 9f34f1b15..dd3b3a9ba 100644 --- a/apps/boot/boot0.js +++ b/apps/boot/boot0.js @@ -1,40 +1,45 @@ // This ALWAYS runs at boot E.setFlags({pretokenise:1}); -// All of this is just shim for older Bangles -if (!Bangle.loadWidgets) { - Bangle.loadWidgets = function(){ - global.WIDGETPOS={tl:32,tr:g.getWidth()-32,bl:32,br:g.getWidth()-32}; - global.WIDGETS={}; - require("Storage").list().filter(a=>a[0]=='=').forEach(widget=>eval(require("Storage").read(widget))); - }; - Bangle.drawWidgets = function(){ - for(var w of WIDGETS)w.draw() - }; - Bangle.showLauncher = function(){ - var l = require("Storage").list().filter(a=>a[0]=='+').map(app=>{ - try { return require("Storage").readJSON(app); } catch (e) {} - }).find(app=>app.type=="launch"); - if (l) load(l.src); - else E.showMessage("Launcher\nnot found"); - }; - var _load = load; - global.load = function(x) { - if (!x) _load(x); - else setTimeout(function(){ - // attempt to remove any currently-running code - delete Bangle.buzz; - delete Bangle.beep; - Bangle.setLCDOffset&&Bangle.setLCDOffset(0); - Bangle.setLCDMode("direct"); - g.clear(); - clearInterval(); - clearWatch(); - Bangle.removeAllListeners(); - NRF.removeAllListeners(); - Bluetooth.removeAllListeners(); - E.removeAllListeners(); - for (var i in global) if (i!="g") delete global[i]; - setTimeout('eval(require("Storage").read("'+x+'"));',20); - },20); +// Load settings... +var s = require('Storage').readJSON('setting.json',1)||{}; +if (s.ble!==false) { + if (s.HID) { // Human interface device + Bangle.HID = E.toUint8Array(atob("BQEJBqEBhQIFBxngKecVACUBdQGVCIEClQF1CIEBlQV1AQUIGQEpBZEClQF1A5EBlQZ1CBUAJXMFBxkAKXOBAAkFFQAm/wB1CJUCsQLABQwJAaEBhQEVACUBdQGVAQm1gQIJtoECCbeBAgm4gQIJzYECCeKBAgnpgQIJ6oECwA==")); + NRF.setServices({}, {uart:true, hid:Bangle.HID}); } } +if (s.blerepl===false) { // If not programmable, force terminal off Bluetooth + if (s.log) Terminal.setConsole(true); // if showing debug, force REPL onto terminal + else E.setConsole(null,{force:true}); // on new (2v05+) firmware we have E.setConsole which allows a 'null' console +} else { + if (s.log && !NRF.getSecurityStatus().connected) Terminal.setConsole(); // if showing debug, put REPL on terminal (until connection) + else Bluetooth.setConsole(true); // else if no debug, force REPL to Bluetooth +} +// we just reset, so BLE should be on. +// Don't disconnect if something is already connected to us +if (s.ble===false && !NRF.getSecurityStatus().connected) NRF.sleep(); +// Set time, vibrate, beep, etc +if (!s.vibrate) Bangle.buzz=Promise.resolve; +if (s.beep===false) Bangle.beep=Promise.resolve; +else if (s.beep=="vib") Bangle.beep = function (time, freq) { + return new Promise(function(resolve) { + if ((0|freq)<=0) freq=4000; + if ((0|time)<=0) time=200; + if (time>5000) time=5000; + analogWrite(D13,0.1,{freq:freq}); + setTimeout(function() { + digitalWrite(D13,0); + resolve(); + }, time); + }); +}; +Bangle.setLCDTimeout(s.timeout); +if (!s.timeout) Bangle.setLCDPower(1); +E.setTimeZone(s.timezone); +delete s; +// stop users doing bad things! +global.save = function() { throw new Error("You can't use save() on Bangle.js without overwriting the bootloader!"); } +// Load *.boot.js files +require('Storage').list(/\.boot\.js/).map(bootFile=>{ + eval(require('Storage').read(bootFile)); +}); diff --git a/apps/boot/bootloader.js b/apps/boot/bootloader.js index e73e9c955..c16984f10 100644 --- a/apps/boot/bootloader.js +++ b/apps/boot/bootloader.js @@ -1,22 +1,38 @@ // This runs after a 'fresh' boot -var settings; -try { - settings = require("Storage").readJSON('@setting'); -} catch (e) { - settings = {} -} +var settings=require("Storage").readJSON('setting.json',1)||{}; // load clock if specified var clockApp = settings.clock; if (clockApp) clockApp = require("Storage").read(clockApp) if (!clockApp) { - var clockApps = require("Storage").list().filter(a=>a[0]=='+').map(app=>{ - try { return require("Storage").readJSON(app); } - catch (e) {} - }).filter(app=>app.type=="clock").sort((a, b) => a.sortorder - b.sortorder); + var clockApps = require("Storage").list(/\.info$/).map(app=>require("Storage").readJSON(app,1)||{}).filter(app=>app.type=="clock").sort((a, b) => a.sortorder - b.sortorder); if (clockApps && clockApps.length > 0) clockApp = require("Storage").read(clockApps[0].src); delete clockApps; } -if (clockApp) eval(clockApp); -else E.showMessage("No Clock Found"); -delete clockApp; +if (!clockApp) clockApp=`E.showMessage("No Clock Found"); +setWatch(() => { + Bangle.showLauncher(); +}, BTN2, {repeat:false,edge:"falling"});) +`; +delete settings; +// check to see if our clock is wrong - if it is use GPS time +if ((new Date()).getFullYear()==1970) { + E.showMessage("Searching for\nGPS time"); + Bangle.on('GPS',function cb(g) { + Bangle.setGPSPower(0); + Bangle.removeListener("GPS",cb); + if (!g.time || (g.time.getFullYear()<2000) || + (g.time.getFullYear()==2250)) { + // GPS receiver's time not set - just boot clock anyway + eval(clockApp);delete clockApp; + return; + } + // We have a GPS time. Set time and reboot (to load alarms properly) + setTime(g.time.getTime()/1000); + load(); + }); + Bangle.setGPSPower(1); +} else { + eval(clockApp); + delete clockApp; +} diff --git a/apps/boot/bootloader.json b/apps/boot/bootloader.json deleted file mode 100644 index dc568a319..000000000 --- a/apps/boot/bootloader.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "name":"Bootloader","type":"boot" -} 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/clck3x2/ChangeLog b/apps/clck3x2/ChangeLog deleted file mode 100644 index 7819dbe2a..000000000 --- a/apps/clck3x2/ChangeLog +++ /dev/null @@ -1 +0,0 @@ -0.02: Modified for use with new bootloader and firmware diff --git a/apps/clck3x2/clock3x2.json b/apps/clck3x2/clock3x2.json deleted file mode 100644 index 2d445787e..000000000 --- a/apps/clck3x2/clock3x2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name":"Clock 3x2 Pix", - "type":"clock", - "icon":"*clck3x2", - "src":"-clck3x2" -} diff --git a/apps/clickms/click-master.json b/apps/clickms/click-master.json deleted file mode 100644 index 6a2874259..000000000 --- a/apps/clickms/click-master.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name":"Click Master", - "icon": "*clickms", - "src":"-clickms" -} diff --git a/apps/cliock/ChangeLog b/apps/cliock/ChangeLog new file mode 100644 index 000000000..081a638f6 --- /dev/null +++ b/apps/cliock/ChangeLog @@ -0,0 +1 @@ +0.07: Submitted to App Loader 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..20086464e --- /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(){ + g.clear(); + Bangle.loadWidgets(); + Bangle.drawWidgets(); + 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); +} + +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/ChangeLog b/apps/clock2x3/ChangeLog new file mode 100644 index 000000000..88876affa --- /dev/null +++ b/apps/clock2x3/ChangeLog @@ -0,0 +1,3 @@ +0.02: Modified for use with new bootloader and firmware +0.03: Added 'reset' so we don't get the font color from widgets +0.04: Changed name from clck3x2 to clock2x3 diff --git a/apps/clck3x2/clock3x2.js b/apps/clock2x3/clock2x3-app.js similarity index 95% rename from apps/clck3x2/clock3x2.js rename to apps/clock2x3/clock2x3-app.js index fdb38db2a..511a7662b 100644 --- a/apps/clck3x2/clock3x2.js +++ b/apps/clock2x3/clock2x3-app.js @@ -57,9 +57,9 @@ const pixels = [[[0,0], // digit on/off pixels let idTimeout = null; function drawTime() { - g.clear(); + g.clear(1); Bangle.drawWidgets(); - + g.reset(); let d = Date(); let h = d.getHours(); let m = d.getMinutes(); @@ -76,8 +76,7 @@ function drawTime() { } let t = d.getSeconds()*1000 + d.getMilliseconds(); - let delta = (60000 - t) % 60000; // time till next minute - idTimeout = setTimeout(drawTime, delta); + idTimeout = setTimeout(drawTime, 60000 - t); // time till next minute } // special function to handle display switch on diff --git a/apps/clck3x2/clock3x2-icon.js b/apps/clock2x3/clock2x3-icon.js similarity index 61% rename from apps/clck3x2/clock3x2-icon.js rename to apps/clock2x3/clock2x3-icon.js index 5ef420d1e..961e259fb 100644 --- a/apps/clck3x2/clock3x2-icon.js +++ b/apps/clock2x3/clock2x3-icon.js @@ -1 +1 @@ -require("heatshrink").decompress(atob("mEwgRC/AH4A/gED/k/5/wh/wgAFCBcg7NgAVBh/zDoYLkHaAFqAH4A/AH4AW")); +require("heatshrink").decompress(atob("mEwgRC/AH4A/gED/k/5/wh/wgAFCBcg7NgAVBh/zDoYLkHaAFqAH4A/AH4AW")) diff --git a/apps/clck3x2/clock3x2.png b/apps/clock2x3/clock2x3.png similarity index 100% rename from apps/clck3x2/clock3x2.png rename to apps/clock2x3/clock2x3.png diff --git a/apps/clotris/clock-tris.json b/apps/clotris/clock-tris.json deleted file mode 100644 index ddbb7d10c..000000000 --- a/apps/clotris/clock-tris.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name":"Clock-Tris", - "icon":"*clotris", - "src":"-clotris" -} \ No newline at end of file diff --git a/apps/compass/compass.json b/apps/compass/compass.json deleted file mode 100644 index 7abc9a733..000000000 --- a/apps/compass/compass.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name":"Compass","type":"app", - "icon":"*compass", - "src":"-compass" -} diff --git a/apps/ctrclk/app.json b/apps/ctrclk/app.json deleted file mode 100644 index 68fbfdb70..000000000 --- a/apps/ctrclk/app.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "Centerclock", - "type": "clock", - "icon": "*ctrclk", - "src": "-ctrclk" -} diff --git a/apps/cube/cube.json b/apps/cube/cube.json deleted file mode 100644 index 440a78c72..000000000 --- a/apps/cube/cube.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name":"Cube", - "type":"app", - "icon":"*cube", - "src":"-cube" - } 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..4a32d5f26 --- /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 b84839b45..cb3136196 100644 --- a/apps/demoapp/app.js +++ b/apps/demoapp/app.js @@ -9,6 +9,7 @@ var scenes = [ y+=step; if (y>70) { clearInterval(i); + i = undefined; } g.clearRect(0,y-(step+1),240,y-1); @@ -159,10 +160,13 @@ var scenes = [ ]; var sceneNo = scenes.length-1; -var stop = scenes[sceneNo](); -setInterval(function() { +var stop; +function next() { sceneNo++; if (sceneNo>=scenes.length) sceneNo=0; - stop(); + if (stop) stop(); + clearInterval(); stop = scenes[sceneNo](); -}, 10000); + setTimeout(next, 10000); +} +next() diff --git a/apps/demoapp/app.json b/apps/demoapp/app.json deleted file mode 100644 index fab184c15..000000000 --- a/apps/demoapp/app.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name":"Demo Loop", - "icon":"*demoapp", - "src":"-demoapp" -} 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/files/files.js b/apps/files/files.js index b5b77a7f8..31353cf96 100644 --- a/apps/files/files.js +++ b/apps/files/files.js @@ -31,7 +31,7 @@ function showMainMenu() { } function eraseApp(app) { - E.showMessage('Erasing ' + app.name + '...'); + E.showMessage('Erasing\n' + app.name + '...'); storage.erase(app['']); storage.erase(app.icon); storage.erase(app.src); @@ -44,7 +44,7 @@ function showAppMenu(app) { }, '< Back': () => m = showApps(), 'Erase': () => { - E.showPrompt('Erase ' + app.name + '?').then((v) => { + E.showPrompt('Erase\n' + app.name + '?').then((v) => { if (v) { Bangle.buzz(100, 1); eraseApp(app); @@ -66,10 +66,10 @@ function showApps() { '< Back': () => m = showMainMenu(), }; - var list = storage.list().filter((a)=> { - return a[0]=='+' && a !== '+setting'; + var list = storage.list(/\.info$/).filter((a)=> { + return a !== 'setting.info'; }).sort().map((app) => { - var ret = storage.readJSON(app); + var ret = storage.readJSON(app,1)||{}; ret[''] = app; return ret; }); diff --git a/apps/files/files.json b/apps/files/files.json deleted file mode 100644 index db43a7cdc..000000000 --- a/apps/files/files.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name":"App Manager","type":"app", - "icon":"*files", - "src":"-files" -} diff --git a/apps/flagrse/app-icon.js b/apps/flagrse/app-icon.js new file mode 100644 index 000000000..68d95b518 --- /dev/null +++ b/apps/flagrse/app-icon.js @@ -0,0 +1 @@ +require("heatshrink").decompress(atob("mEwxH+AH4A/AH4AJmUyF/4Adstl1ovvAAIvvGNQvGGNAvIGMwvKGMgvMGMQvOGMAvQGLwvSGLgvUGLQvWGLAvYGKwv/R+zvtFrAvUFrQvSFrgvQFrwvOFsAvMFsQvKFsgvIFswvGFtAvEFtQABmUyF1gv/F/4v/F/4v/F/4v/F/4A/AH4A/AAwA=")) diff --git a/apps/flagrse/app.js b/apps/flagrse/app.js new file mode 100644 index 000000000..e7e8e2445 --- /dev/null +++ b/apps/flagrse/app.js @@ -0,0 +1,57 @@ + +function redraw() { + var img = require("heatshrink").decompress(atob("sFgxH+AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/ACcyAARD/L/5f/If5f/AHdlAAWtIn5ffAAJG/L75h/L8Jh/L8Jh/L8Jh/L8Jh/L8Jh/L8Jh/L8Jh/L8Jh/L8Jh/L8Jh/L8Jh/L8Jh/L8Jh+L8Rh8L8hh6L8xh4L9Bh2L9Rh0L9hhyL9xhwL+BhuL+RhsL+hhqL/5f/Lvpf0LtRfyLthfwLtxfuLuBfsLuRfqLuhfoLuxfmLvBfkLvRfiLvhfgLvxfeLn5fdLX5fdLH5fdK35fdKn5fdKX5fdKH5fdJ35fdJn5fdJX5fdJH5fdI35fdIn4AamQACIf5f/L/5D/L/5f/If5f/L/5D/L/5f/If5f/L/5D/L/5f/If5f/L/5D/L/5f/If5f/L/5D/L/5f/If5f/L/5D/L/4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4AnA")); + g.clear(); + g.drawImage(img, 120-96, 120-96, {scale:2}); +} + + // Code for button (Puck.js) + var busy = false; + +var lastTry = getTime(); + +function flag() { + E.showMessage("Working..."); + if (busy && lastTry+5| name | +quantity | +actions | +
|---|
Please choose a language from the following list:
+Then click
+ + + + + + + diff --git a/apps/locale/locale.png b/apps/locale/locale.png new file mode 100644 index 000000000..1719f6181 Binary files /dev/null and b/apps/locale/locale.png differ diff --git a/apps/locale/locales.js b/apps/locale/locales.js new file mode 100644 index 000000000..43e073cd1 --- /dev/null +++ b/apps/locale/locales.js @@ -0,0 +1,407 @@ +/* jshint esversion: 6 */ +const distanceUnits = { // how many meters per X? + "m" : 1, + "yd" : 0.9144, + "mi" : 1609.34, + "km" : 1000, + "kmi" : 1000 +}; +const speedUnits = { // how many kph per X? + "kmh" : 1, + "kph" : 1, + "mph" : 1.60934 +}; + +/* +timePattern / datePattern: + + %Y year four digits + %y last two digits of year (00..99) + %m month (01..12) + %d day of month (e.g, 01) + + %a locale's abbreviated weekday name (e.g., Sun) + %A locale's full weekday name (e.g., Sunday) + %b locale's abbreviated month name (e.g., Jan) + %B locale's full month name (e.g., January) + + %H hour (00..23) + %M minute (00..59) + %S second (00..60) + %p locale's equivalent of either AM or PM; blank if not known + %P like %p, but lower case +*/ + +var locales = { + "en_GB": { // this is default + lang: "en_GB", + decimal_point: ".", + thousands_sep: ",", + currency_symbol: "£", currency_first:true, + int_curr_symbol: "GBP", + speed: 'mph', + distance: { "0": "yd", "1": "mi" }, + temperature: '°C', + ampm: {0:"am",1:"pm"}, + timePattern: { 0: "%HH:%MM:%SS ", 1: "%HH:%MM" }, + datePattern: { 0: "%b %d %Y", 1: "%d/%m/%Y" }, // Feb 28 2020" // "01/03/2020"(short) + abmonth: "Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec", + month: "January,February,March,April,May,June,July,August,September,October,November,December", + abday: "Sun,Mon,Tue,Wed,Thu,Fri,Sat", + day: "Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday", + trans: { /*yes: "yes", Yes: "Yes", no: "no", No: "No", ok: "ok", on: "on", off: "off"*/ }}, + "de_DE": { + lang: "de_DE", + decimal_point: ",", + thousands_sep: ".", + currency_symbol: "\x80", + int_curr_symbol: "EUR", + speed: "kmh", + distance: { 0: "m", 1: "km" }, + temperature: "°C", + ampm: {0:"",1:""}, + timePattern: { 0: "%HH:%MM:%SS", 1: "%HH:%MM" }, + datePattern: { 0: "%A, %d. %B %Y", "1": "%d.%m.%Y" }, // Sonntag, 1. März 2020 // 01.01.20 + abmonth: "Jan,Feb,Mär,Apr,Mai,Jun,Jul,Aug,Sep,Okt,Nov,Dez", + month: "Januar,Februar,März,April,Mai,Juni,Juli,August,September,Oktober,November,Dezember", + abday: "So,Mo,Di,Mi,Do,Fr,Sa", + day: "Sonntag,Montag,Dienstag,Mittwoch,Donnerstag,Freitag,Samstag", + trans: { yes: "ja", Yes: "Ja", no: "nein", No: "Nein", ok: "ok", on: "an", off: "aus" }}, + "en_US": { + lang: "en_US", + decimal_point: ".", + thousands_sep: ",", + currency_symbol: "$", currency_first:true, + int_curr_symbol: "USD", + speed: "mph", + distance: { 0: "yd", 1: "mi" }, + temperature: "°F", + ampm: {0:"am",1:"pm"}, + timePattern: { 0: "%HH:%MM:%SS ", 1: "%HH:%MM" }, + datePattern: { 0: "", 1: "%m/%d/%y" }, + abmonth: "Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec", + month: "January,February,March,April,May,June,July,August,September,October,November,December", + abday: "Sun,Mon,Tue,Wed,Thu,Fri,Sat", + day: "Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday", + trans: { yes: "yes", Yes: "Yes", no: "no", No: "No", ok: "ok", on: "on", off: "off" }}, + "en_JP": { // we do not have the font, so it is not ja_JP + lang: "en_JP", + decimal_point: ".", + thousands_sep: ",", + currency_symbol: "￥", + int_curr_symbol: "JPY", + speed: "kmh", + distance: { 0: "m", 1: "km" }, + temperature: "°F", + ampm: {0:"",1:""}, + timePattern: { 0: "%HH:%MM:%SS ", 1: "%HH:%MM" }, + datePattern: { 0: "%y/%M/%d", 1: "%y/%m;/%d" }, + abmonth: "Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec", + month: "January,February,March,April,May,June,July,August,September,October,November,December", + abday: "Sun,Mon,Tue,Wed,Thu,Fri,Sat", + day: "Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday", + trans: { yes: "yes", Yes: "Yes", no: "no", No: "No", ok: "ok", on: "on", off: "off" }}, + "nl_NL": { + lang: "nl_NL", + decimal_point: ",", + thousands_sep: ".", + currency_symbol: "\x80", + int_curr_symbol: "EUR", + speed: "kmh", + distance: { 0: "m", 1: "km" }, + temperature: "°C", + ampm: {0:"",1:""}, + timePattern: { 0: "%HH:%MM:%SS", 1: "%HH:%MM" }, + datePattern: { 0: "%A %B %d %Y", 1: "%d.%m.%y" }, // zondag 1 maart 2020 // 01.01.20 + abday: "zo,ma,di,wo,do,vr,za", + day: "zondag,maandag,dinsdag,woensdag,donderdag,vrijdag,zaterdag", + abmonth: "jan,feb,mrt,apr,mei,jun,jul,aug,sep,okt,nov,dec", + month: "januari,februari,maart,april,mei,juni,juli,augustus,september,oktober,november,december", + trans: { yes: "yes", Yes: "Yes", no: "no", No: "No", ok: "ok", on: "on", off: "off" }}, + "en_CA": { + lang: "en_CA", + decimal_point: ".", + thousands_sep: ",", + currency_symbol: "$", + int_curr_symbol: "CAD", + speed: "mph", + distance: { 0: "mi", 1: "kmi" }, + temperature: "°F", + ampm: {0:"am",1:"pm"}, + timePattern: { 0: "%HH:%MM:%SS ", 1: "%HH:%MM" }, + datePattern: { 0: "%A, %B %d, %Y", "1": "%Y-%m-%d" }, // Sunday, March 1, 2020 // 2012-12-20 + abmonth: "Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec", + month: "January,February,March,April,May,June,July,August,September,October,November,December", + abday: "Sun,Mon,Tue,Wed,Thu,Fri,Sat", + day: "Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday", + trans: { yes: "yes", Yes: "Yes", no: "no", No: "No", ok: "ok", on: "on", off: "off" }}, + "fr_FR": { + lang: "fr_FR", + decimal_point: ",", + thousands_sep: ".", + currency_symbol: "\x80", + int_curr_symbol: "EUR", + speed: "kmh", + distance: { 0: "m", 1: "km" }, + temperature: "°C", + ampm: {0:"",1:""}, + timePattern: { 0: "%HH:%MM:%SS ", 1: "%HH:%MM" }, + datePattern: { 0: "%A %d %B %Y", "1": "%d/%m/%Y" }, // dimanche 1 mars 2020 // 01/03/2020 + abmonth: "janv,févr,mars,avril,mai,juin,juil,août,sept,oct,nov,déc", + month: "janvier,février,mars,avril,mai,juin,juillet,août,septembre,octobre,novembre,décembre", + abday: "dim,lun,mar,mer,jeu,ven,sam", + day: "dimanche,lundi,mardi,mercredi,jeudi,vendredi,samedi", + trans : { yes : "oui", Yes: "Oui", no: "no", No: "No", ok : "ok", on: "on", off: "off" }}, + "sv_SE": { + lang: "sv_SE", + decimal_point: ",", + thousands_sep: ".", + currency_symbol: "kr", + int_curr_symbol: "SKR", + speed: "kmh", + distance: { 0: "m", 1: "km" }, + temperature: "°C", + ampm: {0:"fm",1:"em"}, + timePattern: { 0: "%HH:%MM:%SS ", 1: "%HH:%MM" }, + datePattern: { 0: "%A %B %d %Y", "1": "%Y-%m-%d" }, // söndag 1 mars 2020 // 2020-03-01 + abmonth: "jan,feb,mars,apr,maj,juni,juli,aug,sep,okt,nov,dec", + month: "januari,februari,mars,april,maj,juni,juli,augusti,september,oktober,november,december", + abday: "sön,mån,tis,ons,tors,fre,lör", + day: "söndag,måndag,tisdag,onsdag,torsdag,fredag,lördag", + trans : { yes : "ja", Yes: "Ja", no: "nej", No: "Nej", ok : "ok", on: "on", off: "off" }}, + "en_AU": { + lang: "en_AU", + decimal_point: ".", + thousands_sep: ",", + currency_symbol: "$", + int_curr_symbol: "AUD", + speed: "mph", + distance: { 0: "mi", 1: "kmi" }, + temperature: "°F", + ampm: {0:"am",1:"pm"}, + timePattern: { 0: "%HH:%MM:%SS ", 1: "%HH:%MM" }, + datePattern: { 0: "%A, %B %d, %Y", "1": "%m/%d/%y" }, // Sunday, 1 March 2020 // 1/3/20 + abmonth: "Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec", + month: "January,February,March,April,May,June,July,August,September,October,November,December", + abday: "Sun,Mon,Tue,Wed,Thu,Fri,Sat", + day: "Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday", + trans: { yes: "yes", Yes: "Yes", no: "no", No: "No", ok: "ok", on: "on", off: "off" }}, + "de_AT": { + lang: "de_AT", + decimal_point: ",", + thousands_sep: ".", + currency_symbol: "\x80", + int_curr_symbol: "EUR", + speed: "kmh", + distance: { 0: "m", 1: "km" }, + temperature: "°C", + timePattern: { 0: "%HH:%MM:%SS ", 1: "%HH:%MM" }, + datePattern: { 0: "%A, %d. %B %Y", "1": "%d.%m.%y" }, // Sonntag, 1. März 2020 // 01.03.20 + abmonth: "Jän,Feb,März,Apr,Mai,Jun,Jul,Aug,Sep,Okt,Nov,Dez", + month: "Jänner,Februar,März,April,Mai,Juni,Juli,August,September,Oktober,November,Dezember", + abday: "So,Mo,Di,Mi,Do,Fr,Sa", + day: "Sonntag,Montag,Dienstag,Mittwoch,Donnerstag,Freitag,Samstag", + trans: { yes: "ja", Yes: "Ja", no: "nein", No: "Nein", ok: "ok", on: "an", off: "aus" }}, + "en_IL": { + lang: "en_IL", + decimal_point: ",", + thousands_sep: ".", + currency_symbol: "₪", + int_curr_symbol: "ILS", + speed: "kmh", + distance: { 0: "m", 1: "km" }, + temperature: "°F", + ampm: {0:"am",1:"pm"}, + timePattern: { 0: "%HH:%MM:%SS ", 1: "%HH:%MM" }, + datePattern: { 0: "%A, %B %d, %Y", "1": "%d/%m/%Y" }, // Sunday, 1 March 2020 // 01/03/2020 + abmonth: "Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec", + month: "January,February,March,April,May,June,July,August,September,October,November,December", + abday: "Sun,Mon,Tue,Wed,Thu,Fri,Sat", + day: "Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday", + trans: { yes: "yes", Yes: "Yes", no: "no", No: "No", ok: "ok", on: "on", off: "off" }}, + "es_ES": { + lang: "es_ES", + decimal_point: ",", + thousands_sep: ".", + currency_symbol: "\x80", + int_curr_symbol: "EUR", + speed: "kmh", + distance: { 0: "m", 1: "km" }, + temperature: "°C", + ampm: {0:"",1:""}, + timePattern: { 0: "%HH:%MM:%SS ", 1: "%HH:%MM" }, + datePattern: { 0: "%A, %d de %B de %Y", "1": "%d/%m/%y" }, // domingo, 1 de marzo de 2020 // 01/03/20 + abmonth: "ene,feb,mar,abr,may,jun,jul,ago,sept,oct,nov,dic", + month: "enero,febrero,marzo,abril,mayo,junio,julio,agosto,septiembre,octubre,noviembre,diciembre", + abday: "dom,lun,mar,mié,jue,vie,sáb", + day: "domingo,lunes,martes,miércoles,jueves,viernes,sábado", + trans: { yes : "sí", Yes: "Sí",no: "no", No: "No", ok : "ok", on: "on", off: "off" }}, + "fr_BE": { + lang: "fr_BE", + decimal_point: ",", + thousands_sep: ".", + currency_symbol: "\x80", + int_curr_symbol: "EUR", + speed: "kmh", + distance: { 0: "m", 1: "km" }, + temperature: "°C", + ampm: {0: "",1: ""}, + timePattern: { 0: "%HH:%MM:%SS ", 1: "%HH:%MM" }, + datePattern: { 0: "%A %B %d %Y", "1": "%d/%m/%y" }, // dimanche 1 mars 2020 // 01/03/20 + abmonth: "anv.,févr.,mars,avril,mai,juin,juil.,août,sept.,oct.,nov.,déc.", + month: "janvier,février,mars,avril,mai,juin,juillet,août,septembre,octobre,novembre,décembre", + abday: "dim,lun,mar,mer,jeu,ven,sam", + day: "dimanche,lundi,mardi,mercredi,jeudi,vendredi,samedi", + trans : { yes : "oui", Yes: "Oui", no: "no", No: "No", ok : "ok", on: "on", off: "off" }}, + "fi_FI": { + lang: "fi_FI", + decimal_point: ",", + thousands_sep: ".", + currency_symbol: "\x80", + int_curr_symbol: "EUR", + speed: "kmh", + distance: { 0: "m", 1: "km" }, + temperature: "°C", + ampm: {0: "ap",1: "ip"}, + timePattern: { 0: "%HH:%MM:%SS ", 1: "%HH:%MM" }, // 17.00.00 // 17.00 + datePattern: { 0: "%A %d. %B %Y", "1": "%-d/%-m/%Y" }, // sunnuntai 1. maaliskuuta 2020 // 1.3.2020 + abmonth: "tammik,helmik,maalisk,huhtik,toukok,kesäk,heinäk,elok,syysk,lokak,marrask,jouluk", + month: "tammikuuta,helmikuuta,maaliskuuta,huhtikuuta,toukokuuta,kesäkuuta,heinäkuuta,elokuuta,syyskuuta,lokakuuta,marraskuuta,joulukuuta", + abday: "su,ma,ti,ke,to,pe,la", + day: "sunnuntaina,maanantaina,tiistaina,keskiviikkona,torstaina,perjantaina,lauantaina", + trans : { yes : "oui", Yes: "Oui", no: "no", No: "No", ok : "ok", on: "on", off: "off" }}, + "de_CH": { + lang: "de_CH", + decimal_point: ",", + thousands_sep: ".", + currency_symbol: "CHF", + int_curr_symbol: "CHF", + speed: "kmh", + distance: { 0: "m", 1: "km" }, + temperature: "°C", + ampm: {0:"vorm",1:" nachm"}, + timePattern: { 0: "%HH:%MM:%SS", 1: "%HH:%MM" }, + datePattern: { 0: "%A, %d. %B %Y", "1": "%d.%m.%Y" }, // Sonntag, 1. März 2020 // 1.3.2020 + abmonth: "Jan,Feb,März,Apr,Mai,Jun,Jul,Aug,Sep,Okt,Nov,Dez", + month: "Januar,Februar,März,April,Mai,Juni,Juli,August,September,Oktober,November,Dezember", + abday: "So,Mo,Di,Mi,Do,Fr,Sa", + day: "Sonntag,Montag,Dienstag,Mittwoch,Donnerstag,Freitag,Samstag", + trans: { yes: "ja", Yes: "Ja", no: "nein", No: "Nein", ok: "ok", on: "an", off: "aus" }}, + "fr_CH": { + lang: "fr_CH", + decimal_point: ",", + thousands_sep: ".", + currency_symbol: "CHF", + int_curr_symbol: "CHF", + speed: "kmh", + distance: { 0: "m", 1: "km" }, + temperature: "°C", + ampm: {0:"AM",1:"PM"}, + timePattern: { 0: "%HH:%MM:%SS", 1: "%HH:%MM" }, + datePattern: { 0: "%A %d %B %Y", "1": "%d/%m/%y" }, // dimanche 1 mars 2020 // 01/03/20 + abmonth: "anv.,févr.,mars,avril,mai,juin,juil.,août,sept.,oct.,nov.,déc.", + month: "janvier,février,mars,avril,mai,juin,juillet,août,septembre,octobre,novembre,décembre", + abday: "dim,lun,mar,mer,jeu,ven,sam", + day: "dimanche,lundi,mardi,mercredi,jeudi,vendredi,samedi", + trans : { yes : "oui", Yes: "Oui", no: "no", No: "No", ok : "ok", on: "on", off: "off" }}, + "it_CH": { + lang: "it_CH", + decimal_point: ",", + thousands_sep: ".", + currency_symbol: "CHF", + int_curr_symbol: "CHF", + speed: 'kmh', + distance: { "0": "m", "1": "km" }, + temperature: '°C', + timePattern: { 0: "%HH.%MM.%SS ", 1: "%HH.%MM" }, // 17.00.00 // 17.00 + datePattern: { 0: "%A %B %d %Y", "1": "%d/%m/%Y" }, // sunnuntai 1. maaliskuuta 2020 // 1.3.2020 + abmonth: "gen,feb,mar,apr,mag,giu,lug,ago,set,ott,nov,dic", + month: "gennaio,febbraio,marzo,aprile,maggio,giugno,luglio,agosto,settembre,ottobre,novembre,dicembre", + abday : "dom,lun,mar,mer,gio,ven,sab", + day: "domenica,lunedì,martedì,mercoledì,giovedì,venerdì, sabato", + trans : { yes: "sì", Yes: "Sì", no: "no", No: "No", ok: "ok", on: "on", off: "off" }}, + "wae_CH" : { + lang: "wae_CH", + decimal_point: ",", + thousands_sep: ".", + currency_symbol: "CHF", + int_curr_symbol: "CHF", + speed: 'kmh', + distance: { "0": "m", "1": "km" }, + temperature: '°C', + timePattern: { 0: "%HH.%MM.%SS ", 1: "%HH.%MM" }, // 17.00.00 // 17.00 + datePattern: { 0: "%A, %d. %B %Y", "1": "%Y-%m-%d" }, // Sunntag, 1. Märze 2020 // 2020-03-01 + abmonth: "Jen,Hor,Mär,Abr,Mei,Brá,Hei,Öig,Her,Wím,Win,Chr", + month: "Jenner,Hornig,Märze,Abrille,Meije,Bráčet,Heiwet,Öigšte,Herbštmánet,Wímánet,Wintermánet,Chrištmánet", + abday: "Sun,Män,Ziš,Mit,Fró,Fri,Sam", + day: "Sunntag,Mäntag,Zištag,Mittwuč,Fróntag,Fritag,Samštag", + trans : { yes: "sì", Yes: "Sì", no: "no", No: "No", ok: "ok", on: "on", off: "off" }}, + "tr_TR": { // this is default + lang: "tr_TR", + decimal_point: ",", + thousands_sep: ".", + currency_symbol: "TL", + int_curr_symbol: "TRY", + speed: 'kmh', + distance: { "0": "m", "1": "km" }, + temperature: '°C', + ampm: {0:"öö",1:"ös"}, + timePattern: { 0: "%HH:%MM:%SS ", 1: "%HH:%MM" }, + datePattern: { 0: "%d %w %Y %A", 1: "%d/%m/%Y" }, // 1 Mart 2020 Pazar // "01/03/2020" + abmonth: "Oca,Sub,Mar,Nis,May,Haz,Tem,Agu,Eyl,Eki,Kas,Ara", + month: "Ocak,Subat,Mart,Nisan,Mayis,Haziran,Temmuz,Agustos,Eylul,Ekim,Kasim,Aralik", + abday: "Paz,Pzt,Sal,Car,Per,Cum,Cmt", + day: "Pazar,Pazartesi,Sali,Carsamba,Persembe,Cuma,Cumartesi", + trans: { yes: "evet", Yes: "Evet", no: "hayir", No: "Hayir", ok: "tamam", on: "acik", off: "kapali" }}, + "hu_HU": { + lang: "hu_HU", + decimal_point: ",", + thousands_sep: " ", + currency_symbol: "Ft", + int_curr_symbol: "HUF", + speed: 'kph', + distance: { "0": "m", "1": "km" }, + temperature: '°C', + ampm: {0:"de",1:"du"}, + timePattern: { 0: "%HH:%MM:%SS ", 1: "%HH:%MM" }, + datePattern: { 0: "%Y %b %d, %A", 1: "%Y.%m.%d" }, // 2020 Feb 28, Péntek" // "2020.03.01."(short) + abmonth: "Jan,Feb,Már,Ápr,Máj,Jún,Júl,Aug,Szep,Okt,Nov,Dec", + month: "Január,Február,Március,Április,Május,Június,Július,Augusztus,Szeptember,Október,November,December", + abday: "Vas,Hét,Ke,Szer,Csüt,Pén,Szom", + day: "Vasárnap,Hétfő,Kedd,Szerda,Csütörtök,Péntek,Szombat", + trans: { yes: "igen", Yes: "Igen", no: "nem", No: "Nem", ok: "ok", on: "be", off: "ki" }}, + "pt_BR": { + lang: "pt_BR", + decimal_point: ",", + thousands_sep: ".", + currency_symbol: "R$", currency_first:true, + int_curr_symbol: "BRL", + speed: "kmh", + distance: { 0: "m", 1: "km" }, + temperature: "°C", + ampm: {0:"am",1:"pm"}, + timePattern: { 0: "%HH:%MM:%SS ", 1: "%HH:%MM" }, + datePattern: { 0: "", 1: "%d/%m/%y" }, + abmonth: "Jan,Fev,Mar,Abr,Mai,Jun,Jul,Ago,Set,Out,Nov,Dez", + month: "Janeiro,Fevereiro,Março,Abril,Maio,Junho,Julho,Agosto,Setembro,Outubro,Novembro,Dezembro", + abday: "Dom,Seg,Ter,Qua,Qui,Sex,Sab", + day: "Domingo,Segunda-feira,Terça-feira,Quarta-feira,Quinta-feira,Sexta-feira,Sábado", + trans: { yes: "sim", Yes: "Sim", no: "não", No: "Não", ok: "certo", on: "ligado", off: "desligado" }}, + "cs_CZ": { + lang: "cs_CZ", + decimal_point: ",", + thousands_sep: " ", + currency_symbol: "Kč", + int_curr_symbol: " CZK", + speed: 'kmh', + distance: { "0": "m", "1": "km" }, + temperature: '°C', + ampm: {0:"dop",1:"odp"}, + timePattern: { 0: "%HH:%MM:%SS ", 1: "%HH:%MM" }, + datePattern: { 0: "%d. %b %Y", 1: "%d.%m.%Y" }, // "30. led 2020" // "30.01.2020"(short) + abmonth: "led,úno,bře,dub,kvě,čvn,čvc,srp,zář,říj,lis,pro", + month: "leden,únor,březen,duben,květen,červen,červenec,srpen,září,říjen,listopad,prosinec", + abday: "ne,po,út,st,čt,pá,so", + day: "neděle,pondělí,úterý,středa,čtvrtek,pátek,sobota", + trans: { yes: "tak", Yes: "Tak", no: "nie", No: "Nie", ok: "ok", on: "na", off: "poza" }} +}; diff --git a/apps/marioclock/ChangeLog b/apps/marioclock/ChangeLog new file mode 100644 index 000000000..c16d02fc8 --- /dev/null +++ b/apps/marioclock/ChangeLog @@ -0,0 +1,7 @@ +0.01: Create mario app [Paul Cockrell https://github.com/paulcockrell] +0.02: Fix day of the week and add padding +0.03: use short date format from locale, take timeout from settings +0.04: modify date to display to be more at the original idea but still localized +0.05: use 12/24 hour clock from settings +0.06: Performance refactor, and enhanced graphics! +0.07: Swipe right to change between Mario and Toad characters, swipe left to toggle night mode \ No newline at end of file diff --git a/apps/marioclock/README.md b/apps/marioclock/README.md new file mode 100644 index 000000000..a74c863f8 --- /dev/null +++ b/apps/marioclock/README.md @@ -0,0 +1,19 @@ +# Mario Clock +Let's go back in time with this Gameboy inspired Mario retro clock. + +Enjoy watching Mario, or one of the other game characters run through a level while showing you the time and date. + + + +## Features + +* Multiple characters - swipe the screen right to change the character +* Night and Day modes - swipe left to toggle mode +* Smooth animation +* Awesome 8-bit style grey-scale graphics +* Mario jumps to change the time, every minute +* You can make Mario jump by pressing the top button (Button 1) on the watch + +## Requests + +If you have any feature requests, please send an email to the author `paulcockrell@gmail.com` diff --git a/apps/marioclock/mario-clock-screen-shot.png b/apps/marioclock/mario-clock-screen-shot.png new file mode 100755 index 000000000..ae2dc7800 Binary files /dev/null and b/apps/marioclock/mario-clock-screen-shot.png differ diff --git a/apps/marioclock/marioclock-app.js b/apps/marioclock/marioclock-app.js new file mode 100644 index 000000000..dabe7ad9e --- /dev/null +++ b/apps/marioclock/marioclock-app.js @@ -0,0 +1,399 @@ +/** + * BangleJS MARIO CLOCK + * + * + Original Author: Paul Cockrell https://github.com/paulcockrell + * + Created: April 2020 + * + Based on Espruino Mario Clock V3 https://github.com/paulcockrell/espruino-mario-clock + * + Online Image convertor: https://www.espruino.com/Image+Converter, Use transparency + compression + 8bit Web + export as Image String + * + Images must be drawn as PNGs with transparent backgrounds + */ + +const locale = require("locale"); +const storage = require('Storage'); +const settings = (storage.readJSON('setting.json', 1) || {}); +const timeout = settings.timeout || 10; +const is12Hour = settings["12hour"] || false; + +// Screen dimensions +let W, H; + +let intervalRef, displayTimeoutRef = null; + +// Colours +const LIGHTEST = "#effedd"; +const LIGHT = "#add795"; +const DARK = "#588d77"; +const DARKEST = "#122d3e"; +const NIGHT = "#001818"; + +// Character names +const TOAD = "toad"; +const MARIO = "mario"; + +const characterSprite = { + frameIdx: 0, + x: 35, + y: 55, + jumpCounter: 0, + jumpIncrement: Math.PI / 6, + isJumping: false, + character: MARIO, +}; + +const coinSprite = { + frameIdx: 0, + x: 34, + y: 18, + isAnimating: false, + yDefault: 18, +}; + +const pyramidSprite = { + x: 90, + height: 34, +}; + +const ONE_SECOND = 1000; + +let timer = 0; +let backgroundArr = []; +let nightMode = false; + +function genRanNum(min, max) { + return Math.floor(Math.random() * (max - min + 1) + min); +} + +function switchCharacter() { + const curChar = characterSprite.character; + let newChar; + if (curChar === MARIO) { + newChar = TOAD; + } else { + newChar = MARIO; + } + + characterSprite.character = newChar; +} + +function toggleNightMode() { + nightMode = !nightMode; +} + +function incrementTimer() { + if (timer > 1000) { + timer = 0; + } + else { + timer += 50; + } +} + +function drawBackground() { + // Clear screen + const bgColor = (nightMode) ? NIGHT : LIGHTEST; + g.setColor(bgColor); + g.fillRect(0, 10, W, H); + + // set cloud colors and draw clouds + const cloudColor = (nightMode) ? DARK : LIGHT; + g.setColor(cloudColor); + g.fillRect(0, 10, g.getWidth(), 15); + g.fillRect(0, 17, g.getWidth(), 17); + g.fillRect(0, 19, g.getWidth(), 19); + g.fillRect(0, 21, g.getWidth(), 21); + + // Date bar + g.setColor(DARKEST); + g.fillRect(0, 0, W, 9); +} + +function drawFloor() { + const fImg = require("heatshrink").decompress(atob("ikDxH+rgATCoIBQAQYDP")); // Floor image + for (let x = 0; x < 4; x++) { + g.drawImage(fImg, x * 20, g.getHeight() - 5); + } +} + +function drawPyramid() { + const pPol = [pyramidSprite.x + 10, H - 6, pyramidSprite.x + 50, pyramidSprite.height, pyramidSprite.x + 90, H - 6]; // Pyramid poly + + const color = (nightMode) ? DARK : LIGHT; + g.setColor(color); + g.fillPoly(pPol); + + pyramidSprite.x -= 1; + // Reset and randomize pyramid if off-screen + if (pyramidSprite.x < - 100) { + pyramidSprite.x = 90; + pyramidSprite.height = genRanNum(25, 60); + } +} + +function drawTreesFrame(x, y) { + const tImg = require("heatshrink").decompress(atob("h8GxH+AAMHAAIFCAxADEBYgDCAQYAFCwobOAZAEFBxo=")); // Tree image + + g.drawImage(tImg, x, y); + g.setColor(DARKEST); + g.drawLine(x + 6 /* Match stalk to palm tree */, y + 6 /* Match stalk to palm tree */, x + 6, H - 6); +} + +function generateTreeSprite() { + return { + x: 90, + y: genRanNum(30, 60) + }; +} + +function drawTrees() { + // remove first sprite if offscreen + let firstBackgroundSprite = backgroundArr[0]; + if (firstBackgroundSprite) { + if (firstBackgroundSprite.x < -15) backgroundArr.splice(0, 1); + } + + // set background sprite if array empty + let lastBackgroundSprite = backgroundArr[backgroundArr.length - 1]; + if (!lastBackgroundSprite) { + const newSprite = generateTreeSprite(); + lastBackgroundSprite = newSprite; + backgroundArr.push(lastBackgroundSprite); + } + + // add random sprites + if (backgroundArr.length < 2 && lastBackgroundSprite.x < (16 * 7)) { + const randIdx = Math.floor(Math.random() * 25); + if (randIdx < 2) { + const newSprite = generateTreeSprite(); + backgroundArr.push(newSprite); + } + } + + for (x = 0; x < backgroundArr.length; x++) { + let scenerySprite = backgroundArr[x]; + scenerySprite.x -= 5; + drawTreesFrame(scenerySprite.x, scenerySprite.y); + } +} + +function drawCoinFrame(x, y) { + const cImg = require("heatshrink").decompress(atob("hkPxH+AAcHAAQIEBIXWAAQNEBIWHAAdcBgQLBA4IODBYQKEBAQMDBelcBaJUBM4QRBNYx1EBQILDR4QHBBISdIBIoA==")); // Coin image + g.drawImage(cImg, x, y); +} + +function drawCoin() { + if (!coinSprite.isAnimating) return; + + coinSprite.y -= 8; + if (coinSprite.y < (0 - 15 /*Coin sprite height*/)) { + coinSprite.isAnimating = false; + coinSprite.y = coinSprite.yDefault; + return; + } + + drawCoinFrame(coinSprite.x, coinSprite.y); +} + +function drawMarioFrame(idx, x, y) { + switch(idx) { + case 0: + const mFr1 = require("heatshrink").decompress(atob("h8UxH+AAkHAAYKFBolcAAIPIBgYPDBpgfGFIY7EA4YcEBIPWAAYdDC4gLDAII5ECoYOFDogODFgoJCBwYZCAQYOFBAhAFFwZKGHQpMDw52FSg2HAAIoDAgIOMB5AAFGQTtKeBLuNcQwOJFwgJFA=")); // Mario Frame 1 + g.drawImage(mFr1, x, y); + break; + case 1: + const mFr2 = require("heatshrink").decompress(atob("h8UxH+AAkHAAYKFBolcAAIPIBgYPDBpgfGFIY7EA4YcEBIPWAAYdDC4gLDAII5ECoYOFDogODFgoJCBwYZCAQYOFBAhAFFwZKGHQpMDw+HCQYEBSowOBBQIdCCgTOIFgiVHFwYCBUhA9FBwz8HAo73GACQA=")); // Mario frame 2 + g.drawImage(mFr2, x, y); + break; + default: + } +} + +function drawToadFrame(idx, x, y) { + switch(idx) { + case 0: + const tFr1 = require("heatshrink").decompress(atob("iEUxH+ACkHAAoNJrnWAAQRGg/WrgACB4QEBCAYOBB44QFB4QICAg4QBBAQbDEgwPCHpAGCGAQ9KAYQPKCYg/EJAoADAwaKFw4BEP4YQCBIIABB468EB4QADYIoQGDwQOGBYYrCCAwbFFwgQEM4gAEeA4OIH4ghFAAYLD")); // Toad Frame 1 + g.drawImage(tFr1, x, y); + break; + case 1: + const tFr2 = require("heatshrink").decompress(atob("iEUxH+ACkHAAoNJrnWAAQRGg/WrgACB4QEBCAYOBB44QFB4QICAg4QBBAQbDEgwPCHpAGCGAQ9KAYQPKCYg/EJAoADAwaKFw4BEP4YQCBIIABB468EB4QADYIoQGDwQOGBYQrDb4wcGFxYLDMoYgHRYgwKABAMBA")); // Mario frame 2 + g.drawImage(tFr2, x, y); + break; + default: + } +} + +function drawCharacter(date, character) { + // calculate jumping + const seconds = date.getSeconds(), + milliseconds = date.getMilliseconds(); + + if (seconds == 59 && milliseconds > 800 && !characterSprite.isJumping) { + characterSprite.isJumping = true; + } + + if (characterSprite.isJumping) { + characterSprite.y = (Math.sin(characterSprite.jumpCounter) * -12) + 50 /* Character Y base value */; + characterSprite.jumpCounter += characterSprite.jumpIncrement; + + if (parseInt(characterSprite.jumpCounter) === 2 && !coinSprite.isAnimating) { + coinSprite.isAnimating = true; + } + + if (characterSprite.jumpCounter.toFixed(1) >= 4) { + characterSprite.jumpCounter = 0; + characterSprite.isJumping = false; + } + } + + // calculate animation timing + if (timer % 50 === 0) { + // shift to next frame + characterSprite.frameIdx ^= 1; + } + + switch(characterSprite.character) { + case(TOAD): + drawToadFrame(characterSprite.frameIdx, characterSprite.x, characterSprite.y); + break; + case(MARIO): + default: + drawMarioFrame(characterSprite.frameIdx, characterSprite.x, characterSprite.y); + } +} + +function drawBrickFrame(x, y) { + const brk = require("heatshrink").decompress(atob("ikQxH+/0HACASB6wAQCoPWw4AOrgT/Cf4T/Cb1cAB8H/wVBAB/+A")); + g.drawImage(brk, x, y); +} + +function drawTime(date) { + // draw hour brick + drawBrickFrame(20, 25); + // draw minute brick + drawBrickFrame(42, 25); + + const h = date.getHours(); + const hours = ("0" + ((is12Hour && h > 12) ? h - 12 : h)).substr(-2); + const mins = ("0" + date.getMinutes()).substr(-2); + + g.setFont("6x8"); + g.setColor(DARKEST); + g.drawString(hours, 25, 29); + g.drawString(mins, 47, 29); +} + +function drawDate(date) { + g.setFont("6x8"); + g.setColor(LIGHTEST); + let dateStr = locale.date(date, true); + dateStr = dateStr.replace(date.getFullYear(), "").trim().replace(/\/$/i,""); + dateStr = locale.dow(date, true) + " " + dateStr; + g.drawString(dateStr, (W - g.stringWidth(dateStr))/2, 1); +} + +function redraw() { + const date = new Date(); + + // Update timers + incrementTimer(); + + // Draw frame + drawBackground(); + drawFloor(); + drawPyramid(); + drawTrees(); + drawTime(date); + drawDate(date); + drawCharacter(date); + drawCoin(); + + // Render new frame + g.flip(); +} + +function clearTimers(){ + if(intervalRef) { + clearInterval(intervalRef); + intervalRef = null; + } + + if(displayTimeoutRef) { + clearInterval(displayTimeoutRef); + displayTimeoutRef = null; + } +} + +function resetDisplayTimeout() { + if (displayTimeoutRef) clearInterval(displayTimeoutRef); + + displayTimeoutRef = setInterval(() => { + if (Bangle.isLCDOn()) Bangle.setLCDPower(false); + clearTimers(); + }, ONE_SECOND * timeout); +} + +function startTimers(){ + if(intervalRef) clearTimers(); + intervalRef = setInterval(redraw, 50); + + resetDisplayTimeout(); + + redraw(); +} + +// Main +function init() { + clearInterval(); + + // Initialise display + Bangle.setLCDMode("80x80"); + + // Store screen dimensions + W = g.getWidth(); + H = g.getHeight(); + + // Get Mario to jump! + setWatch(() => { + if (intervalRef && !characterSprite.isJumping) characterSprite.isJumping = true; + resetDisplayTimeout(); + }, BTN1, {repeat:true}); + + setWatch(() => { + Bangle.setLCDMode(); + Bangle.showLauncher(); + }, BTN2, {repeat:false,edge:"falling"}); + + Bangle.on('lcdPower', (on) => { + if (on) { + startTimers(); + } else { + clearTimers(); + } + }); + + Bangle.on('faceUp', (up) => { + if (up && !Bangle.isLCDOn()) { + clearTimers(); + Bangle.setLCDPower(true); + } + }); + + Bangle.on('swipe', (sDir) => { + resetDisplayTimeout(); + + switch(sDir) { + // Swipe right (1) - change character (on a loop) + case(1): + switchCharacter(); + break; + // Swipe left (-1) - change day/night mode (on a loop) + case(-1): + default: + toggleNightMode(); + } + }); + + startTimers(); +} + +// Initialise! +init(); \ No newline at end of file diff --git a/apps/marioclock/marioclock-icon.js b/apps/marioclock/marioclock-icon.js new file mode 100644 index 000000000..223d911f4 --- /dev/null +++ b/apps/marioclock/marioclock-icon.js @@ -0,0 +1 @@ +require("heatshrink").decompress(atob("mEwxH+AAmBAEgrFAAZelFo+s1krAEgnBFwo5BBIIAi64nBSQgvnE4QvCwMAM4SRCXsAlFqwvGdsPXF5QHBRsYvJBYXWAD4vdw4ABF9gRBF8xYGF4plLF6xYMw4NBF74SBF9ocHAATvpFwgwOF6J9IFwwNIUIgvZFw4xGF7IABFxwwECxC/WE4gkCAALBMF64uHAYLvfC4xXDF4pflF4aPFBIQvZVo5bFAQYvIDQgvYFIjEFSIwvVAALwJGQyKGDQi/XSIYyDdhjvaYBIwNF8AwOF6LBHRoqVDXpIvUWQ4wGBpAvhSQaNHF7DCNdxwvcSIgRNF659GAAqUJF/4vIXAQGJBgy/hMxov/F6QARF/es64NBAD/XEwQvCqwvBBIYvhEgQvD/3+RoYAkFoOBFoIvqE4IvE/2BwMrAEgnBFwgACXsIADFo4ABeoIAjFQgA=")) diff --git a/apps/marioclock/marioclock.png b/apps/marioclock/marioclock.png new file mode 100644 index 000000000..a462cdea1 Binary files /dev/null and b/apps/marioclock/marioclock.png differ diff --git a/apps/mclock/ChangeLog b/apps/mclock/ChangeLog index 7819dbe2a..e6a689e9e 100644 --- a/apps/mclock/ChangeLog +++ b/apps/mclock/ChangeLog @@ -1 +1,2 @@ 0.02: Modified for use with new bootloader and firmware +0.03: Added Locale based date diff --git a/apps/mclock/clock-morphing.js b/apps/mclock/clock-morphing.js index 50e81ec72..ce30ad033 100644 --- a/apps/mclock/clock-morphing.js +++ b/apps/mclock/clock-morphing.js @@ -1,3 +1,4 @@ +var locale = require("locale"); // Offscreen buffer var buf = Graphics.createArrayBuffer(240,86,1,{msb:true}); function flip() { @@ -145,7 +146,7 @@ function draw(lastText,thisText,n) { buf.drawString(("0"+d.getSeconds()).substr(-2), x, y-8); // date buf.setFontAlign(0,-1); - var date = d.toString().substr(0,15); + var date = locale.date(d,false); buf.drawString(date, buf.getWidth()/2, y+8); flip(); } diff --git a/apps/mclock/clock-morphing.json b/apps/mclock/clock-morphing.json deleted file mode 100644 index bf629ac87..000000000 --- a/apps/mclock/clock-morphing.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name":"Morphing Clock","type":"clock", - "icon":"*mclock", - "src":"-mclock", - "sortorder":-10 -} diff --git a/apps/miclock/ChangeLog b/apps/miclock/ChangeLog index 7819dbe2a..f2e354bc1 100644 --- a/apps/miclock/ChangeLog +++ b/apps/miclock/ChangeLog @@ -1 +1,3 @@ 0.02: Modified for use with new bootloader and firmware +0.03: Localization +0.04: move jshint to the top diff --git a/apps/miclock/clock-mixed.js b/apps/miclock/clock-mixed.js index 579db5f19..bf6efb09e 100644 --- a/apps/miclock/clock-mixed.js +++ b/apps/miclock/clock-mixed.js @@ -1,4 +1,5 @@ /* jshint esversion: 6 */ +var locale = require("locale"); const Radius = { "center": 8, "hour": 78, "min": 95, "dots": 102 }; const Center = { "x": 120, "y": 132 }; @@ -16,6 +17,7 @@ function drawMixedClock() { var date = new Date(); var dateArray = date.toString().split(" "); + var isEn = locale.name.startsWith("en"); var point = []; var minute = date.getMinutes(); var hour = date.getHours(); @@ -25,10 +27,10 @@ function drawMixedClock() { g.setColor(0x7be0); g.setFont("6x8", 2); g.setFontAlign(-1, 0); - g.drawString(dateArray[0] + ' ', 4, 35, true); - g.drawString(' ' + dateArray[2], 4, 225, true); + g.drawString(locale.dow(date,true) + ' ', 4, 35, true); + g.drawString(isEn?(' ' + dateArray[2]):locale.month(date,true), 4, 225, true); g.setFontAlign(1, 0); - g.drawString(dateArray[1], 237, 35, true); + g.drawString(isEn?locale.month(date,true):(' ' + dateArray[2]), 237, 35, true); g.drawString(dateArray[3], 237, 225, true); // draw hour and minute dots diff --git a/apps/miclock/clock-mixed.json b/apps/miclock/clock-mixed.json deleted file mode 100644 index b5396287a..000000000 --- a/apps/miclock/clock-mixed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name":"Mixed Clock","type":"clock", - "icon":"*miclock", - "src":"-miclock", - "sortorder":-10 -} diff --git a/apps/minionclk/ChangeLog b/apps/minionclk/ChangeLog new file mode 100755 index 000000000..7b83706bf --- /dev/null +++ b/apps/minionclk/ChangeLog @@ -0,0 +1 @@ +0.01: First release diff --git a/apps/minionclk/app-icon.js b/apps/minionclk/app-icon.js new file mode 100755 index 000000000..f78fb9e35 --- /dev/null +++ b/apps/minionclk/app-icon.js @@ -0,0 +1 @@ +require("heatshrink").decompress(atob("mEwhAaXlZEolVVvOj0mq1XOv9/qtWFb8rquj1XV5wBDAA2jvMqNLMqwAsCABBhBAIujqpbWvIsCLowBHMg0qFyVVFQJNDK4YoEAYxjFvIuQwHP6ur5+rDgfU5wBDMI2qCYOsC4XV0bFOwIWBAAeBAIOrMYYsF54sCCIWswQDB52AGBcrFIOtF4gAEMoJfDAAOrCYQuDAIowKFwQWIBIeA52pGQPWLYgAFA4YDBGA4uDEwQYFGQvPL4IuKC4wwHFglWAIQYIYoQuFCYwDGqrqFF4YYCYBKeHHwgRLlZhCLowMBKIIubWAtWF4PXBQRdEBAIBHGAoTRCIRfCDQQvBLofXB4NVBIQcDFweAOYdWp9WqwrDGA8ABoRJFAAOswFOqtUwBNFeQYVCwMqp4ABqwbDCowvCAgKOGf4N5aAIwKKIVPpwRBGQOBFw5fCIgZfGwFVlT/BqtVBQQwFUAVWFwMAlYvCL6mBqkqDgNUF4RLGAgVPFwMAklPwD0GX5gOCXoReBJgSvDIwWrAoN6py/Cp58DCYxQBVIYwHqyQBbgL6EX4qQDFwRdFLAifBaoQaEAJIuDCYWrEgoTIGAerWIJfHGRZdECZ5fD0bQBIwJgEIoynEGBJxIAAYPBwHNlUq6owBMIZ4OMKQPC0eiqsr53PX4guOwBhOComk0ejqpfB53OJZAeDU4lVvN5OQQXKBIeA0RfBvNV5wwBMI4uD1oLDFoN4AQJEMBYWl0fOL4NUL4QwCPw4BEwN4AAejvGACZaMBLoRfGAIWr1Z8HwGkFQRIBDgekwAVGFoOAB4QTDqgvBFwQDD1Wk1el1YsBv4oDAIoAB0d/GQOlAIV/CpF51ZfFAIgAEUoOiAJYmEAAoHDvOBFxWqAIWpFxwnDOJABBquJ1QwM5oDCMYYDDAIN/5+r6CABHRKOBmVewIwCYY4sC0bGB678B1ekZYIAB0ulwOlvWkIQLJCMY0yq2sr2sMJYABp96vQnB0tPz4FBBANzAAWj5pdI0dWq0zr2Ir2rMJKQCvNIp9PudIuYDBAIV0FwSMFL4d/LoMzL4WBwIwD6hhH5ujuZXBFAIDDAIOdFwPNL4hdCwBdCq15AgMrAQLDB52pRYYACBIWjvGdK4NJAQOdvIlB5oXB0QwBLoWjqsrAAaSCGANVGAJHBSQjBEAAINBewIDCLYIBCAAJfDv5dCLAIvBvIEDAAJoBwGqDQSUBY4htDBwIBBAoIwDL4WjvNdhAvCAAYFGhDGCY4IAB1QABFwQwDv4BB1V/0eA0mALINdP4IpGMYcAAIQABGAIxDAAIFBruCroAGq1eFALkDmdeD4IjDGQYCCBQYDBCgIqBAJAoBAQIDCmeBCoIDCGgIfBLooADL4YBCJAIiCAANdAIQoCAI4ABAYdWKQQDDMooEBlVPBwJfCGAwABFxABDSAZYGLo1OvFOIgQaBLYZhFAIsyFgYAEFAUqpxUBFYQ=")) \ No newline at end of file diff --git a/apps/minionclk/app.js b/apps/minionclk/app.js new file mode 100755 index 000000000..88fe446ae --- /dev/null +++ b/apps/minionclk/app.js @@ -0,0 +1,68 @@ +const bob = require("heatshrink").decompress(atob("nk8hAaXlYLWAEsqvN/0gBBql5lQ2tquj1XV5wBJ52j0hACPsdP1QsBAQQAGBIIBF51/P8OkN5R1GIxF5HLmAFgoDLPZfOpzmZ6vPFwomCPaA6DAYOjeq2A1YyCdI4HGQJQ8F1T2SJ4Oq1XW1es1mtAQOrPoPUAIh3J54ZHIAR5S62s64cBwIBGQIOqHQK4HKQYVDAAIFC1g+BHh9VHAQAFDwQDDHoJ5E54BB6AaBKQ5YGqo6MwJzGHQ4BDeIj/BR4JxDABY8BvI6OOYgaEHwZADHgQ6BZA42GAIusPJNW64eFqzJDlcrERA8BHQI2FqwaBDYYGBPI45GCoIgCLoVWQ5NWXA2rKhaiGLAwOGEAmADxJPDVA51ElQaMC4ouEWALdEHRg8Dc4woCDJo8EAIYxCHQQIFHiwaRegJ5EcYWsHgbrKbBA8GDSrNDO4wfRKgR3FDSh3CN4UrdwZbSHYZ5DHajMFHYQGCHalWO4jtQDQwABwAGCAAQfTKoK0EHahwCeARdFHakASIZWVZ4Q8CO4YgWO4QbCO6hWGEIKYZKzZ3DLog7UG4I6C1lWDSdWO4bpCO4bwUwKYEHajMDwOAlUkLojTUd4gaTZoRWC0YIB1eJLqo4EWiqRE0mjlcr1QkEeKFWOooBCHiB2CC4WA5wzB52rEQgfPHQwABAYJXOHQ2iO4XO6omFEJh1BEAgBGPJlWDIQbC0ej50qgHV1XPEwohKcwRbEvJ3EBQTrLFomkOwOjlR3C5w8GMAR8ClYuBLIgOCvN4HgIZFDQYbBlaOBR4YNCwA5B0XOpzvBHgWqTw4AFxB1EvQ6BAAI8GDZILEdgQBCqp3DPIRfIEQwABvJ1CvGkvGiwA6IAYoBCv6wCAAVOlQ6DAIWkL5ABEwN40Z1CAYJfCv7zEAJNWOYZ3KAIWq5yYHFYLOBLIrVCAIh7BOIzpECoYDDpw7BHAQDG1WqwGkAIN/CwIABLY4LDAAZ9BwAABvLCBC5IBBvOrO44BEAAmjAIPN0XOAJyHIAAgPEquBHBi4BAId+HwWiHxqJDRpYBDq2I1R3LIAQ6BAAOpPogABGgIDDOomk0nP5pIGd42Aq1ewI8CeZI6CHAJhCEAIDCdIo2B0er1esAQIZBC4Z9JlVW1leeKGp0es5+s6+s6ABB0oFBAIervWr0ulub7OqtWmdexJ4BGxB5G0V6pF6wItB0t6p9PvQABvINBudJudPzwXCHQwBDlY6BO4WIwPPPJbvDvA0BFgNzAAIDGugGCzrtHdYh1DAIOBrzxBPIgAIeIXNHgoBCGwYADzoVB0fNOpMyHQdW5+Bro7BHgQAB6jxJAAOjOYhxCAIukOoPN5ujdZFWqyyD0d6AwUrquBwAuB1I1FHgRJBMoQ9BWg1zzw0BDYI6B0R3DAAJ1BvMyp8rAAV4IQWBIodewAeCHAZ5IAAJoBAAXHHAJWDO4TtEdYQvEHgejAwIKClcqIQRdDXYbzFeoQBIGwIDDOot/VgQ6FAAIGBlgBCAAMzmZPBF4LzDACB1FAAOi1WjvFVr0zGYQ7GAAMAAYpPBwNeAIOIwOrfYOA1eA1WkAIWjAIekv4PBwCVBruBq5eBEYIABlcBF4wCEHw55CHwQABIQQBBABkzAILlCHQR1CFYavEPgsAAAIDEDQNdAwQAaHQNWEwQ0DHAh3KleBLoI7dHQKuFWQo0EAIsISoKdBHbyyHNgwADlVVpwEBDANWro7fd4Q6HO495vF5QgIYCd75eBHYUINAN5lQ3EA")); + +const locale = require("locale"); + +const black = 0x0000; +const white = 0xFFFF; + +let hour; +let minute; +let date; + +function draw() { + const d = new Date(); + + const newHour = ('0' + d.getHours()).substr(-2); + const newMinute = ('0' + d.getMinutes()).substr(-2); + const newDate = locale.date(d).trim(); + + g.setFontAlign(0, 0, 0); + + if (newHour !== hour) { + g.setFontVector(48); + g.setColor(black); + g.drawString(hour, 64, 92); + g.setColor(white); + g.drawString(newHour, 64, 92); + hour = newHour; + } + + if (newMinute !== minute) { + g.setFontVector(48); + g.setColor(black); + g.drawString(minute, 172, 92); + g.setColor(white); + g.drawString(newMinute, 172, 92); + minute = newMinute; + } + + if (newDate !== date) { + g.setFontVector(12); + g.setColor(black); + g.drawString(date, 120, 228); + g.setColor(0xFFFF); + g.drawString(newDate, 120, 228); + date = newDate; + } +} + +function drawAll() { + hour = ''; + minute = ''; + date = ''; + g.drawImage(bob, 0, 0, { scale: 4 }); + draw(); +} + +Bangle.on('lcdPower', function(on) { + if (on) { + drawAll(); + } +}); + +Bangle.loadWidgets(); +Bangle.drawWidgets(); +setInterval(draw, 1000); +drawAll(); + +setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"}); diff --git a/apps/minionclk/minionclk.png b/apps/minionclk/minionclk.png new file mode 100755 index 000000000..77cac31df Binary files /dev/null and b/apps/minionclk/minionclk.png differ diff --git a/apps/mmonday/ChangeLog b/apps/mmonday/ChangeLog new file mode 100644 index 000000000..1b5f725c4 --- /dev/null +++ b/apps/mmonday/ChangeLog @@ -0,0 +1 @@ +0.02: Added vibrate as beep workaround diff --git a/apps/mmonday/manic-monday.js b/apps/mmonday/manic-monday.js index a2245e7e7..c949fafbf 100644 --- a/apps/mmonday/manic-monday.js +++ b/apps/mmonday/manic-monday.js @@ -1,12 +1,23 @@ // made using https://www.espruino.com/Making+Music // Manic Monday tone by The Bangles -var SPEAKER_PIN = D18; - -function freq(f) { - if (f===0) digitalWrite(SPEAKER_PIN, 0); - else analogWrite(SPEAKER_PIN, 0.5, {freq: f}); +var s = require('Storage').readJSON('setting.json',1)||{}; +/* Normally we'd just use Bangle.beep which works automatically +but because we're going lower level we need to account for the +different pin. */ +if (s.beep=="vib") { + function freq(f) { + if (f===0) digitalWrite(D13, 0); + else analogWrite(D13, 0.1, {freq: f}); + } +} else { + function freq(f) { + if (f===0) digitalWrite(D18, 0); + else analogWrite(D18, 0.5, {freq: f}); + } } + + freq(1000); freq(1500); freq(0); @@ -39,6 +50,7 @@ var tune = "aggffefed"; var pos = 0; setWatch(() => { + pos = 0; var playing = setInterval(step, 500); if(playing === 0) clearInterval(playing); }, BTN1); diff --git a/apps/mmonday/manic-monday.json b/apps/mmonday/manic-monday.json deleted file mode 100644 index 1454658dd..000000000 --- a/apps/mmonday/manic-monday.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name":"Manic Monday tone", - "icon": "*mmonday", - "src":"-mmonday" -} diff --git a/apps/moonphase/ChangeLog b/apps/moonphase/ChangeLog new file mode 100644 index 000000000..baa668c3c --- /dev/null +++ b/apps/moonphase/ChangeLog @@ -0,0 +1,2 @@ +0.01: New App! +0.02: Added GPS to obtain coordinates, added buttons \ No newline at end of file diff --git a/apps/moonphase/app-icon.js b/apps/moonphase/app-icon.js new file mode 100644 index 000000000..b083b07e5 --- /dev/null +++ b/apps/moonphase/app-icon.js @@ -0,0 +1 @@ +require("heatshrink").decompress(atob("mEwgIifh/wAod//wECgP//+AAoMHAoPgCwQFBDAUfw///AFBjkD//8AoMYgPnEgUQgPB/4qCgeB/YFDwHxGAeA+AFEvHAAocdAoQCBh4CBgJFBh4CBAoNwg4FBhHA+AIBgkcgJSBAoMIg5SBAoIpB/E58EGAoP8n4FD/8f8EDAoQvBgfANYOfAYPwAoP/4AtBAoWAgP4SARfBAoZYB/0/Aod/AgKJCBQSVCj4FBUIStFXIrFFaIrdGADYA==")) \ No newline at end of file diff --git a/apps/moonphase/app.js b/apps/moonphase/app.js new file mode 100644 index 000000000..480a0e144 --- /dev/null +++ b/apps/moonphase/app.js @@ -0,0 +1,353 @@ +//Icons from https://icons8.com +//Sun and Moon calculations from https://github.com/mourner/suncalc and https://gist.github.com/endel/dfe6bb2fbe679781948c + +//varibales +const storage = require('Storage'); +let coords; +var timer; +var fix; + +var PI = Math.PI, + sin = Math.sin, + cos = Math.cos, + tan = Math.tan, + asin = Math.asin, + atan = Math.atan2, + acos = Math.acos, + rad = PI / 180, + dayMs = 1000 * 60 * 60 * 24, + J1970 = 2440588, + J2000 = 2451545; + +var SunCalc = {}; + +//pictures +function getImg(i) { + var data = { + "NewMoon": "AD8AAH/4AHwPgDwA8BwADg4AAcMAADHAAA5gAAGYAABsAAAPAAADwAAA8AAAPAAADwAAA2AAAZgAAGcAADjAAAw4AAcHAAOA8APAHwPgAf/gAA/AAA==", + "WaxingCrescentNorth" : "AD8AAH/4AHw/gDwH8BwA/g4AH8MAB/HAAf5gAD+YAA/sAAP/AAD/wAA/8AAP/AAD/wAA/2AAP5gAD+cAB/jAAfw4AH8HAD+A8B/AHw/gAf/gAA/AAA==", + "WaningCrescentSouth" : "AD8AAH/4AHw/gDwH8BwA/g4AH8MAB/HAAf5gAD+YAA/sAAP/AAD/wAA/8AAP/AAD/wAA/2AAP5gAD+cAB/jAAfw4AH8HAD+A8B/AHw/gAf/gAA/AAA==", + "FirstQuarterNorth" : "AD8AAH/4AHx/gDwf8BwH/g4B/8MAf/HAH/5gB/+YAf/sAH//AB//wAf/8AH//AB//wAf/2AH/5gB/+cAf/jAH/w4B/8HAf+A8H/AHx/gAf/gAA/AAA==", + "FirstQuarterSouth" : "AD8AAH/4AH+PgD/g8B/4Dg/+AcP/gDH/4A5/+AGf/gBv/4AP/+AD//gA//4AP/+AD//gA3/4AZ/+AGf/gDj/4Aw/+AcH/gOA/4PAH+PgAf/gAA/AAA==", + "WaxingGibbousNorth" : "AD8AAH/4AH3/gDz/8Bw//g4f/8MH//HB//5g//+YP//sD///A///wP//8D///A///wP//2D//5g//+cH//jB//w4f/8HD/+A8//AH3/gAf/gAA/AAA==", + "WaxingGibbousSouth" : "AD8AAH/4AH/vgD/88B//Dg//4cP/+DH//g5//8Gf//Bv//wP//8D///A///wP//8D///A3//wZ//8Gf/+Dj//gw//4cH/8OA//PAH/vgAf/gAA/AAA==", + "FullMoon" : "AD8AAH/4AH//gD//8B///g///8P///H///5///+f///v/////////////////////////3///5///+f///j///w///8H//+A///AH//gAf/gAA/AAA==", + "WaningGibbousNorth" : "AD8AAH/4AH/vgD/88B//Dg//4cP/+DH//g5//8Gf//Bv//wP//8D///A///wP//8D///A3//wZ//8Gf/+Dj//gw//4cH/8OA//PAH/vgAf/gAA/AAA==", + "WaningGibbousSouth" : "AD8AAH/4AH3/gDz/8Bw//g4f/8MH//HB//5g//+YP//sD///A///wP//8D///A///wP//2D//5g//+cH//jB//w4f/8HD/+A8//AH3/gAf/gAA/AAA==", + "LastQuarterNorth" : "AD8AAH/4AH+PgD/g8B/4Dg/+AcP/gDH/4A5/+AGf/gBv/4AP/+AD//gA//4AP/+AD//gA3/4AZ/+AGf/gDj/4Aw/+AcH/gOA/4PAH+PgAf/gAA/AAA==", + "LastQuarterSouth" : "AD8AAH/4AHx/gDwf8BwH/g4B/8MAf/HAH/5gB/+YAf/sAH//AB//wAf/8AH//AB//wAf/2AH/5gB/+cAf/jAH/w4B/8HAf+A8H/AHx/gAf/gAA/AAA==", + "WaningCrescentNorth" : "AD8AAH/4AH8PgD+A8B/ADg/gAcP4ADH+AA5/AAGfwABv8AAP/AAD/wAA/8AAP/AAD/wAA38AAZ/AAGf4ADj+AAw/gAcH8AOA/gPAH8PgAf/gAA/AAA==", + "WaxingCrescentSouth" : "AD8AAH/4AH8PgD+A8B/ADg/gAcP4ADH+AA5/AAGfwABv8AAP/AAD/wAA/8AAP/AAD/wAA38AAZ/AAGf4ADj+AAw/gAcH8AOA/gPAH8PgAf/gAA/AAA==" + }; + return { + width : 26, height : 26, bpp : 1, + transparent : 0, + buffer : E.toArrayBuffer(atob(data[i])) + }; +} +// sun calculations are based on http://aa.quae.nl/en/reken/zonpositie.html formulas +// date/time constants and conversions +function toJulian(date) { return date.valueOf() / dayMs - 0.5 + J1970; } +function fromJulian(j) { return new Date((j + 0.5 - J1970) * dayMs); } +function toDays(date) { return toJulian(date) - J2000; } + +// general calculations for position +var e = rad * 23.4397; // obliquity of the Earth +function rightAscension(l, b) { return atan(sin(l) * cos(e) - tan(b) * sin(e), cos(l)); } +function declination(l, b) { return asin(sin(b) * cos(e) + cos(b) * sin(e) * sin(l)); } +function azimuth(H, phi, dec) { return atan(sin(H), cos(H) * sin(phi) - tan(dec) * cos(phi)); } +function altitude(H, phi, dec) { return asin(sin(phi) * sin(dec) + cos(phi) * cos(dec) * cos(H)); } +function siderealTime(d, lw) { return rad * (280.16 + 360.9856235 * d) - lw; } +function astroRefraction(h) { + if (h < 0) // the following formula works for positive altitudes only. + h = 0; // if h = -0.08901179 a div/0 would occur. + + // formula 16.4 of "Astronomical Algorithms" 2nd edition by Jean Meeus (Willmann-Bell, Richmond) 1998. + // 1.02 / tan(h + 10.26 / (h + 5.10)) h in degrees, result in arc minutes -> converted to rad: + return 0.0002967 / Math.tan(h + 0.00312536 / (h + 0.08901179)); +} + +// general sun calculations +function solarMeanAnomaly(d) { return rad * (357.5291 + 0.98560028 * d); } +function eclipticLongitude(M) { + + var C = rad * (1.9148 * sin(M) + 0.02 * sin(2 * M) + 0.0003 * sin(3 * M)), // equation of center + P = rad * 102.9372; // perihelion of the Earth + + return M + C + P + PI; +} + +function sunCoords(d) { + var M = solarMeanAnomaly(d), + L = eclipticLongitude(M); + return { + dec: declination(L, 0), + ra: rightAscension(L, 0) + }; +} + + + +// adds a custom time to the times config +SunCalc.addTime = function (angle, riseName, setName) { + times.push([angle, riseName, setName]); +}; + +// moon calculations, based on http://aa.quae.nl/en/reken/hemelpositie.html formulas +function moonCoords(d) { // geocentric ecliptic coordinates of the moon + var L = rad * (218.316 + 13.176396 * d), // ecliptic longitude + M = rad * (134.963 + 13.064993 * d), // mean anomaly + F = rad * (93.272 + 13.229350 * d), // mean distance + l = L + rad * 6.289 * sin(M), // longitude + b = rad * 5.128 * sin(F), // latitude + dt = 385001 - 20905 * cos(M); // distance to the moon in km + + return { + ra: rightAscension(l, b), + dec: declination(l, b), + dist: dt + }; +} + +SunCalc.getMoonPosition = function (date, lat, lng) { + + var lw = rad * -lng, + phi = rad * lat, + d = toDays(date), + c = moonCoords(d), + H = siderealTime(d, lw) - c.ra, + h = altitude(H, phi, c.dec), + // formula 14.1 of "Astronomical Algorithms" 2nd edition by Jean Meeus (Willmann-Bell, Richmond) 1998. + pa = atan(sin(H), tan(phi) * cos(c.dec) - sin(c.dec) * cos(H)); + h = h + astroRefraction(h); // altitude correction for refraction + return { + azimuth: azimuth(H, phi, c.dec), + altitude: h, + distance: c.dist, + parallacticAngle: pa + }; +}; + +// calculations for illumination parameters of the moon, +// based on http://idlastro.gsfc.nasa.gov/ftp/pro/astro/mphase.pro formulas and +// Chapter 48 of "Astronomical Algorithms" 2nd edition by Jean Meeus (Willmann-Bell, Richmond) 1998. +SunCalc.getMoonIllumination = function (date) { + var year = date.getFullYear(); + var month = date.getMonth(); + var day = date.getDate(); + var Moon = { + phases: ['new', 'waxing-crescent', 'first-quarter', 'waxing-gibbous', 'full', 'waning-gibbous', 'last-quarter', 'waning-crescent'], + phase: function (year, month, day) { + let c = 0; + let e = 0; + let jd = 0; + let b = 0; + if (month < 3) { + year--; + month += 12; + } + ++month; + c = 365.25 * year; + e = 30.6 * month; + jd = c + e + day - 694039.09; // jd is total days elapsed + jd /= 29.5305882; // divide by the moon cycle + b = parseInt(jd); // int(jd) -> b, take integer part of jd + jd -= b; // subtract integer part to leave fractional part of original jd + b = Math.round(jd * 8); // scale fraction from 0-8 and round + if (b >= 8) b = 0; // 0 and 8 are the same so turn 8 into 0 + return {phase: b, name: Moon.phases[b]}; + } + }; + return (Moon.phase(year, month, day)); +}; + +function hoursLater(date, h) { + return new Date(date.valueOf() + h * dayMs / 24); +} + +// calculations for moon rise/set times are based on http://www.stargazing.net/kepler/moonrise.html article +SunCalc.getMoonTimes = function (date, lat, lng, inUTC) { + var t = new Date(date); + if (inUTC) t.setUTCHours(0, 0, 0, 0); + else t.setHours(0, 0, 0, 0); + var hc = 0.133 * rad, + h0 = SunCalc.getMoonPosition(t, lat, lng).altitude - hc, + h1, h2, rise, set, a, b, xe, ye, d, roots, x1, x2, dx; + + // go in 2-hour chunks, each time seeing if a 3-point quadratic curve crosses zero (which means rise or set) + for (var i = 1; i <= 24; i += 2) { + h1 = SunCalc.getMoonPosition(hoursLater(t, i), lat, lng).altitude - hc; + h2 = SunCalc.getMoonPosition(hoursLater(t, i + 1), lat, lng).altitude - hc; + a = (h0 + h2) / 2 - h1; + b = (h2 - h0) / 2; + xe = -b / (2 * a); + ye = (a * xe + b) * xe + h1; + d = b * b - 4 * a * h1; + roots = 0; + if (d >= 0) { + dx = Math.sqrt(d) / (Math.abs(a) * 2); + x1 = xe - dx; + x2 = xe + dx; + if (Math.abs(x1) <= 1) roots++; + if (Math.abs(x2) <= 1) roots++; + if (x1 < -1) x1 = x2; + } + if (roots === 1) { + if (h0 < 0) rise = i + x1; + else set = i + x1; + } else if (roots === 2) { + rise = i + (ye < 0 ? x2 : x1); + set = i + (ye < 0 ? x1 : x2); + } + if (rise && set) break; + h0 = h2; + } + var result = {}; + if (rise) result.rise = hoursLater(t, rise); + if (set) result.set = hoursLater(t, set); + if (!rise && !set) result[ye > 0 ? 'alwaysUp' : 'alwaysDown'] = true; + return result; +}; + +function getMPhaseComp (offset) { + var date = new Date(); + date.setDate(date.getDate() + offset); + var dd = String(date.getDate()); + if(dd<10){dd='0'+dd;} + var mm = String(date.getMonth() + 1); + if(mm<10){mm='0'+mm;} + var yyyy = date.getFullYear(); + var phase = SunCalc.getMoonIllumination(date); + return dd + "." + mm + "." + yyyy + ": "+ phase.name; +} + +function getMPhaseSim (offset) { + var date = new Date(); + date.setDate(date.getDate() + offset); + var dd = String(date.getDate()); + if(dd<10){dd='0'+dd;} + var mm = String(date.getMonth() + 1); + if(mm<10){mm='0'+mm;} + var yyyy = date.getFullYear(); + var phase = SunCalc.getMoonIllumination(date); + return phase.name; +} + +function drawMoonPhase(offset, x, y){ + if (coords.lat >= 0 && coords.lat <= 90){ //Northern hemisphere + if (getMPhaseSim(offset) == "new") {g.drawImage(getImg("NewMoon"), x, y);} + if (getMPhaseSim(offset) == "waxing-crescent") {g.drawImage(getImg("WaxingCrescentNorth"), x, y);} + if (getMPhaseSim(offset) == "first-quarter") {g.drawImage(getImg("FirstQuarterNorth"), x, y);} + if (getMPhaseSim(offset) == "waxing-gibbous") {g.drawImage(getImg("WaxingGibbousNorth"), x, y);} + if (getMPhaseSim(offset) == "full") {g.drawImage(getImg("FullMoon"), x, y);} + if (getMPhaseSim(offset) == "waning-gibbous") {g.drawImage(getImg("WaningGibbousNorth"), x, y);} + if (getMPhaseSim(offset) == "last-quarter") {g.drawImage(getImg("LastQuarterNorth"), x, y);} + if (getMPhaseSim(offset) == "waning-crescent") {g.drawImage(getImg("WaningCrescentNorth"), x, y);} +} + else { //Southern hemisphere + if (getMPhaseSim(offset) == "new") {g.drawImage(getImg("NewMoon"), x, y);} + if (getMPhaseSim(offset) == "waxing-crescent") {g.drawImage(getImg("WaxingCrescentSouth"), x, y);} + if (getMPhaseSim(offset) == "first-quarter") {g.drawImage(getImg("FirstQuarterSouth"), x, y);} + if (getMPhaseSim(offset) == "waxing-gibbous") {g.drawImage(getImg("WaxingGibbousSouth"), x, y);} + if (getMPhaseSim(offset) == "full") {g.drawImage(getImg("FullMoon"), x, y);} + if (getMPhaseSim(offset) == "waning-gibbous") {g.drawImage(getImg("WaningGibbousSouth"), x, y);} + if (getMPhaseSim(offset) == "last-quarter") {g.drawImage(getImg("LastQuarterSouth"), x, y);} + if (getMPhaseSim(offset) == "waning-crescent") {g.drawImage(getImg("WaningCrescentSouth"), x, y);} + } +} + +function drawMoon(offset, x, y) { + g.setFont("6x8"); + g.clear(); + g.drawString("Key1: day+, Key2:today, Key3:day-",x,y-30); + g.drawString("Last known coordinates: " + coords.lat.toFixed(4) + " " + coords.lon.toFixed(4), x, y-20); + g.drawString("Press BTN4 to update",x, y-10); + + g.drawString(getMPhaseComp(offset),x,y+30); + drawMoonPhase(offset, x+35, y+40); + + g.drawString(getMPhaseComp(offset+2),x,y+70); + drawMoonPhase(offset+2, x+35, y+80); + + g.drawString(getMPhaseComp(offset+4),x,y+110); + drawMoonPhase(offset+4, x+35, y+120); + + g.drawString(getMPhaseComp(offset+6),x,y+150); + drawMoonPhase(offset+6, x+35, y+160); +} + +//Write coordinates to file +function updateCoords() { + storage.write('coords.json', coords); +} + +//set coordinates to default (city where I live) +function resetCoords() { + coords = { + lat : 52.96236, + lon : 7.62571, + }; + updateCoords(); +} + +function getGpsFix() { + Bangle.on('GPS', function(fix) { + g.clear(); + + if (fix.fix == 1) { + var gpsString = "lat: " + fix.lat.toFixed(4) + " lon: " + fix.lon.toFixed(4); + coords.lat = fix.lat; + coords.lon = fix.lon; + updateCoords(); + g.drawString("Got GPS fix and wrote coords to file",10,20); + g.drawString(gpsString,10,30); + g.drawString("Press BTN5 to return to app",10,40); + clearInterval(timer); + timer = undefined; + } + else { + g.drawString("Searching satellites...",10,20); + g.drawString("Press BTN5 to stop GPS",10, 30); + } + }); +} + +function start() { + var x = 10; + var y = 50; + var offsetMoon = 0; + coords = storage.readJSON('coords.json',1); //read coordinates from file + if (!coords) resetCoords(); //if coordinates could not be read, reset them + drawMoon(offsetMoon, x, y); //offset, x, y + + //define button functions + setWatch(function() { //BTN1 + offsetMoon++; //jump to next day + drawMoon(offsetMoon, x, y); //offset, x, y + }, BTN1, {edge:"rising", debounce:50, repeat:true}); + + setWatch(function() { //BTN2 + offsetMoon = 0; //jump to today + drawMoon(offsetMoon, x, y); //offset, x, y + }, BTN2, {edge:"rising", debounce:50, repeat:true}); + + setWatch(function() { //BTN3 + offsetMoon--; //jump to next day + drawMoon(offsetMoon, x, y); //offset, x, y + }, BTN3, {edge:"rising", debounce:50, repeat:true}); + + setWatch(function() { //BTN4 + g.drawString("--- Getting GPS signal ---",x, y); + Bangle.setGPSPower(1); + timer = setInterval(getGpsFix, 10000); + }, BTN4, {edge:"rising", debounce:50, repeat:true}); + + setWatch(function() { //BTN5 + if (timer) clearInterval(timer); + timer = undefined; + Bangle.setGPSPower(0); + drawMoon(offsetMoon, x, y); //offset, x, y + }, BTN5, {edge:"rising", debounce:50, repeat:true}); +} + +start(); \ No newline at end of file diff --git a/apps/moonphase/app.png b/apps/moonphase/app.png new file mode 100644 index 000000000..cdad713a1 Binary files /dev/null and b/apps/moonphase/app.png differ diff --git a/apps/morse/morse-code.json b/apps/morse/morse-code.json deleted file mode 100644 index bbd142c18..000000000 --- a/apps/morse/morse-code.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name":"Morse Code","type":"app", - "icon":"*morse", - "src":"-morse" -} \ No newline at end of file diff --git a/apps/nceuwid/nceu-widget.js b/apps/nceuwid/nceu-widget.js deleted file mode 100644 index fa0e11cd1..000000000 --- a/apps/nceuwid/nceu-widget.js +++ /dev/null @@ -1,13 +0,0 @@ -(function(){ -var img = E.toArrayBuffer(atob("SxgCAAAAAAAAAAAAAAAAAAAAAAAAALwDwH/gD/0B//Af+AAD4C8f/wL8Dwf/8H//C//C//AAD9C8f/wL9Dw//+H//i4AD0AH8D/C8fAAL/Dz///H//y8ALgAf/D/i8fAALrzz///H//2//PAAv/Dz28f/gLz7z///H//29VPQAv/Dx+8fqQLw/y///H//y4ALwAP/Dwv8fAALwfw//9H//i+qD8FC0DwP8fAALwPwP/4H/+C//A//AADwD8fAAAAAAC/QD+gAAAAL4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGqooBkD+AP0fgvgAAAAAAAAAAL/88C4NBw0NBjQcAAAAAAAAAALQA8C4AAyQDBjAJAAAAAAAAAALQA8C4AAzACBjAKAAAAAAAAAAL/88C4ABTACRjQbAAAAAAAAAAL/48C4AHDACRgvjAAAAAAAAAALQA8C4AcDACBgACAAAAAAAAAALQA+D0BwCQDBgANAAAAAAAAAAL/8P/wHAA0NBgAoAAAAAAAAAAGqoC+AP/0HgAQuAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA")); -var xpos = WIDGETPOS.tl; -WIDGETPOS.tl+=75; - - -WIDGETS["nceu"]={draw:()=>{ - var x = xpos, y = 0; - g.setColor(0.17,0.2,0.5); - g.drawImage(img,x,y); - g.setColor(1,1,1); -}}; -})() diff --git a/apps/nceuwid/nceu-widget.json b/apps/nceuwid/nceu-widget.json deleted file mode 100644 index b7c4faa70..000000000 --- a/apps/nceuwid/nceu-widget.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name":"nceuwid", - "type":"widget", - "src":"=nceuwid" -} diff --git a/apps/ncfrun/nceu-funrun.json b/apps/ncfrun/nceu-funrun.json deleted file mode 100644 index 6a62f1a66..000000000 --- a/apps/ncfrun/nceu-funrun.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name":"5K Fun Run","type":"app", - "icon":"*ncfrun", - "src":"-ncfrun", - "sortorder":-1 -} diff --git a/apps/ncstart/ChangeLog b/apps/ncstart/ChangeLog index ec926ceed..553f7388a 100644 --- a/apps/ncstart/ChangeLog +++ b/apps/ncstart/ChangeLog @@ -1,2 +1,4 @@ 0.02: Modified for use with new bootloader and firmware Renamed as nodeconf-specific +0.03: Move configuration into App/widget settings + Move loader into welcome.boot.js diff --git a/apps/ncstart/boot.js b/apps/ncstart/boot.js new file mode 100644 index 000000000..dbb70d213 --- /dev/null +++ b/apps/ncstart/boot.js @@ -0,0 +1,10 @@ +(function() { + let s = require('Storage').readJSON('setting.json', 1) || {} + if (!s.welcomed && require('Storage').read('ncstart.app.js')) { + setTimeout(() => { + s.welcomed = true + require('Storage').write('setting.json', s) + load('ncstart.app.js') + }) + } +})() diff --git a/apps/ncstart/settings.js b/apps/ncstart/settings.js new file mode 100644 index 000000000..284262634 --- /dev/null +++ b/apps/ncstart/settings.js @@ -0,0 +1,16 @@ +// The welcome app is special, and gets to use global settings +(function(back) { + let settings = require('Storage').readJSON('setting.json', 1) || {} + E.showMenu({ + '': { 'title': 'NCEU Startup' }, + 'Run again': { + value: !settings.welcomed, + format: v => v ? 'Yes' : 'No', + onchange: v => { + settings.welcomed = v ? undefined : true + require('Storage').write('setting.json', settings) + }, + }, + '< Back': back, + }) +}) diff --git a/apps/ncstart/start.js b/apps/ncstart/start.js index 1a619555f..d2d713cb2 100644 --- a/apps/ncstart/start.js +++ b/apps/ncstart/start.js @@ -1,5 +1,3 @@ -NRF.sleep(); -var g = Graphics.getInstance(); g.setFontAlign(1, 1, 0); const d = g.getWidth() - 18; function c(a) { @@ -53,7 +51,7 @@ function logos() { ]; function next() { var n = logos.shift(); - var img = require("Storage").read("*"+n[0]); + var img = require("Storage").read("nc-"+n[0]+".img"); g.clear(); g.drawImage(img, n[1], n[2]); n[3](); @@ -116,22 +114,7 @@ function info() { }); } -function cleanup() { - E.showMessage('Loading...'); - var s = require('Storage'); - s.erase('*nfr'); - s.erase('*nceu'); - s.erase('*bangle'); - s.erase('*nodew'); - s.erase('*tf'); - s.erase('+ncstart'); - s.erase('.boot3'); - s.erase('*ncstart'); - return Promise.resolve(); -} - welcome() .then(logos) .then(info) - .then(cleanup) .then(load); diff --git a/apps/ncstart/start.json b/apps/ncstart/start.json deleted file mode 100644 index 73665eb7f..000000000 --- a/apps/ncstart/start.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "NCEU Start", - "type": "app", - "icon": "*ncstart", - "src": ".boot3" -} diff --git a/apps/nyancat/code.js b/apps/nyancat/code.js new file mode 100644 index 000000000..e69de29bb diff --git a/apps/openloc/openlocation-icon.js b/apps/openloc/app-icon.js similarity index 100% rename from apps/openloc/openlocation-icon.js rename to apps/openloc/app-icon.js diff --git a/apps/openloc/openlocation.js b/apps/openloc/app.js similarity index 100% rename from apps/openloc/openlocation.js rename to apps/openloc/app.js diff --git a/apps/openloc/openlocation.png b/apps/openloc/app.png similarity index 100% rename from apps/openloc/openlocation.png rename to apps/openloc/app.png diff --git a/apps/openloc/openlocation.json b/apps/openloc/openlocation.json deleted file mode 100644 index c02a5a233..000000000 --- a/apps/openloc/openlocation.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name":"Open Location","type":"app", - "icon":"*openloc", - "src":"-openloc" -} diff --git a/apps/pipboy/ChangeLog b/apps/pipboy/ChangeLog new file mode 100644 index 000000000..134ba4e18 --- /dev/null +++ b/apps/pipboy/ChangeLog @@ -0,0 +1,2 @@ +0.01: New Watch! +0.02: Changed colors for better readability and added current date diff --git a/apps/pipboy/app-icon.js b/apps/pipboy/app-icon.js new file mode 100644 index 000000000..935210156 --- /dev/null +++ b/apps/pipboy/app-icon.js @@ -0,0 +1 @@ +require("heatshrink").decompress(atob("mEwxH+AC4fDDjAuSgwACGFIuBhgACGAJjmLoQvDGAJkhbAguGGYwxbRAoAMGDZZMGBAvSbIpdSGCxYCW5jpDHhKSRDYQgGAwY8ETZYvPDZBXEAAwUFNAowOF44bFNJI2ENISRQdIqzLYhAxDAoRgScZgwFdow1DF54tQdpRMDF5jjHLiDxWF44wJBZIJFF5qPGF5blDLxIvPeAjsOF7RgCc6QvId6AvUd5QACF5pyEKAwlGF5qORcIwoFBgIwHFwwvTU4gvILxYuOXwouKA5AwGFxzuIDYYvkDQ6GIABKqEL6ryGF8QbHF6QXFX6wvuYIQvnFJgMBAAQva/wgMBQT4CF5QPCeB65CABgwCHxYuOF6L5JHYYuPSAyDFBRS6TMA4AME4RdHFyhgCLRLoJLzBgDExa7JFywwVFzQwTFwIADGDC5NRohDBSTQdCGCARCGDRNCGRQuFSobAYGAYxIFwoTDGKpMGWggADA4Q1FYipNGGA7NHYawVBD44qDGIbEHIwwlEA=")) diff --git a/apps/pipboy/app.js b/apps/pipboy/app.js new file mode 100644 index 000000000..48a87fc5d --- /dev/null +++ b/apps/pipboy/app.js @@ -0,0 +1,103 @@ +const bigFont = 4; +const smallFont = 2; +const tinyFont = 1; +const green = 0x0661; +const darkGreen = 0x0461; +const darkerGreen = 0x0261; +const pip = require("heatshrink").decompress(atob("klQyAlihNhgNhNP5FC0MjokboUJ8JC64ABBgNAjdDifiikhjfjjekjcDgOhImMKoUbscTsUbwUT4QBC8UMkMMgUT8MLwcBS8/hiNiIo2DhkBgkhhfhHoMT0MT0RLBjYJCCIMTocBUoIAiiIvBgcKsMSG4KLChY1CjckgUhgOAhJDBocL4RTBAYMT0ZJliS9BwUDQIchgWAhXCgVAgUghWhiXihWBgUAhdjhYTBkEB8ELkUTgcA8BHfgNAZ4MT8UTwcCJIOjikjihVB8QDBAIcToUSRYNDkdjjWDgOhjdjhVBI8EAgVBiXhQ4MTkcb4ZPCTILLBAYPBjZDBAIUL8QBBd4KRBWIMboZHfiPCOIMKsK5BR4XChkBAIUChkiheibYMT0RPBBoJZBgWgiRfD0RHfhMhhPhjcjhcBiQrBwSHBRocLRINCgUAhWBR4SZBsatCI4IRBsRHfAAMKkJBBhYBCgfBgZDBAYQFC0Q3BicCgehgbRBscKoMCkBlBjXiI8IxBifDgVAidDhfiIoMLkMUgUb4USQ4MiAoLlDiejgVhI4L3BjUjIr8BIILPBwUBwEa8YzBhQ/BoTLBjejgOgiTVEhkChdhiXCI4MB4MA8BHgsAxBjkDP4MjskTgZ3BTIMMkMb8cKLINCS4KPEcIMChWiK4LVhgJ5EAIJJBOoKTBbIQLB4I9BA4QJDCoOigZLBocJ8JHiwELGoPAgfghdCBIJ7BH4mhAYXAAYMDAIQNE0UKwJHioETwZ/C8cT0cS4UDgCBC4UTHIKjCiaNChfiB4SVDoUA4BJhicjhVgjeEjfDifiikCiZPBwUS4MB4ES0Ub4UUgMMgJDBAYJTBiXjIsIABiPiaIK5BgWggXhhXhgQJB4Mi8kakRJBHoJHDLIViiWCWYJHjhNBhWCHoMK0MbgkbkkTgYHBKYMTgUC4DVCcYUbscB8BDjAArFBOoKLCoECgADBaoMToUTsMLwML0MLBIUJ4JFpAAK3BidDhfiQIXCQIIBBRIcEgJFC0UKoJFrbYnBjeDibHBAIUMgIFC8QBC4UKsEA8EZ4cRJd0BwDPC8Y/BI4IBBR4IHBheijXkgOBjcCjcDVoJHriUiiWigVhiY3BS4PBI4JLCwcKkUK0UMgULwSrBiPBRtEhidDQII3BgMgPoMKgRRBhVhgPAiWBieCiehhQBBoKpBJYJFjiPihPhhdChfBieiGIMKwEKkI5BJIMTsUL4UL4afBgUgidjBIMbscJsBFfhOhjdDicigUAhWBYYMT8MT4QBHcIMCwIVBU4TnCMIMbgarBaLkgIoML8UT8Q1BiViYYI/DikCAoRXCgOAiWCCoIbBAIRHBEIPjBoJHbiR7D8UMgQ9BIoMKbIIJCAIMLkMSoSjCIYUMgIBECYIFCKYL/BIq8KgMTwRtBXIcL0UKsELRIIJBBYUCwEK4UL4UD4MDCoPgCIITEEIYJBgUBsLTUsMTka1DAIS3B0UCoETQYIvCT4MKoLXBH4QXCAYIBDEInhSIIZCsTTUsQZBNIXigkBGIVjgUhZIQ7DTIIPBoSHESoRDFAIYlBT4MToUBkCNQsETsRFBgaFBAoPhEIUiR4WiB4QxBwK+BhYTCZojPDAIYJCgfgAoRjBkKNQ0UTZoLVBgMKOYPihiLBoYhBToQJBXocALYbTEEIJHFE4IJCUYQFBkUA8CNMPoOCGIIBCoLPC4aPCsTNCBoIvD4MCkC/BHYrZEAoKTGdIQDB0UJ4KNMsR9CDYeCgR9BwZ9CsQHBGYhHB4RHGJIT1CNoTdGMIQnC0MSwSNKgEbobBBYYQXCgQrBkYpCJ4T9BI4sKkELoQzEMoKtB0BhBQYKnCT4Z5EjdCHoIAHTYIbBZYIBBDIWihWBhWhhYBBI4UDsJPCDIOhI4TjBD4PBAIJ9C8SdCkQdBBYIbCEoITDwUJ0JHHhTLBe4xPBhUigVBA4TNBoIhBA4KjC8RZBhcCDoKvDC4cTgUCkMbwgPDXoIfDikCiWBIw3ggOAidjI4ZFBiXCBoWgS4JHEoRZDBYMK4MKB4Q1BI4YDC4USsUKAoOjF4TrCAIcbkSNGoQZCeoODFYMboZRBB4LvBicjjeDCoMLoSBER4PhhWCV4StDJ4UbscSkQhBiXjjZJCLIsTsUBsBHDGoWChVhgUBhVBiPiLAnAhPgB4MJNoLJCQoJHBichTYWjAIJXBKIMCsMKkLHBjWDhOhOYJHFLocB8A0BhNhLYMLwJTBjUjiPChNBIwYFBjXjiXhiVha4RLB4ADBDYMCkEB4ABCLoQZBCoL9BjcjfoILBDIMD8AhCAISBBGoMR0USDIIbCEoMS0ZlBI4cBIINjhkCNIXiOIZzCZoODc4IBBSYQJBCYUT4cTgcA0DLBieCBYTXCAoMSwZHCwSJBV4JJBN4MST4Mga4ngY4MLoMbGYJrDW4QtC4RLBAIRDBE4INB0UKOYNggEhgFgiWiCYQPB8BPBhUCYoTRBokCwEbskJ4KzBhUia4j/B4cCsC3CgKlBAIXCKIQvCIIIvBjcidoJvCkMa8UBgMAdYPBjahCjbPB8MKGYQ3BjUDgPhjcEhUhiWhV4MJwTXCsDDCBYMCiVjhUBTIL7BKIIBBgVAhQ3B4BDCOoPjDoa5CB4MAhWCGYI3BEoMjkkSoQ3CoMSkZJBgPgNYITBhIPDoELwUDV4PBidjidDiXihXChWBF4IxCSYMCidihehhfAgfADIL7Ba4JBCwMCDYInBoTZCoDJDiNikXkiQpBoUZ8YNDM4MLsUD8EEgAvBGYI3CHIgNBAIYVBC4cL4T3BEYKZBjdjNYIBBCYYjBWII5DAAMJ0MawbjDAAnAjcje4MLSIPiGIJrBegMTOIPhB4IFEAIITBBYUCgMSAIKDBgKLC0ULsJFBWoMJ4I7GABgXBFYMMgIBBJILNBXYMT0JDBHoTpCLYQDD4USW4gnCI4NhhSzBkMSwcBR4wANhViI4aRDV4MKKYRDBBogBEJ4RdCf4sTgUTIYJpBoMRwRFTcocTsR7E0UCkELgQHCAJo5CI4lgI4MCoMasZPBADHgbIIxEwUCgELkQHC0BDHgYDB0IBBgPhNosa4cBkEA4BGZbIUiieiYYWjgPgTIwBKieCRIIjDZoMR4ZDbWYmAidCI41jA4RJBAI6nBBoNiV4I/fABMSwUb4RHDjejikCAJphBI9cBoETGINigUAhbfBapkL4UK4UJ4MKDAIAohOgjXjgUgheBhfAgY9B0IBBAoIHCAIOihVCiXCiXDI9JJCwMCgKPCI4YBIieCgPhicjjWEI9YABhUhY4I9C8JDEAoIBCdYJHCLwJGtI4NCikDikCAIsMAIUT8RDBCYMbwapBR+iRFRoeihVhhWhdYMS0RHtgUhgY1B0EDAIPAAoQDB4MToUCgELgMDA4MiR+sDR4Q9BBIUhgPgieCgYDBoRHwaYoBD8DPDa4IJBhkAiXjI91BifihkCifhAoMUgUMgMb4cKgMSsQNBhkhJ4JHugKNCIoIBCA4cbocBsEJ4MT0RVBgUBI9sJHoOhaIQDB4EDBIUSsITDjWjkcjgMgI9sB4BHEAIPgSoVihOhLYkBiNCItpHC0CLDAYMDI4OijXjHt5HKwET4cL8UTAIPjiciTYMI8BH4gES4ULkcS8USkUJ8AJBiTPwAA8KsUKsMCoECsMK0MTgUTsZH1hPhhdChaNB4MT0RBC4cKTINCgMgImGghPihdigfBgeggfAhehhXBgHAZ+qLCwULAYPCiaNBoTbBgNAIuoABiOiiQBB0LJBhUhgKLBAEgA==")); + +function topLine() { + + g.setColor(green); + g.setFontAlign(0, -1, 0); + + g.moveTo(0, 50).lineTo(30, 50); + g.lineTo(30, 40); + g.lineTo(35, 40).moveTo(90, 40).lineTo(95, 40); + g.lineTo(95, 50); + g.lineTo(239, 50); + + g.setFont("6x8", smallFont); + g.drawString("STAT", 65, 34); + g.drawString("INV", 130, 34); + g.drawString("DATA", 190, 34); + g.setColor(darkGreen); + g.drawString("STATUS", 45, 55); + g.drawString("SPEC", 122, 55); + g.drawString("PERKS", 195, 55); +} + +function bottomLine() { + + //first line + g.setColor(darkerGreen); + g.fillRect(5, 175, 100, 185); //DATE + g.fillRect(105, 175, 160, 185);//STIM + g.fillRect(166, 175, 239, 185); // RADAWAY + + g.setColor(green); + g.setFont("6x8", tinyFont); + g.drawString("DATE", 20, 177); + g.drawString("STIM (3)", 135, 177); + g.drawString("RADAWAY (8)", 205, 177); + + //second line + g.setColor(darkerGreen); + g.fillRect(5, 190, 70, 200); + g.fillRect(75, 190, 239, 200); + + g.setColor(green); + g.drawString("HP 115/115", 38, 192); + g.drawString("LEVEL 6", 100, 192); + g.drawRect(127, 192, 235, 198); +} + +function boy() { + g.drawImage(pip, 165, 85); +} + +function drawClock() { + + var t = new Date(); + var h = t.getHours(); + var m = t.getMinutes(); + var dd = t.getDate(); + var mm = t.getMonth()+1; //month is zero-based + var yy = t.getFullYear(); + var time = ("0" + h).substr(-2) + ":" + ("0" + m).substr(-2); + + //create date string + if (dd.toString().length < 2) dd = '0' + dd; + if (mm.toString().length < 2) mm = '0' + mm; + var date = dd + "." + mm + "." + yy; + + g.setFont("6x8",bigFont); + g.setColor(green); + g.setFontAlign(0, -1, 0); + + g.clearRect(0, 110, 150, 140); + g.drawString(time, 70, 110); + + //draw date + g.setFont("6x8", tinyFont); + g.drawString(date, 67, 177); +} + +function drawAll() { + topLine(); + boy(); + bottomLine(); + drawClock(); +} + +Bangle.on('lcdPower', function(on) { + if (on) drawAll(); +}); + +g.clear(); +Bangle.loadWidgets(); +Bangle.drawWidgets(); +setInterval(drawClock, 1E4); +drawAll(); + +setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"}); diff --git a/apps/pipboy/app.png b/apps/pipboy/app.png new file mode 100644 index 000000000..018b5c7bb Binary files /dev/null and b/apps/pipboy/app.png differ diff --git a/apps/pomodo/pomodoro.json b/apps/pomodo/pomodoro.json deleted file mode 100644 index c017048df..000000000 --- a/apps/pomodo/pomodoro.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name":"Pomodoro","type":"app", - "icon":"*pomodo", - "src":"-pomodo" -} diff --git a/apps/pparrot/party-parrot.json b/apps/pparrot/party-parrot.json deleted file mode 100644 index abf950e47..000000000 --- a/apps/pparrot/party-parrot.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name":"Party Parrot","type":"app", - "icon":"*pparrot", - "src":"-pparrot" -} \ No newline at end of file diff --git a/apps/qrcode/qrcode.html b/apps/qrcode/qrcode.html index cb734c1b5..5d372aa59 100644 --- a/apps/qrcode/qrcode.html +++ b/apps/qrcode/qrcode.html @@ -4,11 +4,11 @@ -Enter a URL:
+Enter a URL:
Try your QR Code:
Click
- + @@ -41,23 +41,14 @@ g.setColor(0,0,0); g.drawString(url,120,230); g.setColor(1,1,1); `; - console.log(app); - var json = JSON.stringify({ - name:"QR Code", - icon:"*qrcode", - src:"-qrcode" - }); var icon = `require("heatshrink").decompress(atob("mEwgP/AEX8gE8nkAn4FSngCWF6xfYDgIABHAQFPDQXD4YgDApxNDMooFOAQIdDAqIvWfcYA="))`; - - window.postMessage({ - id : "qrcode", - + sendCustomizedApp({ storage:[ - {name:"-qrcode", content:app}, - {name:"+qrcode", content:json}, - {name:"*qrcode", content:icon, evaluate:true}, + {name:"qrcode.app.js", content:app}, + {name:"qrcode.img", content:icon, evaluate:true}, ] }); + }); diff --git a/apps/route/route.html b/apps/route/route.html index bee670b08..2417aa232 100644 --- a/apps/route/route.html +++ b/apps/route/route.html @@ -25,6 +25,7 @@ + + + +