Merge pull request #3360 from shansou504/master

binaryclk: 0.11 fixed battery counter and changed to buzz instead of blink
pull/3361/head
thyttan 2024-04-17 19:51:24 +02:00 committed by GitHub
commit b8cf841871
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 30 deletions

View File

@ -8,3 +8,4 @@
0.08: Changed month to day and text color to black on date 0.08: Changed month to day and text color to black on date
0.09: Changed day color back to white 0.09: Changed day color back to white
0.10: Add blinking when charging 0.10: Add blinking when charging
0.11: Changed battery to buzz instead of blink and fixed battery counter

View File

@ -5,6 +5,7 @@ var settings = Object.assign({
showbat: true, showbat: true,
}, require('Storage').readJSON("binaryclk.json", true) || {}); }, require('Storage').readJSON("binaryclk.json", true) || {});
var cnt = 0;
var gap = 4; var gap = 4;
var mgn = 24; var mgn = 24;
var sq = 33; var sq = 33;
@ -38,14 +39,8 @@ function drawbatrect() {
g.drawRect(Math.floor(mgn/2) + gap + 2 * pos, mgn + gap, Math.floor(mgn/2) + gap + 2 * pos + sq, mgn + gap + sq); g.drawRect(Math.floor(mgn/2) + gap + 2 * pos, mgn + gap, Math.floor(mgn/2) + gap + 2 * pos + sq, mgn + gap + sq);
} }
function clearbat() {
g.clearRect(Math.floor(mgn/2) + gap + 2 * pos, mgn + gap, Math.floor(mgn/2) + gap + 2 * pos + sq, mgn + gap + sq);
}
function draw() { function draw() {
let i = 0; let i = 0;
var cnt = 0;
var dt = new Date(); var dt = new Date();
var h = dt.getHours(); var h = dt.getHours();
var m = dt.getMinutes(); var m = dt.getMinutes();
@ -100,15 +95,17 @@ function draw() {
g.drawRect(Math.floor(mgn/2) + gap, mgn + gap, Math.floor(mgn/2) + gap + sq, mgn + gap + sq); g.drawRect(Math.floor(mgn/2) + gap, mgn + gap, Math.floor(mgn/2) + gap + sq, mgn + gap + sq);
} }
if (cnt == 0) { if (settings.showbat) {
if (settings.showbat) { var batcnt = cnt;
if (batcnt == 0) {
drawbat(); drawbat();
drawbatrect(); drawbatrect();
} }
cnt++; cnt++;
if (cnt > 29) { }
cnt = 0;
} if (cnt > 29) {
cnt = 0;
} }
} }
@ -121,21 +118,6 @@ if (!settings.fullscreen) {
Bangle.drawWidgets(); Bangle.drawWidgets();
} }
var blink = true; Bangle.on('charging', function(charging) {
if(charging) Bangle.buzz();
function blinkbat() { });
if (blink) {
clearbat();
} else {
drawbat();
}
drawbatrect();
blink = !blink;
}
function getcharging() {
if (Bangle.isCharging()) {
blinkbat();
}
}
setInterval(getcharging, 1000);

View File

@ -1,7 +1,7 @@
{ {
"id": "binaryclk", "id": "binaryclk",
"name": "Bin Clock", "name": "Bin Clock",
"version": "0.10", "version": "0.11",
"description": "Binary clock with date and battery", "description": "Binary clock with date and battery",
"icon": "app-icon.png", "icon": "app-icon.png",
"screenshots": [{"url":"screenshot.png"}], "screenshots": [{"url":"screenshot.png"}],