Skip to content

Commit

Permalink
Fix minor issues
Browse files Browse the repository at this point in the history
- Make it compile
  • Loading branch information
Aashay Shah committed Apr 22, 2024
1 parent 3ccae70 commit 91cd7af
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion libraries/AP_Avoidance/AP_Avoidance.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,7 @@ void AP_Avoidance::handle_avoidance_local(AP_Avoidance::Obstacle *threat)
double instantaneous_z = -1000; // default error is -1000
// = 0.01*(threat->_location.alt-my_loc.alt); // wrong uses mixed alt definitions
int32_t m_ret_alt_cm; // temporary variable to store alt
if(get_alt_cm(Location::AltFrame::ABOVE_HOME, m_ret_alt_cm)){
if(my_loc.get_alt_cm(Location::AltFrame::ABOVE_HOME, m_ret_alt_cm)){
// alt location good
instantaneous_z = threat->_location.alt-0.01*m_ret_alt_cm;
}
Expand Down
4 changes: 2 additions & 2 deletions libraries/AP_ODIDScanner/AP_ODIDScanner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ Location AP_ODIDScanner::get_location(rid_vehicle_t &vehicle) {
const Location loc = Location(
vehicle.loc.latitude,
vehicle.loc.longitude,
vehicle.loc.height;
vehicle.loc.height,

// vehicle.loc.altitude_geodetic * 0.1f,
// TODO: Right unit?
Expand Down Expand Up @@ -251,4 +251,4 @@ rid_vehicle_t& AP_ODIDScanner::get_vehicle(int i) {
Location AP_ODIDScanner::get_vehicle_location(int i) {
auto v = this->get_vehicle(i);
return Location(v.loc.latitude, v.loc.longitude, v.loc.altitude_geodetic*100, Location::AltFrame::ABSOLUTE);
}
}

0 comments on commit 91cd7af

Please sign in to comment.