Commit 4e2291e4 authored by Don Gagne's avatar Don Gagne

Merge pull request #1431 from Susurrus/local_offset

Support LOCAL_OFFSET_NED waypoints.
parents 4f6cde07 3e535acd
...@@ -84,6 +84,7 @@ WaypointEditableView::WaypointEditableView(Waypoint* wp, QWidget* parent) : ...@@ -84,6 +84,7 @@ WaypointEditableView::WaypointEditableView(Waypoint* wp, QWidget* parent) :
m_ui->comboBox_frame->addItem("Global/Abs. Alt",MAV_FRAME_GLOBAL); m_ui->comboBox_frame->addItem("Global/Abs. Alt",MAV_FRAME_GLOBAL);
m_ui->comboBox_frame->addItem("Global/Rel. Alt", MAV_FRAME_GLOBAL_RELATIVE_ALT); m_ui->comboBox_frame->addItem("Global/Rel. Alt", MAV_FRAME_GLOBAL_RELATIVE_ALT);
m_ui->comboBox_frame->addItem("Local(NED)",MAV_FRAME_LOCAL_NED); m_ui->comboBox_frame->addItem("Local(NED)",MAV_FRAME_LOCAL_NED);
m_ui->comboBox_frame->addItem("Local Offset(NED)",MAV_FRAME_LOCAL_OFFSET_NED);
m_ui->comboBox_frame->addItem("Mission",MAV_FRAME_MISSION); m_ui->comboBox_frame->addItem("Mission",MAV_FRAME_MISSION);
// We do not want users to mess with the current waypoint in missions - // We do not want users to mess with the current waypoint in missions -
......
...@@ -41,6 +41,7 @@ void QGCMissionNavWaypoint::updateFrame(MAV_FRAME frame) ...@@ -41,6 +41,7 @@ void QGCMissionNavWaypoint::updateFrame(MAV_FRAME frame)
{ {
case MAV_FRAME_LOCAL_ENU: case MAV_FRAME_LOCAL_ENU:
case MAV_FRAME_LOCAL_NED: case MAV_FRAME_LOCAL_NED:
case MAV_FRAME_LOCAL_OFFSET_NED:
this->ui->posNSpinBox->show(); this->ui->posNSpinBox->show();
this->ui->posESpinBox->show(); this->ui->posESpinBox->show();
this->ui->posDSpinBox->show(); this->ui->posDSpinBox->show();
......
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