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

Merge remote-tracking branch 'origin/laurent/OP-1538_Embedded_Documentation' into thread/OP-1538_Embedded_Documentation

Browse Source
This commit is contained in:
m_thread 2014-10-14 09:51:34 +02:00
commit a69d9fe5f1
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjectbrowserwidget.cpp
View File

@ -315,7 +315,10 @@ QString UAVObjectBrowserWidget::createObjectDescription(UAVObject *object)
}
if (elements > 1) {
description.append("<tr><td></td><td>").append("<b>").append(tr("Elements:")).append(" </b>").append("</td><td>");
description.append("<tr><td").append(fields & 1 ? " bgcolor='#ffcc99'>" : " bgcolor='#ff9900'>");
description.append("</td><td").append(fields & 1 ? " bgcolor='#ffcc99'>" : " bgcolor='#ff9900'>");
description.append("<b>").append(tr("Elements:")).append(" </b>");
description.append("</td><td").append(fields & 1 ? " bgcolor='#ffcc99'>" : " bgcolor='#ff9900'>");
QStringList names = field->getElementNames();
for (uint i = 0; i < field->getNumElements(); i++) {
description.append( i == 0 ? tr("<b>Name: </b>") : " | ").append(names.at(i));
@ -323,10 +326,12 @@ QString UAVObjectBrowserWidget::createObjectDescription(UAVObject *object)
description.append(QString(" %1 - %2 ").arg(field->getMinLimit(i).toString(), field->getMaxLimit(i).toString()));
}
}
description.append("<td").append(fields & 1 ? " bgcolor='#ffcc99'>" : " bgcolor='#ff9900'>");
description.append("</td></tr>");
} else {
if (field->getMinLimit(0).toString() != "" && field->getMaxLimit(0).toString() != "") {
description.append("<tr><td>").append(tr("<b> Limits: </b>")).append(" </b>")
description.append("<tr><td").append(fields & 1 ? " bgcolor='#ffcc99'>" : " bgcolor='#ff9900'>");
description.append(tr("<b> Limits: </b>")).append(" </b>")
.append(QString(" %1 - %2 ").arg(field->getMinLimit(0).toString(), field->getMaxLimit(0).toString()));
description.append("</td></tr>");
}

2
shared/uavobjectdefinition/camerastabsettings.xml
View File

@ -1,6 +1,6 @@
<xml>
<object name="CameraStabSettings" singleinstance="true" settings="true" category="Control">
<description>Settings for the @ref CameraStab mmodule</description>
<description>Settings for the @ref CameraStab module</description>
<field name="Input" units="channel" type="enum" elementnames="Roll,Pitch,Yaw" options="Accessory0,Accessory1,Accessory2,Accessory3,Accessory4,Accessory5,None" defaultvalue="None"/>
<field name="InputRange" units="deg" type="uint8" elementnames="Roll,Pitch,Yaw" defaultvalue="20"/>
<field name="InputRate" units="deg/s" type="uint8" elementnames="Roll,Pitch,Yaw" defaultvalue="50"/>

2
shared/uavobjectdefinition/homelocation.xml
View File

@ -1,6 +1,6 @@
<xml>
<object name="HomeLocation" singleinstance="true" settings="true" category="Navigation">
<description>HomeLocation setting which contains the constants to tranlate from longitutde and latitude to NED reference frame. Automatically set by @ref GPSModule after acquiring a 3D lock. Used by @ref AHRSCommsModule.</description>
<description>HomeLocation setting which contains the constants to translate from longitude and latitude to NED reference frame. Automatically set by @ref GPSModule after acquiring a 3D lock. Used by @ref AHRSCommsModule.</description>
<field name="Set" units="" type="enum" elements="1" options="FALSE,TRUE" defaultvalue="FALSE"/>
<field name="Latitude" units="deg * 10e6" type="int32" elements="1" defaultvalue="0"/>
<field name="Longitude" units="deg * 10e6" type="int32" elements="1" defaultvalue="0"/>

2
shared/uavobjectdefinition/manualcontrolcommand.xml
View File

@ -1,6 +1,6 @@
<xml>
<object name="ManualControlCommand" singleinstance="true" settings="false" category="Control">
<description>The output from the @ref ManualControlModule which descodes the receiver inputs. Overriden by GCS for fly-by-wire control.</description>
<description>The output from the @ref ManualControlModule which decodes the receiver inputs. Overriden by GCS for fly-by-wire control.</description>
<field name="Connected" units="" type="enum" elements="1" options="False,True"/>
<field name="Throttle" units="%" type="float" elements="1"/>
<field name="Roll" units="%" type="float" elements="1"/>