settings 0.49: Now reloads settings properly after 'Calibrate Battery'

master
Gordon Williams 2022-07-18 14:24:53 +01:00
parent 3f14b0dc8f
commit 9b5dd113b4
3 changed files with 8 additions and 10 deletions

View File

@ -53,3 +53,4 @@
0.47: Allow colors to be translated 0.47: Allow colors to be translated
Improve "Turn Off" user experience Improve "Turn Off" user experience
0.48: Allow reading custom themes from files 0.48: Allow reading custom themes from files
0.49: Now reloads settings properly after 'Calibrate Battery'

View File

@ -1,7 +1,7 @@
{ {
"id": "setting", "id": "setting",
"name": "Settings", "name": "Settings",
"version": "0.48", "version": "0.49",
"description": "A menu for setting up Bangle.js", "description": "A menu for setting up Bangle.js",
"icon": "settings.png", "icon": "settings.png",
"tags": "tool,system", "tags": "tool,system",

View File

@ -25,15 +25,7 @@ function updateOptions() {
Bangle.setOptions(o) Bangle.setOptions(o)
} }
function gToInternal(g) {
// converts g to Espruino internal unit
return g * 8192;
}
function internalToG(u) {
// converts Espruino internal unit to g
return u / 8192
}
function resetSettings() { function resetSettings() {
settings = { settings = {
@ -386,6 +378,11 @@ function showWhitelistMenu() {
} }
function showLCDMenu() { function showLCDMenu() {
// converts g to Espruino internal unit
function gToInternal(g) { return g * 8192; }
// converts Espruino internal unit to g
function internalToG(u) { return u / 8192; }
const lcdMenu = { const lcdMenu = {
'': { 'title': 'LCD' }, '': { 'title': 'LCD' },
'< Back': ()=>showSystemMenu(), '< Back': ()=>showSystemMenu(),
@ -578,7 +575,7 @@ function showUtilMenu() {
var s=require("Storage").readJSON("setting.json"); var s=require("Storage").readJSON("setting.json");
s.batFullVoltage = (analogRead(D3)+analogRead(D3)+analogRead(D3)+analogRead(D3))/4; s.batFullVoltage = (analogRead(D3)+analogRead(D3)+analogRead(D3)+analogRead(D3))/4;
require("Storage").writeJSON("setting.json",s); require("Storage").writeJSON("setting.json",s);
E.showAlert(/*LANG*/"Calibrated!").then(() => load("settings.app.js")); E.showAlert(/*LANG*/"Calibrated!").then(() => load("setting.app.js"));
} else { } else {
E.showAlert(/*LANG*/"Please charge Bangle.js for 3 hours and try again").then(() => load("settings.app.js")); E.showAlert(/*LANG*/"Please charge Bangle.js for 3 hours and try again").then(() => load("settings.app.js"));
} }