diff --git a/android.html b/android.html
new file mode 100644
index 000000000..93999008f
--- /dev/null
+++ b/android.html
@@ -0,0 +1,352 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Bangle.js App Loader
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Sort by:
+
+
+
+
+
+
+
+
diff --git a/apps/speedalt2/app.js b/apps/speedalt2/app.js
index ed16131a4..4cdf71913 100644
--- a/apps/speedalt2/app.js
+++ b/apps/speedalt2/app.js
@@ -5,8 +5,9 @@ Mike Bennett mike[at]kereru.com
1.14 : Add VMG screen
1.34 : Add bluetooth data stream for Droidscript
1.43 : Keep GPS in SuperE mode while using Droiscript screen mirroring
+1.50 : Add cfg.wptSfx one char suffix to append to waypoints.json filename. Protects speedalt2 waypoints from other apps that use the same file name for waypoints.
*/
-var v = '1.49';
+var v = '1.50';
var vDroid = '1.50'; // Required DroidScript program version
/*kalmanjs, Wouter Bulten, MIT, https://github.com/wouterbulten/kalmanjs */
@@ -209,7 +210,7 @@ function nxtWp(){
}
function loadWp() {
- var w = require("Storage").readJSON('waypoints.json')||[{name:"NONE"}];
+ var w = require("Storage").readJSON('waypoints'+cfg.wptSfx+'.json')||[{name:"NONE"}];
if (cfg.wp>=w.length) cfg.wp=0;
if (cfg.wp<0) cfg.wp = w.length-1;
savSettings();
@@ -718,6 +719,7 @@ cfg.primSpd = cfg.primSpd||0; // 1 = Spd in primary, 0 = Spd in secondary
cfg.spdFilt = cfg.spdFilt==undefined?true:cfg.spdFilt;
cfg.altFilt = cfg.altFilt==undefined?true:cfg.altFilt;
cfg.touch = cfg.touch==undefined?true:cfg.touch;
+cfg.wptSfx = cfg.wptSfx==undefined?'':cfg.wptSfx;
if ( cfg.spdFilt ) var spdFilter = new KalmanFilter({R: 0.1 , Q: 1 });
if ( cfg.altFilt ) var altFilter = new KalmanFilter({R: 0.01, Q: 2 });
diff --git a/apps/speedalt2/metadata.json b/apps/speedalt2/metadata.json
index 4ace46854..2a111af28 100644
--- a/apps/speedalt2/metadata.json
+++ b/apps/speedalt2/metadata.json
@@ -2,7 +2,7 @@
"id": "speedalt2",
"name": "GPS Adventure Sports II",
"shortName":"GPS Adv Sport II",
- "version":"1.49",
+ "version":"1.50",
"description": "GPS speed, altitude and distance to waypoint display. Designed for easy viewing and use during outdoor activities such as para-gliding, hang-gliding, sailing, cycling etc.",
"icon": "app.png",
"type": "app",
@@ -15,5 +15,11 @@
{"name":"speedalt2.img","url":"app-icon.js","evaluate":true},
{"name":"speedalt2.settings.js","url":"settings.js"}
],
- "data": [{"name":"speedalt2.json"}]
+ "data": [
+ {"name":"speedalt2.json"},
+ {"name":"waypoints.json"},
+ {"name":"waypoints1.json"},
+ {"name":"waypoints2.json"},
+ {"name":"waypoints3.json"}
+ ]
}
diff --git a/apps/speedalt2/settings.js b/apps/speedalt2/settings.js
index babb03061..1bdb58f9d 100644
--- a/apps/speedalt2/settings.js
+++ b/apps/speedalt2/settings.js
@@ -30,6 +30,11 @@
writeSettings();
}
+ function setSfx(s) {
+ settings.wptSfx = s;
+ writeSettings();
+ }
+
const appMenu = {
'': {'title': 'GPS Adv Sprt II'},
@@ -38,6 +43,7 @@
'Units' : function() { E.showMenu(unitsMenu); },
'Colours' : function() { E.showMenu(colMenu); },
'Kalman Filter' : function() { E.showMenu(kalMenu); },
+ 'Wpt File Suffix' : function() { E.showMenu(sfxMenu); },
'Touch' : {
value : settings.touch,
format : v => v?"On":"Off",
@@ -69,6 +75,15 @@
'Inverted' : function() { setColour(3); }
};
+ const sfxMenu = {
+ '': {'title': 'Wpt File Suffix'},
+ '< Back': function() { E.showMenu(appMenu); },
+ 'Default' : function() { setSfx(''); },
+ '1' : function() { setSfx('1'); },
+ '2' : function() { setSfx('2'); },
+ '3' : function() { setSfx('3'); }
+ };
+
const kalMenu = {
'': {'title': 'Kalman Filter'},
'< Back': function() { E.showMenu(appMenu); },
diff --git a/core b/core
index 147892754..404e98183 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 147892754eaf50c8581ebfb4d8651b9ec24aa44e
+Subproject commit 404e981834f2e8df9c505a8fab12ae12fe3bd562
diff --git a/lang/it_IT.json b/lang/it_IT.json
index 4bc36ee48..310af8580 100644
--- a/lang/it_IT.json
+++ b/lang/it_IT.json
@@ -192,7 +192,15 @@
"Notifications": "Notifiche",
"Scheduler": "Schedulatore",
"Stop": "Stop",
- "Min Font": "Dimensione minima del font"
+ "Min Font": "Dimensione minima del font",
+ "White": "Bianco",
+ "Red": "Rosso",
+ "Yellow": "Giallo",
+ "Cyan": "Ciano",
+ "Green": "Verde",
+ "Blue": "Blu",
+ "Black": "Nero",
+ "Show Week Number": "Mostra numero settimana"
},
"//2": "App-specific overrides",
"alarm": {
diff --git a/modules/ClockFace.js b/modules/ClockFace.js
index 25e2430bf..d6c3a2e66 100644
--- a/modules/ClockFace.js
+++ b/modules/ClockFace.js
@@ -66,6 +66,10 @@ ClockFace.prototype.tick = function() {
};
ClockFace.prototype.start = function() {
+ /* Some widgets want to know if we're in a clock or not (like chrono, widget clock, etc). Normally
+ .CLOCK is set by Bangle.setUI('clock') but we want to load widgets so we can check appRect and *then*
+ call setUI. see #1864 */
+ Bangle.CLOCK = 1;
Bangle.loadWidgets();
if (this.init) this.init.apply(this);
if (this._upDown) Bangle.setUI("clockupdown", d=>this._upDown.apply(this,[d]));
@@ -103,4 +107,4 @@ ClockFace.prototype.redraw = function() {
this.tick();
};
-exports = ClockFace;
\ No newline at end of file
+exports = ClockFace;
diff --git a/modules/Layout.js b/modules/Layout.js
index 019d63815..43419a397 100644
--- a/modules/Layout.js
+++ b/modules/Layout.js
@@ -65,6 +65,8 @@ Other functions:
* `layout.debug(obj)` - draw outlines for objects on screen
* `layout.clear(obj)` - clear the given object (you can also just specify `bgCol` to clear before each render)
* `layout.forgetLazyState()` - if lazy rendering is enabled, makes the next call to `render()` perform a full re-render
+* `layout.setUI()` - (called when module initialised) This sets up input (buttons, touch, etc) with Bangle._setUI
+ This can be useful if you called E.showMenu/showPrompt/etc and those grabbed input away from layour
*/
@@ -73,11 +75,10 @@ function Layout(layout, options) {
// Do we have >1 physical buttons?
this.physBtns = (process.env.HWVERSION==2) ? 1 : 3;
- options = options || {};
- this.lazy = options.lazy || false;
+ this.options = options || {};
+ this.lazy = this.options.lazy || false;
- var btnList, uiSet;
- Bangle.setUI(); // remove all existing input handlers
+ var btnList;
if (process.env.HWVERSION!=2) {
// no touchscreen, find any buttons in 'layout'
btnList = [];
@@ -91,48 +92,19 @@ function Layout(layout, options) {
this.physBtns = 0;
this.buttons = btnList;
this.selectedButton = -1;
- Bangle.setUI({mode:"updown", back:options.back}, dir=>{
- var s = this.selectedButton, l=this.buttons.length;
- if (dir===undefined && this.buttons[s])
- return this.buttons[s].cb();
- if (this.buttons[s]) {
- delete this.buttons[s].selected;
- this.render(this.buttons[s]);
- }
- s = (s+l+dir) % l;
- if (this.buttons[s]) {
- this.buttons[s].selected = 1;
- this.render(this.buttons[s]);
- }
- this.selectedButton = s;
- });
- uiSet = true;
}
}
- if (options.back && !uiSet) Bangle.setUI({mode: "custom", back: options.back});
- if (options.btns) {
- var buttons = options.btns;
+ if (this.options.btns) {
+ var buttons = this.options.btns;
this.b = buttons;
if (this.physBtns >= buttons.length) {
- // Handler for button watch events
- function pressHandler(btn,e) {
- if (e.time-e.lastTime > 0.75 && this.b[btn].cbl)
- this.b[btn].cbl(e);
- else
- if (this.b[btn].cb) this.b[btn].cb(e);
- }
// enough physical buttons
let btnHeight = Math.floor(Bangle.appRect.h / this.physBtns);
- if (Bangle.btnWatches) Bangle.btnWatches.forEach(clearWatch);
- Bangle.btnWatches = [];
if (this.physBtns > 2 && buttons.length==1)
buttons.unshift({label:""}); // pad so if we have a button in the middle
while (this.physBtns > buttons.length)
buttons.push({label:""});
- if (buttons[0]) Bangle.btnWatches.push(setWatch(pressHandler.bind(this,0), BTN1, {repeat:true,edge:-1}));
- if (buttons[1]) Bangle.btnWatches.push(setWatch(pressHandler.bind(this,1), BTN2, {repeat:true,edge:-1}));
- if (buttons[2]) Bangle.btnWatches.push(setWatch(pressHandler.bind(this,2), BTN3, {repeat:true,edge:-1}));
this._l.width = g.getWidth()-8; // text width
this._l = {type:"h", filly:1, c: [
this._l,
@@ -149,19 +121,8 @@ function Layout(layout, options) {
if (btnList) btnList.push.apply(btnList, this._l.c[1].c);
}
}
- if (process.env.HWVERSION==2) {
-
- // Handler for touch events
- function touchHandler(l,e) {
- if (l.cb && e.x>=l.x && e.y>=l.y && e.x<=l.x+l.w && e.y<=l.y+l.h) {
- if (e.type==2 && l.cbl) l.cbl(e); else if (l.cb) l.cb(e);
- }
- if (l.c) l.c.forEach(n => touchHandler(n,e));
- }
- Bangle.touchHandler = (_,e)=>touchHandler(this._l,e);
- Bangle.on('touch',Bangle.touchHandler);
- }
-
+ // Link in all buttons/touchscreen/etc
+ this.setUI();
// recurse over layout doing some fixing up if needed
var ll = this;
function recurser(l) {
@@ -175,16 +136,57 @@ function Layout(layout, options) {
this.updateNeeded = true;
}
-Layout.prototype.remove = function (l) {
- if (Bangle.btnWatches) {
- Bangle.btnWatches.forEach(clearWatch);
- delete Bangle.btnWatches;
+Layout.prototype.setUI = function() {
+ Bangle.setUI(); // remove all existing input handlers
+
+ var uiSet;
+ if (this.buttons) {
+ // multiple buttons so we'll jus use back/next/select
+ Bangle.setUI({mode:"updown", back:this.options.back}, dir=>{
+ var s = this.selectedButton, l=this.buttons.length;
+ if (dir===undefined && this.buttons[s])
+ return this.buttons[s].cb();
+ if (this.buttons[s]) {
+ delete this.buttons[s].selected;
+ this.render(this.buttons[s]);
+ }
+ s = (s+l+dir) % l;
+ if (this.buttons[s]) {
+ this.buttons[s].selected = 1;
+ this.render(this.buttons[s]);
+ }
+ this.selectedButton = s;
+ });
+ uiSet = true;
}
- if (Bangle.touchHandler) {
- Bangle.removeListener("touch",Bangle.touchHandler);
- delete Bangle.touchHandler;
+ if (this.options.back && !uiSet) Bangle.setUI({mode: "custom", back: this.options.back});
+ // physical buttons -> actual applications
+ if (this.b) {
+ // Handler for button watch events
+ function pressHandler(btn,e) {
+ if (e.time-e.lastTime > 0.75 && this.b[btn].cbl)
+ this.b[btn].cbl(e);
+ else
+ if (this.b[btn].cb) this.b[btn].cb(e);
+ }
+ if (Bangle.btnWatches) Bangle.btnWatches.forEach(clearWatch);
+ Bangle.btnWatches = [];
+ if (this.b[0]) Bangle.btnWatches.push(setWatch(pressHandler.bind(this,0), BTN1, {repeat:true,edge:-1}));
+ if (this.b[1]) Bangle.btnWatches.push(setWatch(pressHandler.bind(this,1), BTN2, {repeat:true,edge:-1}));
+ if (this.b[2]) Bangle.btnWatches.push(setWatch(pressHandler.bind(this,2), BTN3, {repeat:true,edge:-1}));
}
-};
+ // Handle touch events on new Bangle.js
+ if (process.env.HWVERSION==2) {
+ function touchHandler(l,e) {
+ if (l.cb && e.x>=l.x && e.y>=l.y && e.x<=l.x+l.w && e.y<=l.y+l.h) {
+ if (e.type==2 && l.cbl) l.cbl(e); else if (l.cb) l.cb(e);
+ }
+ if (l.c) l.c.forEach(n => touchHandler(n,e));
+ }
+ Bangle.touchHandler = (_,e)=>touchHandler(this._l,e);
+ Bangle.on('touch',Bangle.touchHandler);
+ }
+}
function prepareLazyRender(l, rectsToClear, drawList, rects, parentBg) {
var bgCol = l.bgCol == null ? parentBg : g.toColor(l.bgCol);
diff --git a/typescript/types/globals.d.ts b/typescript/types/globals.d.ts
index 2ef52dcdf..e82c3da3d 100644
--- a/typescript/types/globals.d.ts
+++ b/typescript/types/globals.d.ts
@@ -140,7 +140,7 @@ declare const require: ((module: 'heatshrink') => {
declare const Bangle: {
// functions
- buzz: () => void;
+ buzz: (duration?: number, intensity?: number) => Promise;
drawWidgets: () => void;
isCharging: () => boolean;
// events
@@ -158,9 +158,9 @@ declare type Image = {
};
declare type GraphicsApi = {
- reset: () => void;
+ reset: () => GraphicsApi;
flip: () => void;
- setColor: (color: string) => void; // TODO we can most likely type color more usefully than this
+ setColor: (color: string) => GraphicsApi; // TODO we can most likely type color more usefully than this
drawImage: (
image: string | Image | ArrayBuffer,
xOffset: number,
@@ -169,7 +169,7 @@ declare type GraphicsApi = {
rotate?: number;
scale?: number;
}
- ) => void;
+ ) => GraphicsApi;
// TODO add more
};
+ 