Merge branch 'ffcniftya-clock-0.02'

pull/1150/head^2
Danny 2021-12-26 00:13:21 +01:00
commit ab5b9c6897
2 changed files with 6 additions and 3 deletions

View File

@ -1,9 +1,11 @@
# Nifty-A Clock # Nifty-A Clock
Colors are black/white - "blue" comes from a photo
## This is the clock ## This is the clock
![](screenshot_nifty.png) ![](screenshot_nifty.png)
##And the week number can be turned On/Off via settings ## The week number can be turned On/Off via settings
![](screenshot_settings_nifty.png) ![](screenshot_settings_nifty.png)
default is "On" default is "On"

View File

@ -1,5 +1,6 @@
const locale = require("locale"); const locale = require("locale");
const is12Hour = (require("Storage").readJSON("setting.json", 1) || {})["12hour"]; const is12Hour = (require("Storage").readJSON("setting.json", 1) || {})["12hour"];
const CFG = require('Storage').readJSON("ffcniftya.json", true) || {showWeek: true};
/* Clock *********************************************/ /* Clock *********************************************/
const scale = g.getWidth() / 176; const scale = g.getWidth() / 176;
@ -58,7 +59,7 @@ function draw() {
g.drawString(year, centerDatesScaleX, center.y - 62 * scale); g.drawString(year, centerDatesScaleX, center.y - 62 * scale);
g.drawString(month, centerDatesScaleX, center.y - 44 * scale); g.drawString(month, centerDatesScaleX, center.y - 44 * scale);
g.drawString(day, centerDatesScaleX, center.y - 26 * scale); g.drawString(day, centerDatesScaleX, center.y - 26 * scale);
g.drawString(weekNum, centerDatesScaleX, center.y + 15 * scale); if (CFG.showWeek) g.drawString(d02(ISO8601_week_no(now)), centerDatesScaleX, center.y + 15 * scale);
g.drawString(monthName, centerDatesScaleX, center.y + 48 * scale); g.drawString(monthName, centerDatesScaleX, center.y + 48 * scale);
g.drawString(dayName, centerDatesScaleX, center.y + 66 * scale); g.drawString(dayName, centerDatesScaleX, center.y + 66 * scale);
} }