mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-03-15 07:29:15 +01:00
OP-1781 Minor changes according to review results. Leave the stick don't move and 1 flight mode issues to tomorrow
This commit is contained in:
parent
8b1e7dee58
commit
30a40140be
@ -901,12 +901,16 @@ void ConfigInputWidget::setChannel(int newChan)
|
||||
void ConfigInputWidget::nextChannel()
|
||||
{
|
||||
QList <int> order;
|
||||
if (transmitterType == heli) {
|
||||
switch (transmitterType) {
|
||||
case heli:
|
||||
order = heliChannelOrder;
|
||||
} else if (transmitterType == ground) {
|
||||
break;
|
||||
case ground:
|
||||
order = groundChannelOrder;
|
||||
} else {
|
||||
break;
|
||||
default:
|
||||
order = acroChannelOrder;
|
||||
break;
|
||||
}
|
||||
|
||||
if (currentChannelNum == -1) {
|
||||
@ -1677,16 +1681,15 @@ void ConfigInputWidget::simpleCalibration(bool enable)
|
||||
manualCommandData = manualCommandObj->getData();
|
||||
manualSettingsData = manualSettingsObj->getData();
|
||||
|
||||
QMessageBox msgBox;
|
||||
QPushButton *yesButton = msgBox.addButton(tr("Yes"), QMessageBox::YesRole);
|
||||
QPushButton *noButton = msgBox.addButton(tr("No"), QMessageBox::NoRole);
|
||||
msgBox.setText(tr("<p>Are you configuring a transmitter for your <b>ground vehicle</b> with reversible motor<br>"
|
||||
"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>"));
|
||||
msgBox.setDefaultButton(noButton);
|
||||
msgBox.exec();
|
||||
QMessageBox::StandardButton reply;
|
||||
reply = QMessageBox::question(this, tr("Ground vehicle"),
|
||||
tr("<p>Are you configuring a transmitter for your <b>ground vehicle</b> with reversible motor<br>"
|
||||
"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>Attention, if you press <b>Yes</b>, then the flight modes will be set to 1.</p>"),
|
||||
QMessageBox::Yes | QMessageBox::No);
|
||||
|
||||
if (msgBox.clickedButton() == yesButton) {
|
||||
if (reply == QMessageBox::Yes) {
|
||||
transmitterType = ground;
|
||||
manualSettingsData.ChannelNeutral[ManualControlSettings::CHANNELNEUTRAL_THROTTLE] =
|
||||
manualCommandData.Channel[ManualControlSettings::CHANNELNUMBER_THROTTLE];
|
||||
|
@ -14,7 +14,7 @@
|
||||
<item>
|
||||
<widget class="QStackedWidget" name="pagesStack">
|
||||
<property name="currentIndex">
|
||||
<number>0</number>
|
||||
<number>1</number>
|
||||
</property>
|
||||
<widget class="QWidget" name="welcomePage">
|
||||
<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>
|
||||
<widget class="QRadioButton" name="typeGround">
|
||||
<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>
|
||||
</widget>
|
||||
</item>
|
||||
@ -81,7 +81,7 @@ You can press 'back' at any time to return to the previous screen or press 'Canc
|
||||
<item>
|
||||
<widget class="QLabel" name="typePageFooter">
|
||||
<property name="text">
|
||||
<string>If selecting the Helicopter option, please engage throttle hold now.</string>
|
||||
<string><html><head/><body><p>If selecting the Helicopter option, please engage throttle hold now.</p><p>If selecting the Surface option, the flight mode will be set to be only one mode.</p></body></html></string>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
|
Loading…
x
Reference in New Issue
Block a user