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

Make the input wizard detect already inverted channels and preserve them.

Browse Source
This commit is contained in:
James Cotton 2011-11-25 12:30:17 -06:00
parent fae611a01f
commit d3cc67f5c4
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -455,8 +455,15 @@ void ConfigInputWidget::wizardSetUpStep(enum wizardSteps step)
manualSettingsData=manualSettingsObj->getData(); manualSettingsData=manualSettingsObj->getData();
for(uint i=0;i<ManualControlSettings::CHANNELMAX_NUMELEM;++i) for(uint i=0;i<ManualControlSettings::CHANNELMAX_NUMELEM;++i)
{ {
manualSettingsData.ChannelMin[i]=manualSettingsData.ChannelNeutral[i]; // Preserve the inverted status
manualSettingsData.ChannelMax[i]=manualSettingsData.ChannelNeutral[i]; if(manualSettingsData.ChannelMin[i] <= manualSettingsData.ChannelMax[i]) {
manualSettingsData.ChannelMin[i]=manualSettingsData.ChannelNeutral[i];
manualSettingsData.ChannelMax[i]=manualSettingsData.ChannelNeutral[i];
} else {
// Make this detect as still inverted
manualSettingsData.ChannelMin[i]=manualSettingsData.ChannelNeutral[i] + 1;
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())); connect(manualCommandObj, SIGNAL(objectUpdated(UAVObject*)), this, SLOT(moveSticks()));
@ -466,13 +473,19 @@ void ConfigInputWidget::wizardSetUpStep(enum wizardSteps step)
dimOtherControls(true); dimOtherControls(true);
setTxMovement(nothing); setTxMovement(nothing);
extraWidgets.clear(); extraWidgets.clear();
foreach(QString name,manualSettingsObj->getFields().at(0)->getElementNames())
for (int index = 0; index < manualSettingsObj->getField("ChannelMax")->getElementNames().length(); index++)
{ {
QString name = manualSettingsObj->getField("ChannelMax")->getElementNames().at(index);
if(!name.contains("Access") && !name.contains("Flight")) if(!name.contains("Access") && !name.contains("Flight"))
{ {
QCheckBox * cb=new QCheckBox(name,this); QCheckBox * cb=new QCheckBox(name,this);
// Make sure checked status matches current one
cb->setChecked(manualSettingsData.ChannelMax[index] < manualSettingsData.ChannelMin[index]);
extraWidgets.append(cb); extraWidgets.append(cb);
m_config->checkBoxesLayout->layout()->addWidget(cb); m_config->checkBoxesLayout->layout()->addWidget(cb);
connect(cb,SIGNAL(toggled(bool)),this,SLOT(invertControls())); connect(cb,SIGNAL(toggled(bool)),this,SLOT(invertControls()));
} }
} }
@ -711,10 +724,19 @@ void ConfigInputWidget::identifyLimits()
manualCommandData=manualCommandObj->getData(); manualCommandData=manualCommandObj->getData();
for(uint i=0;i<ManualControlSettings::CHANNELMAX_NUMELEM;++i) for(uint i=0;i<ManualControlSettings::CHANNELMAX_NUMELEM;++i)
{ {
if(manualSettingsData.ChannelMin[i]>manualCommandData.Channel[i]) if(manualSettingsData.ChannelMin[i] <= manualSettingsData.ChannelMax[i]) {
manualSettingsData.ChannelMin[i]=manualCommandData.Channel[i]; // Non inverted channel
if(manualSettingsData.ChannelMax[i]<manualCommandData.Channel[i]) if(manualSettingsData.ChannelMin[i]>manualCommandData.Channel[i])
manualSettingsData.ChannelMax[i]=manualCommandData.Channel[i]; manualSettingsData.ChannelMin[i]=manualCommandData.Channel[i];
if(manualSettingsData.ChannelMax[i]<manualCommandData.Channel[i])
manualSettingsData.ChannelMax[i]=manualCommandData.Channel[i];
} else {
// Inverted channel
if(manualSettingsData.ChannelMax[i]>manualCommandData.Channel[i])
manualSettingsData.ChannelMax[i]=manualCommandData.Channel[i];
if(manualSettingsData.ChannelMin[i]<manualCommandData.Channel[i])
manualSettingsData.ChannelMin[i]=manualCommandData.Channel[i];
}
} }
manualSettingsObj->setData(manualSettingsData); manualSettingsObj->setData(manualSettingsData);
} }