From b292a54677e03689924cb495c97d47335512af32 Mon Sep 17 00:00:00 2001 From: storm64 Date: Mon, 3 Oct 2022 12:39:44 +0200 Subject: [PATCH 01/13] [gpsnav] Correct wpindex check --- apps/gpsnav/app.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/gpsnav/app.js b/apps/gpsnav/app.js index e2b6ee6f1..9fb743176 100644 --- a/apps/gpsnav/app.js +++ b/apps/gpsnav/app.js @@ -36,7 +36,7 @@ function drawCompass(course) { } xpos+=15; } - if (wpindex!=0) { + if (wpindex>=0) { var bpos = brg - course; if (bpos>180) bpos -=360; if (bpos<-180) bpos +=360; @@ -220,7 +220,7 @@ function nextwp(inc){ } function doselect(){ - if (selected && wpindex!=0 && waypoints[wpindex].lat===undefined && savedfix.fix) { + if (selected && wpindex<=0 && waypoints[wpindex].lat===undefined && savedfix.fix) { waypoints[wpindex] ={name:"@"+wp.name, lat:savedfix.lat, lon:savedfix.lon}; wp = waypoints[wpindex]; require("waypoints").save(waypoints); From 459a1b91d93b8c93656ed7b2cf76ad6d1fab47cd Mon Sep 17 00:00:00 2001 From: storm64 Date: Mon, 3 Oct 2022 13:18:40 +0200 Subject: [PATCH 02/13] [gpsnav] Correct wpindex check --- apps/gpsnav/app_b2.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/gpsnav/app_b2.js b/apps/gpsnav/app_b2.js index e46be649f..241666d43 100644 --- a/apps/gpsnav/app_b2.js +++ b/apps/gpsnav/app_b2.js @@ -43,7 +43,7 @@ function drawCompass(course) { } xpos += 12; } - if (wpindex != 0) { + if (wpindex >= 0) { var bpos = brg - course; if (bpos > 180) bpos -= 360; if (bpos < -180) bpos += 360; @@ -241,7 +241,7 @@ function nextwp(inc) { } function doselect() { - if (selected && wpindex != 0 && waypoints[wpindex].lat === undefined && savedfix.fix) { + if (selected && wpindex >= 0 && waypoints[wpindex].lat === undefined && savedfix.fix) { waypoints[wpindex] = { name: "@" + wp.name, lat: savedfix.lat, @@ -265,4 +265,4 @@ drawAll(); startTimers(); Bangle.on('GPS', onGPS); // Toggle selected -setButtons(); \ No newline at end of file +setButtons(); From 4410c4458fd5ae2a53735c61bc0452ce14019bf8 Mon Sep 17 00:00:00 2001 From: storm64 Date: Mon, 3 Oct 2022 13:21:16 +0200 Subject: [PATCH 03/13] [gpsnav] Update ChangeLog --- apps/gpsnav/ChangeLog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/gpsnav/ChangeLog b/apps/gpsnav/ChangeLog index 6f327f364..5e1c98160 100644 --- a/apps/gpsnav/ChangeLog +++ b/apps/gpsnav/ChangeLog @@ -4,4 +4,5 @@ 0.04: Fix great circle formula 0.05: Use locale for speed and distance + fix Vector font sizes 0.06: Move waypoints.json (and editor) to 'waypoints' app -0.07: Add support for b2 \ No newline at end of file +0.07: Add support for b2 +0.08: Fix not displaying of wpindex = 0 From ed1675d297647434c1ad19cf716ebe82a1ee8fb9 Mon Sep 17 00:00:00 2001 From: storm64 Date: Mon, 3 Oct 2022 13:22:15 +0200 Subject: [PATCH 04/13] [gpsnav] Update metadata.js --- apps/gpsnav/metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/gpsnav/metadata.json b/apps/gpsnav/metadata.json index dce80112f..bc46a733c 100644 --- a/apps/gpsnav/metadata.json +++ b/apps/gpsnav/metadata.json @@ -1,7 +1,7 @@ { "id": "gpsnav", "name": "GPS Navigation", - "version": "0.07", + "version": "0.08", "description": "Displays GPS Course and Speed, + Directions to waypoint and waypoint recording, now with waypoint editor", "screenshots": [{"url":"screenshot-b2.png"}], "icon": "icon.png", From c39d40b0ce78514bcb60c302601d5fce2db016ca Mon Sep 17 00:00:00 2001 From: storm64 Date: Mon, 3 Oct 2022 16:33:10 +0200 Subject: [PATCH 05/13] [gpsnav] Correct typo --- apps/gpsnav/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/gpsnav/app.js b/apps/gpsnav/app.js index 9fb743176..68bd2cbda 100644 --- a/apps/gpsnav/app.js +++ b/apps/gpsnav/app.js @@ -220,7 +220,7 @@ function nextwp(inc){ } function doselect(){ - if (selected && wpindex<=0 && waypoints[wpindex].lat===undefined && savedfix.fix) { + if (selected && wpindex>=0 && waypoints[wpindex].lat===undefined && savedfix.fix) { waypoints[wpindex] ={name:"@"+wp.name, lat:savedfix.lat, lon:savedfix.lon}; wp = waypoints[wpindex]; require("waypoints").save(waypoints); From 31794449595b5d85971f2fdada8b64243583b386 Mon Sep 17 00:00:00 2001 From: storm64 Date: Tue, 4 Oct 2022 12:08:29 +0200 Subject: [PATCH 06/13] [gpsnav] Add reset and clear for compass drawing --- apps/gpsnav/app_b2.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/apps/gpsnav/app_b2.js b/apps/gpsnav/app_b2.js index 241666d43..635567493 100644 --- a/apps/gpsnav/app_b2.js +++ b/apps/gpsnav/app_b2.js @@ -21,7 +21,7 @@ var loc = { function drawCompass(course) { if (!candraw) return; - g.setColor(g.theme.fg); + g.reset().clearRect(0, 24, 175, 70); g.setFont("Vector", 18); var start = course - 90; if (start < 0) start += 360; @@ -106,9 +106,8 @@ function distance(a, b) { var selected = false; function drawN() { - g.clearRect(0, 89, 175, 175); + g.reset().clearRect(0, 89, 175, 175); var txt = loc.speed[locindex](speed); - g.setColor(g.theme.fg); g.setFont("6x8", 2); g.drawString("o", 68, 87); g.setFont("6x8", 1); @@ -117,10 +116,8 @@ function drawN() { var cs = course.toString().padStart(3, "0"); g.drawString(cs, 2, 89); g.drawString(txt.substring(0, txt.length - 3), 92, 89); - g.setColor(g.theme.fg); g.setFont("Vector", 18); var bs = brg.toString().padStart(3, "0"); - g.setColor(g.theme.fg); g.drawString("Brg:", 1, 128); g.drawString("Dist:", 1, 148); g.setColor(selected ? g.theme.bgH : g.theme.bg); From 488d865218f3026626d18d67ff3be870b228f0b0 Mon Sep 17 00:00:00 2001 From: storm64 Date: Tue, 4 Oct 2022 12:16:23 +0200 Subject: [PATCH 07/13] [gpsnav] Add changes --- apps/gpsnav/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/gpsnav/ChangeLog b/apps/gpsnav/ChangeLog index 5e1c98160..6784a8243 100644 --- a/apps/gpsnav/ChangeLog +++ b/apps/gpsnav/ChangeLog @@ -5,4 +5,4 @@ 0.05: Use locale for speed and distance + fix Vector font sizes 0.06: Move waypoints.json (and editor) to 'waypoints' app 0.07: Add support for b2 -0.08: Fix not displaying of wpindex = 0 +0.08: Fix not displaying of wpindex = 0, correct compass drawing on b2 From a4c1348013c16bb5fd03526dc4a35c460c34fc8c Mon Sep 17 00:00:00 2001 From: storm64 Date: Tue, 4 Oct 2022 12:44:08 +0200 Subject: [PATCH 08/13] [gpsnav] Correct nm calculation --- apps/gpsnav/app_b2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/gpsnav/app_b2.js b/apps/gpsnav/app_b2.js index 635567493..ed3035029 100644 --- a/apps/gpsnav/app_b2.js +++ b/apps/gpsnav/app_b2.js @@ -13,7 +13,7 @@ var loc = { distance: [ require("locale").distance, (m) => { - return (m / 1.852).toFixed(3) + "nm "; + return (m / 1852).toFixed(3) + "nm "; } ] }; From fd3d47bd7b2832944c35e6e8b6bb02fd385fd2e1 Mon Sep 17 00:00:00 2001 From: storm64 Date: Tue, 4 Oct 2022 12:45:09 +0200 Subject: [PATCH 09/13] [gpsnav] Add changes --- apps/gpsnav/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/gpsnav/ChangeLog b/apps/gpsnav/ChangeLog index 6784a8243..840f9ecbc 100644 --- a/apps/gpsnav/ChangeLog +++ b/apps/gpsnav/ChangeLog @@ -5,4 +5,4 @@ 0.05: Use locale for speed and distance + fix Vector font sizes 0.06: Move waypoints.json (and editor) to 'waypoints' app 0.07: Add support for b2 -0.08: Fix not displaying of wpindex = 0, correct compass drawing on b2 +0.08: Fix not displaying of wpindex = 0, correct compass drawing and nm calculation on b2 From 9e0147d8bc1cded0a4ecc37dce1be6dc2e843dc3 Mon Sep 17 00:00:00 2001 From: storm64 Date: Tue, 4 Oct 2022 12:58:00 +0200 Subject: [PATCH 10/13] [gpsnav] Correct clearing rect --- apps/gpsnav/app_b2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/gpsnav/app_b2.js b/apps/gpsnav/app_b2.js index ed3035029..ee6519c92 100644 --- a/apps/gpsnav/app_b2.js +++ b/apps/gpsnav/app_b2.js @@ -21,7 +21,7 @@ var loc = { function drawCompass(course) { if (!candraw) return; - g.reset().clearRect(0, 24, 175, 70); + g.reset().clearRect(0, 24, 175, 71); g.setFont("Vector", 18); var start = course - 90; if (start < 0) start += 360; From 74166eaedc951528a5af04f131c7a8a4729ce36d Mon Sep 17 00:00:00 2001 From: storm64 Date: Tue, 4 Oct 2022 17:42:08 +0200 Subject: [PATCH 11/13] [waypointer] Correct wpindex=0 check --- apps/waypointer/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/waypointer/app.js b/apps/waypointer/app.js index 9fd288c9a..fe3f73fc3 100644 --- a/apps/waypointer/app.js +++ b/apps/waypointer/app.js @@ -263,7 +263,7 @@ function nextwp(inc){ } function doselect(){ - if (selected && wpindex!=0 && waypoints[wpindex].lat===undefined && savedfix.fix) { + if (selected && wpindex>=0 && waypoints[wpindex].lat===undefined && savedfix.fix) { waypoints[wpindex] ={name:"@"+wp.name, lat:savedfix.lat, lon:savedfix.lon}; wp = waypoints[wpindex]; require("waypoints").save(waypoints); From e59dade545c9232c265636a7ceb192674e889668 Mon Sep 17 00:00:00 2001 From: storm64 Date: Fri, 7 Oct 2022 20:56:19 +0200 Subject: [PATCH 12/13] [waypointer] Update ChangeLog --- apps/waypointer/ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/waypointer/ChangeLog b/apps/waypointer/ChangeLog index 292d77a99..ea86cbe0c 100644 --- a/apps/waypointer/ChangeLog +++ b/apps/waypointer/ChangeLog @@ -2,3 +2,4 @@ 0.02: Make Bangle.js 2 compatible 0.03: Silently use built in heading when no magnav calibration file is present 0.04: Move waypoints.json (and editor) to 'waypoints' app +0.05: Fix not displaying of wpindex = 0 From 070991120ef2a84649c7068600f2bfeda58a5416 Mon Sep 17 00:00:00 2001 From: storm64 Date: Fri, 7 Oct 2022 20:58:44 +0200 Subject: [PATCH 13/13] [waypointer] Update metadata.js --- apps/waypointer/metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/waypointer/metadata.json b/apps/waypointer/metadata.json index 8b923c604..a55db8c0e 100644 --- a/apps/waypointer/metadata.json +++ b/apps/waypointer/metadata.json @@ -1,7 +1,7 @@ { "id": "waypointer", "name": "Way Pointer", - "version": "0.04", + "version": "0.05", "description": "Navigate to a waypoint using the GPS for bearing and compass to point way, uses the same waypoint interface as GPS Navigation", "icon": "waypointer.png", "tags": "tool,outdoors,gps",