From fe5ca6d5c159b6455a2f765cf79c0dd5ad966b96 Mon Sep 17 00:00:00 2001 From: Laurent Lalanne Date: Sun, 7 Oct 2018 19:40:20 +0200 Subject: [PATCH 1/5] LP-601 Waypoint file output : Write double values in C locale --- ground/gcs/src/plugins/opmap/flightdatamodel.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ground/gcs/src/plugins/opmap/flightdatamodel.cpp b/ground/gcs/src/plugins/opmap/flightdatamodel.cpp index 01756e9323..821543ed33 100644 --- a/ground/gcs/src/plugins/opmap/flightdatamodel.cpp +++ b/ground/gcs/src/plugins/opmap/flightdatamodel.cpp @@ -453,27 +453,27 @@ bool flightDataModel::writeToFile(QString fileName) waypoint.appendChild(field); field = doc.createElement("field"); - field.setAttribute("value", obj->latPosition); + field.setAttribute("value", QString::number(obj->latPosition, 'f', 16)); field.setAttribute("name", "latitude"); waypoint.appendChild(field); field = doc.createElement("field"); - field.setAttribute("value", obj->lngPosition); + field.setAttribute("value", QString::number(obj->lngPosition, 'f', 16)); field.setAttribute("name", "longitude"); waypoint.appendChild(field); field = doc.createElement("field"); - field.setAttribute("value", obj->disRelative); + field.setAttribute("value", QString::number(obj->disRelative, 'f', 16)); field.setAttribute("name", "distance_to_home"); waypoint.appendChild(field); field = doc.createElement("field"); - field.setAttribute("value", obj->beaRelative); + field.setAttribute("value", QString::number(obj->beaRelative, 'f', 16)); field.setAttribute("name", "bearing_from_home"); waypoint.appendChild(field); field = doc.createElement("field"); - field.setAttribute("value", obj->altitudeRelative); + field.setAttribute("value", QString::number(obj->altitudeRelative, 'f', 16)); field.setAttribute("name", "altitude_above_home"); waypoint.appendChild(field); From 9e788436d003b3eba6db0e16d6cf016cc35baace Mon Sep 17 00:00:00 2001 From: Laurent Lalanne Date: Sun, 7 Oct 2018 23:16:25 +0200 Subject: [PATCH 2/5] LP-601 Use normal altitude sign above home for AboveAltitude condition parameter --- flight/modules/PathPlanner/pathplanner.c | 5 ++--- ground/gcs/src/plugins/opmap/opmap_edit_waypoint_dialog.cpp | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/flight/modules/PathPlanner/pathplanner.c b/flight/modules/PathPlanner/pathplanner.c index 0faeeafe2c..0650bc59cb 100644 --- a/flight/modules/PathPlanner/pathplanner.c +++ b/flight/modules/PathPlanner/pathplanner.c @@ -601,8 +601,7 @@ static uint8_t conditionBelowError() /** * the AboveAltitude measures the flight altitude relative to home position * returns true if above critical altitude - * WARNING! Altitudes are always negative (down coordinate) - * Parameter 0: altitude in meters (negative!) + * Parameter 0: altitude in meters */ static uint8_t conditionAboveAltitude() { @@ -610,7 +609,7 @@ static uint8_t conditionAboveAltitude() PositionStateGet(&positionState); - if (positionState.Down <= pathAction.ConditionParameters[0]) { + if (-positionState.Down >= pathAction.ConditionParameters[0]) { return true; } return false; diff --git a/ground/gcs/src/plugins/opmap/opmap_edit_waypoint_dialog.cpp b/ground/gcs/src/plugins/opmap/opmap_edit_waypoint_dialog.cpp index 9975246dcb..dbbed9ba5c 100644 --- a/ground/gcs/src/plugins/opmap/opmap_edit_waypoint_dialog.cpp +++ b/ground/gcs/src/plugins/opmap/opmap_edit_waypoint_dialog.cpp @@ -290,8 +290,7 @@ void opmap_edit_waypoint_dialog::setupConditionWidgets() ui->condParam1->setEnabled(true); ui->dsb_condParam1->setEnabled(true); ui->condParam1->setText("Altitude (m):"); - ui->descriptionConditionLabel->setText(tr("

The AboveAltitude condition measures the flight altitude relative to home position, returns true if " - "above critical altitude.

WARNING! altitudes set here are always negative if above Home. (down coordinate)

")); + ui->descriptionConditionLabel->setText(tr("

The AboveAltitude condition measures the flight altitude relative to home position, returns true if above critical altitude.

")); break; case MapDataDelegate::ENDCONDITION_ABOVESPEED: ui->condParam1->setEnabled(true); From 285fb8b82cee00aa055b1e36a39f0567dfebc350 Mon Sep 17 00:00:00 2001 From: Laurent Lalanne Date: Sun, 7 Oct 2018 23:22:17 +0200 Subject: [PATCH 3/5] LP-601 Fix typo for ConditionParameter3 --- ground/gcs/src/plugins/opmap/opmap_edit_waypoint_dialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/gcs/src/plugins/opmap/opmap_edit_waypoint_dialog.cpp b/ground/gcs/src/plugins/opmap/opmap_edit_waypoint_dialog.cpp index dbbed9ba5c..b8921b8211 100644 --- a/ground/gcs/src/plugins/opmap/opmap_edit_waypoint_dialog.cpp +++ b/ground/gcs/src/plugins/opmap/opmap_edit_waypoint_dialog.cpp @@ -73,7 +73,7 @@ opmap_edit_waypoint_dialog::opmap_edit_waypoint_dialog(QWidget *parent, QAbstrac mapper->addMapping(ui->dsb_condParam1, flightDataModel::CONDITION_PARAMS0); mapper->addMapping(ui->dsb_condParam2, flightDataModel::CONDITION_PARAMS1); mapper->addMapping(ui->dsb_condParam3, flightDataModel::CONDITION_PARAMS2); - mapper->addMapping(ui->dsb_condParam4, flightDataModel::CONDITION_PARAMS0); + mapper->addMapping(ui->dsb_condParam4, flightDataModel::CONDITION_PARAMS3); mapper->addMapping(ui->cbCommand, flightDataModel::COMMAND); mapper->addMapping(ui->sbJump, flightDataModel::JUMPDESTINATION); From cd196c8d34ce1f5c8335c554503e527f30d2f53a Mon Sep 17 00:00:00 2001 From: Laurent Lalanne Date: Sun, 7 Oct 2018 23:34:09 +0200 Subject: [PATCH 4/5] LP-601 Define line (or no line) for all WP modes on map. --- ground/gcs/src/plugins/opmap/modelmapproxy.cpp | 7 ++++++- ground/gcs/src/plugins/opmap/modelmapproxy.h | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ground/gcs/src/plugins/opmap/modelmapproxy.cpp b/ground/gcs/src/plugins/opmap/modelmapproxy.cpp index db658f0bf9..fe2d84cac8 100644 --- a/ground/gcs/src/plugins/opmap/modelmapproxy.cpp +++ b/ground/gcs/src/plugins/opmap/modelmapproxy.cpp @@ -89,6 +89,7 @@ modelMapProxy::overlayType modelMapProxy::overlayTranslate(int type) case MapDataDelegate::MODE_GOTOENDPOINT: case MapDataDelegate::MODE_FOLLOWVECTOR: case MapDataDelegate::MODE_VELOCITY: + case MapDataDelegate::MODE_FIXEDATTITUDE: case MapDataDelegate::MODE_LAND: case MapDataDelegate::MODE_AUTOTAKEOFF: case MapDataDelegate::MODE_BRAKE: @@ -98,8 +99,12 @@ modelMapProxy::overlayType modelMapProxy::overlayTranslate(int type) return OVERLAY_CIRCLE_RIGHT; case MapDataDelegate::MODE_CIRCLELEFT: - default: return OVERLAY_CIRCLE_LEFT; + + case MapDataDelegate::MODE_SETACCESSORY: + case MapDataDelegate::MODE_DISARMALARM: + default: + return OVERLAY_NOLINE; } } diff --git a/ground/gcs/src/plugins/opmap/modelmapproxy.h b/ground/gcs/src/plugins/opmap/modelmapproxy.h index 0c169698a0..30ae7922c9 100644 --- a/ground/gcs/src/plugins/opmap/modelmapproxy.h +++ b/ground/gcs/src/plugins/opmap/modelmapproxy.h @@ -39,7 +39,7 @@ using namespace mapcontrol; class modelMapProxy : public QObject { - typedef enum { OVERLAY_LINE, OVERLAY_CIRCLE_RIGHT, OVERLAY_CIRCLE_LEFT } overlayType; + typedef enum { OVERLAY_LINE, OVERLAY_CIRCLE_RIGHT, OVERLAY_CIRCLE_LEFT, OVERLAY_NOLINE } overlayType; Q_OBJECT public: explicit modelMapProxy(QObject *parent, OPMapWidget *map, flightDataModel *model, QItemSelectionModel *selectionModel); From 62f48ac9436cbf5e69d9192838038fcbe1a960ab Mon Sep 17 00:00:00 2001 From: Laurent Lalanne Date: Thu, 21 Feb 2019 21:23:13 +0100 Subject: [PATCH 5/5] LP-470 Bump map version --- ground/gcs/src/libs/opmapcontrol/src/core/providerstrings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/gcs/src/libs/opmapcontrol/src/core/providerstrings.cpp b/ground/gcs/src/libs/opmapcontrol/src/core/providerstrings.cpp index 0413c1a86d..b6b10ca4cc 100644 --- a/ground/gcs/src/libs/opmapcontrol/src/core/providerstrings.cpp +++ b/ground/gcs/src/libs/opmapcontrol/src/core/providerstrings.cpp @@ -41,7 +41,7 @@ ProviderStrings::ProviderStrings() { // Google version strings VersionGoogleMap = "m@301"; - QString version = "810"; + QString version = "823"; QString envVersion = qgetenv("GCS_GOOGLE_SAT_VERSION").constData(); VersionGoogleSatellite = (envVersion.toInt() > version.toInt()) ? envVersion : version; VersionGoogleLabels = "h@301";