rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-21 11:54:15 +01:00
Code Issues Releases Activity

LP-478 Set default flightmode number to 1 and remove unneeded forceOneFlightMode()

Browse Source
This commit is contained in:
Laurent Lalanne 2017-01-22 00:00:14 +01:00
parent a0a2f30788
commit 184ac1e4e7
2 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ground/gcs/src/plugins/config/configinputwidget.cpp
View File

@ -58,7 +58,7 @@
#define MAX_INPUT_US 2500 #define MAX_INPUT_US 2500
#define CHANNEL_NUMBER_NONE 0 #define CHANNEL_NUMBER_NONE 0
#define DEFAULT_FLIGHT_MODE_NUMBER 0 #define DEFAULT_FLIGHT_MODE_NUMBER 1
ConfigInputWidget::ConfigInputWidget(QWidget *parent) : ConfigInputWidget::ConfigInputWidget(QWidget *parent) :
ConfigTaskWidget(parent), ConfigTaskWidget(parent),
@ -662,12 +662,8 @@ void ConfigInputWidget::wzNext()
throttleError = false; throttleError = false;
checkThrottleRange(); checkThrottleRange();
// Force flight mode number to be 1 if 2 CH ground vehicle was selected
if (transmitterType == ground) {
forceOneFlightMode();
}
manualSettingsObj->setData(manualSettingsData); manualSettingsObj->setData(manualSettingsData);
// move to Arming Settings tab // move to Arming Settings tab
ui->stackedWidget->setCurrentIndex(0); ui->stackedWidget->setCurrentIndex(0);
ui->tabWidget->setCurrentIndex(3); ui->tabWidget->setCurrentIndex(3);
@ -917,12 +913,6 @@ void ConfigInputWidget::wizardTearDownStep(enum wizardSteps step)
disconnect(receiverActivityObj, SIGNAL(objectUpdated(UAVObject *)), this, SLOT(identifyControls())); disconnect(receiverActivityObj, SIGNAL(objectUpdated(UAVObject *)), this, SLOT(identifyControls()));
wizardUi->wzNext->setEnabled(true); wizardUi->wzNext->setEnabled(true);
setTxMovement(nothing); setTxMovement(nothing);
/* If flight mode stick isn't identified, force flight mode number to be 1 */
manualSettingsData = manualSettingsObj->getData();
if (manualSettingsData.ChannelGroups[ManualControlSettings::CHANNELNUMBER_FLIGHTMODE] ==
ManualControlSettings::CHANNELGROUPS_NONE) {
forceOneFlightMode();
}
break; break;
case wizardIdentifyCenter: case wizardIdentifyCenter:
manualCommandData = manualCommandObj->getData(); manualCommandData = manualCommandObj->getData();
@ -2013,11 +2003,6 @@ void ConfigInputWidget::simpleCalibration(bool enable)
restoreMdataSingle(manualCommandObj, &manualControlMdata); restoreMdataSingle(manualCommandObj, &manualControlMdata);
// Force flight mode number to be 1 if 2 channel ground vehicle was confirmed
if (transmitterType == ground) {
forceOneFlightMode();
}
for (unsigned int i = 0; i < ManualControlSettings::CHANNELNUMBER_RSSI; i++) { for (unsigned int i = 0; i < ManualControlSettings::CHANNELNUMBER_RSSI; i++) {
if ((i == ManualControlSettings::CHANNELNUMBER_FLIGHTMODE) || (i == ManualControlSettings::CHANNELNUMBER_THROTTLE)) { if ((i == ManualControlSettings::CHANNELNUMBER_FLIGHTMODE) || (i == ManualControlSettings::CHANNELNUMBER_THROTTLE)) {
adjustSpecialNeutrals(); adjustSpecialNeutrals();
@ -2148,13 +2133,6 @@ void ConfigInputWidget::resetActuatorSettings()
} }
} }
void ConfigInputWidget::forceOneFlightMode()
{
manualSettingsData = manualSettingsObj->getData();
manualSettingsData.FlightModeNumber = 1;
manualSettingsObj->setData(manualSettingsData);
}
void ConfigInputWidget::updateReceiverActivityStatus() void ConfigInputWidget::updateReceiverActivityStatus()
{ {
ReceiverActivity *receiverActivity = ReceiverActivity::GetInstance(getObjectManager()); ReceiverActivity *receiverActivity = ReceiverActivity::GetInstance(getObjectManager());

1
ground/gcs/src/plugins/config/configinputwidget.h
View File

@ -228,7 +228,6 @@ private slots:
void resetChannelSettings(); void resetChannelSettings();
void resetFlightModeSettings(); void resetFlightModeSettings();
void resetActuatorSettings(); void resetActuatorSettings();
void forceOneFlightMode();
void updateReceiverActivityStatus(); void updateReceiverActivityStatus();
void failsafeFlightModeChanged(int index); void failsafeFlightModeChanged(int index);