Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-28 02:36:37 +08:00
Code Issues Actions 32 Packages Projects Releases Wiki Activity

HomePos: check corresponding validity before using data

Browse Source
This commit is contained in:
bresch
2020-10-23 16:12:36 +02:00
committed by Daniel Agar
parent 711bd2ce87
commit 3276916df9
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/telemetry/hott/messages.cpp
+5 -3
View File
@@ -295,9 +295,11 @@ build_gps_response(uint8_t *buffer, size_t *size)
memset(&home, 0, sizeof(home)); memset(&home, 0, sizeof(home));
orb_copy(ORB_ID(home_position), _home_sub, &home); orb_copy(ORB_ID(home_position), _home_sub, &home);
_home_lat = home.lat; if (home.valid_hpos) {
_home_lon = home.lon; _home_lat = home.lat;
_home_position_set = true; _home_lon = home.lon;
_home_position_set = true;
}
} }
/* Distance from home */ /* Distance from home */
src/lib/flight_tasks/tasks/Auto/FlightTaskAuto.cpp
+2 -2
View File
@@ -329,14 +329,14 @@ void FlightTaskAuto::_set_heading_from_mode()
break; break;
case 1: // Heading points towards home. case 1: // Heading points towards home.
if (_sub_home_position.get().valid_hpos) { if (_sub_home_position.get().valid_lpos) {
v = Vector2f(&_sub_home_position.get().x) - Vector2f(_position); v = Vector2f(&_sub_home_position.get().x) - Vector2f(_position);
} }
break; break;
case 2: // Heading point away from home. case 2: // Heading point away from home.
if (_sub_home_position.get().valid_hpos) { if (_sub_home_position.get().valid_lpos) {
v = Vector2f(_position) - Vector2f(&_sub_home_position.get().x); v = Vector2f(_position) - Vector2f(&_sub_home_position.get().x);
} }
src/modules/navigator/navigator.h
+1 -1
View File
@@ -162,7 +162,7 @@ public:
void reset_vroi() { _vroi = {}; } void reset_vroi() { _vroi = {}; }
bool home_alt_valid() { return (_home_pos.timestamp > 0 && _home_pos.valid_alt); } bool home_alt_valid() { return (_home_pos.timestamp > 0 && _home_pos.valid_alt); }
bool home_position_valid() { return (_home_pos.timestamp > 0 && _home_pos.valid_alt && _home_pos.valid_hpos); } bool home_position_valid() { return (_home_pos.timestamp > 0 && _home_pos.valid_alt && _home_pos.valid_hpos && _home_pos.valid_lpos); }
Geofence &get_geofence() { return _geofence; } Geofence &get_geofence() { return _geofence; }