From 864ef1b2bce558e6349d155287a7659cd6aad666 Mon Sep 17 00:00:00 2001 From: Erik Andresen Date: Mon, 27 Feb 2023 21:11:15 +0100 Subject: [PATCH] magnav: replace var with let/const --- apps/magnav/lib.js | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/apps/magnav/lib.js b/apps/magnav/lib.js index fe58615cb..443fc91ac 100644 --- a/apps/magnav/lib.js +++ b/apps/magnav/lib.js @@ -1,8 +1,8 @@ exports.calibrate = () => { - var max={x:-32000, y:-32000, z:-32000}, + const max={x:-32000, y:-32000, z:-32000}, min={x:32000, y:32000, z:32000}; - var ref = setInterval(()=>{ - var m = Bangle.getCompass(); + const ref = setInterval(()=>{ + const m = Bangle.getCompass(); max.x = m.x>max.x?m.x:max.x; max.y = m.y>max.y?m.y:max.y; max.z = m.z>max.z?m.z:max.z; @@ -13,10 +13,10 @@ exports.calibrate = () => { return new Promise((resolve) => { setTimeout(()=>{ if(ref) clearInterval(ref); - var offset = {x:(max.x+min.x)/2,y:(max.y+min.y)/2,z:(max.z+min.z)/2}; - var delta = {x:(max.x-min.x)/2,y:(max.y-min.y)/2,z:(max.z-min.z)/2}; - var avg = (delta.x+delta.y+delta.z)/3; - var scale = {x:avg/delta.x, y:avg/delta.y, z:avg/delta.z}; + const offset = {x:(max.x+min.x)/2,y:(max.y+min.y)/2,z:(max.z+min.z)/2}; + const delta = {x:(max.x-min.x)/2,y:(max.y-min.y)/2,z:(max.z-min.z)/2}; + const avg = (delta.x+delta.y+delta.z)/3; + const scale = {x:avg/delta.x, y:avg/delta.y, z:avg/delta.z}; resolve({offset:offset,scale:scale}); },20000); }); @@ -27,22 +27,22 @@ exports.tiltfix = (m,g,O,S) => { if (O & S) { m.dx =(m.x-O.x)*S.x; m.dy=(m.y-O.y)*S.y; m.dz=(m.z-O.z)*S.z; } - var d = Math.atan2(-m.dx,m.dy)*180/Math.PI; + let d = Math.atan2(-m.dx,m.dy)*180/Math.PI; if (d<0) d+=360; - var phi = Math.atan(-g.x/-g.z); - var cosphi = Math.cos(phi), sinphi = Math.sin(phi); - var theta = Math.atan(-g.y/(-g.x*sinphi-g.z*cosphi)); - var costheta = Math.cos(theta), sintheta = Math.sin(theta); - var xh = m.dy*costheta + m.dx*sinphi*sintheta + m.dz*cosphi*sintheta; - var yh = m.dz*sinphi - m.dx*cosphi; - var psi = Math.atan2(yh,xh)*180/Math.PI; + const phi = Math.atan(-g.x/-g.z); + const cosphi = Math.cos(phi), sinphi = Math.sin(phi); + const theta = Math.atan(-g.y/(-g.x*sinphi-g.z*cosphi)); + const costheta = Math.cos(theta), sintheta = Math.sin(theta); + const xh = m.dy*costheta + m.dx*sinphi*sintheta + m.dz*cosphi*sintheta; + const yh = m.dz*sinphi - m.dx*cosphi; + let psi = Math.atan2(yh,xh)*180/Math.PI; if (psi<0) psi+=360; return psi; } exports.tiltfixread = (O,S) => { "ram" - var m = Bangle.getCompass({noTiltComp: true}); - var g = Bangle.getAccel(); - return exports.tiltfix(m,g,O,S); + const mag = Bangle.getCompass({noTiltComp: true}); + const acc = Bangle.getAccel(); + return exports.tiltfix(mag,acc,O,S); }