From 70204b6c273dda08015ec87f9245b194bda5053e Mon Sep 17 00:00:00 2001 From: Martin Boonk Date: Thu, 27 Oct 2022 20:22:06 +0200 Subject: [PATCH] sensortools - Fix scoping --- apps/sensortools/boot.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/apps/sensortools/boot.js b/apps/sensortools/boot.js index 82c2036a9..219878766 100644 --- a/apps/sensortools/boot.js +++ b/apps/sensortools/boot.js @@ -1,11 +1,11 @@ -(function() { - var settings = Object.assign( +{ + let settings = Object.assign( require('Storage').readJSON("sensortools.default.json", true) || {}, require('Storage').readJSON("sensortools.json", true) || {} ); - var log = function(text, param) { - var logline = new Date().toISOString() + " - " + "Sensortools - " + text; + let log = function(text, param) { + let logline = new Date().toISOString() + " - " + "Sensortools - " + text; if (param) logline += ": " + JSON.stringify(param); print(logline); }; @@ -15,7 +15,7 @@ log("Enabled"); const POWER_DELAY = 10000; - var onEvents = []; + let onEvents = []; Bangle.sensortoolsOrigOn = Bangle.on; Bangle.sensortoolsOrigEmit = Bangle.emit; @@ -55,7 +55,7 @@ } }; - var createPowerFunction = function(type, name, origPower) { + let createPowerFunction = function(type, name, origPower) { return function(isOn, app) { if (type == "nop") { return true; @@ -123,17 +123,17 @@ } function degrees(a) { - var d = a*180/Math.PI; + let d = a*180/Math.PI; return (d+360)%360; } function bearing(a,b){ if (!a || !b || !a.lon || !a.lat || !b.lon || !b.lat) return Infinity; - var delta = radians(b.lon-a.lon); - var alat = radians(a.lat); - var blat = radians(b.lat); - var y = Math.sin(delta) * Math.cos(blat); - var x = Math.cos(alat)*Math.sin(blat) - + let delta = radians(b.lon-a.lon); + let alat = radians(a.lat); + let blat = radians(b.lat); + let y = Math.sin(delta) * Math.cos(blat); + let x = Math.cos(alat)*Math.sin(blat) - Math.sin(alat)*Math.cos(blat)*Math.cos(delta); return Math.round(degrees(Math.atan2(y, x))); } @@ -348,4 +348,4 @@ } } } -})(); +}