Commit 94008c99 authored by Don Gagne's avatar Don Gagne

Merge pull request #2541 from DonLakeFlyer/MissionFixes

Mission fixes
parents 93568afe b9c80cc1
...@@ -43,7 +43,7 @@ MapQuickItem { ...@@ -43,7 +43,7 @@ MapQuickItem {
MissionItemIndexLabel { MissionItemIndexLabel {
id: _label id: _label
isCurrentItem: missionItem.isCurrentItem isCurrentItem: missionItem.isCurrentItem
label: missionItem.sequenceNumber label: missionItem.sequenceNumber == 0 ? "H" : missionItem.sequenceNumber
onClicked: _item.clicked() onClicked: _item.clicked()
} }
} }
...@@ -484,19 +484,22 @@ void MissionController::_initAllMissionItems(void) ...@@ -484,19 +484,22 @@ void MissionController::_initAllMissionItems(void)
} }
homeItem->setHomePositionSpecialCase(true); homeItem->setHomePositionSpecialCase(true);
if (_activeVehicle) { if (_activeVehicle) {
homeItem->setCoordinate(_activeVehicle->homePosition());
homeItem->setHomePositionValid(_activeVehicle->homePositionAvailable()); homeItem->setHomePositionValid(_activeVehicle->homePositionAvailable());
if (homeItem->homePositionValid()) {
homeItem->setCoordinate(_activeVehicle->homePosition());
}
} else { } else {
homeItem->setHomePositionValid(false); homeItem->setHomePositionValid(false);
} }
homeItem->setCommand(MAV_CMD_NAV_WAYPOINT); homeItem->setCommand(MAV_CMD_NAV_WAYPOINT);
homeItem->setFrame(MAV_FRAME_GLOBAL); homeItem->setFrame(MAV_FRAME_GLOBAL);
if (!homeItem->homePositionValid()) { if (!homeItem->homePositionValid()) {
QGeoCoordinate homeCoord = homeItem->coordinate(); // Set a bogus home position, the important value is 0.0 Altitude
homeCoord.setAltitude(0.0); homeItem->setCoordinate(QGeoCoordinate(37.803784, -122.462276, 0.0));
homeItem->setCoordinate(homeCoord);
} }
qDebug() << "home item" << homeItem->homePositionValid() << homeItem->coordinate();
for (int i=0; i<_missionItems->count(); i++) { for (int i=0; i<_missionItems->count(); i++) {
_initMissionItem(qobject_cast<MissionItem*>(_missionItems->get(i))); _initMissionItem(qobject_cast<MissionItem*>(_missionItems->get(i)));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment