mirror of https://github.com/espruino/BangleApps
Fix settings, hopefully
parent
515d1ea229
commit
7b91d21bde
|
@ -27,16 +27,16 @@ const monthName = [
|
|||
const weekday = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
|
||||
|
||||
// dynamic variables
|
||||
var batLevel = -1;
|
||||
var batColor = [0, 0, 0];
|
||||
let batLevel = -1;
|
||||
let batColor = [0, 0, 0];
|
||||
|
||||
// settings variables
|
||||
var dateFormat;
|
||||
var drawInterval;
|
||||
var pollInterval;
|
||||
var showAnalogFace;
|
||||
var showWeekInfo;
|
||||
var useVectorFont;
|
||||
let dateFormat;
|
||||
let drawInterval;
|
||||
let pollInterval;
|
||||
let showAnalogFace;
|
||||
let showWeekInfo;
|
||||
let useVectorFont;
|
||||
|
||||
// load settings
|
||||
function loadSettings() {
|
||||
|
@ -44,7 +44,7 @@ function loadSettings() {
|
|||
function def(value, def) {
|
||||
return value !== undefined ? value : def;
|
||||
}
|
||||
var settings = require("Storage").readJSON(SETTINGSFILE, true) || {};
|
||||
let settings = require("Storage").readJSON(SETTINGSFILE, true) || {};
|
||||
|
||||
dateFormat = def(settings.dateFormat, "Short");
|
||||
drawInterval = def(settings.drawInterval, 10);
|
||||
|
@ -146,8 +146,6 @@ function draw() {
|
|||
|
||||
loadSettings();
|
||||
|
||||
console.log(settings);
|
||||
|
||||
g.clear();
|
||||
|
||||
pollBattery();
|
||||
|
|
|
@ -14,5 +14,6 @@
|
|||
{ "name": "smclock.app.js", "url": "app.js" },
|
||||
{ "name": "smclock.settings.js", "url": "settings.js" },
|
||||
{ "name": "smclock.img", "url": "app-icon.js", "evaluate": true }
|
||||
]
|
||||
],
|
||||
"data": [{ "name": "smclock.json" }]
|
||||
}
|
||||
|
|
|
@ -3,10 +3,20 @@
|
|||
// helper functions taken from Anton Clock
|
||||
|
||||
(function (back) {
|
||||
var FILE = "smclock.json";
|
||||
const FILE = "smclock.json";
|
||||
// load settings from the file
|
||||
// assign default values if it doesn't exist
|
||||
var settings = Object.assign(require("Storage").readJSON(FILE, true) || {});
|
||||
let settings = Object.assign(
|
||||
{
|
||||
dateFormat: "Short",
|
||||
drawInterval: 10,
|
||||
pollInterval: 60,
|
||||
showAnalogFace: false,
|
||||
showWeekInfo: false,
|
||||
useVectorFont: false,
|
||||
},
|
||||
require("Storage").readJSON(FILE, true) || {}
|
||||
);
|
||||
|
||||
// write the new settings to the file
|
||||
function writeSettings() {
|
||||
|
|
Loading…
Reference in New Issue