forked from FOSS/BangleApps
skyspy: refactor, switch to newer libraries, start splitting into modules
Pavel Machek
parent
4d4fe0fddc
commit
17192af6ac
|
|
@ -1,12 +1,14 @@
|
|||
/* Sky spy */
|
||||
|
||||
/* fmt library v0.1 */
|
||||
let fmt = {
|
||||
icon_alt : "\0\x08\x1a\1\x00\x00\x00\x20\x30\x78\x7C\xFE\xFF\x00\xC3\xE7\xFF\xDB\xC3\xC3\xC3\xC3\x00\x00\x00\x00\x00\x00\x00\x00",
|
||||
icon_m : "\0\x08\x1a\1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xC3\xE7\xFF\xDB\xC3\xC3\xC3\xC3\x00\x00\x00\x00\x00\x00\x00\x00",
|
||||
icon_km : "\0\x08\x1a\1\xC3\xC6\xCC\xD8\xF0\xD8\xCC\xC6\xC3\x00\xC3\xE7\xFF\xDB\xC3\xC3\xC3\xC3\x00\x00\x00\x00\x00\x00\x00\x00",
|
||||
icon_kph : "\0\x08\x1a\1\xC3\xC6\xCC\xD8\xF0\xD8\xCC\xC6\xC3\x00\xC3\xE7\xFF\xDB\xC3\xC3\xC3\xC3\x00\xFF\x00\xC3\xC3\xFF\xC3\xC3",
|
||||
icon_c : "\0\x08\x1a\1\x00\x00\x60\x90\x90\x60\x00\x7F\xFF\xC0\xC0\xC0\xC0\xC0\xFF\x7F\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
|
||||
icon_hpa : "\x00\x08\x16\x01\x00\x80\xb0\xc8\x88\x88\x88\x00\xf0\x88\x84\x84\x88\xf0\x80\x8c\x92\x22\x25\x19\x00\x00",
|
||||
icon_9 : "\x00\x08\x16\x01\x00\x00\x00\x00\x38\x44\x44\x4c\x34\x04\x04\x38\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
|
||||
icon_10 : "\x00\x08\x16\x01\x00\x08\x18\x28\x08\x08\x08\x00\x00\x18\x24\x24\x24\x24\x18\x00\x00\x00\x00\x00\x00\x00",
|
||||
|
||||
/* 0 .. DD.ddddd
|
||||
1 .. DD MM.mmm'
|
||||
|
|
@ -15,9 +17,39 @@ let fmt = {
|
|||
geo_mode : 1,
|
||||
|
||||
init: function() {},
|
||||
fmtDist: function(km) { return km.toFixed(1) + this.icon_km; },
|
||||
fmtDist: function(km) {
|
||||
if (km >= 1.0) return km.toFixed(1) + this.icon_km;
|
||||
return (km*1000).toFixed(0) + this.icon_m;
|
||||
},
|
||||
fmtSteps: function(n) { return this.fmtDist(0.001 * 0.719 * n); },
|
||||
fmtAlt: function(m) { return m.toFixed(0) + this.icon_alt; },
|
||||
fmtTemp: function(c) { return c.toFixed(1) + this.icon_c; },
|
||||
fmtPress: function(p) {
|
||||
if (p < 900 || p > 1100)
|
||||
return p.toFixed(0) + this.icon_hpa;
|
||||
if (p < 1000) {
|
||||
p -= 900;
|
||||
return this.icon_9 + this.add0(p.toFixed(0)) + this.icon_hpa;
|
||||
}
|
||||
p -= 1000;
|
||||
return this.icon_10 + this.add0(p.toFixed(0)) + this.icon_hpa;
|
||||
},
|
||||
draw_dot : 1,
|
||||
add0: function(i) {
|
||||
if (i > 9) {
|
||||
return ""+i;
|
||||
} else {
|
||||
return "0"+i;
|
||||
}
|
||||
},
|
||||
fmtTOD: function(now) {
|
||||
this.draw_dot = !this.draw_dot;
|
||||
let dot = ":";
|
||||
if (!this.draw_dot)
|
||||
dot = ".";
|
||||
return now.getHours() + dot + this.add0(now.getMinutes());
|
||||
},
|
||||
fmtNow: function() { return this.fmtTOD(new Date()); },
|
||||
fmtTimeDiff: function(d) {
|
||||
if (d < 180)
|
||||
return ""+d.toFixed(0);
|
||||
|
|
@ -53,17 +85,49 @@ let fmt = {
|
|||
c = "S";
|
||||
x = -x;
|
||||
}
|
||||
let s = c+this.fmtAngle(pos.lat) + "\n";
|
||||
let s = c+this.fmtAngle(x) + "\n";
|
||||
c = "E";
|
||||
if (x<0) {
|
||||
c = "W";
|
||||
x = -x;
|
||||
}
|
||||
return s + c + this.fmtAngle(pos.lon);
|
||||
return s + c + this.fmtAngle(x);
|
||||
},
|
||||
fmtFix: function(fix, t) {
|
||||
if (fix && fix.fix && fix.lat) {
|
||||
return this.fmtSpeed(fix.speed) + " " +
|
||||
this.fmtAlt(fix.alt);
|
||||
} else {
|
||||
return "N/FIX " + this.fmtTimeDiff(t);
|
||||
}
|
||||
},
|
||||
fmtSpeed: function(kph) {
|
||||
return kph.toFixed(1) + this.icon_kph;
|
||||
},
|
||||
radians: function(a) { return a*Math.PI/180; },
|
||||
degrees: function(a) { return a*180/Math.PI; },
|
||||
// distance between 2 lat and lons, in meters, Mean Earth Radius = 6371km
|
||||
// https://www.movable-type.co.uk/scripts/latlong.html
|
||||
// (Equirectangular approximation)
|
||||
// returns value in meters
|
||||
distance: function(a,b) {
|
||||
var x = this.radians(b.lon-a.lon) * Math.cos(this.radians((a.lat+b.lat)/2));
|
||||
var y = this.radians(b.lat-a.lat);
|
||||
return Math.sqrt(x*x + y*y) * 6371000;
|
||||
},
|
||||
// thanks to waypointer
|
||||
bearing: function(a,b) {
|
||||
var delta = this.radians(b.lon-a.lon);
|
||||
var alat = this.radians(a.lat);
|
||||
var blat = this.radians(b.lat);
|
||||
var y = Math.sin(delta) * Math.cos(blat);
|
||||
var x = Math.cos(alat) * Math.sin(blat) -
|
||||
Math.sin(alat)*Math.cos(blat)*Math.cos(delta);
|
||||
return Math.round(this.degrees(Math.atan2(y, x)));
|
||||
},
|
||||
};
|
||||
|
||||
/* gps library v0.1 */
|
||||
/* gps library v0.1.4 */
|
||||
let gps = {
|
||||
emulator: -1,
|
||||
init: function(x) {
|
||||
|
|
@ -97,7 +161,7 @@ let gps = {
|
|||
let fix = {};
|
||||
fix.fix = 1;
|
||||
fix.lat = 50;
|
||||
fix.lon = 14;
|
||||
fix.lon = 14-(getTime()-this.gps_start) / 1000; /* Go West! */
|
||||
fix.alt = 200;
|
||||
fix.speed = 5;
|
||||
fix.course = 30;
|
||||
|
|
@ -105,9 +169,86 @@ let gps = {
|
|||
fix.satellites = 5;
|
||||
fix.hdop = 12;
|
||||
return fix;
|
||||
},
|
||||
gps_start : -1,
|
||||
start_gps: function() {
|
||||
Bangle.setGPSPower(1, "libgps");
|
||||
this.gps_start = getTime();
|
||||
},
|
||||
stop_gps: function() {
|
||||
Bangle.setGPSPower(0, "libgps");
|
||||
},
|
||||
};
|
||||
|
||||
/* ui library 0.1.2 */
|
||||
let ui = {
|
||||
display: 0,
|
||||
numScreens: 2,
|
||||
drawMsg: function(msg) {
|
||||
g.reset().setFont("Vector", 35)
|
||||
.setColor(1,1,1)
|
||||
.fillRect(0, this.wi, 176, 176)
|
||||
.setColor(0,0,0)
|
||||
.drawString(msg, 5, 30)
|
||||
.flip();
|
||||
},
|
||||
drawBusy: function() {
|
||||
this.drawMsg("\n.oO busy");
|
||||
},
|
||||
nextScreen: function() {
|
||||
print("nextS");
|
||||
this.display = this.display + 1;
|
||||
if (this.display == this.numScreens)
|
||||
this.display = 0;
|
||||
this.drawBusy();
|
||||
},
|
||||
prevScreen: function() {
|
||||
print("prevS");
|
||||
this.display = this.display - 1;
|
||||
if (this.display < 0)
|
||||
this.display = this.numScreens - 1;
|
||||
this.drawBusy();
|
||||
},
|
||||
onSwipe: function(dir) {
|
||||
this.nextScreen();
|
||||
},
|
||||
h: 176,
|
||||
w: 176,
|
||||
wi: 32,
|
||||
last_b: 0,
|
||||
touchHandler: function(d) {
|
||||
let x = Math.floor(d.x);
|
||||
let y = Math.floor(d.y);
|
||||
|
||||
if (d.b != 1 || this.last_b != 0) {
|
||||
this.last_b = d.b;
|
||||
return;
|
||||
}
|
||||
|
||||
print("touch", x, y, this.h, this.w);
|
||||
|
||||
/*
|
||||
if ((x<this.h/2) && (y<this.w/2)) {
|
||||
}
|
||||
if ((x>this.h/2) && (y<this.w/2)) {
|
||||
}
|
||||
*/
|
||||
|
||||
if ((x<this.h/2) && (y>this.w/2)) {
|
||||
print("prev");
|
||||
this.prevScreen();
|
||||
}
|
||||
if ((x>this.h/2) && (y>this.w/2)) {
|
||||
print("next");
|
||||
this.nextScreen();
|
||||
}
|
||||
},
|
||||
init: function() {
|
||||
this.drawBusy();
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
var display = 0;
|
||||
var debug = 0;
|
||||
var gps_start;
|
||||
|
|
@ -128,27 +269,29 @@ function radY(p, d) {
|
|||
return h/2 - Math.cos(a)*radD(d) + wi;
|
||||
}
|
||||
|
||||
var qalt = -1, min_dalt, max_dalt, step;
|
||||
function resetAlt() {
|
||||
min_dalt = 9999; max_dalt = -9999; step = 0;
|
||||
}
|
||||
resetAlt();
|
||||
let gps_quality = {
|
||||
min_dalt: 9999,
|
||||
max_dalt: -9999,
|
||||
step: 0,
|
||||
|
||||
function calcAlt(alt, cur_altitude) {
|
||||
resetAlt: function() {
|
||||
this.min_dalt = 9999;
|
||||
this.max_dalt = -9999;
|
||||
this.step = 0;
|
||||
},
|
||||
|
||||
calcAlt: function(alt, cur_altitude) {
|
||||
let dalt = alt - cur_altitude;
|
||||
if (this.min_dalt > dalt) this.min_dalt = dalt;
|
||||
if (this.max_dalt < dalt) this.max_dalt = dalt;
|
||||
return this.max_dalt - this.min_dalt;
|
||||
}
|
||||
};
|
||||
|
||||
if (min_dalt > dalt)
|
||||
min_dalt = dalt;
|
||||
if (max_dalt < dalt)
|
||||
max_dalt = dalt;
|
||||
|
||||
let ddalt = max_dalt - min_dalt;
|
||||
return ddalt;
|
||||
}
|
||||
function updateGps() {
|
||||
let lat = "lat ", alt = "?",
|
||||
speed = "speed ", hdop = "?", adelta = "adelta ",
|
||||
tdelta = "tdelta ";
|
||||
let gps_display = {
|
||||
updateGps: function() {
|
||||
let lat = "lat ", alt = "?", speed = "speed ", hdop = "?",
|
||||
adelta = "adelta ", tdelta = "tdelta ";
|
||||
|
||||
fix = gps.getGPSFix();
|
||||
if (adj_time) {
|
||||
|
|
@ -158,6 +301,16 @@ function updateGps() {
|
|||
}
|
||||
if (adj_alt) {
|
||||
print("Adjust altitude");
|
||||
gps_display.adjustAltitude();
|
||||
}
|
||||
|
||||
gps_display.updateAltitude();
|
||||
gps_display.displayData(lat, alt, speed, hdop, adelta, tdelta);
|
||||
|
||||
setTimeout(gps_display.updateGps, 1000);
|
||||
},
|
||||
|
||||
adjustAltitude: function() {
|
||||
if (qalt < 5) {
|
||||
let rest_altitude = fix.alt;
|
||||
let alt_adjust = cur_altitude - rest_altitude;
|
||||
|
|
@ -166,27 +319,23 @@ function updateGps() {
|
|||
let o = Bangle.getOptions();
|
||||
if (abs > 10 && abs < 150) {
|
||||
let a = 0.01;
|
||||
// FIXME: draw is called often compared to alt reading
|
||||
if (cur_altitude > rest_altitude)
|
||||
a = -a;
|
||||
if (cur_altitude > rest_altitude) a = -a;
|
||||
o.seaLevelPressure = o.seaLevelPressure + a;
|
||||
Bangle.setOptions(o);
|
||||
}
|
||||
msg = o.seaLevelPressure.toFixed(1) + "hPa";
|
||||
print(msg);
|
||||
}
|
||||
print(o.seaLevelPressure.toFixed(1) + "hPa");
|
||||
}
|
||||
},
|
||||
|
||||
updateAltitude: function() {
|
||||
try {
|
||||
Bangle.getPressure().then((x) => {
|
||||
cur_altitude = x.altitude;
|
||||
}, print);
|
||||
} catch (e) {
|
||||
//print("Altimeter error", e);
|
||||
}
|
||||
} catch (e) {}
|
||||
},
|
||||
|
||||
|
||||
//print(fix);
|
||||
displayData: function(lat, alt, speed, hdop, adelta, tdelta) {
|
||||
if (fix && fix.time) {
|
||||
tdelta = "" + (getTime() - fix.time.getTime()/1000).toFixed(0);
|
||||
}
|
||||
|
|
@ -197,192 +346,128 @@ function updateGps() {
|
|||
speed = "" + fix.speed.toFixed(1);
|
||||
hdop = "" + fix.hdop.toFixed(0);
|
||||
} else {
|
||||
lat = "NO FIX\n"
|
||||
+ "" + (getTime() - gps_start).toFixed(0) + "s "
|
||||
lat = "NO FIX\n" + (getTime() - gps_start).toFixed(0) + "s "
|
||||
+ sats_used + "/" + snum;
|
||||
if (cur_altitude)
|
||||
adelta = "" + cur_altitude.toFixed(0);
|
||||
if (cur_altitude) adelta = "" + cur_altitude.toFixed(0);
|
||||
}
|
||||
|
||||
let ddalt = calcAlt(alt, cur_altitude);
|
||||
let msg = "";
|
||||
if (display == 1) {
|
||||
msg = lat +
|
||||
"\ne" + hdop + "m "+tdelta+"s\n" +
|
||||
speed + "km/h\n"+ alt + "m+" + adelta + "\nmsghere";
|
||||
}
|
||||
if (display == 2) {
|
||||
/* qalt is altitude quality estimate -- over ten seconds,
|
||||
computes differences between GPS and barometric altitude.
|
||||
The lower the better.
|
||||
let ddalt = gps_quality.calcAlt(alt, cur_altitude);
|
||||
let msg = this.formatDisplayMessage(lat, alt, speed, hdop, adelta, ddalt, tdelta);
|
||||
|
||||
ddalt is just a debugging -- same estimate, but without
|
||||
waiting 10 seconds, so will be always optimistic at start
|
||||
of the cycle */
|
||||
msg = speed + "km/h\n" +
|
||||
"e"+hdop + "m"
|
||||
+"\ndd "+qalt.toFixed(0) + "\n(" + step + "/" + ddalt.toFixed(0) + ")" +
|
||||
"\n"+alt + "m+" + adelta;
|
||||
}
|
||||
step++;
|
||||
if (step == 10) {
|
||||
qalt = max_dalt - min_dalt;
|
||||
resetAlt();
|
||||
}
|
||||
if (display > 0) {
|
||||
if (ui.display > 0) {
|
||||
g.reset().setFont("Vector", 31)
|
||||
.setColor(1,1,1)
|
||||
.fillRect(0, wi, 176, 176)
|
||||
.setColor(0,0,0)
|
||||
.drawString(msg, 3, 25);
|
||||
.setColor(1,1,1).fillRect(0, wi, 176, 176)
|
||||
.setColor(0,0,0).drawString(msg, 3, 25);
|
||||
}
|
||||
if (debug > 0)
|
||||
print(fix);
|
||||
setTimeout(updateGps, 1000);
|
||||
}
|
||||
if (debug > 0) print(fix);
|
||||
},
|
||||
|
||||
function radLine(a1, d1, a2, d2) {
|
||||
g.drawLine(radX(a1, d1), radY(a1, d1), radX(a2, d2), radY(a2, d2));
|
||||
}
|
||||
function radCircle(d) {
|
||||
let step = 0.05;
|
||||
for (let i=0; i<1; i+=0.05) {
|
||||
radLine(i-step, d, i, d);
|
||||
formatDisplayMessage: function(lat, alt, speed, hdop, adelta, ddalt, tdelta) {
|
||||
let msg = "";
|
||||
if (ui.display == 1) {
|
||||
msg = lat + "\ne" + hdop + "m " + tdelta + "s\n" +
|
||||
speed + "km/h\n" + alt + "m+" + adelta + "\nmsghere";
|
||||
} else if (ui.display == 2) {
|
||||
msg = speed + "km/h\n" + "e" + hdop + "m" + "\ndd " +
|
||||
qalt.toFixed(0) + "\n(" + gps_quality.step + "/" +
|
||||
ddalt.toFixed(0) + ")" + "\n" + alt + "m+" + adelta;
|
||||
}
|
||||
//g.flip();
|
||||
}
|
||||
function drawGrid() {
|
||||
gps_quality.step++;
|
||||
if (gps_quality.step == 10) {
|
||||
qalt = gps_quality.max_dalt - gps_quality.min_dalt;
|
||||
gps_quality.resetAlt();
|
||||
}
|
||||
return msg;
|
||||
}
|
||||
};
|
||||
|
||||
/* sky library v0.0.1 */
|
||||
let sky = {
|
||||
drawGrid: function() {
|
||||
g.setColor(0,0,0);
|
||||
radLine(0, 1, 0.5, 1);
|
||||
radLine(0.25, 1, 0.75, 1);
|
||||
radCircle(0.5);
|
||||
radCircle(1.0);
|
||||
}
|
||||
function drawSat(s) {
|
||||
this.radLine(0, 1, 0.5, 1);
|
||||
this.radLine(0.25, 1, 0.75, 1);
|
||||
this.radCircle(0.5);
|
||||
this.radCircle(1.0);
|
||||
},
|
||||
|
||||
radLine: function(a1, d1, a2, d2) {
|
||||
g.drawLine(radX(a1, d1), radY(a1, d1), radX(a2, d2), radY(a2, d2));
|
||||
},
|
||||
|
||||
radCircle: function(d) {
|
||||
let step = 0.05;
|
||||
for (let i = 0; i < 1; i += 0.05) {
|
||||
this.radLine(i - step, d, i, d);
|
||||
}
|
||||
},
|
||||
|
||||
drawSat: function(s) {
|
||||
let a = s.azi / 360;
|
||||
let e = ((90 - s.ele) / 90);
|
||||
let x = radX(a, e);
|
||||
let y = radY(a, e);
|
||||
|
||||
if (s.snr == "")
|
||||
g.setColor(1, 0.25, 0.25);
|
||||
else {
|
||||
//let snr = 1*s.snr;
|
||||
g.setColor(0, 0, 0);
|
||||
//sats_receiving ++;
|
||||
}
|
||||
g.setColor(s.snr === "" ? 1 : 0, s.snr === "" ? 0.25 : 0, s.snr === "" ? 0.25 : 0);
|
||||
g.drawString(s.id, x, y);
|
||||
},
|
||||
|
||||
}
|
||||
|
||||
// Should correspond to view from below.
|
||||
// https://in-the-sky.org//satmap_radar.php?year=2023&month=10&day=24&skin=1
|
||||
function drawSats(sats) {
|
||||
//sats_receiving = 0;
|
||||
g.reset().setFont("Vector", 20)
|
||||
.setColor(1,1,1)
|
||||
// Should correspond to view from below.
|
||||
// https://in-the-sky.org//satmap_radar.php?year=2023&month=10&day=24&skin=1
|
||||
drawSats: function(sats) {
|
||||
g.reset().setFont("Vector", 20).setColor(1,1,1)
|
||||
.fillRect(0, 30, 176, 176);
|
||||
this.drawGrid();
|
||||
sats.forEach(s => this.drawSat(s));
|
||||
|
||||
drawGrid();
|
||||
for (var s of sats) {
|
||||
if (debug > 1)
|
||||
print(s.ele, s.azi, s.snr);
|
||||
drawSat(s);
|
||||
}
|
||||
if (fix && fix.fix && fix.lat) {
|
||||
g.setColor(0, 0, 0);
|
||||
g.drawString(fix.satellites + "/" + fix.hdop, 10, 150);
|
||||
}
|
||||
}
|
||||
|
||||
var sats = [];
|
||||
var snum = 0;
|
||||
var sats_used = 0;
|
||||
|
||||
function parseRaw(msg, lost) {
|
||||
if (lost)
|
||||
print("## data lost");
|
||||
let s = msg.split(",");
|
||||
if (s[0] != "$GPGSV")
|
||||
},
|
||||
parseRaw: function(msg, lost) {
|
||||
if (ui.display != 0)
|
||||
return;
|
||||
//print("Message", s[2], s[1]);
|
||||
if (debug > 0)
|
||||
print(msg);
|
||||
if (lost) print("## data lost");
|
||||
let s = msg.split(",");
|
||||
if (s[0] !== "$GPGSV") return;
|
||||
|
||||
if (s[2] == "1") {
|
||||
if (s[2] === "1") {
|
||||
snum = 0;
|
||||
sats = [];
|
||||
sats_used = 0;
|
||||
}
|
||||
|
||||
let view = 1 * s[3];
|
||||
|
||||
// s[3] -- sats in view.
|
||||
// id, ele, azi, snr
|
||||
if (debug > 0)
|
||||
print("in view:", view);
|
||||
let i = 4;
|
||||
let k = 4;
|
||||
if (view - snum < k)
|
||||
k = view - snum;
|
||||
for (let j=0; j<k; j++) {
|
||||
let sat = {};
|
||||
sat.id = s[i++];
|
||||
sat.ele = 1*s[i++];
|
||||
sat.azi = 1*s[i++];
|
||||
sat.snr = s[i++];
|
||||
if (sat.snr != "")
|
||||
sats_used++;
|
||||
if (debug > 0)
|
||||
print(" ", sat);
|
||||
let k = Math.min(4, view - snum);
|
||||
for (let i = 4, j = 0; j < k; j++) {
|
||||
let sat = { id: s[i++], ele: 1 * s[i++], azi: 1 * s[i++], snr: s[i++] };
|
||||
if (sat.snr !== "") sats_used++;
|
||||
sats[snum++] = sat;
|
||||
}
|
||||
if (debug > 1)
|
||||
print("Checksum:", s[i]);
|
||||
if (s[1] == s[2]) {
|
||||
print("Complete...");
|
||||
//print(sats);
|
||||
if (display == 0)
|
||||
drawSats(sats);
|
||||
}
|
||||
}
|
||||
|
||||
if (s[1] === s[2]) sky.drawSats(sats);
|
||||
}
|
||||
};
|
||||
|
||||
// Main GPS Marking Function
|
||||
function markGps() {
|
||||
Bangle.setGPSPower(1, "skyspy");
|
||||
Bangle.on('GPS-raw', parseRaw);
|
||||
Bangle.on('GPS-raw', sky.parseRaw);
|
||||
gps_start = getTime();
|
||||
updateGps();
|
||||
}
|
||||
function drawMsg(msg) {
|
||||
g.reset().setFont("Vector", 35)
|
||||
.setColor(1,1,1)
|
||||
.fillRect(0, wi, 176, 176)
|
||||
.setColor(0,0,0)
|
||||
.drawString(msg, 5, 30);
|
||||
}
|
||||
function drawBusy() {
|
||||
drawMsg("\n.oO busy");
|
||||
gps_display.updateGps();
|
||||
}
|
||||
|
||||
var numScreens = 3;
|
||||
gps_quality.resetAlt();
|
||||
|
||||
function nextScreen() {
|
||||
display = display + 1;
|
||||
if (display == numScreens)
|
||||
display = 0;
|
||||
drawBusy();
|
||||
}
|
||||
|
||||
function prevScreen() {
|
||||
display = display - 1;
|
||||
if (display < 0)
|
||||
display = numScreens - 1;
|
||||
drawBusy();
|
||||
}
|
||||
var sats = [];
|
||||
var snum = 0;
|
||||
var sats_used = 0;
|
||||
|
||||
function onSwipe(dir) {
|
||||
nextScreen();
|
||||
}
|
||||
ui.init();
|
||||
ui.numScreens = 3;
|
||||
ui.drawBusy();
|
||||
|
||||
var last_b = 0;
|
||||
function touchHandler(d) {
|
||||
|
|
@ -396,18 +481,18 @@ function touchHandler(d) {
|
|||
last_b = d.b;
|
||||
|
||||
if ((x<h/2) && (y<w/2)) {
|
||||
drawMsg("Clock\nadjust");
|
||||
ui.drawMsg("Clock\nadjust");
|
||||
adj_time = 1;
|
||||
}
|
||||
if ((x>h/2) && (y<w/2)) {
|
||||
drawMsg("Alt\nadjust");
|
||||
ui.drawMsg("Alt\nadjust");
|
||||
adj_alt = 1;
|
||||
}
|
||||
|
||||
if ((x<h/2) && (y>w/2))
|
||||
prevScreen();
|
||||
ui.prevScreen();
|
||||
if ((x>h/2) && (y>w/2))
|
||||
nextScreen();
|
||||
ui.nextScreen();
|
||||
}
|
||||
|
||||
gps.init();
|
||||
|
|
@ -416,11 +501,10 @@ fmt.init();
|
|||
Bangle.on("drag", touchHandler);
|
||||
Bangle.setUI({
|
||||
mode : "custom",
|
||||
swipe : onSwipe,
|
||||
swipe : ui.onSwipe,
|
||||
clock : 0
|
||||
});
|
||||
|
||||
Bangle.loadWidgets();
|
||||
Bangle.drawWidgets();
|
||||
drawBusy();
|
||||
markGps();
|
||||
|
|
|
|||
Loading…
Reference in New Issue