rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-18 08:54:15 +01:00
Code Issues Releases Activity

Fixed [cm] vs. [m] unit discrepencies in PFD and xml files, as per revo update to [m-kg-s] units.

Browse Source
This commit is contained in:
Laura Sebesta 2012-04-20 06:11:44 -04:00
parent 73cafd742c
commit 48d018f9bb
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ground/openpilotgcs/src/plugins/pfd/pfdgadgetwidget.cpp
View File

@ -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.

6
shared/uavobjectdefinition/positionactual.xml
View File

@ -1,9 +1,9 @@
<xml>
<object name="PositionActual" singleinstance="true" settings="false">
<description>Contains the current position relative to @ref HomeLocation</description>
<field name="North" units="cm" type="int32" elements="1"/>
<field name="East" units="cm" type="int32" elements="1"/>
<field name="Down" units="cm" type="int32" elements="1"/>
<field name="North" units="m" type="int32" elements="1"/>
<field name="East" units="m" type="int32" elements="1"/>
<field name="Down" units="m" type="int32" elements="1"/>
<access gcs="readwrite" flight="readwrite"/>
<telemetrygcs acked="false" updatemode="manual" period="0"/>
<telemetryflight acked="false" updatemode="periodic" period="1000"/>

6
shared/uavobjectdefinition/positiondesired.xml
View File

@ -1,9 +1,9 @@
<xml>
<object name="PositionDesired" singleinstance="true" settings="false">
<description>The position the craft is trying t achieve. Can come from GCS or @ref PathPlanner </description>
<field name="North" units="cm" type="int32" elements="1"/>
<field name="East" units="cm" type="int32" elements="1"/>
<field name="Down" units="cm" type="int32" elements="1"/>
<field name="North" units="m" type="int32" elements="1"/>
<field name="East" units="m" type="int32" elements="1"/>
<field name="Down" units="m" type="int32" elements="1"/>
<access gcs="readwrite" flight="readwrite"/>
<telemetrygcs acked="false" updatemode="manual" period="0"/>
<telemetryflight acked="false" updatemode="onchange" period="0"/>

6
shared/uavobjectdefinition/velocityactual.xml
View File

@ -1,9 +1,9 @@
<xml>
<object name="VelocityActual" singleinstance="true" settings="false">
<description>Updated by @ref AHRSCommsModule and used within @ref GuidanceModule for velocity control</description>
<field name="North" units="cm/s" type="int32" elements="1"/>
<field name="East" units="cm/s" type="int32" elements="1"/>
<field name="Down" units="cm/s" type="int32" elements="1"/>
<field name="North" units="m/s" type="int32" elements="1"/>
<field name="East" units="m/s" type="int32" elements="1"/>
<field name="Down" units="m/s" type="int32" elements="1"/>
<access gcs="readwrite" flight="readwrite"/>
<telemetrygcs acked="false" updatemode="manual" period="0"/>
<telemetryflight acked="false" updatemode="periodic" period="1000"/>

6
shared/uavobjectdefinition/velocitydesired.xml
View File

@ -1,9 +1,9 @@
<xml>
<object name="VelocityDesired" singleinstance="true" settings="false">
<description>Used within @ref GuidanceModule to communicate between the task computing the desired velocity and the PID loop to achieve it (running at different rates).</description>
<field name="North" units="cm/s" type="int32" elements="1"/>
<field name="East" units="cm/s" type="int32" elements="1"/>
<field name="Down" units="cm/s" type="int32" elements="1"/>
<field name="North" units="m/s" type="int32" elements="1"/>
<field name="East" units="m/s" type="int32" elements="1"/>
<field name="Down" units="m/s" type="int32" elements="1"/>
<access gcs="readwrite" flight="readwrite"/>
<telemetrygcs acked="false" updatemode="manual" period="0"/>
<telemetryflight acked="false" updatemode="periodic" period="1000"/>