From 47b7ef53dd1f47a2b54cbeb38abbab275b0feca7 Mon Sep 17 00:00:00 2001 From: Gordon Williams Date: Sat, 9 Nov 2019 20:31:03 +0000 Subject: [PATCH] adjust sortorder, make default clock always stay white even if colour got changed, add nceu widget --- apps.json | 55 +++++++++++++++++++++++++-------------- apps/clock-morphing.js | 10 ++++--- apps/clock-morphing.json | 3 ++- apps/clock-word.json | 3 ++- apps/nceu-funrun.json | 3 ++- apps/nceu-widget.js | 13 +++++++++ apps/nceu-widget.json | 5 ++++ apps/nceu-widget.png | Bin 0 -> 1489 bytes 8 files changed, 65 insertions(+), 27 deletions(-) create mode 100644 apps/nceu-widget.js create mode 100644 apps/nceu-widget.json create mode 100644 apps/nceu-widget.png diff --git a/apps.json b/apps.json index 2ac17efa0..2c157f56e 100644 --- a/apps.json +++ b/apps.json @@ -7,7 +7,7 @@ "storage": [ {"name":".bootcde","url":"bootloader.js"} ], - "sortorder" : -1 + "sortorder" : -10 }, { "id": "mclock", "name": "Morphing Clock", @@ -20,7 +20,7 @@ {"name":"-mclock","url":"clock-morphing.js"}, {"name":"*mclock","url":"clock-morphing-icon.js","evaluate":true} ], - "sortorder" : -1 + "sortorder" : -9 }, { "id": "wclock", "name": "Word Clock", @@ -219,23 +219,6 @@ {"name":"*mouse","url":"animals-mouse.js","evaluate":true} ] }, - { - "id": "start", - "name": "NCEU Startup", - "icon": "start.png", - "description": "NodeConfEU 2019 Startup Sequence", - "tags": "start", - "storage": [ - {"name":"+start","url":"start.json"}, - {"name":"-start","url":"start.js"}, - {"name":"*start","url":"start-icon.js","evaluate":true}, - {"name":"*bangle","url":"start-bangle.js","evaluate":true}, - {"name":"*nceu","url":"start-nceu.js","evaluate":true}, - {"name":"*nfr","url":"start-nfr.js","evaluate":true}, - {"name":"*nodew","url":"start-nodew.js","evaluate":true}, - {"name":"*tf","url":"start-tf.js","evaluate":true} - ] - }, { "id": "qrcode", "name": "Custom QR Code", "icon": "qrcode.png", @@ -272,6 +255,25 @@ {"name":"=route"} ] }, + + { + "id": "start", + "name": "NCEU Startup", + "icon": "start.png", + "description": "NodeConfEU 2019 Startup Sequence", + "tags": "start", + "storage": [ + {"name":"+start","url":"start.json"}, + {"name":"-start","url":"start.js"}, + {"name":"*start","url":"start-icon.js","evaluate":true}, + {"name":"*bangle","url":"start-bangle.js","evaluate":true}, + {"name":"*nceu","url":"start-nceu.js","evaluate":true}, + {"name":"*nfr","url":"start-nfr.js","evaluate":true}, + {"name":"*nodew","url":"start-nodew.js","evaluate":true}, + {"name":"*tf","url":"start-tf.js","evaluate":true} + ], + "sortorder" : -1 + }, { "id": "funrun5", "name": "5K Fun Run", "icon": "nceu-funrun.png", @@ -281,6 +283,19 @@ {"name":"+funrun5","url":"nceu-funrun.json"}, {"name":"-funrun5","url":"nceu-funrun.js"}, {"name":"*funrun5","url":"nceu-funrun-icon.js","evaluate":true} - ] + ], + "sortorder" : -1 + }, + { "id": "sbat", + "name": "Battery Level Widget", + "icon": "nceu-widget.png", + "description": "Show the NodeConf EU logo in the top left", + "tags": "widget", + "type":"widget", + "storage": [ + {"name":"+sbat","url":"nceu-widget.json"}, + {"name":"=sbat","url":"nceu-widget.js"} + ], + "sortorder" : -1 } ] diff --git a/apps/clock-morphing.js b/apps/clock-morphing.js index 7b42a99ae..63656b70f 100644 --- a/apps/clock-morphing.js +++ b/apps/clock-morphing.js @@ -2,7 +2,9 @@ (function(){ // make our own scope so this is GC'd when intervals are cleared // Offscreen buffer var buf = Graphics.createArrayBuffer(240,86,1,{msb:true}); -function flip() { g.drawImage({width:buf.getWidth(),height:buf.getHeight(),buffer:buf.buffer},0,50); +function flip() { + g.setColor(1,1,1); + g.drawImage({width:buf.getWidth(),height:buf.getHeight(),buffer:buf.buffer},0,50); } // The last time that we displayed var lastTime = " "; @@ -11,7 +13,7 @@ var animInterval; /* Get array of lines from digit d to d+1. n is the amount (0..1) - maxFive is true is this digit only counts 0..5 */ + maxFive is true is this digit only counts 0..5 */ const DIGITS = { " ":n=>[], "0":n=>[ @@ -108,9 +110,9 @@ const DIGITS = { /* Draw a transition between lastText and thisText. 'n' is the amount - 0..1 */ -function draw(lastText,thisText,n) { +function draw(lastText,thisText,n) { buf.clear(); - var x = 1; // x offset + var x = 1; // x offset const p = 2; // padding around digits var y = p; // y offset const s = 34; // character size diff --git a/apps/clock-morphing.json b/apps/clock-morphing.json index 5433647cd..bf629ac87 100644 --- a/apps/clock-morphing.json +++ b/apps/clock-morphing.json @@ -1,5 +1,6 @@ { "name":"Morphing Clock","type":"clock", "icon":"*mclock", - "src":"-mclock" + "src":"-mclock", + "sortorder":-10 } diff --git a/apps/clock-word.json b/apps/clock-word.json index f5711afa8..594b73f17 100644 --- a/apps/clock-word.json +++ b/apps/clock-word.json @@ -1,5 +1,6 @@ { "name":"Word Clock","type":"clock", "icon":"*wclock", - "src":"-wclock" + "src":"-wclock", + "sortorder":-10 } diff --git a/apps/nceu-funrun.json b/apps/nceu-funrun.json index ea709a924..ce0f1f1f4 100644 --- a/apps/nceu-funrun.json +++ b/apps/nceu-funrun.json @@ -1,5 +1,6 @@ { "name":"5K Fun Run","type":"app", "icon":"*funrun5", - "src":"-funrun5" + "src":"-funrun5", + "sortorder":-1 } diff --git a/apps/nceu-widget.js b/apps/nceu-widget.js new file mode 100644 index 000000000..fa0e11cd1 --- /dev/null +++ b/apps/nceu-widget.js @@ -0,0 +1,13 @@ +(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/nceu-widget.json b/apps/nceu-widget.json new file mode 100644 index 000000000..b7c4faa70 --- /dev/null +++ b/apps/nceu-widget.json @@ -0,0 +1,5 @@ +{ + "name":"nceuwid", + "type":"widget", + "src":"=nceuwid" +} diff --git a/apps/nceu-widget.png b/apps/nceu-widget.png new file mode 100644 index 0000000000000000000000000000000000000000..43d742664a55d31c95cb83180d1b92d8c12b94fd GIT binary patch literal 1489 zcmV;?1upuDP)kxxy`?G@Vonqab`0 zjKbbnneT#nQ5&RCxG?ZV6qCwcBozz6pk5RN(IAN+NC*Zqn&ReNEN2^CX1nEP({cZv zUYxkB-sQ{R?|xq0^F7Z!=eg&5&T}q+fq{X6fq{X+{~J_QRkd^H&XtvwY&Od<%&uL# ze*E~s^L$lRRYylhU0of|^NBjg0|-&1NI>Ii1dOxg3wjYiepXZ{D2G=ZA)dPMpwCwLV~-xx>{OVBuOe13c+B|VzGSx{yh)~^!N7*f>2vq zOX4Yt0+-9BD2m_jUteFpdiCn^@^Ua3%x1HHB{V!d?DP5l5|14_hB4MOP1CgZ@88$f z)?$o_N5m#Q^1*`#&CSgi<5Qq%FkP-t&&cQ_p3a2O%P5S3w=$;nBN$K&()SeEVY?@y&t`rI7HO-)Vt z{r<{?`uh4LNdkaSD73b=R#Q`R`0(M0iHS%gGBh+~wOUiDR8LP&cXxL#m*Y6j>2v}B zP1Cn;-#&2QKyPm^8AnysTrO8E7D^s5x;jIfTn2_MInU9c|-`&G_5F#KGX*45K~`Y9}EWT>go_ek|g>4{)Z1A zo;h=-SS*f@kI&4^OioVr_V#YyzTIRpB@&6}&!2a6boBN0iJ~|)HC0_*-P6+(4u?~z z)WwSzGntIlY8@RN-B>mN01k&^eSLjwY;0s?WO#VkZntBMo0^&c;Op0~