Tagging bootloader messages, and all "Loading..." messages

master
Eskild Hustvedt 2022-04-10 21:35:46 +02:00
parent dc273a7a12
commit 78e135b80d
12 changed files with 18 additions and 18 deletions

View File

@ -29,7 +29,7 @@ function showMenu() {
} }
function viewLog(n) { function viewLog(n) {
E.showMessage("Loading..."); E.showMessage(/*LANG*/"Loading...");
var f = require("Storage").open(getFileName(n), "r"); var f = require("Storage").open(getFileName(n), "r");
var records = 0, l = "", ll=""; var records = 0, l = "", ll="";
while ((l=f.readLine())!==undefined) {records++;ll=l;} while ((l=f.readLine())!==undefined) {records++;ll=l;}

View File

@ -1,7 +1,7 @@
/* This rewrites boot0.js based on current settings. If settings changed then it /* This rewrites boot0.js based on current settings. If settings changed then it
recalculates, but this avoids us doing a whole bunch of reconfiguration most recalculates, but this avoids us doing a whole bunch of reconfiguration most
of the time. */ of the time. */
E.showMessage("Updating boot0..."); E.showMessage(/*LANG*/"Updating boot0...");
var s = require('Storage').readJSON('setting.json',1)||{}; var s = require('Storage').readJSON('setting.json',1)||{};
var BANGLEJS2 = process.env.HWVERSION==2; // Is Bangle.js 2 var BANGLEJS2 = process.env.HWVERSION==2; // Is Bangle.js 2
var boot = "", bootPost = ""; var boot = "", bootPost = "";
@ -209,7 +209,7 @@ delete bootPost;
delete bootFiles; delete bootFiles;
delete fileSize; delete fileSize;
delete fileOffset; delete fileOffset;
E.showMessage("Reloading..."); E.showMessage(/*LANG*/"Reloading...");
eval(require('Storage').read('.boot0')); eval(require('Storage').read('.boot0'));
// .bootcde should be run automatically after if required, since // .bootcde should be run automatically after if required, since
// we normally get called automatically from '.boot0' // we normally get called automatically from '.boot0'

View File

@ -244,7 +244,7 @@ function run(){
Bangle.setLCDMode(); Bangle.setLCDMode();
g.clear(); g.clear();
g.flip(); g.flip();
E.showMessage("Loading..."); E.showMessage(/*LANG*/"Loading...");
load(app.src); load(app.src);
} }

View File

@ -5,7 +5,7 @@ function satelliteImage() {
var Layout = require("Layout"); var Layout = require("Layout");
var layout; var layout;
//Bangle.setGPSPower(1, "app"); //Bangle.setGPSPower(1, "app");
E.showMessage("Loading..."); // avoid showing rubbish on screen E.showMessage(/*LANG*/"Loading..."); // avoid showing rubbish on screen
var lastFix = { var lastFix = {
fix: -1, fix: -1,

View File

@ -126,7 +126,7 @@ function asTime(v){
function viewTrack(n, info) { function viewTrack(n, info) {
if (!info) { if (!info) {
E.showMessage("Loading...","GPS Track "+n); E.showMessage(/*LANG*/"Loading...","GPS Track "+n);
info = getTrackInfo(n); info = getTrackInfo(n);
} }
const menu = { const menu = {

View File

@ -10,7 +10,7 @@ var Layout = require("Layout");
Bangle.setGPSPower(1, "app"); Bangle.setGPSPower(1, "app");
Bangle.loadWidgets(); Bangle.loadWidgets();
Bangle.drawWidgets(); Bangle.drawWidgets();
E.showMessage("Loading..."); // avoid showing rubbish on screen E.showMessage(/*LANG*/"Loading..."); // avoid showing rubbish on screen
function setGPSTime() { function setGPSTime() {
if (fix.time!==undefined) { if (fix.time!==undefined) {

View File

@ -70,7 +70,7 @@ function menuHRM() {
function stepsPerHour() { function stepsPerHour() {
E.showMessage("Loading..."); E.showMessage(/*LANG*/"Loading...");
var data = new Uint16Array(24); var data = new Uint16Array(24);
require("health").readDay(new Date(), h=>data[h.hr]+=h.steps); require("health").readDay(new Date(), h=>data[h.hr]+=h.steps);
g.clear(1); g.clear(1);
@ -81,7 +81,7 @@ function stepsPerHour() {
} }
function stepsPerDay() { function stepsPerDay() {
E.showMessage("Loading..."); E.showMessage(/*LANG*/"Loading...");
var data = new Uint16Array(31); var data = new Uint16Array(31);
require("health").readDailySummaries(new Date(), h=>data[h.day]+=h.steps); require("health").readDailySummaries(new Date(), h=>data[h.day]+=h.steps);
g.clear(1); g.clear(1);
@ -92,7 +92,7 @@ function stepsPerDay() {
} }
function hrmPerHour() { function hrmPerHour() {
E.showMessage("Loading..."); E.showMessage(/*LANG*/"Loading...");
var data = new Uint16Array(24); var data = new Uint16Array(24);
var cnt = new Uint8Array(23); var cnt = new Uint8Array(23);
require("health").readDay(new Date(), h=>{ require("health").readDay(new Date(), h=>{
@ -108,7 +108,7 @@ function hrmPerHour() {
} }
function hrmPerDay() { function hrmPerDay() {
E.showMessage("Loading..."); E.showMessage(/*LANG*/"Loading...");
var data = new Uint16Array(31); var data = new Uint16Array(31);
var cnt = new Uint8Array(31); var cnt = new Uint8Array(31);
require("health").readDailySummaries(new Date(), h=>{ require("health").readDailySummaries(new Date(), h=>{
@ -124,7 +124,7 @@ function hrmPerDay() {
} }
function movementPerHour() { function movementPerHour() {
E.showMessage("Loading..."); E.showMessage(/*LANG*/"Loading...");
var data = new Uint16Array(24); var data = new Uint16Array(24);
require("health").readDay(new Date(), h=>data[h.hr]+=h.movement); require("health").readDay(new Date(), h=>data[h.hr]+=h.movement);
g.clear(1); g.clear(1);
@ -135,7 +135,7 @@ function movementPerHour() {
} }
function movementPerDay() { function movementPerDay() {
E.showMessage("Loading..."); E.showMessage(/*LANG*/"Loading...");
var data = new Uint16Array(31); var data = new Uint16Array(31);
require("health").readDailySummaries(new Date(), h=>data[h.day]+=h.movement); require("health").readDailySummaries(new Date(), h=>data[h.day]+=h.movement);
g.clear(1); g.clear(1);

View File

@ -20,6 +20,6 @@ const avg = [];
setInterval(function() { setInterval(function() {
drawTemperature(); drawTemperature();
}, 2000); }, 2000);
E.showMessage("Loading..."); E.showMessage(/*LANG*/"Loading...");
Bangle.loadWidgets(); Bangle.loadWidgets();
Bangle.drawWidgets(); Bangle.drawWidgets();

View File

@ -23,6 +23,6 @@ setInterval(function() {
drawTemperature(); drawTemperature();
}, 20000); }, 20000);
drawTemperature(); drawTemperature();
E.showMessage("Loading..."); E.showMessage(/*LANG*/"Loading...");
Bangle.loadWidgets(); Bangle.loadWidgets();
Bangle.drawWidgets(); Bangle.drawWidgets();

View File

@ -255,7 +255,7 @@ function run(){
if (process.env.HWVERSION == 1) Bangle.setLCDMode(); if (process.env.HWVERSION == 1) Bangle.setLCDMode();
g.clear(); g.clear();
g.flip(); g.flip();
E.showMessage("Loading..."); E.showMessage(/*LANG*/"Loading...");
load(app.src); load(app.src);
} }

View File

@ -354,7 +354,7 @@ function loadFile(fn) {
Bangle.setLCDMode("direct"); Bangle.setLCDMode("direct");
g.clear(); g.clear();
E.showMenu(); E.showMenu();
E.showMessage("Loading...", fn); E.showMessage(/*LANG*/"Loading...", fn);
readSTL(fn); readSTL(fn);
zDist = 5*largestExtent(points); zDist = 5*largestExtent(points);
g.clear(); g.clear();

View File

@ -216,7 +216,7 @@ function loadFile(fn) {
Bangle.setLCDMode("direct"); Bangle.setLCDMode("direct");
g.clear(); g.clear();
E.showMenu(); E.showMenu();
E.showMessage("Loading...", fn); E.showMessage(/*LANG*/"Loading...", fn);
readSTL(fn); readSTL(fn);
zDist = 5*largestExtent(points); zDist = 5*largestExtent(points);
g.clear(); g.clear();