bryan
/
BangleApps
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

marioclock: use short date format from locale, take timeout from settings

master
DerGuteWolf 2020-03-30 23:52:41 +02:00 committed by GitHub
parent 7ff958ad2c
commit 6176c16712
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/marioclock/marioclock-app.js
View File

@ -6,6 +6,9 @@
**********************************/ **********************************/
var locale = require("locale"); var locale = require("locale");
const storage = require('Storage');
const settings = (storage.readJSON('setting.json',1)||{});
const timeout = settings.timeout||10;
// Screen dimensions // Screen dimensions
let W, H; let W, H;
@ -280,14 +283,10 @@ function drawTime() {
} }
function drawDate() { function drawDate() {
const date = new Date();
const day = locale.dow(date).substr(0, 3);
const dayNum = ("0" + date.getDate()).substr(-2);
const month = locale.month(date).substr(0, 3);
g.setFont("6x8"); g.setFont("6x8");
g.setColor(LIGHTEST); g.setColor(LIGHTEST);
g.drawString(`${day} ${dayNum} ${month}`, 10, 0, true); const dateStr = locale.date(new Date(), true);
g.drawString(dateStr, (W - g.stringWidth(dateStr))/2, 0, true);
} }
function redraw() { function redraw() {
@ -322,7 +321,7 @@ function resetDisplayTimeout() {
displayTimeoutRef = setInterval(() => { displayTimeoutRef = setInterval(() => {
if (Bangle.isLCDOn()) Bangle.setLCDPower(false); if (Bangle.isLCDOn()) Bangle.setLCDPower(false);
clearTimers(); clearTimers();
}, ONE_SECOND * 10); }, ONE_SECOND * timeout);
} }
function startTimers(){ function startTimers(){