diff --git a/loader.js b/loader.js
index d8ba26269..fe6625ed3 100644
--- a/loader.js
+++ b/loader.js
@@ -32,12 +32,13 @@ DEVICEINFO = DEVICEINFO.filter(x=>x.id.startsWith("BANGLEJS"));
// When a device is found, filter the apps accordingly
function onFoundDeviceInfo(deviceId, deviceVersion) {
- var fwURL = "#";
+ var fwURL = "#", fwExtraText = "";
if (deviceId == "BANGLEJS") {
fwURL = "https://www.espruino.com/Bangle.js#firmware-updates";
Const.MESSAGE_RELOAD = 'Hold BTN3\nto reload';
}
if (deviceId == "BANGLEJS2") {
+ fwExtraText = "with the
Firmware Update app in this App Loader, or "
fwURL = "https://www.espruino.com/Bangle.js2#firmware-updates";
Const.MESSAGE_RELOAD = 'Hold button\nto reload';
}
@@ -45,7 +46,7 @@ function onFoundDeviceInfo(deviceId, deviceVersion) {
if (deviceId != "BANGLEJS" && deviceId != "BANGLEJS2") {
showToast(`You're using ${deviceId}, not a Bangle.js. Did you want
espruino.com/apps instead?` ,"warning", 20000);
} else if (versionLess(deviceVersion, RECOMMENDED_VERSION)) {
- showToast(`You're using an old Bangle.js firmware (${deviceVersion}) and ${RECOMMENDED_VERSION} is available (
see changes). You can
update with the instructions here` ,"warning", 20000);
+ showToast(`You're using an old Bangle.js firmware (${deviceVersion}) and ${RECOMMENDED_VERSION} is available (
see changes). You can update ${fwExtraText}
with the instructions here` ,"warning", 20000);
}
@@ -206,7 +207,7 @@ window.addEventListener('load', (event) => {
});
selectLang.addEventListener("change",event=>{
SETTINGS.language = event.target.value;
- reloadLanguage();
+ reloadLanguage();
saveSettings();
});
reloadLanguage();
diff --git a/modules/Layout.js b/modules/Layout.js
index cb64183ea..fbd618524 100644
--- a/modules/Layout.js
+++ b/modules/Layout.js
@@ -1,5 +1,8 @@
+/* Copyright (c) 2022 Bangle.js contibutors. See the file LICENSE for copying permission. */
/*
+Take a look at README.md for hints on developing with this library.
+
Usage:
```
diff --git a/modules/README.md b/modules/README.md
index 6930da2b9..62ce90a97 100644
--- a/modules/README.md
+++ b/modules/README.md
@@ -1,9 +1,54 @@
App Modules
===========
-These are modules used by apps - you can use them with:
+These are modules used by apps - you can use them from a Bangle.js app with:
```
var testmodule = require("testmodule");
testmodule.test()
```
+
+Development
+-----------
+
+When apps that use these modules are uploaded via the
+app loader, the module is automatically included in the app's source. However
+when developing via the IDE the module won't get pulled in by default.
+
+To fix this you have three options:
+
+### Host your own App Loader and upload from that
+
+This is reasonably easy to set up, but it's more difficult to make changes and upload:
+
+* Follow the steps here to set up your own App Loader: https://www.espruino.com/Bangle.js+App+Loader
+* Make changes to that repository
+* Refresh and upload your app from the app loader (you can have the IDE connected
+ at the same time so you can see any error messages)
+
+### Upload the module to the Bangle's internal storage
+
+This allows you to develop both the app and module very quickly, but the app is
+uploaded in a slightly different way to what you'd get when you use the App Loader
+or the method below:
+
+* Load the module's source file in the Web IDE
+* Click the down-arrow below the upload button, then `Storage`
+* Click `New File`, type `your_module_name` as the name (with no `.js` extension), click `Ok`
+* Now Click the `Upload` icon.
+
+You can now upload the app direct from the IDE. You can even leave a second Web IDE window open
+(one for the app, one for the module) to allow you to change the module.
+
+### Change the Web IDE search path to include Bangle.js modules
+
+This is nice and easy (and the results are the same as if the app was
+uploaded via the app loader), however you cannot then make/test changes
+to the module.
+
+* In the IDE, Click the `Settings` icon in the top right
+* Click `Communications` and scroll down to `Module URL`
+* Now change the module URL from the default of `https://www.espruino.com/modules`
+to `https://banglejs.com/apps/modules|https://www.espruino.com/modules`
+
+The next time you upload your app, the module will automatically be included.
diff --git a/modules/dane_arwes.js b/modules/dane_arwes.js
index b24bc008e..0083d117b 100644
--- a/modules/dane_arwes.js
+++ b/modules/dane_arwes.js
@@ -1,6 +1,8 @@
/* Copyright (c) 2020 OmegaRogue. See the file LICENSE for copying permission. */
/*
Graphics Functions based on the React Sci-Fi UI Framework Arwes
+
+Take a look at README.md for hints on developing with this library.
*/
var C = {
diff --git a/modules/exstats.js b/modules/exstats.js
new file mode 100644
index 000000000..dfeee9042
--- /dev/null
+++ b/modules/exstats.js
@@ -0,0 +1,262 @@
+/* Copyright (c) 2022 Bangle.js contibutors. See the file LICENSE for copying permission. */
+/* Exercise Stats module
+
+Take a look at README.md for hints on developing with this library.
+
+Usage
+-----
+
+var ExStats = require("exstats");
+// Get a list of available types of run statistic
+print(ExStats.getList());
+// returns list of available stat IDs like
+[
+ {name: "Time", id:"time"},
+ {name: "Distance", id:"dist"},
+ {name: "Steps", id:"step"},
+ {name: "Heart (BPM)", id:"bpm"},
+ {name: "Pace (avr)", id:"pacea"},
+ {name: "Pace (current)", id:"pacec"},
+ {name: "Cadence", id:"caden"},
+]
+
+// Setup and load all statistic types
+var exs = ExStats.getStats(["dist", "time", "pacea","bpm","step","caden"], options);
+// exs contains
+{
+ stats : { time : {
+ id : "time"
+ title : "Time" // title to use when rendering
+ getValue : function // get a floating point value for this stat
+ getString : function // get a formatted string for this stat
+ // also fires a 'changed' event
+ },
+ dist : { ... },
+ pacea : { ... },
+ ...
+ },
+ state : { active : bool,
+ .. other internal-ish state info
+ },
+ start : function, // call to start exercise and reset state
+ stop : function, // call to stop exercise
+}
+
+/// Or you can display a menu where the settings can be configured - these are passed as the 'options' argument of getStats
+
+var menu = { ... };
+ExStats.appendMenuItems(menu, settings, saveSettingsFunction);
+E.showMenu(menu);
+
+*/
+var state = {
+ active : false, // are we working or not?
+ // startTime, // time exercise started
+ lastGPS:{}, thisGPS:{}, // This & previous GPS readings
+ // distance : 0, ///< distance in meters
+ // avrSpeed : 0, ///< in m/sec
+ startSteps : Bangle.getStepCount(), ///< number of steps when we started
+ lastSteps : Bangle.getStepCount(), // last time 'step' was called
+ stepHistory : new Uint8Array(60), // steps each second for the last minute (0 = current minute)
+ // stepsInMinute // steps over the last minute
+ // cadence // steps per minute adjusted if <1 minute
+ // BPM // beats per minute
+ // BPMage // how many seconds was BPM set?
+};
+// list of active stats (indexed by ID)
+var stats = {};
+
+// distance between 2 lat and lons, in meters, Mean Earth Radius = 6371km
+// https://www.movable-type.co.uk/scripts/latlong.html
+function calcDistance(a,b) {
+ function radians(a) { return a*Math.PI/180; }
+ var x = radians(a.lon-b.lon) * Math.cos(radians((a.lat+b.lat)/2));
+ var y = radians(b.lat-a.lat);
+ return Math.round(Math.sqrt(x*x + y*y) * 6371000);
+}
+
+// Given milliseconds, return a time
+function formatTime(ms) {
+ let hrs = Math.floor(ms/3600000).toString();
+ let mins = (Math.floor(ms/60000)%60).toString();
+ let secs = (Math.floor(ms/1000)%60).toString();
+
+ if (hrs === '0')
+ return mins.padStart(2,0)+":"+secs.padStart(2,0);
+ else
+ return hrs+":"+mins.padStart(2,0)+":"+secs.padStart(2,0); // dont pad hours
+}
+
+// Format speed in meters/second, paceLength=length in m for pace over
+function formatPace(speed, paceLength) {
+ if (speed < 0.1667) {
+ return `__:__`;
+ }
+ const pace = Math.round(paceLength / speed); // seconds for paceLength (1000=1km)
+ const min = Math.floor(pace / 60); // minutes for paceLength
+ const sec = pace % 60;
+ return ('0' + min).substr(-2) + `:` + ('0' + sec).substr(-2);
+}
+
+Bangle.on("GPS", function(fix) {
+ if (!fix.fix) return; // only process actual fixes
+
+ if (!state.active) return;
+ if( state.lastGPS.fix)
+ state.distance += calcDistance(state.lastGPS, fix);
+ var duration = Date.now() - state.startTime; // in ms
+ state.avrSpeed = state.distance * 1000 / duration; // meters/sec
+ if (stats["pacea"]) stats["pacea"].emit("changed",stats["pacea"]);
+ state.lastGPS = state.thisGPS;
+ state.thisGPS = fix;
+ if (stats["pacec"]) stats["pacec"].emit("changed",stats["pacec"]);
+});
+
+Bangle.on("step", function(steps) {
+ if (!state.active) return;
+ if (stats["step"]) stats["step"].emit("changed",stats["step"]);
+ state.lastStepCount = steps;
+});
+Bangle.on("HRM", function(h) {
+ if (h.confidence>=60) {
+ state.BPM = h.bpm;
+ state.BPMage = 0;
+ stats["bpm"].emit("changed",stats["bpm"]);
+ }
+});
+
+/** Get list of available statistic types */
+exports.getList = function() {
+ return [
+ {name: "Time", id:"time"},
+ {name: "Distance", id:"dist"},
+ {name: "Steps", id:"step"},
+ {name: "Heart (BPM)", id:"bpm"},
+ {name: "Pace (avr)", id:"pacea"},
+ {name: "Pace (current)", id:"pacec"},
+ {name: "Cadence", id:"caden"},
+ ];
+};
+/** Instatiate the given list of statistic IDs (see comments at top)
+ options = {
+ paceLength : meters to measure pace over
+ }
+*/
+exports.getStats = function(statIDs, options) {
+ options = options||{};
+ options.paceLength = options.paceLength||1000;
+ var needGPS,needHRM;
+ // ======================
+ if (statIDs.includes("time")) {
+ stats["time"]={
+ title : "Time",
+ getValue : function() { return Date.now()-state.startTime; },
+ getString : function() { return formatTime(this.getValue()) },
+ };
+ };
+ if (statIDs.includes("dist")) {
+ needGPS = true;
+ stats["dist"]={
+ title : "Dist",
+ getValue : function() { return state.distance; },
+ getString : function() { return require("locale").distance(state.distance); },
+ };
+ }
+ if (statIDs.includes("step")) {
+ stats["step"]={
+ title : "Steps",
+ getValue : function() { return Bangle.getStepCount() - state.startSteps; },
+ getString : function() { return this.getValue().toString() },
+ };
+ }
+ if (statIDs.includes("bpm")) {
+ needHRM = true;
+ stats["bpm"]={
+ title : "BPM",
+ getValue : function() { return state.BPM; },
+ getString : function() { return state.BPM||"--" },
+ };
+ }
+ if (statIDs.includes("pacea")) {
+ needGPS = true;
+ stats["pacea"]={
+ title : "Pace(avr)",
+ getValue : function() { return state.avrSpeed; }, // in m/sec
+ getString : function() { return formatPace(state.avrSpeed, options.paceLength); },
+ };
+ }
+ if (statIDs.includes("pacec")) {
+ needGPS = true;
+ stats["pacec"]={
+ title : "Pace(now)",
+ getValue : function() { return (state.thisGPS.speed||0)/3.6; }, // in m/sec
+ getString : function() { return formatPace(this.getValue(), options.paceLength); },
+ };
+ }
+ if (statIDs.includes("caden")) {
+ needGPS = true;
+ stats["caden"]={
+ title : "Cadence",
+ getValue : function() { return state.stepsPerMin; },
+ getString : function() { return state.stepsPerMin; },
+ };
+ }
+ // ======================
+ for (var i in stats) stats[i].id=i; // set up ID field
+ if (needGPS) Bangle.setGPSPower(true,"exs");
+ if (needHRM) Bangle.setHRMPower(true,"exs");
+ setInterval(function() { // run once a second....
+ if (!state.active) return;
+ // called once a second
+ var duration = Date.now() - state.startTime; // in ms
+ // set cadence -> steps over last minute
+ state.stepsPerMin = Math.round(60000 * E.sum(state.stepHistory) / Math.min(duration,60000));
+ if (stats["caden"]) stats["caden"].emit("changed",stats["caden"]);
+ // move step history onwards
+ state.stepHistory.set(state.stepHistory,1);
+ state.stepHistory[0]=0;
+ if (stats["time"]) stats["time"].emit("changed",stats["time"]);
+ // update BPM - if nothing valid in 60s remove the reading
+ state.BPMage++;
+ if (state.BPM && state.BPMage>60) {
+ state.BPM = 0;
+ if (stats["bpm"]) stats["bpm"].emit("changed",stats["bpm"]);
+ }
+ }, 1000);
+ function reset() {
+ state.startTime = Date.now();
+ state.startSteps = state.lastSteps = Bangle.getStepCount();
+ state.lastSteps = 0;
+ state.stepHistory.fill(0);
+ state.stepsPerMin = 0;
+ state.distance = 0;
+ state.avrSpeed = 0;
+ state.BPM = 0;
+ state.BPMage = 0;
+ }
+ reset();
+ return {
+ stats : stats, state : state,
+ start : function() {
+ state.active = true;
+ reset();
+ },
+ stop : function() {
+ state.active = false;
+ }
+ };
+};
+
+exports.appendMenuItems = function(menu, settings, saveSettings) {
+ var paceNames = ["1000m","1 mile","1/2 Mthn", "Marathon",];
+ var paceAmts = [1000,1609,21098,42195];
+ menu['Pace'] = {
+ min :0, max: paceNames.length-1,
+ value: Math.max(paceAmts.indexOf(settings.paceLength),0),
+ format: v => paceNames[v],
+ onchange: v => {
+ settings.paceLength = paceAmts[v];
+ saveSettings();
+ },
+ };
+};