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

OP-1781 Minor changes according to review results. Leave the stick don't move and 1 flight mode issues to tomorrow

Browse Source
This commit is contained in:
samguns 2015-03-18 23:00:17 +08:00
parent 8b1e7dee58
commit 30a40140be
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -901,12 +901,16 @@ void ConfigInputWidget::setChannel(int newChan)
void ConfigInputWidget::nextChannel() void ConfigInputWidget::nextChannel()
{ {
QList <int> order; QList <int> order;
if (transmitterType == heli) { switch (transmitterType) {
case heli:
order = heliChannelOrder; order = heliChannelOrder;
} else if (transmitterType == ground) { break;
case ground:
order = groundChannelOrder; order = groundChannelOrder;
} else { break;
default:
order = acroChannelOrder; order = acroChannelOrder;
break;
} }
if (currentChannelNum == -1) { if (currentChannelNum == -1) {
@ -1677,16 +1681,15 @@ void ConfigInputWidget::simpleCalibration(bool enable)
manualCommandData = manualCommandObj->getData(); manualCommandData = manualCommandObj->getData();
manualSettingsData = manualSettingsObj->getData(); manualSettingsData = manualSettingsObj->getData();
QMessageBox msgBox; QMessageBox::StandardButton reply;
QPushButton *yesButton = msgBox.addButton(tr("Yes"), QMessageBox::YesRole); reply = QMessageBox::question(this, tr("Ground vehicle"),
QPushButton *noButton = msgBox.addButton(tr("No"), QMessageBox::NoRole); tr("<p>Are you configuring a transmitter for your <b>ground vehicle</b> with reversible motor<br>"
msgBox.setText(tr("<p>Are you configuring a transmitter for your <b>ground vehicle</b> with reversible motor<br>" "controlled by throttle stick?</p>"
"controlled by throttle stick?</p>" "<p>If so, please make sure you've centered throttle control and press <b>Yes</b> button. Otherwise, press No.</p>"
"<p>If so, please make sure you've centered throttle control and press <b>Yes</b> button. Otherwise, press No.</p>")); "<p>Attention, if you press <b>Yes</b>, then the flight modes will be set to 1.</p>"),
msgBox.setDefaultButton(noButton); QMessageBox::Yes | QMessageBox::No);
msgBox.exec();
if (msgBox.clickedButton() == yesButton) { if (reply == QMessageBox::Yes) {
transmitterType = ground; transmitterType = ground;
manualSettingsData.ChannelNeutral[ManualControlSettings::CHANNELNEUTRAL_THROTTLE] = manualSettingsData.ChannelNeutral[ManualControlSettings::CHANNELNEUTRAL_THROTTLE] =
manualCommandData.Channel[ManualControlSettings::CHANNELNUMBER_THROTTLE]; manualCommandData.Channel[ManualControlSettings::CHANNELNUMBER_THROTTLE];

6
ground/openpilotgcs/src/plugins/config/input_wizard.ui
View File

@ -14,7 +14,7 @@
<item> <item>
<widget class="QStackedWidget" name="pagesStack"> <widget class="QStackedWidget" name="pagesStack">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="welcomePage"> <widget class="QWidget" name="welcomePage">
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
@ -67,7 +67,7 @@ You can press 'back' at any time to return to the previous screen or press 'Canc
<item> <item>
<widget class="QRadioButton" name="typeGround"> <widget class="QRadioButton" name="typeGround">
<property name="text"> <property name="text">
<string>Surface: has reversible motor controlled by throttle stick</string> <string>Surface: has reversible motor controlled by throttle stick, plus yaw control (2 channels)</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -81,7 +81,7 @@ You can press 'back' at any time to return to the previous screen or press 'Canc
<item> <item>
<widget class="QLabel" name="typePageFooter"> <widget class="QLabel" name="typePageFooter">
<property name="text"> <property name="text">
<string>If selecting the Helicopter option, please engage throttle hold now.</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If selecting the Helicopter option, please engage throttle hold now.&lt;/p&gt;&lt;p&gt;If selecting the Surface option, the flight mode will be set to be only one mode.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>