From 62d87b88531e62ad021f08d04843e314936d90cc Mon Sep 17 00:00:00 2001 From: James M Snell Date: Fri, 8 Nov 2019 17:30:11 -0800 Subject: [PATCH] Fixups --- apps/bootloader.js | 2 +- apps/settings.js | 2 +- apps/start.js | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/bootloader.js b/apps/bootloader.js index e7dad0247..cc9f29a0f 100644 --- a/apps/bootloader.js +++ b/apps/bootloader.js @@ -2,7 +2,7 @@ E.setTimeZone(1); E.setFlags({pretokenise:1}); var startapp; try { - startapp = s.readJSON('+start'); + startapp = require('Storage').readJSON('+start'); } catch (e) {} if (startapp) { eval(require("Storage").read(startapp.src)); diff --git a/apps/settings.js b/apps/settings.js index f8e2d493f..5aa8f7837 100644 --- a/apps/settings.js +++ b/apps/settings.js @@ -51,7 +51,7 @@ function showMainMenu() { }, 'Dev': { value: settings.dev, - format: bootFormat, + format: boolFormat, onchange: () => { settings.dev = !settings.dev; updateSettings(); diff --git a/apps/start.js b/apps/start.js index 959532993..52fa703f4 100644 --- a/apps/start.js +++ b/apps/start.js @@ -72,9 +72,9 @@ function logos() { function info() { var slides = [ - () => E.showMessage('Visit\nnodewatch.dev\nfor info'), - () => E.showMessage('Visit\nbanglejs.com/apps\nfor apps'), - () => E.showMessage('Remember\nto charge\nyour watch!'), + () => E.showMessage('Visit\\nnodewatch.dev\\nfor info'), + () => E.showMessage('Visit\\nbanglejs.com/apps\\nfor apps'), + () => E.showMessage('Remember\\nto charge\\nyour watch!'), () => { g.clear(); g.setFont('6x8',2); @@ -88,17 +88,17 @@ function info() { }, () => { g.clear(); - E.showMessage('Hold both\nto return\nto clock'); + E.showMessage('Hold both\\nto return\\nto clock'); g.drawImage(c([0,8,12,14,255,14,12,8]),d,40); g.drawImage(c([0,8,12,14,255,14,12,8]),d,194); }, () => { g.clear(); - E.showMessage('Hold both\nto reboot'); + E.showMessage('Hold both\\nto reboot'); g.drawImage(c([0,8,12,14,255,14,12,8]),d,40); g.drawImage(c([0,8,12,14,255,14,12,8]),d,116); }, - () => E.showMessage('Open Settings\nto enable\nBluetooth') + () => E.showMessage('Open Settings\\nto enable\\nBluetooth') ]; function next() { var n = slides.shift();