From 1d5dc855d07ee93df0327f1a678a09ba35fb12a1 Mon Sep 17 00:00:00 2001 From: "L. Christopher Bird" Date: Thu, 22 Jul 2021 09:34:03 -0700 Subject: [PATCH 01/14] Added Fahrenheit Thermometer --- apps.json | 17 +++++++++++++++++ apps/thermomF/app-icon.js | 2 ++ apps/thermomF/app..png | Bin 0 -> 1189 bytes apps/thermomF/app.js | 28 ++++++++++++++++++++++++++++ 4 files changed, 47 insertions(+) create mode 100644 apps/thermomF/app-icon.js create mode 100644 apps/thermomF/app..png create mode 100644 apps/thermomF/app.js diff --git a/apps.json b/apps.json index cc21f3115..2148fb5f6 100644 --- a/apps.json +++ b/apps.json @@ -3316,5 +3316,22 @@ {"name":"mysticclock.settings.js","url":"mystic-clock-settings.js"}, {"name":"mysticclock.img","url":"mystic-clock-icon.js","evaluate":true} ] +}, + + +{ "id": "thermomF", + "name": "Fahrenheit Thermometer", + "shortName":"Thermometer F", + "icon": "app.png", + "version":"0.01", + "description": "A modification of the Thermometer App to display temprature in Fahrenheit", + "tags": "", + "storage": [ + {"name":"thermof.app.js","url":"app.js"}, + {"name":"thermof.png","url":"app-icon.js","evaluate":true} + ] } ] + + + diff --git a/apps/thermomF/app-icon.js b/apps/thermomF/app-icon.js new file mode 100644 index 000000000..3a5bb959f --- /dev/null +++ b/apps/thermomF/app-icon.js @@ -0,0 +1,2 @@ +require("heatshrink").decompress(atob("AH4A/AAMIxGIwAXTxACEACIsChAXqLwQDBMCQXYI4YvUCgIXVF6xH/I8DX/R/4ANgUgAIYX/C+MiC4ciFyQCGC54aEgAXQIIUiAYYXRgUzmYtBC6ASCC4IcCC5+wgGzC4M7gELC6O7C4O7C6ISC2c7DgQXRAQIDDC58LFYIFIGB4uSFQRFDFyJeDMAYA/AH4")) +} \ No newline at end of file diff --git a/apps/thermomF/app..png b/apps/thermomF/app..png new file mode 100644 index 0000000000000000000000000000000000000000..bb33cb939d63a9682e318025e2f94c7c1f0ea31b GIT binary patch literal 1189 zcmV;W1X}xvP)nbkt*}t8k&unGMZv-!*9L9P7LD0b z$gE+K)ifw5s5ZsGe@q54Q4?BH5!OTshs9=5bi*=m{V<9_)2Li(Qenkb?8kkd(;xS~ z+nBrl(fi!m#T|J5c+NST@AKt3&pGG47p7%eE^SfS3LJYvmN-HjK!i_E?@`CHfn%M( z{3oTz8Kzy}t_h}2m89YOm(-s&@f@4M0Q^DPwV~QKH2DrO-y!A;&7R>7?eMy7JgaiU zBeJBlQKW3WG)=UXt(T_KMv<}&vdAW;)f@2PR&Br^Vc!L|5%y^VI-tTPrd0y2p->x8 zaHf2nNclRE(02S4bygd211__Psci=H0TB>I%Vc&>Kv^yuRtad6B5?FI)tt$0n}F36 z(k8WTTO(5Wplr!xw~A>sSo#K(qJ@A@CbLiZ6hh$L{gbDVXRzKnvywt}_leZ4&e0SC zP|#vzk`xj^CTb&M+6?BK)cM|gD{~6j9=_~9V&MLjV-0No!LetnbA^D)(8zLzz^iXx zq>u}~2$_WCYJawle0Cv2msz&Wo znSh_3g~sp4iB=*1?*_!TRLTrnxK;>k ztB@;(JrbU>gd8*T}bwAsLpOkn3ysn>>k-GFDGKB^9f`qsEC(1tnMFlX0Nxh~W{^Reo54b9rH zsENgSpfq|@qFVk^&G&93#D2qK1i0sP;JW3?*i{jaG?6pZuKER+alQtH2E_rc<3WF z_;1e;=>`gg`C4$CfSyq2L4(dGnZE*xW~SE66`=D8TxbaWT&!wG2#_4}?Joe+&)jhDCOPjYP!OpaMY@3*hI870FT_Rz26U@)I0Zk# zl_RND@B_GKaWr&?exBi)bffz@${8XNSp5~JJi{5^P!sA3|7N={^!>gUGuQ!x9dLdx z#)Cd@i0z@D4>g|Q^qMdD>3<`jP@)Y7T*EybH>OHueXr_w0~Wc%v=4mFz+a!y?c#~YM15N_p=pm|Wzf(gO^Y2<9dC5Ey3QAp{ z>uZmzU!&kh?gJ~oR=;S&S}nx!>3pYHW@qy4S|C^9)1`&Qj<7cB;lbkP#rq}l0Pr%x zpulcX9P(Xy0Y;LPD2I9skE6&Fc(~?UwciG=)!{Z#EG57;U^(DUFb4__8O5gCdsVM3 z%&h#)nkbgp+E67hFAZ`!>5!;8p?=E--n2~1r7ZsdH4U76`VJt+00000NkvXXu0mjf DV^KD_ literal 0 HcmV?d00001 diff --git a/apps/thermomF/app.js b/apps/thermomF/app.js new file mode 100644 index 000000000..76f15b481 --- /dev/null +++ b/apps/thermomF/app.js @@ -0,0 +1,28 @@ +function onTemperature(p) { + g.reset(1).clearRect(0,24,g.getWidth(),g.getHeight()); + g.setFont("6x8",2).setFontAlign(0,0); + var x = g.getWidth()/2; + var y = g.getHeight()/2 + 10; + g.drawString("Temperature", x, y - 45); + g.setFontVector(70).setFontAlign(0,0); + g.drawString(p.temperature.toFixed(1), x, y); +} + +function drawTemperature() { + if (Bangle.getPressure) { + Bangle.getPressure().then(onTemperature); + } else { + onTemperature({ + temperature : E.getTemperature() * (9/5) + 32, + }); + } +} + + +setInterval(function() { + drawTemperature(); +}, 20000); +drawTemperature(); +E.showMessage("Loading..."); +Bangle.loadWidgets(); +Bangle.drawWidgets(); \ No newline at end of file From fcc17e075edcafdb2aaa6cf3f5b8d77b5f4fa76f Mon Sep 17 00:00:00 2001 From: "L. Christopher Bird" Date: Thu, 22 Jul 2021 09:51:50 -0700 Subject: [PATCH 02/14] Update apps.json fixed formatting --- apps.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/apps.json b/apps.json index 2148fb5f6..6a486e7e5 100644 --- a/apps.json +++ b/apps.json @@ -3317,8 +3317,6 @@ {"name":"mysticclock.img","url":"mystic-clock-icon.js","evaluate":true} ] }, - - { "id": "thermomF", "name": "Fahrenheit Thermometer", "shortName":"Thermometer F", From 3f50989e03225fb8e400165eaf01ab13d76aa268 Mon Sep 17 00:00:00 2001 From: "L. Christopher Bird" Date: Thu, 22 Jul 2021 09:59:39 -0700 Subject: [PATCH 03/14] Formating fixes --- apps.json | 2 -- apps/thermomF/{app..png => app.png} | Bin 2 files changed, 2 deletions(-) rename apps/thermomF/{app..png => app.png} (100%) diff --git a/apps.json b/apps.json index 2148fb5f6..6a486e7e5 100644 --- a/apps.json +++ b/apps.json @@ -3317,8 +3317,6 @@ {"name":"mysticclock.img","url":"mystic-clock-icon.js","evaluate":true} ] }, - - { "id": "thermomF", "name": "Fahrenheit Thermometer", "shortName":"Thermometer F", diff --git a/apps/thermomF/app..png b/apps/thermomF/app.png similarity index 100% rename from apps/thermomF/app..png rename to apps/thermomF/app.png From 51a10df84c10ea184f88d64bd72aad978ea3da40 Mon Sep 17 00:00:00 2001 From: "L. Christopher Bird" Date: Thu, 22 Jul 2021 10:11:24 -0700 Subject: [PATCH 04/14] formatting fixes (forgive the noob) --- apps.json | 8 ++++---- apps/thermomF/{app.png => thermf.png} | Bin 2 files changed, 4 insertions(+), 4 deletions(-) rename apps/thermomF/{app.png => thermf.png} (100%) diff --git a/apps.json b/apps.json index 6a486e7e5..d64b6c017 100644 --- a/apps.json +++ b/apps.json @@ -3318,15 +3318,15 @@ ] }, { "id": "thermomF", - "name": "Fahrenheit Thermometer", - "shortName":"Thermometer F", - "icon": "app.png", + "name": "Fahrenheit Temp", + "shortName":"F Temp", + "icon": "thermf.png", "version":"0.01", "description": "A modification of the Thermometer App to display temprature in Fahrenheit", "tags": "", "storage": [ {"name":"thermof.app.js","url":"app.js"}, - {"name":"thermof.png","url":"app-icon.js","evaluate":true} + {"name":"thermof.img","url":"app-icon.js","evaluate":true} ] } ] diff --git a/apps/thermomF/app.png b/apps/thermomF/thermf.png similarity index 100% rename from apps/thermomF/app.png rename to apps/thermomF/thermf.png From 89f67dff6e1a04f209514d89b575f958e679cc47 Mon Sep 17 00:00:00 2001 From: "L. Christopher Bird" Date: Thu, 22 Jul 2021 10:20:06 -0700 Subject: [PATCH 05/14] another format fix *sigh* --- apps.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps.json b/apps.json index d64b6c017..4befd9965 100644 --- a/apps.json +++ b/apps.json @@ -3325,8 +3325,8 @@ "description": "A modification of the Thermometer App to display temprature in Fahrenheit", "tags": "", "storage": [ - {"name":"thermof.app.js","url":"app.js"}, - {"name":"thermof.img","url":"app-icon.js","evaluate":true} + {"name":"thermomF.app.js","url":"app.js"}, + {"name":"thermomF.img","url":"app-icon.js","evaluate":true} ] } ] From f43b2d33190ecf730d4f0bb5fdec8e30810cdc61 Mon Sep 17 00:00:00 2001 From: "L. Christopher Bird" Date: Thu, 22 Jul 2021 10:27:16 -0700 Subject: [PATCH 06/14] YAFF --- apps.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps.json b/apps.json index 4befd9965..18b7e9c66 100644 --- a/apps.json +++ b/apps.json @@ -3319,11 +3319,10 @@ }, { "id": "thermomF", "name": "Fahrenheit Temp", - "shortName":"F Temp", "icon": "thermf.png", "version":"0.01", "description": "A modification of the Thermometer App to display temprature in Fahrenheit", - "tags": "", + "tags": "Temperature, Thermometer", "storage": [ {"name":"thermomF.app.js","url":"app.js"}, {"name":"thermomF.img","url":"app-icon.js","evaluate":true} From 53a138f11656e7d434a14518efd7017f0abe6188 Mon Sep 17 00:00:00 2001 From: "L. Christopher Bird" Date: Thu, 22 Jul 2021 10:34:41 -0700 Subject: [PATCH 07/14] YAFF a comma --- apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps.json b/apps.json index 18b7e9c66..c6e3a5af0 100644 --- a/apps.json +++ b/apps.json @@ -3327,7 +3327,7 @@ {"name":"thermomF.app.js","url":"app.js"}, {"name":"thermomF.img","url":"app-icon.js","evaluate":true} ] -} +}, ] From 0d6524ff2e18c8fed80ab093cbdbbbcf080fb26e Mon Sep 17 00:00:00 2001 From: "L. Christopher Bird" Date: Thu, 22 Jul 2021 10:45:24 -0700 Subject: [PATCH 08/14] fixed synatx error --- apps/thermomF/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/thermomF/app.js b/apps/thermomF/app.js index 76f15b481..2961e1efc 100644 --- a/apps/thermomF/app.js +++ b/apps/thermomF/app.js @@ -13,7 +13,7 @@ function drawTemperature() { Bangle.getPressure().then(onTemperature); } else { onTemperature({ - temperature : E.getTemperature() * (9/5) + 32, + temperature : E.getTemperature() * (9/5) + 32 }); } } From 13b65888f840a883f2e841381111ab63b0730599 Mon Sep 17 00:00:00 2001 From: "L. Christopher Bird" Date: Thu, 22 Jul 2021 10:48:34 -0700 Subject: [PATCH 09/14] YAFF --- apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps.json b/apps.json index c6e3a5af0..18b7e9c66 100644 --- a/apps.json +++ b/apps.json @@ -3327,7 +3327,7 @@ {"name":"thermomF.app.js","url":"app.js"}, {"name":"thermomF.img","url":"app-icon.js","evaluate":true} ] -}, +} ] From e4880a57d4ad506399c6524d6f34fe55b7da4fd1 Mon Sep 17 00:00:00 2001 From: "L. Christopher Bird" Date: Thu, 22 Jul 2021 10:59:29 -0700 Subject: [PATCH 10/14] YAFF --- apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps.json b/apps.json index 18b7e9c66..690c03e8b 100644 --- a/apps.json +++ b/apps.json @@ -3322,7 +3322,7 @@ "icon": "thermf.png", "version":"0.01", "description": "A modification of the Thermometer App to display temprature in Fahrenheit", - "tags": "Temperature, Thermometer", + "tags": "tool", "storage": [ {"name":"thermomF.app.js","url":"app.js"}, {"name":"thermomF.img","url":"app-icon.js","evaluate":true} From 026c63f7dd9373bc6f3fad73043b0ad0cf29ae67 Mon Sep 17 00:00:00 2001 From: "L. Christopher Bird" Date: Thu, 22 Jul 2021 11:53:26 -0700 Subject: [PATCH 11/14] correct syntax error --- apps/thermomF/app-icon.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/thermomF/app-icon.js b/apps/thermomF/app-icon.js index 3a5bb959f..45e3675b6 100644 --- a/apps/thermomF/app-icon.js +++ b/apps/thermomF/app-icon.js @@ -1,2 +1,2 @@ require("heatshrink").decompress(atob("AH4A/AAMIxGIwAXTxACEACIsChAXqLwQDBMCQXYI4YvUCgIXVF6xH/I8DX/R/4ANgUgAIYX/C+MiC4ciFyQCGC54aEgAXQIIUiAYYXRgUzmYtBC6ASCC4IcCC5+wgGzC4M7gELC6O7C4O7C6ISC2c7DgQXRAQIDDC58LFYIFIGB4uSFQRFDFyJeDMAYA/AH4")) -} \ No newline at end of file +}; \ No newline at end of file From 2c952dc281615754f7176ce416c54bd7f9fa3dde Mon Sep 17 00:00:00 2001 From: "L. Christopher Bird" Date: Thu, 22 Jul 2021 11:58:03 -0700 Subject: [PATCH 12/14] FAFF --- apps/thermomF/app-icon.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/thermomF/app-icon.js b/apps/thermomF/app-icon.js index 45e3675b6..64edafeed 100644 --- a/apps/thermomF/app-icon.js +++ b/apps/thermomF/app-icon.js @@ -1,2 +1 @@ -require("heatshrink").decompress(atob("AH4A/AAMIxGIwAXTxACEACIsChAXqLwQDBMCQXYI4YvUCgIXVF6xH/I8DX/R/4ANgUgAIYX/C+MiC4ciFyQCGC54aEgAXQIIUiAYYXRgUzmYtBC6ASCC4IcCC5+wgGzC4M7gELC6O7C4O7C6ISC2c7DgQXRAQIDDC58LFYIFIGB4uSFQRFDFyJeDMAYA/AH4")) -}; \ No newline at end of file +require("heatshrink").decompress(atob("AH4A/AAMIxGIwAXTxACEACIsChAXqLwQDBMCQXYI4YvUCgIXVF6xH/I8DX/R/4ANgUgAIYX/C+MiC4ciFyQCGC54aEgAXQIIUiAYYXRgUzmYtBC6ASCC4IcCC5+wgGzC4M7gELC6O7C4O7C6ISC2c7DgQXRAQIDDC58LFYIFIGB4uSFQRFDFyJeDMAYA/AH4"))} \ No newline at end of file From dda544bd5810bf1e90e1e7b88e6dd4ff0c73fe44 Mon Sep 17 00:00:00 2001 From: "L. Christopher Bird" Date: Thu, 22 Jul 2021 12:17:58 -0700 Subject: [PATCH 13/14] Fixed Syntax error --- apps/thermomF/app-icon.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/thermomF/app-icon.js b/apps/thermomF/app-icon.js index 64edafeed..0f733eeac 100644 --- a/apps/thermomF/app-icon.js +++ b/apps/thermomF/app-icon.js @@ -1 +1 @@ -require("heatshrink").decompress(atob("AH4A/AAMIxGIwAXTxACEACIsChAXqLwQDBMCQXYI4YvUCgIXVF6xH/I8DX/R/4ANgUgAIYX/C+MiC4ciFyQCGC54aEgAXQIIUiAYYXRgUzmYtBC6ASCC4IcCC5+wgGzC4M7gELC6O7C4O7C6ISC2c7DgQXRAQIDDC58LFYIFIGB4uSFQRFDFyJeDMAYA/AH4"))} \ No newline at end of file +require("heatshrink").decompress(atob("AH4A/AAMIxGIwAXTxACEACIsChAXqLwQDBMCQXYI4YvUCgIXVF6xH/I8DX/R/4ANgUgAIYX/C+MiC4ciFyQCGC54aEgAXQIIUiAYYXRgUzmYtBC6ASCC4IcCC5+wgGzC4M7gELC6O7C4O7C6ISC2c7DgQXRAQIDDC58LFYIFIGB4uSFQRFDFyJeDMAYA/AH4")) \ No newline at end of file From 944d89468bc18f25a07c384d0306ddfd335d107b Mon Sep 17 00:00:00 2001 From: "L. Christopher Bird" Date: Thu, 22 Jul 2021 12:38:24 -0700 Subject: [PATCH 14/14] fkxed icon from object to string --- apps/thermomF/app-icon.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/thermomF/app-icon.js b/apps/thermomF/app-icon.js index 0f733eeac..fe1fa86b7 100644 --- a/apps/thermomF/app-icon.js +++ b/apps/thermomF/app-icon.js @@ -1 +1 @@ -require("heatshrink").decompress(atob("AH4A/AAMIxGIwAXTxACEACIsChAXqLwQDBMCQXYI4YvUCgIXVF6xH/I8DX/R/4ANgUgAIYX/C+MiC4ciFyQCGC54aEgAXQIIUiAYYXRgUzmYtBC6ASCC4IcCC5+wgGzC4M7gELC6O7C4O7C6ISC2c7DgQXRAQIDDC58LFYIFIGB4uSFQRFDFyJeDMAYA/AH4")) \ No newline at end of file +require("heatshrink").decompress(atob("mEwwhC/AH4AChGIxGAC6eIAQgARFgUIC9ReCAYJgSC7BHDF6gUBC6ovWI/5Hga/6P/ABsCkABDC/4XxkQXDkQuSAQwXPDQkAC6BBCkQDDC6MCmczFoIXQCQQXBDgQXP2EA2YXBncAhYXR3YXB3YXRCQWznYcCC6ICBAYYXPhYrBApAwPFyQqCIoYuRLwZgDAH4A/")) \ No newline at end of file