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

Merge pull request #3865 from nxdefiant/master 

gipy: Avoid crash on negative array access
master
thyttan 2025-05-26 22:59:02 +02:00 committed by GitHub
parent e05b80d319 59c6a0e351
commit 176c1548a4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/gipy/ChangeLog
View File

@ -141,3 +141,5 @@
0.26: Add option to plot openstmap if installed 0.26: Add option to plot openstmap if installed
0.27: Support for large paths (grid sizes > 65k) 0.27: Support for large paths (grid sizes > 65k)
0.28: Avoid crash on negative array access

22
apps/gipy/app.js
View File

@ -34,6 +34,7 @@ var settings = Object.assign(
power_lcd_off: false, power_lcd_off: false,
powersave_by_default: false, powersave_by_default: false,
sleep_between_waypoints: false, sleep_between_waypoints: false,
keep_gps_alive: true
}, },
s.readJSON("gipy.json", true) || {} s.readJSON("gipy.json", true) || {}
); );
@ -255,6 +256,7 @@ class Map {
add_to_tile_image(img, absolute_tile_x, absolute_tile_y) { add_to_tile_image(img, absolute_tile_x, absolute_tile_y) {
let tile_x = absolute_tile_x - this.first_tile[0]; let tile_x = absolute_tile_x - this.first_tile[0];
let tile_y = absolute_tile_y - this.first_tile[1]; let tile_y = absolute_tile_y - this.first_tile[1];
if (tile_x < 0 || tile_y < 0) return; // FIXME: Negative Array index
let side = img.getWidth() - 6; let side = img.getWidth() - 6;
let thick = this.color[0] == 1; let thick = this.color[0] == 1;
@ -609,16 +611,16 @@ class Status {
); );
// disable gps when far from next point and locked // disable gps when far from next point and locked
// if (Bangle.isLocked() && !settings.keep_gps_alive) { if (Bangle.isLocked() && !settings.keep_gps_alive) {
// let time_to_next_point = let time_to_next_point =
// (this.distance_to_next_point * 3.6) / settings.max_speed; (this.distance_to_next_point * 3.6) / settings.max_speed;
// if (time_to_next_point > 60) { if (time_to_next_point > 60) {
// Bangle.setGPSPower(false, "gipy"); Bangle.setGPSPower(false, "gipy");
// setTimeout(function () { setTimeout(function () {
// Bangle.setGPSPower(true, "gipy"); Bangle.setGPSPower(true, "gipy");
// }, time_to_next_point); }, time_to_next_point);
// } }
// } }
let reaching_waypoint = this.path.is_waypoint(next_point); let reaching_waypoint = this.path.is_waypoint(next_point);
if (this.distance_to_next_point <= 100) { if (this.distance_to_next_point <= 100) {
if (reaching_waypoint || !settings.sleep_between_waypoints) { if (reaching_waypoint || !settings.sleep_between_waypoints) {

2
apps/gipy/metadata.json
View File

@ -2,7 +2,7 @@
"id": "gipy", "id": "gipy",
"name": "Gipy", "name": "Gipy",
"shortName": "Gipy", "shortName": "Gipy",
"version": "0.27", "version": "0.28",
"description": "Follow gpx files using the gps. Don't get lost in your bike trips and hikes.", "description": "Follow gpx files using the gps. Don't get lost in your bike trips and hikes.",
"allow_emulator":false, "allow_emulator":false,
"icon": "gipy.png", "icon": "gipy.png",

10
apps/gipy/settings.js
View File

@ -11,6 +11,7 @@
power_lcd_off: false, power_lcd_off: false,
powersave_by_default: false, powersave_by_default: false,
sleep_between_waypoints: false, sleep_between_waypoints: false,
keep_gps_alive: true
}, },
require("Storage").readJSON(FILE, true) || {} require("Storage").readJSON(FILE, true) || {}
); );
@ -97,6 +98,13 @@
settings.sleep_between_waypoints = v; settings.sleep_between_waypoints = v;
writeSettings(); writeSettings();
} }
} },
"keep gps alive": {
value: !!settings.keep_gps_alive, // !! converts undefined to false
onchange: (v) => {
settings.keep_gps_alive = v;
writeSettings();
},
},
}); });
}) })