fixed linter warnings

master
jan lamos 2024-03-16 12:28:43 +01:00
parent 7310ab9708
commit f26169856e
4 changed files with 34 additions and 49 deletions

View File

@ -31,14 +31,3 @@ var mainmenu = {
// Actually display the menu // Actually display the menu
E.showMenu(mainmenu); E.showMenu(mainmenu);
// Function to fix time format
function fixTime(h, m) {
if (h.toString().length < 2) {
h = "0" + h.toString();
}
if (m.toString().length < 2) {
m = "0" + m.toString();
}
return h.toString() + ":" + m.toString();
}

View File

@ -9,7 +9,7 @@ if (typeof (global.sleeplog || {}).trigger === "object") {
to: 0, to: 0,
// reference time to from & to is rounded to full minutes // reference time to from & to is rounded to full minutes
fn: function (data, thisTriggerEntry) { fn: function (data, thisTriggerEntry) {
aSettings = require('Storage').readJSON('quietSwitch.json', 1) || {}; let aSettings = require('Storage').readJSON('quietSwitch.json', 1) || {};
const DEFAULTS = { const DEFAULTS = {
'quietWhenSleep': false, 'quietWhenSleep': false,
'quietMode': 1 'quietMode': 1
@ -20,12 +20,12 @@ if (typeof (global.sleeplog || {}).trigger === "object") {
if (aSettings && aSettings['quietWhenSleep']) { if (aSettings && aSettings['quietWhenSleep']) {
console.log("the sleep status is: " + data.status); console.log("the sleep status is: " + data.status);
quietMode = aSettings['quietMode']; let quietMode = aSettings['quietMode'];
delete aSettings; delete aSettings;
if ((data.status === 3 || data.status === 4) if ((data.status === 3 || data.status === 4)
&& (data.prevStatus !== 3 && data.prevStatus !== 4)) { && (data.prevStatus !== 3 && data.prevStatus !== 4)) {
bSettings = require("Storage").readJSON('setting.json', true) || {}; bSettings = require("Storage").readJSON('setting.json', true) || {};
current = 0 | bSettings.quiet; let current = 0 | bSettings.quiet;
console.log("quiet mode is:" + current); console.log("quiet mode is:" + current);
if (current !== quietMode) { if (current !== quietMode) {
console.log("fallen asleep"); console.log("fallen asleep");
@ -36,7 +36,7 @@ if (typeof (global.sleeplog || {}).trigger === "object") {
} }
if ((data.status === 2 || data.status === 1) if ((data.status === 2 || data.status === 1)
&& (data.prevStatus !== 2 && data.prevStatus !== 1)) { && (data.prevStatus !== 2 && data.prevStatus !== 1)) {
bSettings = require("Storage").readJSON('setting.json', true) || {}; let bSettings = require("Storage").readJSON('setting.json', true) || {};
current = 0 | bSettings.quiet; current = 0 | bSettings.quiet;
console.log("quiet mode is:" + current); console.log("quiet mode is:" + current);
if (current !== 0) { if (current !== 0) {

View File

@ -2,14 +2,14 @@ const SETTINGS_FILE = "themeSwitch.json";
const storage = require("Storage"); const storage = require("Storage");
var sunrise, sunset, date; var sunrise, sunset, date;
var SunCalc = require("suncalc"); // from modules folder var SunCalc = require("suncalc"); // from modules folder
const locale = require("locale");
let settings = storage.readJSON('setting.json', 1); let settings = storage.readJSON('setting.json', 1);
let saved = storage.readJSON(SETTINGS_FILE, 1) || {}; let saved = storage.readJSON(SETTINGS_FILE, 1) || {};
if (settings.theme.fg > 0) { if (settings.theme.fg > 0) {
saved.darkModeActive = 1 saved.darkModeActive = 1;
} else { } else {
saved.darkModeActive = 0 saved.darkModeActive = 0;
} }
let dmH, dmM, lmH, lmM;
if (require("Storage").readJSON("themeSwitch.json", 1) !== undefined) { if (require("Storage").readJSON("themeSwitch.json", 1) !== undefined) {
dmH = parseInt(saved.darkModeAt.split(":")[0] | 0); dmH = parseInt(saved.darkModeAt.split(":")[0] | 0);
dmM = parseInt(saved.darkModeAt.split(":")[1] | 0); dmM = parseInt(saved.darkModeAt.split(":")[1] | 0);
@ -47,11 +47,9 @@ var mainmenu = {
if (v !== 0) { if (v !== 0) {
setDarkTheme(); setDarkTheme();
Bangle.drawWidgets(); Bangle.drawWidgets();
delete m.lastIdx;
} else { } else {
setLightTheme(); setLightTheme();
Bangle.drawWidgets(); Bangle.drawWidgets();
delete m.lastIdx;
} }
} }
}, },
@ -68,9 +66,6 @@ var mainmenu = {
saved.darkModeAt = sunset; saved.darkModeAt = sunset;
//print("sunrise" +sunrise); //print("sunrise" +sunrise);
//print("sunset" +sunset); //print("sunset" +sunset);
} }
storage.writeJSON(SETTINGS_FILE, saved); storage.writeJSON(SETTINGS_FILE, saved);
}, },
@ -101,7 +96,6 @@ var mainmenu = {
} }
}, },
"Exit": function () { load(); }, "Exit": function () { load(); },
}; };
var lightModeAtMenu = { var lightModeAtMenu = {
@ -185,23 +179,24 @@ function upd(th) {
g.clear(1); g.clear(1);
} }
function flipTheme() { //flipTheme function to be used in future version
if (!g.theme.dark) { // function flipTheme() {
upd({ // if (!g.theme.dark) {
fg: cl("#fff"), bg: cl("#000"), // upd({
fg2: cl("#fff"), bg2: cl("#004"), // fg: cl("#fff"), bg: cl("#000"),
fgH: cl("#fff"), bgH: cl("#00f"), // fg2: cl("#fff"), bg2: cl("#004"),
dark: true // fgH: cl("#fff"), bgH: cl("#00f"),
}); // dark: true
} else { // });
upd({ // } else {
fg: cl("#000"), bg: cl("#fff"), // upd({
fg2: cl("#000"), bg2: cl("#cff"), // fg: cl("#000"), bg: cl("#fff"),
fgH: cl("#000"), bgH: cl("#0ff"), // fg2: cl("#000"), bg2: cl("#cff"),
dark: false // fgH: cl("#000"), bgH: cl("#0ff"),
}); // dark: false
} // });
} // }
// }
function setDarkTheme() { function setDarkTheme() {
if (!g.theme.dark) { if (!g.theme.dark) {

View File

@ -8,6 +8,7 @@
return "lightN"; return "lightN";
} }
} }
function setDarkTheme() { function setDarkTheme() {
if (!g.theme.dark) { if (!g.theme.dark) {
upd({ upd({
@ -52,7 +53,7 @@
function cl(x) { return g.setColor(x).getColor(); } function cl(x) { return g.setColor(x).getColor(); }
function upd(th) { function upd(th) {
g.theme = th; g.theme = th;
settings = storage.readJSON('setting.json', 1) let settings = storage.readJSON('setting.json', 1)
settings.theme = th; settings.theme = th;
storage.write('setting.json', settings); storage.write('setting.json', settings);
delete g.reset; delete g.reset;
@ -71,18 +72,18 @@
const storage = require("Storage"); const storage = require("Storage");
var sunrise, sunset, date; var sunrise, sunset, date;
var SunCalc = require("suncalc"); // from modules folder var SunCalc = require("suncalc"); // from modules folder
const locale = require("locale");
let bSettings = storage.readJSON(SETTINGS_FILE, true) || {}; let bSettings = storage.readJSON(SETTINGS_FILE, true) || {};
const now = new Date(); const now = new Date();
hr = now.getHours() + (now.getMinutes() / 60) + (now.getSeconds() / 3600); // current (decimal) hour let hr = now.getHours() + (now.getMinutes() / 60) + (now.getSeconds() / 3600); // current (decimal) hour
dmH = parseFloat(bSettings.darkModeAt.split(":")[0]); let dmH = parseFloat(bSettings.darkModeAt.split(":")[0]);
dmM = parseFloat(bSettings.darkModeAt.split(":")[1]); let dmM = parseFloat(bSettings.darkModeAt.split(":")[1]);
lmH = parseFloat(bSettings.lightModeAt.split(":")[0]); let lmH = parseFloat(bSettings.lightModeAt.split(":")[0]);
lmM = parseFloat(bSettings.lightModeAt.split(":")[1]); let lmM = parseFloat(bSettings.lightModeAt.split(":")[1]);
print("reading switch timeslots....."); print("reading switch timeslots.....");
let dmDec = parseFloat(dmH) + parseFloat(dmM) / parseFloat(60); let dmDec = parseFloat(dmH) + parseFloat(dmM) / parseFloat(60);
let lmDec = parseFloat(lmH) + parseFloat(lmM) / parseFloat(60); let lmDec = parseFloat(lmH) + parseFloat(lmM) / parseFloat(60);
targetMode = selectRightMode(parseFloat(lmDec), parseFloat(dmDec), parseFloat(hr)); let targetMode = selectRightMode(parseFloat(lmDec), parseFloat(dmDec), parseFloat(hr));
let nextH, nextM;
if (targetMode === "lightT" || targetMode === "lightN") { if (targetMode === "lightT" || targetMode === "lightN") {
nextH = lmH; nextH = lmH;
nextM = lmM; nextM = lmM;