rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

Merge branch 'next' into thread/OP-39

Browse Source 
Conflicts:
	ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
This commit is contained in:
Fredrik Arvidsson 2012-09-20 23:53:33 +02:00
commit 69621ba2f8
25 changed files with 130 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
artwork/3D Model/boards/CC3D/CC3D.3ds Normal file
View File

Binary file not shown.

BIN
artwork/3D Model/boards/CC3D/TEXTURE.PNG Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 160 KiB

BIN
artwork/3D Model/multi/dankers_quad/TEXTURE.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 102 KiB

BIN
artwork/3D Model/multi/dankers_quad/dankers_quad.3ds Normal file
View File

Binary file not shown.

BIN
artwork/3D Model/multi/dankers_quad/dankers_quad.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 113 KiB

BIN
artwork/3D Model/multi/mattL_Y6/TEXTURE.PNG Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 131 KiB

BIN
artwork/3D Model/multi/mattL_Y6/mattL_Y6.3ds Normal file
View File

Binary file not shown.

BIN
artwork/3D Model/multi/mattL_Y6/mattL_Y6.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 93 KiB

38
flight/Project/gdb/bu_coptercontrol Normal file
View File

@ -0,0 +1,38 @@
define connect
target remote localhost:3333
monitor cortex_m3 vector_catch all
file ./build/bu_coptercontrol/bu_coptercontrol.elf
end
#monitor reset halt
define hook-step
monitor cortex_m3 maskisr on
end
define hookpost-step
monitor cortex_m3 maskisr off
end
define hook-stepi
monitor cortex_m3 maskisr on
end
define hookpost-stepi
monitor cortex_m3 maskisr off
end
define hook-next
monitor cortex_m3 maskisr on
end
define hookpost-next
monitor cortex_m3 maskisr off
end
define hook-finish
monitor cortex_m3 maskisr on
end
define hookpost-finish
monitor cortex_m3 maskisr off
end

37
ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS.xml
View File

@ -1455,6 +1455,17 @@
<enableVbo>false</enableVbo>
</data>
</CopterControl>
<CC3D>
<configInfo>
<locked>false</locked>
<version>0.0.0</version>
</configInfo>
<data>
<acFilename>%%DATAPATH%%models/boards/CC3D/CC3D.3ds</acFilename>
<bgFilename>%%DATAPATH%%models/backgrounds/default_background.png</bgFilename>
<enableVbo>false</enableVbo>
</data>
</CC3D>
<Easyquad__PCT__20X>
<configInfo>
<locked>false</locked>
@ -1609,6 +1620,17 @@
<enableVbo>false</enableVbo>
</data>
</Scorpion__PCT__20Tricopter>
<MattL__PCT__27s__PCT__20Y6>
<configInfo>
<locked>false</locked>
<version>0.0.0</version>
</configInfo>
<data>
<acFilename>%%DATAPATH%%models/multi/mattL_Y6/mattL_Y6.3ds</acFilename>
<bgFilename>%%DATAPATH%%models/backgrounds/default_background.png</bgFilename>
<enableVbo>false</enableVbo>
</data>
</MattL__PCT__27s__PCT__20Y6>
<Test__PCT__20Quad__PCT__20__PCT__2B>
<configInfo>
<locked>false</locked>
@ -1631,6 +1653,17 @@
<enableVbo>false</enableVbo>
</data>
</Test__PCT__20Quad__PCT__20X>
<Danker__PCT__27s__PCT__20Quad>
<configInfo>
<locked>false</locked>
<version>0.0.0</version>
</configInfo>
<data>
<acFilename>%%DATAPATH%%models/multi/dankers_quad/dankers_quad.3ds</acFilename>
<bgFilename>%%DATAPATH%%models/backgrounds/default_background.png</bgFilename>
<enableVbo>false</enableVbo>
</data>
</Danker__PCT__27s__PCT__20Quad>
</ModelViewGadget>
<OPMapGadget>
<Google__PCT__20Sat>
@ -2459,11 +2492,11 @@
<type>uavGadget</type>
</side1>
<splitterOrientation>1</splitterOrientation>
<splitterSizes>@Variant(AAAACQAAAAIAAAACAAAAsQAAAAIAAAEV)</splitterSizes>
<splitterSizes>@Variant(AAAACQAAAAIAAAACAAAAYwAAAAIAAAB7)</splitterSizes>
<type>splitter</type>
</side1>
<splitterOrientation>1</splitterOrientation>
<splitterSizes>@Variant(AAAACQAAAAIAAAACAAAArgAAAAIAAAHH)</splitterSizes>
<splitterSizes>@Variant(AAAACQAAAAIAAAACAAAAZgAAAAIAAADf)</splitterSizes>
<type>splitter</type>
</side0>
<side1>

BIN
ground/openpilotgcs/share/openpilotgcs/models/boards/CC3D/CC3D.3ds Normal file
View File

Binary file not shown.

BIN
ground/openpilotgcs/share/openpilotgcs/models/boards/CC3D/TEXTURE.PNG Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 160 KiB

BIN
ground/openpilotgcs/share/openpilotgcs/models/multi/dankers_quad/TEXTURE.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 102 KiB

BIN
ground/openpilotgcs/share/openpilotgcs/models/multi/dankers_quad/dankers_quad.3ds Normal file
View File

Binary file not shown.

BIN
ground/openpilotgcs/share/openpilotgcs/models/multi/dankers_quad/dankers_quad.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 113 KiB

BIN
ground/openpilotgcs/share/openpilotgcs/models/multi/mattL_Y6/TEXTURE.PNG Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 131 KiB

BIN
ground/openpilotgcs/share/openpilotgcs/models/multi/mattL_Y6/mattL_Y6.3ds Normal file
View File

Binary file not shown.

BIN
ground/openpilotgcs/share/openpilotgcs/models/multi/mattL_Y6/mattL_Y6.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 93 KiB

4
ground/openpilotgcs/src/plugins/config/autotune.ui
View File

@ -1001,13 +1001,13 @@ border-radius: 4;
<rect>
<x>30</x>
<y>440</y>
<width>371</width>
<width>401</width>
<height>31</height>
</rect>
</property>
<property name="text">
<string>The buttons below change the autotuning settings which
will alter thingsfor the next autotuning flight</string>
will alter things for the next autotuning flight</string>
</property>
</widget>
<widget class="QPushButton" name="useComputedValues">

1
ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
View File

@ -292,7 +292,6 @@ void ConfigInputWidget::openHelp()
QDesktopServices::openUrl( QUrl("http://wiki.openpilot.org/x/04Cf", QUrl::StrictMode) );
}
void ConfigInputWidget::goToWizard()
{
QMessageBox msgBox;

7
ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
View File

@ -471,11 +471,10 @@ void ConfigVehicleTypeWidget::refreshWidgetsValues(UAVObject * o)
{
Q_UNUSED(o);
//if(!allObjectsUpdated())
// return;
if(!allObjectsUpdated())
return;
//WHAT DOES THIS DO?
bool dirty=isDirty(); //WHY IS THIS CALLED HERE AND THEN AGAIN SEVERAL LINES LATER IN setupAirframeUI()
bool dirty=isDirty();
// Get the Airframe type from the system settings:
UAVDataObject* system = dynamic_cast<UAVDataObject*>(getObjectManager()->getObject(QString("SystemSettings")));

72
ground/openpilotgcs/src/plugins/config/images/curve-bg.svg
View File

@ -7,16 +7,28 @@
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="253"
height="253"
id="svg2"
version="1.1"
inkscape:version="0.47 r22583"
inkscape:version="0.48.2 r9819"
sodipodi:docname="curve-bg.svg">
<defs
id="defs4">
<linearGradient
id="linearGradient3774">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop3776" />
<stop
style="stop-color:#f0f6e9;stop-opacity:0.98290598;"
offset="1"
id="stop3778" />
</linearGradient>
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 526.18109 : 1"
@ -24,6 +36,16 @@
inkscape:vp_z="744.09448 : 526.18109 : 1"
inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
id="perspective10" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3774"
id="radialGradient3780"
cx="300.41299"
cy="379.09206"
fx="300.41299"
fy="379.09206"
r="126.5"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
@ -32,17 +54,17 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.4"
inkscape:cx="96.087002"
inkscape:cy="157.47786"
inkscape:zoom="1.9966906"
inkscape:cx="181.06787"
inkscape:cy="89.329853"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1280"
inkscape:window-height="744"
inkscape:window-x="-4"
inkscape:window-y="1020"
inkscape:window-maximized="1" />
inkscape:window-width="1440"
inkscape:window-height="878"
inkscape:window-x="1695"
inkscape:window-y="97"
inkscape:window-maximized="0" />
<metadata
id="metadata7">
<rdf:RDF>
@ -51,7 +73,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@ -61,7 +83,7 @@
id="layer1"
transform="translate(-173.91299,-252.59206)">
<rect
style="opacity:0.98000004;fill:#eeeeee;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
style="opacity:0.98000003999999996;fill:url(#radialGradient3780);fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.44888889999999998;stroke-dasharray:none;stroke-dashoffset:0"
id="rect2816"
width="250"
height="250"
@ -69,59 +91,59 @@
y="254.09206"
ry="10" />
<path
style="fill:none;stroke:#000000;stroke-width:1.0199573px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
style="fill:none;stroke:#242c00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.49333334;stroke-miterlimit:4;stroke-dasharray:none"
d="m 175.95412,379.09206 248.91774,0"
id="path3590" />
<path
id="path3592"
d="m 300.41299,254.63319 0,248.91774"
style="fill:none;stroke:#000000;stroke-width:1.0199573px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
style="fill:none;stroke:#242c00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.49333334;stroke-miterlimit:4;stroke-dasharray:none" />
<path
id="path3594"
d="m 175.95412,348.09206 248.91774,0"
style="fill:none;stroke:#000000;stroke-width:1.01999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1.01999998, 4.07999992;stroke-dashoffset:0" />
style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:5.30000019;stroke-opacity:0.28888890000000000;stroke-dasharray:0.5,0.5;stroke-dashoffset:3.7" />
<path
style="fill:none;stroke:#000000;stroke-width:1.01999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1.01999998, 4.07999992;stroke-dashoffset:0"
style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:5.30000019;stroke-opacity:0.28888890000000000;stroke-dasharray:0.5,0.5;stroke-dashoffset:3.7"
d="m 175.95412,317.09206 248.91774,0"
id="path3596" />
<path
id="path3598"
d="m 175.95412,286.09206 248.91774,0"
style="fill:none;stroke:#000000;stroke-width:1.01999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1.01999998, 4.07999992;stroke-dashoffset:0" />
style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:5.30000019;stroke-opacity:0.28888890000000000;stroke-dasharray:0.5,0.5;stroke-dashoffset:3.7" />
<path
style="fill:none;stroke:#000000;stroke-width:1.01999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1.01999998,4.07999992;stroke-dashoffset:0;marker-start:none"
style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:5.30000019;stroke-opacity:0.28888890000000000;stroke-dasharray:0.5,0.5;stroke-dashoffset:3.7;marker-start:none"
d="m 175.95412,410.09206 248.91774,0"
id="path3600" />
<path
id="path3602"
d="m 175.95412,441.09206 248.91774,0"
style="fill:none;stroke:#000000;stroke-width:1.01999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1.01999998,4.07999992;stroke-dashoffset:0;marker-start:none" />
style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:5.30000019;stroke-opacity:0.28888890000000000;stroke-dasharray:0.5,0.5;stroke-dashoffset:3.7;marker-start:none" />
<path
style="fill:none;stroke:#000000;stroke-width:1.01999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1.01999998,4.07999992;stroke-dashoffset:0;marker-start:none"
style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:5.30000019;stroke-opacity:0.28888890000000000;stroke-dasharray:0.5,0.5;stroke-dashoffset:3.7;marker-start:none"
d="m 175.95412,472.09206 248.91774,0"
id="path3604" />
<path
style="fill:none;stroke:#000000;stroke-width:1.0199573;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:1.0199573,4.07982922;stroke-dashoffset:0"
style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.28888890000000000;stroke-miterlimit:5.30000019;stroke-dasharray:0.5,0.5;stroke-dashoffset:3.7"
d="m 269.41299,254.63319 0,248.91774"
id="path3792" />
<path
id="path3794"
d="m 238.41299,254.63319 0,248.91774"
style="fill:none;stroke:#000000;stroke-width:1.0199573;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:1.0199573,4.07982922;stroke-dashoffset:0" />
style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.28888890000000000;stroke-miterlimit:5.30000019;stroke-dasharray:0.5,0.5;stroke-dashoffset:3.7" />
<path
style="fill:none;stroke:#000000;stroke-width:1.0199573;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:1.0199573,4.07982922;stroke-dashoffset:0"
style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.28888890000000000;stroke-miterlimit:5.30000019;stroke-dasharray:0.5,0.5;stroke-dashoffset:3.7"
d="m 207.41299,254.63319 0,248.91774"
id="path3796" />
<path
style="fill:none;stroke:#000000;stroke-width:1.0199573;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:1.0199573,4.07982922;stroke-dashoffset:0"
style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.28888890000000000;stroke-miterlimit:5.30000019;stroke-dasharray:0.5,0.5;stroke-dashoffset:3.7"
d="m 331.41299,254.63319 0,248.91774"
id="path3800" />
<path
id="path3802"
d="m 362.41299,254.63319 0,248.91774"
style="fill:none;stroke:#000000;stroke-width:1.0199573;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:1.0199573,4.07982922;stroke-dashoffset:0" />
style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.28888890000000000;stroke-miterlimit:5.30000019;stroke-dasharray:0.5,0.5;stroke-dashoffset:3.7" />
<path
style="fill:none;stroke:#000000;stroke-width:1.0199573;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:1.0199573,4.07982922;stroke-dashoffset:0"
style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.28888890000000000;stroke-miterlimit:5.30000019;stroke-dasharray:0.5,0.5;stroke-dashoffset:3.7"
d="m 393.41299,254.63319 0,248.91774"
id="path3804" />
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

2
ground/openpilotgcs/src/plugins/plugins.pro
View File

@ -174,6 +174,7 @@ plugin_logging.subdir = logging
plugin_logging.depends = plugin_coreplugin
plugin_logging.depends += plugin_uavobjects
plugin_logging.depends += plugin_uavtalk
plugin_logging.depends += plugin_scope
SUBDIRS += plugin_logging
#GCS Control of UAV gadget
@ -217,6 +218,7 @@ SUBDIRS += plugin_uavsettingsimportexport
plugin_uavobjectwidgetutils.subdir = uavobjectwidgetutils
plugin_uavobjectwidgetutils.depends = plugin_coreplugin
plugin_uavobjectwidgetutils.depends += plugin_uavobjects
plugin_uavobjectwidgetutils.depends += plugin_uavobjectutil
plugin_uavobjectwidgetutils.depends += plugin_uavsettingsimportexport
SUBDIRS += plugin_uavobjectwidgetutils

2
ground/openpilotgcs/src/plugins/uavobjects/uavobjecttemplate.m
View File

@ -126,7 +126,7 @@ $(SWITCHCODE)
if msgBytesLeft > 255
msgBytesLeft = 0;
end
bufferIdx=bufferIdx+msgBytesLeft;
bufferIdx=bufferIdx+double(msgBytesLeft);
end
catch
% One of the reads failed - indicates EOF

2
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
View File

@ -553,11 +553,13 @@ void ConfigTaskWidget::objectUpdated(UAVObject *obj)
*/
bool ConfigTaskWidget::allObjectsUpdated()
{
qDebug()<<"ConfigTaskWidge:allObjectsUpdated called";
bool ret=true;
foreach(UAVObject *obj, objectUpdates.keys())
{
ret=ret & objectUpdates[obj];
}
qDebug()<<"Returned:"<<ret;
return ret;
}
/**