Compare commits

...

3 Commits

Author SHA1 Message Date
Jacob Dahl 0be38ef424 set yaw to NAN 2025-02-21 12:12:28 -09:00
Jacob Dahl 347d4e0c1b fix implicit conversion 2025-02-13 12:35:37 -09:00
Jacob Dahl de997f93c2 navigator: loiter: allow without global position 2025-02-13 12:20:11 -09:00
2 changed files with 14 additions and 5 deletions
@@ -95,7 +95,6 @@ void getModeRequirements(uint8_t vehicle_type, failsafe_flags_s &flags)
setRequirement(vehicle_status_s::NAVIGATION_STATE_AUTO_LOITER, flags.mode_req_angular_velocity);
setRequirement(vehicle_status_s::NAVIGATION_STATE_AUTO_LOITER, flags.mode_req_attitude);
setRequirement(vehicle_status_s::NAVIGATION_STATE_AUTO_LOITER, flags.mode_req_local_position);
setRequirement(vehicle_status_s::NAVIGATION_STATE_AUTO_LOITER, flags.mode_req_global_position);
setRequirement(vehicle_status_s::NAVIGATION_STATE_AUTO_LOITER, flags.mode_req_local_alt);
setRequirement(vehicle_status_s::NAVIGATION_STATE_AUTO_LOITER, flags.mode_req_wind_and_flight_time_compliance);
+14 -4
View File
@@ -736,11 +736,21 @@ MissionBlock::setLoiterItemFromCurrentPositionWithBraking(struct mission_item_s
{
setLoiterItemCommonFields(item);
_navigator->preproject_stop_point(item->lat, item->lon);
auto global = _navigator->get_global_position();
item->altitude = _navigator->get_global_position()->alt;
item->loiter_radius = _navigator->get_loiter_radius();
item->yaw = NAN;
if (global->lat_lon_valid && global->alt_valid) {
_navigator->preproject_stop_point(item->lat, item->lon);
item->altitude = global->alt;
item->loiter_radius = _navigator->get_loiter_radius();
item->yaw = NAN;
} else {
item->lat = (double)NAN;
item->lon = (double)NAN;
item->altitude = NAN;
item->loiter_radius = NAN;
item->yaw = NAN;
}
}
void