Merge pull request #936 from Vingelar/master

Binwatch: re-format background images
master
Gordon Williams 2021-11-24 08:38:06 +00:00 committed by GitHub
commit 1750c72e94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 7 deletions

View File

@ -4321,6 +4321,8 @@
"type": "clock", "type": "clock",
"storage": [ "storage": [
{"name":"binwatch.app.js","url":"app.js"}, {"name":"binwatch.app.js","url":"app.js"},
{"name":"binwatch.bg176.img","url":"Background176_center.img"},
{"name":"binwatch.bg240.img","url":"Background240_center.img"},
{"name":"binwatch.img","url":"app-icon.js","evaluate":true} {"name":"binwatch.img","url":"app-icon.js","evaluate":true}
] ]
}, },

Binary file not shown.

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

View File

@ -1,3 +1,4 @@
0.01: start of development 0.01: start of development
0.02: first running version for BangleJs2 0.02: first running version for BangleJs2
0.03: corrected icon, added screen shot, extended description 0.03: corrected icon, added screen shot, extended description
0.04: corrected format of background image (raw binary)

View File

@ -12,7 +12,6 @@
require("Font7x11Numeric7Seg").add(Graphics); require("Font7x11Numeric7Seg").add(Graphics);
require("Font5x7Numeric7Seg").add(Graphics); require("Font5x7Numeric7Seg").add(Graphics);
/* constants and definitions */ /* constants and definitions */
/* Bangle 2: 176 x 176 */ /* Bangle 2: 176 x 176 */
@ -63,7 +62,7 @@ const V2_BAT_SIZE_Y = 2;
const V2_SCREEN_SIZE_X = 176; const V2_SCREEN_SIZE_X = 176;
const V2_SCREEN_SIZE_Y = 176; const V2_SCREEN_SIZE_Y = 176;
const V2_BACKGROUND_IMAGE = "Background176_center.png"; const V2_BACKGROUND_IMAGE = "binwatch.bg176.img";
const V2_BG_COLOR = 0; const V2_BG_COLOR = 0;
const V2_FG_COLOR = 1; const V2_FG_COLOR = 1;
@ -91,7 +90,7 @@ const V1_BAT_SIZE_X = 3;
const V1_BAT_SIZE_Y = 5; const V1_BAT_SIZE_Y = 5;
const V1_SCREEN_SIZE_X = 240; const V1_SCREEN_SIZE_X = 240;
const V1_SCREEN_SIZE_Y = 240; const V1_SCREEN_SIZE_Y = 240;
const V1_BACKGROUND_IMAGE = "Background240_center.png"; const V1_BACKGROUND_IMAGE = "binwatch.bg240.img";
const V1_BG_COLOR = 1; const V1_BG_COLOR = 1;
const V1_FG_COLOR = 0; const V1_FG_COLOR = 0;
@ -362,8 +361,7 @@ function draw() {
updateVTime(); updateVTime();
g.clear(); g.clear();
g.drawImages([{image:cgimg}, g.drawImages([{image:cgimg},
{image:require("Storage").read(backgroundImage)}, {image:require("Storage").read(backgroundImage)}
// { x:bt_x, y:bt_y, rotate: 0, image:require("Storage").read("bt-icon.png")},
]); ]);
drawBT(g, NRF.getSecurityStatus().connected); drawBT(g, NRF.getSecurityStatus().connected);
// Bangle.drawWidgets(); // Bangle.drawWidgets();