bryan
/
BangleApps
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'espruino:master' into master

master
Ronin0000 2021-10-11 16:43:12 -07:00 committed by GitHub
parent 5db16d190b 68cc9fbd40
commit 4f5558c41e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 53 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps.json
View File

@ -500,9 +500,9 @@
{ "id": "speedo",
"name": "Speedo",
"icon": "speedo.png",
"version":"0.04",
"version":"0.05",
"description": "Show the current speed according to the GPS",
"tags": "tool,outdoors,gps",
"tags": "tool,outdoors,gps,b2",
"storage": [
{"name":"speedo.app.js","url":"speedo.js"},
{"name":"speedo.img","url":"speedo-icon.js","evaluate":true}

1
apps/openstmap/app.js
View File

@ -8,6 +8,7 @@ function redraw() {
m.draw();
drawMarker();
if (WIDGETS["gpsrec"] && WIDGETS["gpsrec"].plotTrack) {
g.flip(); // force immediate draw on double-buffered screens - track will update later
g.setColor(0.75,0.2,0);
WIDGETS["gpsrec"].plotTrack(m);
}

1
apps/speedo/ChangeLog
View File

@ -3,3 +3,4 @@
0.03: Use offscreen buffer (not doublebuffer)
Use 'locale' to get internationalised speed
0.04: Start GPS after loading app, just in case widgets affect it (#449)
0.05: Use Layout lib for Bangle.js 2 compatibility

70
apps/speedo/speedo.js
View File

@ -1,33 +1,61 @@
var buf = Graphics.createArrayBuffer(240,120,1,{msb:true});
var lastFix = {fix:0,satellites:0};
var Layout = require("Layout");
var layout;
var lastFix = {fix:-1,satellites:0};
function speedoImage() {
return require("heatshrink").decompress(atob("kkdxH+ABteAAwWOECImZDQ2CAQglUD4us2fX68ymQDB1omFESWtDgIACEYYACrolPBwddmWIEZWsmVWJYgiLwXX2YcB1gdDq+BAodWGIWsEhQiDRAWBmQdEAAhGBroFC1ojMC4etERIlDAggkHNIgAWSYYjFVwNWGwgAP5KkBEYoFC1ihBagwAL5W72vKJAxpExCiDABnQ4W12vD6AHBEYxnT4YhB3ghCSIhqDe4SIP3giBM4LfFEYpiMDoQhC3fDCA7+DfBwiCAARmFAAmtEYlYagMywISHEQhEId4UyEYleqwABEZBHERQwABroZBq5rR6BGLNZKzMAAPKRZKzJr2tfaAAKxD7CfgRsD1g1GAAwME2YGDwQjFNgOzwMyCwuCwIAEBg0yHoKODEYmCcYNWCwutAAuzBgg4BCwJGEEgj7JV5r7BIwgjEWrDVCEQYkCWgYAWNYIjF/z8awQfD"));
}
function onGPS(fix) {
if (lastFix.fix != fix.fix) {
// if fix is different, change the layout
if (fix.fix) {
layout = new Layout( {
type:"v", c: [
{type:"txt", font:"6x8:2", label:"Speed" },
{type:"h", c: [
{type:"img", src:speedoImage, pad:4 },
{type:"txt", font:"35%", label:"--", fillx:true, id:"speed" },
]},
{type:"txt", font:"6x8", label:"--", id:"units" },
{type:"h", c: [
{type:"txt", font:"10%", label:fix.satellites, pad:2, id:"sat" },
{type:"txt", font:"6x8", pad:3, label:"Satellites" }
]},
]},[],{lazy:true});
} else {
layout = new Layout( {
type:"v", c: [
{type:"txt", font:"6x8:2", label:"Speed" },
{type:"img", src:speedoImage, pad:4 },
{type:"txt", font:"6x8", label:"Waiting for GPS" },
{type:"h", c: [
{type:"txt", font:"10%", label:fix.satellites, pad:2, id:"sat" },
{type:"txt", font:"6x8", pad:3, label:"Satellites" }
]},
]},[],{lazy:true});
}
g.clearRect(0,24,g.getWidth(),g.getHeight());
layout.render();
}
lastFix = fix;
buf.clear();
buf.setFontAlign(0,0);
buf.setFont("6x8");
buf.drawString(fix.satellites+" satellites",120,6);
if (fix.fix) {
if (fix.fix && isFinite(fix.speed)) {
var speed = require("locale").speed(fix.speed);
var m = speed.match(/([0-9,\.]+)(.*)/); // regex splits numbers from units
var txt = (fix.speed<20) ? fix.speed.toFixed(1) : Math.round(fix.speed);
var value = m[1], units = m[2];
var s = 80;
buf.setFontVector(s);
buf.drawString(value,120,10+s/2);
buf.setFont("6x8",2);
buf.drawString(units,120,s+26);
} else {
buf.setFont("6x8",2);
buf.drawString("Waiting for GPS",120,56);
layout.speed.label = m[1];
layout.units.label = m[2];
}
g.reset();
g.drawImage({width:buf.getWidth(),height:buf.getHeight(),bpp:1,buffer:buf.buffer},0,70);
g.flip();
layout.sat.label = fix.satellites;
layout.render();
}
g.clear();
onGPS(lastFix);
onGPS({fix:0,satellites:0});
// onGPS({fix:1,satellites:3,speed:200}); // testing
Bangle.loadWidgets();
Bangle.drawWidgets();
Bangle.on('GPS', onGPS);
Bangle.setGPSPower(1);
Bangle.setGPSPower(1, "app");