Browse Source

Fixed some missing curly braces that were removed by the conflict resolution tool

QGC4.4
Mariano Lizarraga 14 years ago
parent
commit
bf89851b23
  1. 2
      src/uas/UAS.h
  2. 5
      src/ui/WaypointList.cc

2
src/uas/UAS.h

@ -357,7 +357,7 @@ protected slots: @@ -357,7 +357,7 @@ protected slots:
void receiveMessageNamedValue(const mavlink_message_t& message);
private:
unsigned int mode; ///< The current mode of the MAV
// unsigned int mode; ///< The current mode of the MAV
};

5
src/ui/WaypointList.cc

@ -191,11 +191,12 @@ void WaypointList::add() @@ -191,11 +191,12 @@ void WaypointList::add()
wp = new Waypoint(0, uas->getLatitude(), uas->getLongitude(), uas->getAltitude(), 0.0, 0.0, 0.0, 0.0, true, true, MAV_FRAME_GLOBAL, MAV_CMD_NAV_WAYPOINT);
uas->getWaypointManager()->addWaypoint(wp);
}
}
}
void WaypointList::addCurrentPositonWaypoint()
{
void WaypointList::addCurrentPositonWaypoint(){
/* TODO: implement with new waypoint structure
if (uas)
{

Loading…
Cancel
Save