diff --git a/apps/daisy/app.js b/apps/daisy/app.js index 613190404..fcb93edb9 100644 --- a/apps/daisy/app.js +++ b/apps/daisy/app.js @@ -2,6 +2,7 @@ var SunCalc = require("suncalc"); // from modules folder const storage = require('Storage'); const widget_utils = require('widget_utils'); const SETTINGS_FILE = "daisy.json"; +const global_settings = storage.readJSON("setting.json", true) || {}; const LOCATION_FILE = "mylocation.json"; const h = g.getHeight(); const w = g.getWidth(); @@ -87,7 +88,7 @@ function loadSettings() { settings.fg = settings.fg||'#0f0'; settings.idle_check = (settings.idle_check === undefined ? true : settings.idle_check); settings.batt_hours = (settings.batt_hours === undefined ? false : settings.batt_hours); - settings.hr_12 = (settings.hr_12 === undefined ? false : settings.hr_12); + settings.hr_12 = (global_settings["12hour"] === undefined ? false : global_settings["12hour"]); settings.hourly_buzz = (settings.hourly_buzz === undefined ? false : settings.hourly_buzz); settings.ring = settings.ring||'Steps'; settings.idxInfo = settings.idxInfo||0; diff --git a/apps/daisy/settings.js b/apps/daisy/settings.js index 95de5abd1..41ec54160 100644 --- a/apps/daisy/settings.js +++ b/apps/daisy/settings.js @@ -82,20 +82,6 @@ save(); }, }; - appMenu['Expected Battery Life In Days Not Percentage'] = { - value: !!s.batt_hours, - onchange: v => { - s.batt_hours = v; - save(); - }, - }; - appMenu['12 Hr Time'] = { - value: !!s.hr_12, - onchange: v => { - s.hr_12 = v; - save(); - }, - }; appMenu['Hourly Buzz'] = { value: !!s.hourly_buzz, onchange: v => { @@ -103,6 +89,13 @@ save(); }, }; + appMenu['Expected Battery Life In Days Not Percentage'] = { + value: !!s.batt_hours, + onchange: v => { + s.batt_hours = v; + save(); + }, + }; E.showMenu(appMenu); }