FOSS
/
BangleApps
mirror of https://github.com/espruino/BangleApps
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Update app.js

pull/668/head
nujw 2021-02-04 18:58:03 +13:00 committed by GitHub
parent fb3853ce38
commit 6bece4a54c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
apps/speedalt/app.js
View File

@ -1,6 +1,6 @@
/* /*
Speed and Altitude [speedalt] Speed and Altitude [speedalt]
Ver : 1.07 Ver : 1.07a mem optimise
Mike Bennett mike[at]kereru.com Mike Bennett mike[at]kereru.com
process.memory() process.memory()
*/ */
@ -211,35 +211,35 @@ function onGPS(fix) {
var m; var m;
var speed = '---'; var sp = '---';
var alt = '---'; var al = '---';
var dist = '---'; var di = '---';
var age = '---'; var age = '---';
if (lf.fix == 1 ) { if (lf.fix == 1 ) {
// Speed // Speed
if ( settings.spd == 0 ) { if ( settings.spd == 0 ) {
m = require("locale").speed(lf.speed).match(/([0-9,\.]+)(.*)/); // regex splits numbers from units m = require("locale").speed(lf.speed).match(/([0-9,\.]+)(.*)/); // regex splits numbers from units
speed = parseFloat(m[1]); sp = parseFloat(m[1]);
settings.spd_unit = m[2]; settings.spd_unit = m[2];
} }
else { else {
// Calculate for selected units // Calculate for selected units
speed = lf.speed; sp = lf.speed;
speed = parseFloat(speed)/parseFloat(settings.spd); sp = parseFloat(sp)/parseFloat(settings.spd);
} }
if ( speed < 10 ) speed = speed.toFixed(1); if ( sp < 10 ) sp = sp.toFixed(1);
else speed = Math.round(speed); else sp = Math.round(sp);
if (parseFloat(speed) > parseFloat(max.spd) ) max.spd = parseFloat(speed); if (parseFloat(sp) > parseFloat(max.spd) ) max.spd = parseFloat(sp);
// Altitude // Altitude
alt = lf.alt; al = lf.alt;
alt = Math.round(parseFloat(alt)/parseFloat(settings.alt)); al = Math.round(parseFloat(al)/parseFloat(settings.alt));
if (parseFloat(alt) > parseFloat(max.alt) ) max.alt = parseFloat(alt); if (parseFloat(al) > parseFloat(max.alt) ) max.alt = parseFloat(al);
// Distance to waypoint // Distance to waypoint
dist = distance(lf,wp); di = distance(lf,wp);
if (isNaN(dist)) dist = 0; if (isNaN(di)) di = 0;
// Age of last fix (secs) // Age of last fix (secs)
age = Math.max(0,Math.round(getTime())-(lf.time.getTime()/1000)); age = Math.max(0,Math.round(getTime())-(lf.time.getTime()/1000));
@ -253,17 +253,17 @@ function onGPS(fix) {
} }
else { else {
// Show speed/altitude // Show speed/altitude
drawFix(speed,settings.spd_unit,fix.satellites,alt,settings.alt_unit,age,fix.fix); drawFix(sp,settings.spd_unit,fix.satellites,al,settings.alt_unit,age,fix.fix);
} }
} }
else { else {
// Show speed/distance // Show speed/distance
if ( dist <= 0 ) { if ( di <= 0 ) {
// No WP selected // No WP selected
drawFix(speed,settings.spd_unit,fix.satellites,'','',age,fix.fix); drawFix(sp,settings.spd_unit,fix.satellites,'','',age,fix.fix);
} }
else { else {
drawFix(speed,settings.spd_unit,fix.satellites,dist,settings.dist_unit,age,fix.fix); drawFix(sp,settings.spd_unit,fix.satellites,di,settings.dist_unit,age,fix.fix);
} }
} }
@ -384,23 +384,14 @@ if ( settings.colour == 2 ) img.palette = new Uint16Array([0,0xFF800,0xF800,0xF8
var SCREENACCESS = { var SCREENACCESS = {
withApp:true, withApp:true,
request:function(){ request:function(){this.withApp=false;stopDraw();},
this.withApp=false; release:function(){this.withApp=true;startDraw();}
stopDraw();
},
release:function(){
this.withApp=true;
startDraw();
}
}; };
Bangle.on('lcdPower',function(on) { Bangle.on('lcdPower',function(on) {
if (!SCREENACCESS.withApp) return; if (!SCREENACCESS.withApp) return;
if (on) { if (on) startDraw();
startDraw(); else stopDraw();
} else {
stopDraw();
}
}); });
// All set up. Lets go. // All set up. Lets go.