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

Input configuration: Make the sticks move during the limit setting. Makes the

Browse Source 
UI more intuitive.
This commit is contained in:
James Cotton 2011-10-26 22:04:24 -05:00
parent a8f0c5a622
commit eb5e053a3e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -464,7 +464,7 @@ void ConfigInputWidget::wizardSetUpStep(enum wizardSteps step)
case wizardIdentifyLimits: case wizardIdentifyLimits:
{ {
dimOtherControls(false); dimOtherControls(false);
setTxMovement(moveAll); setTxMovement(nothing);
m_config->wzText->setText(QString(tr("Please move all controls to their maximum extents on both directions and press next when ready"))); m_config->wzText->setText(QString(tr("Please move all controls to their maximum extents on both directions and press next when ready")));
fastMdata(); fastMdata();
manualSettingsData=manualSettingsObj->getData(); manualSettingsData=manualSettingsObj->getData();
@ -474,6 +474,7 @@ void ConfigInputWidget::wizardSetUpStep(enum wizardSteps step)
manualSettingsData.ChannelMax[i]=manualSettingsData.ChannelNeutral[i]; manualSettingsData.ChannelMax[i]=manualSettingsData.ChannelNeutral[i];
} }
connect(manualCommandObj, SIGNAL(objectUpdated(UAVObject*)), this, SLOT(identifyLimits())); connect(manualCommandObj, SIGNAL(objectUpdated(UAVObject*)), this, SLOT(identifyLimits()));
connect(manualCommandObj, SIGNAL(objectUpdated(UAVObject*)), this, SLOT(moveSticks()));
} }
break; break;
case wizardIdentifyInverted: case wizardIdentifyInverted:
@ -570,6 +571,7 @@ void ConfigInputWidget::wizardTearDownStep(enum wizardSteps step)
break; break;
case wizardIdentifyLimits: case wizardIdentifyLimits:
disconnect(manualCommandObj, SIGNAL(objectUpdated(UAVObject*)), this, SLOT(identifyLimits())); disconnect(manualCommandObj, SIGNAL(objectUpdated(UAVObject*)), this, SLOT(identifyLimits()));
disconnect(manualCommandObj, SIGNAL(objectUpdated(UAVObject*)), this, SLOT(moveSticks()));
manualSettingsObj->setData(manualSettingsData); manualSettingsObj->setData(manualSettingsData);
restoreMdata(); restoreMdata();
break; break;
@ -734,6 +736,7 @@ void ConfigInputWidget::identifyLimits()
if(manualSettingsData.ChannelMax[i]<manualCommandData.Channel[i]) if(manualSettingsData.ChannelMax[i]<manualCommandData.Channel[i])
manualSettingsData.ChannelMax[i]=manualCommandData.Channel[i]; manualSettingsData.ChannelMax[i]=manualCommandData.Channel[i];
} }
manualSettingsObj->setData(manualSettingsData);
} }
void ConfigInputWidget::setMoveFromCommand(int command) void ConfigInputWidget::setMoveFromCommand(int command)
{ {