rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-01 18:29:16 +01:00
Code Issues Releases Activity

Updated UAV lat/lon/alt value requesting code.

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1975 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
pip 2010-10-17 14:36:41 +00:00 committed by pip
parent 658f9046d2
commit 3f6796138e
2 changed files with 51 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
ground/src/plugins/opmap/opmapgadgetwidget.cpp
View File

@ -91,8 +91,11 @@ OPMapGadgetWidget::OPMapGadgetWidget(QWidget *parent) : QWidget(parent)
// fetch required UAVObjects
// current position
QPointF pos = getUAVLatLon();
internals::PointLatLng pos_lat_lon = internals::PointLatLng(pos.x(), pos.y());
double latitude;
double longitude;
double altitude;
getUAV_LLA(latitude, longitude, altitude);
internals::PointLatLng pos_lat_lon = internals::PointLatLng(latitude, longitude);
// **************
// default home position
@ -667,12 +670,18 @@ void OPMapGadgetWidget::updatePosition()
QMutexLocker locker(&m_map_mutex);
QPointF pos = getUAVLatLon(); // get current UAV lat/lon
float yaw = getUAVYaw(); // get current UAV heading
double latitude;
double longitude;
double altitude;
internals::PointLatLng uav_pos = internals::PointLatLng(pos.x(), pos.y()); // current UAV position
if (!getUAV_LLA(latitude, longitude, altitude)) // get current UAV position
return;
float yaw = getUAV_Yaw(); // get current UAV heading
internals::PointLatLng uav_pos = internals::PointLatLng(latitude, longitude); // current UAV position
float uav_heading = yaw; // current UAV heading
float uav_altitude_meters = 0; //data.Altitude; // current UAV height
float uav_altitude_meters = altitude; // current UAV height
float uav_ground_speed_meters_per_second = 0; //data.Groundspeed; // current UAV ground speed
// display the UAV lat/lon position
@ -745,14 +754,19 @@ void OPMapGadgetWidget::updateMousePos()
{
s += " uav";
QPointF pos = getUAVLatLon();
internals::PointLatLng uav_pos = internals::PointLatLng(pos.x(), pos.y()); // current UAV position
double latitude;
double longitude;
double altitude;
if (getUAV_LLA(latitude, longitude, altitude)) // get current UAV position
{
internals::PointLatLng uav_pos = internals::PointLatLng(latitude, longitude);
// double dist = distance(home_lat_lon, uav_pos);
// double bear = bearing(home_lat_lon, uav_pos);
// s += " " + QString::number(dist * 1000, 'f', 1) + "m";
// s += " " + QString::number(bear, 'f', 1) + "deg";
}
}
m_widget->labelMousePos->setText(s);
}
@ -1731,11 +1745,15 @@ void OPMapGadgetWidget::onGoUAVAct_triggered()
if (!m_widget || !m_map)
return;
QPointF pos = getUAVLatLon();
internals::PointLatLng uav_pos = internals::PointLatLng(pos.x(), pos.y()); // current UAV position
double latitude;
double longitude;
double altitude;
if (getUAV_LLA(latitude, longitude, altitude)) // get current UAV position
{
internals::PointLatLng uav_pos = internals::PointLatLng(latitude, longitude); // current UAV position
internals::PointLatLng map_pos = m_map->CurrentPosition(); // current MAP position
if (map_pos != uav_pos) m_map->SetCurrentPosition(uav_pos); // center the map onto the UAV
}
}
void OPMapGadgetWidget::onFollowUAVpositionAct_toggled(bool checked)
@ -2197,7 +2215,7 @@ internals::PointLatLng OPMapGadgetWidget::destPoint(internals::PointLatLng sourc
// *************************************************************************************
QPointF OPMapGadgetWidget::getUAVLatLon()
bool OPMapGadgetWidget::getUAV_LLA(double &latitude, double &longitude, double &altitude)
{
double BaseECEF[3];
double NED[3];
@ -2205,18 +2223,18 @@ QPointF OPMapGadgetWidget::getUAVLatLon()
UAVObject *obj;
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
if (!pm) return QPointF(0, 0);
if (!pm) return false;
UAVObjectManager *om = pm->getObject<UAVObjectManager>();
if (!om) return QPointF(0, 0);
if (!om) return false;
obj = dynamic_cast<UAVDataObject*>(om->getObject(QString("HomeLocation")));
if (!obj) return QPointF(0, 0);
if (!obj) return false;
BaseECEF[0] = obj->getField(QString("ECEF"))->getDouble(0) / 100;
BaseECEF[1] = obj->getField(QString("ECEF"))->getDouble(1) / 100;
BaseECEF[2] = obj->getField(QString("ECEF"))->getDouble(2) / 100;
obj = dynamic_cast<UAVDataObject*>(om->getObject(QString("PositionActual")));
if (!obj) return QPointF(0, 0);
if (!obj) return false;
NED[0] = obj->getField(QString("North"))->getDouble() / 100;
NED[1] = obj->getField(QString("East"))->getDouble() / 100;
NED[2] = obj->getField(QString("Down"))->getDouble() / 100;
@ -2227,10 +2245,15 @@ QPointF OPMapGadgetWidget::getUAVLatLon()
Utils::CoordinateConversions().GetLLA(BaseECEF, NED, LLA);
return QPointF(LLA[0], LLA[1]);
latitude = LLA[0];
longitude = LLA[1];
altitude = LLA[2];
return true;
// return QPointF(LLA[0], LLA[1]);
}
double OPMapGadgetWidget::getUAVYaw()
double OPMapGadgetWidget::getUAV_Yaw()
{
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
if (!pm) return 0.0;

4
ground/src/plugins/opmap/opmapgadgetwidget.h
View File

@ -318,8 +318,8 @@ private:
double bearing(internals::PointLatLng from, internals::PointLatLng to);
internals::PointLatLng destPoint(internals::PointLatLng source, double bear, double dist);
QPointF getUAVLatLon();
double getUAVYaw();
bool getUAV_LLA(double &latitude, double &longitude, double &altitude);
double getUAV_Yaw();
void setMapFollowingMode();
};