From 48d018f9bb0418527c44632ab932f3257879baa5 Mon Sep 17 00:00:00 2001 From: Laura Sebesta Date: Fri, 20 Apr 2012 06:11:44 -0400 Subject: [PATCH] Fixed [cm] vs. [m] unit discrepencies in PFD and xml files, as per revo update to [m-kg-s] units. --- ground/openpilotgcs/src/plugins/pfd/pfdgadgetwidget.cpp | 4 ++-- shared/uavobjectdefinition/positionactual.xml | 6 +++--- shared/uavobjectdefinition/positiondesired.xml | 6 +++--- shared/uavobjectdefinition/velocityactual.xml | 6 +++--- shared/uavobjectdefinition/velocitydesired.xml | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/pfd/pfdgadgetwidget.cpp b/ground/openpilotgcs/src/plugins/pfd/pfdgadgetwidget.cpp index 072c54be3..7fedb99ab 100644 --- a/ground/openpilotgcs/src/plugins/pfd/pfdgadgetwidget.cpp +++ b/ground/openpilotgcs/src/plugins/pfd/pfdgadgetwidget.cpp @@ -304,7 +304,7 @@ void PFDGadgetWidget::updateAirspeed(UAVObject *object) { UAVObjectField* eastField = object->getField("East"); if (northField && eastField) { double val = floor(sqrt(pow(northField->getDouble(),2) + pow(eastField->getDouble(),2))*10)/10; - groundspeedTarget = 3.6*val*speedScaleHeight/3000; + groundspeedTarget = 3.6*val*speedScaleHeight/30; if (!dialTimer.isActive()) dialTimer.start(); // Rearm the dial Timer which might be stopped. @@ -321,7 +321,7 @@ void PFDGadgetWidget::updateAltitude(UAVObject *object) { UAVObjectField* downField = object->getField("Down"); if (downField) { // The altitude scale represents 30 meters - altitudeTarget = -floor(downField->getDouble()*10)/10*altitudeScaleHeight/3000; + altitudeTarget = -floor(downField->getDouble()*10)/10*altitudeScaleHeight/30; if (!dialTimer.isActive()) dialTimer.start(); // Rearm the dial Timer which might be stopped. diff --git a/shared/uavobjectdefinition/positionactual.xml b/shared/uavobjectdefinition/positionactual.xml index 5fbf4d01c..5792bbdbd 100644 --- a/shared/uavobjectdefinition/positionactual.xml +++ b/shared/uavobjectdefinition/positionactual.xml @@ -1,9 +1,9 @@ Contains the current position relative to @ref HomeLocation - - - + + + diff --git a/shared/uavobjectdefinition/positiondesired.xml b/shared/uavobjectdefinition/positiondesired.xml index fab8cf21f..11ec28c9f 100644 --- a/shared/uavobjectdefinition/positiondesired.xml +++ b/shared/uavobjectdefinition/positiondesired.xml @@ -1,9 +1,9 @@ The position the craft is trying t achieve. Can come from GCS or @ref PathPlanner - - - + + + diff --git a/shared/uavobjectdefinition/velocityactual.xml b/shared/uavobjectdefinition/velocityactual.xml index 94ac75903..b69791984 100644 --- a/shared/uavobjectdefinition/velocityactual.xml +++ b/shared/uavobjectdefinition/velocityactual.xml @@ -1,9 +1,9 @@ Updated by @ref AHRSCommsModule and used within @ref GuidanceModule for velocity control - - - + + + diff --git a/shared/uavobjectdefinition/velocitydesired.xml b/shared/uavobjectdefinition/velocitydesired.xml index ae30659d8..702628177 100644 --- a/shared/uavobjectdefinition/velocitydesired.xml +++ b/shared/uavobjectdefinition/velocitydesired.xml @@ -1,9 +1,9 @@ Used within @ref GuidanceModule to communicate between the task computing the desired velocity and the PID loop to achieve it (running at different rates). - - - + + +