mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-03-16 08:29:15 +01:00
GCS-Made the UI limits board specific
This commit is contained in:
parent
4d257860c8
commit
205d370eec
@ -82,12 +82,12 @@ ConfigInputWidget::ConfigInputWidget(QWidget *parent) : ConfigTaskWidget(parent)
|
||||
connect(m_config->wzBack,SIGNAL(clicked()),this,SLOT(wzBack()));
|
||||
|
||||
m_config->stackedWidget->setCurrentIndex(0);
|
||||
addUAVObjectToWidgetRelation("ManualControlSettings","FlightModePosition",m_config->fmsModePos1,0);
|
||||
addUAVObjectToWidgetRelation("ManualControlSettings","FlightModePosition",m_config->fmsModePos2,1);
|
||||
addUAVObjectToWidgetRelation("ManualControlSettings","FlightModePosition",m_config->fmsModePos3,2);
|
||||
addUAVObjectToWidgetRelation("ManualControlSettings","FlightModePosition",m_config->fmsModePos4,3);
|
||||
addUAVObjectToWidgetRelation("ManualControlSettings","FlightModePosition",m_config->fmsModePos5,4);
|
||||
addUAVObjectToWidgetRelation("ManualControlSettings","FlightModePosition",m_config->fmsModePos6,5);
|
||||
addUAVObjectToWidgetRelation("ManualControlSettings","FlightModePosition",m_config->fmsModePos1,0,1,true);
|
||||
addUAVObjectToWidgetRelation("ManualControlSettings","FlightModePosition",m_config->fmsModePos2,1,1,true);
|
||||
addUAVObjectToWidgetRelation("ManualControlSettings","FlightModePosition",m_config->fmsModePos3,2,1,true);
|
||||
addUAVObjectToWidgetRelation("ManualControlSettings","FlightModePosition",m_config->fmsModePos4,3,1,true);
|
||||
addUAVObjectToWidgetRelation("ManualControlSettings","FlightModePosition",m_config->fmsModePos5,4,1,true);
|
||||
addUAVObjectToWidgetRelation("ManualControlSettings","FlightModePosition",m_config->fmsModePos6,5,1,true);
|
||||
addUAVObjectToWidgetRelation("ManualControlSettings","FlightModeNumber",m_config->fmsPosNum);
|
||||
|
||||
addUAVObjectToWidgetRelation("ManualControlSettings","Stabilization1Settings",m_config->fmsSsPos1Roll,"Roll");
|
||||
|
@ -113,12 +113,22 @@ void UAVObjectField::limitsInitialize(const QString &limits)
|
||||
quint32 index=0;
|
||||
foreach (QString str, stringPerElement) {
|
||||
QString _str=str.trimmed();
|
||||
if(_str.isEmpty())
|
||||
continue;
|
||||
QStringList valuesPerElement=_str.split(":");
|
||||
LimitStruct lstruc;
|
||||
bool b1=valuesPerElement.at(0).startsWith("%");
|
||||
bool b2=(int)(index)<(int)numElements;
|
||||
if(b1 && b2)
|
||||
bool b3=valuesPerElement.at(0).size()==3;
|
||||
bool auxb;
|
||||
valuesPerElement.at(0).mid(1,4).toInt(&auxb,16);
|
||||
bool b4=((valuesPerElement.at(0).size())==7 && auxb);
|
||||
if(b1 && b2 && (b3 || b4))
|
||||
{
|
||||
if(b4)
|
||||
lstruc.board=valuesPerElement.at(0).mid(1,4).toInt(&auxb,16);
|
||||
else
|
||||
lstruc.board=0;
|
||||
if(valuesPerElement.at(0).right(2)=="EQ")
|
||||
lstruc.type=EQUAL;
|
||||
else if(valuesPerElement.at(0).right(2)=="NE")
|
||||
@ -140,7 +150,7 @@ void UAVObjectField::limitsInitialize(const QString &limits)
|
||||
case UINT8:
|
||||
case UINT16:
|
||||
case UINT32:
|
||||
case BITFIELD:
|
||||
case BITFIELD:
|
||||
lstruc.values.append((quint32)value.toULong());
|
||||
break;
|
||||
case INT8:
|
||||
@ -170,14 +180,18 @@ void UAVObjectField::limitsInitialize(const QString &limits)
|
||||
qDebug()<<"limits parsing failed (property doesn't start with %) on UAVObjectField"<<name;
|
||||
else if(!b2)
|
||||
qDebug()<<"limits parsing failed (index>numelements) on UAVObjectField"<<name<<"index"<<index<<"numElements"<<numElements;
|
||||
else if(!b3 || !b4 )
|
||||
qDebug()<<"limits parsing failed limit not starting with %XX or %YYYYXX where XX is the limit type and YYYY is the board type on UAVObjectField"<<name;
|
||||
}
|
||||
}
|
||||
}
|
||||
bool UAVObjectField::isWithinLimits(QVariant var,quint32 index)
|
||||
bool UAVObjectField::isWithinLimits(QVariant var,quint32 index, int board)
|
||||
{
|
||||
if(!elementLimits.keys().contains(index))
|
||||
return true;
|
||||
LimitStruct struc=elementLimits.value(index);
|
||||
if((struc.board!=board) && board!=0 && struc.board!=0)
|
||||
return true;
|
||||
switch(struc.type)
|
||||
{
|
||||
case EQUAL:
|
||||
@ -384,11 +398,13 @@ bool UAVObjectField::isWithinLimits(QVariant var,quint32 index)
|
||||
return true;
|
||||
}
|
||||
|
||||
QVariant UAVObjectField::getMaxLimit(quint32 index)
|
||||
QVariant UAVObjectField::getMaxLimit(quint32 index,int board)
|
||||
{
|
||||
if(!elementLimits.keys().contains(index))
|
||||
return QVariant();
|
||||
LimitStruct struc=elementLimits.value(index);
|
||||
if((struc.board!=board) && board!=0 && struc.board!=0)
|
||||
return QVariant();
|
||||
switch(struc.type)
|
||||
{
|
||||
case EQUAL:
|
||||
@ -409,11 +425,13 @@ QVariant UAVObjectField::getMaxLimit(quint32 index)
|
||||
}
|
||||
return QVariant();
|
||||
}
|
||||
QVariant UAVObjectField::getMinLimit(quint32 index)
|
||||
QVariant UAVObjectField::getMinLimit(quint32 index, int board)
|
||||
{
|
||||
if(!elementLimits.keys().contains(index))
|
||||
return QVariant();
|
||||
LimitStruct struc=elementLimits.value(index);
|
||||
if((struc.board!=board) && board!=0 && struc.board!=0)
|
||||
return QVariant();
|
||||
switch(struc.type)
|
||||
{
|
||||
case EQUAL:
|
||||
|
@ -48,6 +48,7 @@ public:
|
||||
{
|
||||
LimitType type;
|
||||
QList<QVariant> values;
|
||||
int board;
|
||||
} LimitStruct;
|
||||
|
||||
UAVObjectField(const QString& name, const QString& units, FieldType type, quint32 numElements, const QStringList& options,const QString& limits=QString());
|
||||
@ -74,9 +75,9 @@ public:
|
||||
bool isText();
|
||||
QString toString();
|
||||
|
||||
bool isWithinLimits(QVariant var, quint32 index);
|
||||
QVariant getMaxLimit(quint32 index);
|
||||
QVariant getMinLimit(quint32 index);
|
||||
bool isWithinLimits(QVariant var, quint32 index, int board=0);
|
||||
QVariant getMaxLimit(quint32 index, int board=0);
|
||||
QVariant getMinLimit(quint32 index, int board=0);
|
||||
signals:
|
||||
void fieldUpdated(UAVObjectField* field);
|
||||
|
||||
|
@ -37,6 +37,7 @@ ConfigTaskWidget::ConfigTaskWidget(QWidget *parent) : QWidget(parent),isConnecte
|
||||
pm = ExtensionSystem::PluginManager::instance();
|
||||
objManager = pm->getObject<UAVObjectManager>();
|
||||
TelemetryManager* telMngr = pm->getObject<TelemetryManager>();
|
||||
utilMngr = pm->getObject<UAVObjectUtilManager>();
|
||||
connect(telMngr, SIGNAL(connected()), this, SLOT(onAutopilotConnect()));
|
||||
connect(telMngr, SIGNAL(disconnected()), this, SLOT(onAutopilotDisconnect()));
|
||||
connect(telMngr, SIGNAL(connected()), this, SIGNAL(autoPilotConnected()));
|
||||
@ -226,9 +227,15 @@ void ConfigTaskWidget::onAutopilotDisconnect()
|
||||
|
||||
void ConfigTaskWidget::onAutopilotConnect()
|
||||
{
|
||||
if (utilMngr)
|
||||
currentBoard = utilMngr->getBoardModel();//TODO REMEMBER TO ADD THIS TO FORCE CONNECTED FUNC ON CC3D_RELEASE
|
||||
invalidateObjects();
|
||||
dirty=false;
|
||||
isConnected=true;
|
||||
foreach(objectToWidget * ow,objOfInterest)
|
||||
{
|
||||
loadWidgetLimits(ow->widget,ow->field,ow->index,ow->isLimited,ow->scale);
|
||||
}
|
||||
enableControls(true);
|
||||
refreshWidgetsValues();
|
||||
}
|
||||
@ -1057,7 +1064,7 @@ void ConfigTaskWidget::checkWidgetsLimits(QWidget * widget,UAVObjectField * fiel
|
||||
{
|
||||
if(!hasLimits)
|
||||
return;
|
||||
if(!field->isWithinLimits(value,index))
|
||||
if(!field->isWithinLimits(value,index,currentBoard))
|
||||
{
|
||||
if(!widget->property("styleBackup").isValid())
|
||||
widget->setProperty("styleBackup",widget->styleSheet());
|
||||
@ -1131,7 +1138,7 @@ void ConfigTaskWidget::loadWidgetLimits(QWidget * widget,UAVObjectField * field,
|
||||
{
|
||||
foreach(QString str,option)
|
||||
{
|
||||
if(field->isWithinLimits(str,index))
|
||||
if(field->isWithinLimits(str,index,currentBoard))
|
||||
cb->addItem(str);
|
||||
}
|
||||
}
|
||||
@ -1144,33 +1151,33 @@ void ConfigTaskWidget::loadWidgetLimits(QWidget * widget,UAVObjectField * field,
|
||||
{
|
||||
if(field->getMaxLimit(index).isValid())
|
||||
{
|
||||
cb->setMaximum((double)(field->getMaxLimit(index).toDouble()/scale));
|
||||
cb->setMaximum((double)(field->getMaxLimit(index,currentBoard).toDouble()/scale));
|
||||
}
|
||||
if(field->getMinLimit(index).isValid())
|
||||
if(field->getMinLimit(index,currentBoard).isValid())
|
||||
{
|
||||
cb->setMinimum((double)(field->getMinLimit(index).toDouble()/scale));
|
||||
cb->setMinimum((double)(field->getMinLimit(index,currentBoard).toDouble()/scale));
|
||||
}
|
||||
}
|
||||
else if(QSpinBox * cb=qobject_cast<QSpinBox *>(widget))
|
||||
{
|
||||
if(field->getMaxLimit(index).isValid())
|
||||
if(field->getMaxLimit(index,currentBoard).isValid())
|
||||
{
|
||||
cb->setMaximum((int)qRound(field->getMaxLimit(index).toDouble()/scale));
|
||||
cb->setMaximum((int)qRound(field->getMaxLimit(index,currentBoard).toDouble()/scale));
|
||||
}
|
||||
if(field->getMinLimit(index).isValid())
|
||||
if(field->getMinLimit(index,currentBoard).isValid())
|
||||
{
|
||||
cb->setMinimum((int)qRound(field->getMinLimit(index).toDouble()/scale));
|
||||
cb->setMinimum((int)qRound(field->getMinLimit(index,currentBoard).toDouble()/scale));
|
||||
}
|
||||
}
|
||||
else if(QSlider * cb=qobject_cast<QSlider *>(widget))
|
||||
{
|
||||
if(field->getMaxLimit(index).isValid())
|
||||
if(field->getMaxLimit(index,currentBoard).isValid())
|
||||
{
|
||||
cb->setMaximum((int)qRound(field->getMaxLimit(index).toDouble()/scale));
|
||||
cb->setMaximum((int)qRound(field->getMaxLimit(index,currentBoard).toDouble()/scale));
|
||||
}
|
||||
if(field->getMinLimit(index).isValid())
|
||||
if(field->getMinLimit(index,currentBoard).isValid())
|
||||
{
|
||||
cb->setMinimum((int)(field->getMinLimit(index).toDouble()/scale));
|
||||
cb->setMinimum((int)(field->getMinLimit(index,currentBoard).toDouble()/scale));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -144,12 +144,14 @@ private slots:
|
||||
void defaultButtonClicked();
|
||||
void reloadButtonClicked();
|
||||
private:
|
||||
int currentBoard;
|
||||
bool isConnected;
|
||||
bool allowWidgetUpdates;
|
||||
QStringList objectsList;
|
||||
QList <objectToWidget*> objOfInterest;
|
||||
ExtensionSystem::PluginManager *pm;
|
||||
UAVObjectManager *objManager;
|
||||
UAVObjectUtilManager* utilMngr;
|
||||
smartSaveButton *smartsave;
|
||||
QMap<UAVObject *,bool> objectUpdates;
|
||||
QMap<int,QList<objectToWidget*> *> defaultReloadGroups;
|
||||
|
@ -24,7 +24,7 @@
|
||||
|
||||
<!-- Note these options values should be identical to those defined in FlightMode -->
|
||||
<field name="FlightModeNumber" units="" type="uint8" elements="1" defaultvalue="3"/>
|
||||
<field name="FlightModePosition" units="" type="enum" elements="6" options="Manual,Stabilized1,Stabilized2,Stabilized3,AltitudeHold,VelocityControl,PositionHold" defaultvalue="Manual,Stabilized1,Stabilized2,Stabilized3,AltitudeHold,PositionHold"/>
|
||||
<field name="FlightModePosition" units="" type="enum" elements="6" options="Manual,Stabilized1,Stabilized2,Stabilized3,AltitudeHold,VelocityControl,PositionHold" defaultvalue="Manual,Stabilized1,Stabilized2,Stabilized3,Stabilized1,Stabilized2" limits="%0401NE:AltitudeHold:VelocityControl:PositionHold,%0401NE:AltitudeHold:VelocityControl:PositionHold,%0401NE:AltitudeHold:VelocityControl:PositionHold,%0401NE:AltitudeHold:VelocityControl:PositionHold,%0401NE:AltitudeHold:VelocityControl:PositionHold,%0401NE:AltitudeHold:VelocityControl:PositionHold"/>
|
||||
|
||||
<field name="ArmedTimeout" units="ms" type="uint16" elements="1" defaultvalue="30000"/>
|
||||
<access gcs="readwrite" flight="readwrite"/>
|
||||
|
Loading…
x
Reference in New Issue
Block a user