rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-30 15:52:12 +01:00
Code Issues Releases Activity

OP-456 OP-459 OP-460 and OP-461 fixed.

Browse Source
This commit is contained in:
elafargue 2011-04-30 23:28:11 +02:00
parent 693a9dd03e
commit b2f62e724b
5 changed files with 323 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

186
ground/openpilotgcs/src/plugins/config/airframe.ui
View File

@ -73,7 +73,7 @@
<item>
<widget class="QStackedWidget" name="airframesWidget">
<property name="currentIndex">
<number>0</number>
<number>1</number>
</property>
<widget class="QWidget" name="fixedWing">
<property name="enabled">
@ -464,7 +464,11 @@
<widget class="QWidget" name="multiRotor">
<layout class="QVBoxLayout" name="verticalLayout_4" stretch="1">
<item>
<layout class="QVBoxLayout" name="verticalLayout_8" stretch="0,0,0,0">
<layout class="QVBoxLayout" name="verticalLayout_8" stretch="0,0,0">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_7" stretch="0,0">
<item>
<layout class="QVBoxLayout" name="verticalLayout_24">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
@ -497,7 +501,7 @@
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_7" stretch="0,0,0">
<layout class="QHBoxLayout" name="horizontalLayout_22">
<item>
<layout class="QVBoxLayout" name="verticalLayout_20">
<item>
@ -616,7 +620,7 @@ Typical values are 100% for + configuration and 50% for X configuration on quads
Typical value is 50% for + or X configuration on quads.</string>
</property>
<property name="minimum">
<number>-100</number>
<number>0</number>
</property>
<property name="maximum">
<number>100</number>
@ -649,17 +653,24 @@ Typical value is 50% for + or X configuration on quads.</string>
</layout>
</item>
<item>
<spacer name="horizontalSpacer_13">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<widget class="QGraphicsView" name="quadShape">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeHint" stdset="0">
<property name="minimumSize">
<size>
<width>40</width>
<height>20</height>
<width>110</width>
<height>110</height>
</size>
</property>
</spacer>
</widget>
</item>
</layout>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_12">
@ -718,10 +729,11 @@ Typical value is 50% for + or X configuration on quads.</string>
</property>
<property name="minimumSize">
<size>
<width>110</width>
<height>110</height>
<width>120</width>
<height>120</height>
</size>
</property>
<zorder></zorder>
</widget>
</item>
<item>
@ -736,13 +748,23 @@ Typical value is 50% for + or X configuration on quads.</string>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_6" stretch="1,3,4">
<layout class="QHBoxLayout" name="horizontalLayout_6" stretch="1,3">
<property name="spacing">
<number>10</number>
</property>
<item>
<layout class="QVBoxLayout" name="verticalLayout_10">
<item>
<widget class="QLabel" name="label_23">
<property name="text">
<string>Tricopter Yaw Ch</string>
<string>Tricopter Yaw</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>channel:</string>
</property>
</widget>
</item>
@ -783,7 +805,7 @@ Typical value is 50% for + or X configuration on quads.</string>
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Motors</string>
<string>Motor output channels:</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_10">
<property name="spacing">
@ -969,22 +991,6 @@ p, li { white-space: pre-wrap; }
</layout>
</widget>
</item>
<item>
<widget class="QGraphicsView" name="quadShape">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>110</width>
<height>110</height>
</size>
</property>
</widget>
</item>
</layout>
</item>
<item>
@ -2223,8 +2229,120 @@ p, li { white-space: pre-wrap; }
<y>214</y>
</hint>
<hint type="destinationlabel">
<x>118</x>
<y>215</y>
<x>127</x>
<y>214</y>
</hint>
</hints>
</connection>
<connection>
<sender>mrRollMixLevel</sender>
<signal>valueChanged(int)</signal>
<receiver>label_43</receiver>
<slot>setNum(int)</slot>
<hints>
<hint type="sourcelabel">
<x>42</x>
<y>220</y>
</hint>
<hint type="destinationlabel">
<x>43</x>
<y>171</y>
</hint>
</hints>
</connection>
<connection>
<sender>mrPitchMixLevel</sender>
<signal>valueChanged(int)</signal>
<receiver>label_44</receiver>
<slot>setNum(int)</slot>
<hints>
<hint type="sourcelabel">
<x>83</x>
<y>228</y>
</hint>
<hint type="destinationlabel">
<x>82</x>
<y>168</y>
</hint>
</hints>
</connection>
<connection>
<sender>mrYawMixLevel</sender>
<signal>valueChanged(int)</signal>
<receiver>label_45</receiver>
<slot>setNum(int)</slot>
<hints>
<hint type="sourcelabel">
<x>120</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>121</x>
<y>172</y>
</hint>
</hints>
</connection>
<connection>
<sender>elevonSlider1</sender>
<signal>valueChanged(int)</signal>
<receiver>label_18</receiver>
<slot>setNum(int)</slot>
<hints>
<hint type="sourcelabel">
<x>236</x>
<y>253</y>
</hint>
<hint type="destinationlabel">
<x>226</x>
<y>310</y>
</hint>
</hints>
</connection>
<connection>
<sender>elevonSlider2</sender>
<signal>valueChanged(int)</signal>
<receiver>label_25</receiver>
<slot>setNum(int)</slot>
<hints>
<hint type="sourcelabel">
<x>306</x>
<y>273</y>
</hint>
<hint type="destinationlabel">
<x>301</x>
<y>315</y>
</hint>
</hints>
</connection>
<connection>
<sender>customFFSlider</sender>
<signal>valueChanged(int)</signal>
<receiver>customFeedForwardValue</receiver>
<slot>setNum(int)</slot>
<hints>
<hint type="sourcelabel">
<x>651</x>
<y>112</y>
</hint>
<hint type="destinationlabel">
<x>600</x>
<y>112</y>
</hint>
</hints>
</connection>
<connection>
<sender>customFFMaxAccel</sender>
<signal>valueChanged(int)</signal>
<receiver>label_OSD</receiver>
<slot>setNum(int)</slot>
<hints>
<hint type="sourcelabel">
<x>659</x>
<y>211</y>
</hint>
<hint type="destinationlabel">
<x>581</x>
<y>218</y>
</hint>
</hints>
</connection>

2
ground/openpilotgcs/src/plugins/coreplugin/coreconstants.h
View File

@ -35,6 +35,8 @@ namespace Constants {
#define GCS_VERSION_MAJOR 1
#define GCS_VERSION_MINOR 0
#define GCS_VERSION_RELEASE 0
const char * const GCS_VERSION_TYPE = "Beta";
const char * const GCS_VERSION_CODENAME = "Pascal";
#define STRINGIFY_INTERNAL(x) #x
#define STRINGIFY(x) STRINGIFY_INTERNAL(x)

2
ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp
View File

@ -289,7 +289,7 @@ void MainWindow::extensionsInitialized()
if ( ! qs->allKeys().count() ){
QMessageBox msgBox;
msgBox.setText(tr("No configuration file could be found."));
msgBox.setInformativeText(tr("Do you want to load an example configuration?"));
msgBox.setInformativeText(tr("Do you want to load the default configuration?"));
msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
msgBox.setDefaultButton(QMessageBox::Yes);
if ( msgBox.exec() == QMessageBox::Yes ){

4
ground/openpilotgcs/src/plugins/coreplugin/versiondialog.cpp
View File

@ -69,7 +69,7 @@ VersionDialog::VersionDialog(QWidget *parent)
#endif
const QString description = tr(
"<h3>OpenPilot GCS %1</h3>"
"<h3>OpenPilot GCS %1 %9 (%10)</h3>"
"Based on Qt %2 (%3 bit)<br/>"
"<br/>"
"Built on %4 at %5<br />"
@ -87,7 +87,7 @@ VersionDialog::VersionDialog(QWidget *parent)
"PARTICULAR PURPOSE.</small><br/>")
.arg(version, QLatin1String(QT_VERSION_STR), QString::number(QSysInfo::WordSize),
QLatin1String(__DATE__), QLatin1String(__TIME__), QLatin1String(GCS_YEAR),
(QLatin1String(GCS_AUTHOR)), ideRev);
(QLatin1String(GCS_AUTHOR)), ideRev).arg(QLatin1String(GCS_VERSION_TYPE), QLatin1String(GCS_VERSION_CODENAME));
QLabel *copyRightLabel = new QLabel(description);
copyRightLabel->setWordWrap(true);

1
ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
View File

@ -441,6 +441,7 @@ void UploaderGadgetWidget::systemRescue()
}
rescueStep = RESCUE_POWER1;
log("Connect Power in 2 second...");
log("(not required on CopterControl)");
QTimer::singleShot(1000, this, SLOT(systemRescue()));
break;
case RESCUE_POWER1: