mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-02-20 10:54:14 +01:00
Merge branch 'master' into OP-495_CheBuzz_HelpButtons
Conflicts: ground/openpilotgcs/src/plugins/config/output.ui
This commit is contained in:
David Carlson
commit
21213dd3c5
@ -152,6 +152,7 @@ static void AttitudeTask(void *parameters)
|
||||
init = 0;
|
||||
}
|
||||
else if (zero_during_arming && (flightStatus.Armed == FLIGHTSTATUS_ARMED_ARMING)) {
|
||||
accelKp = 1;
|
||||
accelKi = 0.9;
|
||||
yawBiasRate = 0.23;
|
||||
init = 0;
|
||||
|
||||
@ -104,7 +104,8 @@ ConfigOutputWidget::ConfigOutputWidget(QWidget *parent) : ConfigTaskWidget(paren
|
||||
<< m_config->ch6Link
|
||||
<< m_config->ch7Link;
|
||||
|
||||
UAVDataObject * obj = dynamic_cast<UAVDataObject*>(objManager->getObject(QString("ActuatorSettings")));
|
||||
/*
|
||||
UAVDataObject * obj = dynamic_cast<UAVDataObject*>(objManager->getObject(QString("ActuatorSettings")));
|
||||
QList<UAVObjectField*> fieldList = obj->getFields();
|
||||
foreach (UAVObjectField* field, fieldList) {
|
||||
if (field->getUnits().contains("channel")) {
|
||||
@ -118,6 +119,7 @@ ConfigOutputWidget::ConfigOutputWidget(QWidget *parent) : ConfigTaskWidget(paren
|
||||
m_config->ch7Output->addItem(field->getName());
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
for (int i = 0; i < 8; i++) {
|
||||
@ -308,7 +310,7 @@ void ConfigOutputWidget::runChannelTests(bool state)
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the dropdown option for a channel output assignement
|
||||
* Set the label for a channel output assignement
|
||||
*/
|
||||
void ConfigOutputWidget::assignOutputChannel(UAVDataObject *obj, QString str)
|
||||
{
|
||||
@ -316,28 +318,28 @@ void ConfigOutputWidget::assignOutputChannel(UAVDataObject *obj, QString str)
|
||||
QStringList options = field->getOptions();
|
||||
switch (options.indexOf(field->getValue().toString())) {
|
||||
case 0:
|
||||
m_config->ch0Output->setCurrentIndex(m_config->ch0Output->findText(str));
|
||||
m_config->ch0Output->setText(str);
|
||||
break;
|
||||
case 1:
|
||||
m_config->ch1Output->setCurrentIndex(m_config->ch1Output->findText(str));
|
||||
m_config->ch1Output->setText(str);
|
||||
break;
|
||||
case 2:
|
||||
m_config->ch2Output->setCurrentIndex(m_config->ch2Output->findText(str));
|
||||
m_config->ch2Output->setText(str);
|
||||
break;
|
||||
case 3:
|
||||
m_config->ch3Output->setCurrentIndex(m_config->ch3Output->findText(str));
|
||||
m_config->ch3Output->setText(str);
|
||||
break;
|
||||
case 4:
|
||||
m_config->ch4Output->setCurrentIndex(m_config->ch4Output->findText(str));
|
||||
m_config->ch4Output->setText(str);
|
||||
break;
|
||||
case 5:
|
||||
m_config->ch5Output->setCurrentIndex(m_config->ch5Output->findText(str));
|
||||
m_config->ch5Output->setText(str);
|
||||
break;
|
||||
case 6:
|
||||
m_config->ch6Output->setCurrentIndex(m_config->ch6Output->findText(str));
|
||||
m_config->ch6Output->setText(str);
|
||||
break;
|
||||
case 7:
|
||||
m_config->ch7Output->setCurrentIndex(m_config->ch7Output->findText(str));
|
||||
m_config->ch7Output->setText(str);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -421,14 +423,14 @@ void ConfigOutputWidget::requestRCOutputUpdate()
|
||||
UAVObjectManager *objManager = pm->getObject<UAVObjectManager>();
|
||||
|
||||
// Reset all channel assignements:
|
||||
m_config->ch0Output->setCurrentIndex(0);
|
||||
m_config->ch1Output->setCurrentIndex(0);
|
||||
m_config->ch2Output->setCurrentIndex(0);
|
||||
m_config->ch3Output->setCurrentIndex(0);
|
||||
m_config->ch4Output->setCurrentIndex(0);
|
||||
m_config->ch5Output->setCurrentIndex(0);
|
||||
m_config->ch6Output->setCurrentIndex(0);
|
||||
m_config->ch7Output->setCurrentIndex(0);
|
||||
m_config->ch0Output->setText("-");
|
||||
m_config->ch1Output->setText("-");
|
||||
m_config->ch2Output->setText("-");
|
||||
m_config->ch3Output->setText("-");
|
||||
m_config->ch4Output->setText("-");
|
||||
m_config->ch5Output->setText("-");
|
||||
m_config->ch6Output->setText("-");
|
||||
m_config->ch7Output->setText("-");
|
||||
|
||||
// Get the channel assignements:
|
||||
UAVDataObject * obj = dynamic_cast<UAVDataObject*>(objManager->getObject(QString("ActuatorSettings")));
|
||||
@ -541,57 +543,9 @@ void ConfigOutputWidget::sendRCOutputUpdate()
|
||||
field->setValue(m_config->outputRate3->value(),2);
|
||||
field->setValue(m_config->outputRate4->value(),3);
|
||||
|
||||
// Set Actuator assignement for each channel:
|
||||
// Rule: if two channels have the same setting (which is wrong!) the higher channel
|
||||
// will get the setting.
|
||||
|
||||
// First, reset all channel assignements:
|
||||
QList<UAVObjectField*> fieldList = obj->getFields();
|
||||
foreach (UAVObjectField* field, fieldList) {
|
||||
// NOTE: we assume that all options in ActuatorSettings are a channel assignement
|
||||
// except for the options called "ChannelXXX"
|
||||
if (field->getUnits().contains("channel")) {
|
||||
field->setValue(field->getOptions().last());
|
||||
}
|
||||
}
|
||||
|
||||
if (m_config->ch0Output->currentIndex() != 0) {
|
||||
field = obj->getField(m_config->ch0Output->currentText());
|
||||
field->setValue(field->getOptions().at(0)); // -> This way we don't depend on channel naming convention
|
||||
}
|
||||
if (m_config->ch1Output->currentIndex() != 0) {
|
||||
field = obj->getField(m_config->ch1Output->currentText());
|
||||
field->setValue(field->getOptions().at(1)); // -> This way we don't depend on channel naming convention
|
||||
}
|
||||
if (m_config->ch2Output->currentIndex() != 0) {
|
||||
field = obj->getField(m_config->ch2Output->currentText());
|
||||
field->setValue(field->getOptions().at(2)); // -> This way we don't depend on channel naming convention
|
||||
}
|
||||
if (m_config->ch3Output->currentIndex() != 0) {
|
||||
field = obj->getField(m_config->ch3Output->currentText());
|
||||
field->setValue(field->getOptions().at(3)); // -> This way we don't depend on channel naming convention
|
||||
}
|
||||
if (m_config->ch4Output->currentIndex() != 0) {
|
||||
field = obj->getField(m_config->ch4Output->currentText());
|
||||
field->setValue(field->getOptions().at(4)); // -> This way we don't depend on channel naming convention
|
||||
}
|
||||
if (m_config->ch5Output->currentIndex() != 0) {
|
||||
field = obj->getField(m_config->ch5Output->currentText());
|
||||
field->setValue(field->getOptions().at(5)); // -> This way we don't depend on channel naming convention
|
||||
}
|
||||
if (m_config->ch6Output->currentIndex() != 0) {
|
||||
field = obj->getField(m_config->ch6Output->currentText());
|
||||
field->setValue(field->getOptions().at(6)); // -> This way we don't depend on channel naming convention
|
||||
}
|
||||
if (m_config->ch7Output->currentIndex() != 0) {
|
||||
field = obj->getField(m_config->ch7Output->currentText());
|
||||
field->setValue(field->getOptions().at(7)); // -> This way we don't depend on channel naming convention
|
||||
}
|
||||
|
||||
// ... and send to the OP Board
|
||||
obj->updated();
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>600</width>
|
||||
<height>466</height>
|
||||
<width>659</width>
|
||||
<height>511</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
@ -38,7 +38,7 @@
|
||||
<property name="spacing">
|
||||
<number>2</number>
|
||||
</property>
|
||||
<item row="1" column="5">
|
||||
<item row="1" column="4">
|
||||
<widget class="QSpinBox" name="outputRate4">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
@ -52,7 +52,7 @@ Leave at 50Hz for fixed wing.</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="4">
|
||||
<item row="0" column="3">
|
||||
<widget class="QLabel" name="chBank3">
|
||||
<property name="text">
|
||||
<string>-</string>
|
||||
@ -62,7 +62,7 @@ Leave at 50Hz for fixed wing.</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="3">
|
||||
<item row="0" column="2">
|
||||
<widget class="QLabel" name="chBank2">
|
||||
<property name="text">
|
||||
<string>-</string>
|
||||
@ -72,7 +72,7 @@ Leave at 50Hz for fixed wing.</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="2">
|
||||
<item row="0" column="1">
|
||||
<widget class="QLabel" name="chBank1">
|
||||
<property name="text">
|
||||
<string>-</string>
|
||||
@ -82,7 +82,7 @@ Leave at 50Hz for fixed wing.</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="4">
|
||||
<item row="1" column="3">
|
||||
<widget class="QSpinBox" name="outputRate3">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
@ -96,7 +96,7 @@ Leave at 50Hz for fixed wing.</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="3">
|
||||
<item row="1" column="2">
|
||||
<widget class="QSpinBox" name="outputRate2">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
@ -110,7 +110,7 @@ Leave at 50Hz for fixed wing.</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="2">
|
||||
<item row="1" column="1">
|
||||
<widget class="QSpinBox" name="outputRate1">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
@ -124,7 +124,7 @@ Leave at 50Hz for fixed wing.</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="5">
|
||||
<item row="0" column="4">
|
||||
<widget class="QLabel" name="chBank4">
|
||||
<property name="text">
|
||||
<string>-</string>
|
||||
@ -135,7 +135,7 @@ Leave at 50Hz for fixed wing.</string>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="0">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_6">
|
||||
<item>
|
||||
<widget class="QPushButton" name="channelRateHelp">
|
||||
<property name="sizePolicy">
|
||||
@ -160,7 +160,7 @@ Leave at 50Hz for fixed wing.</string>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_2">
|
||||
<spacer name="horizontalSpacer_3">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
@ -176,7 +176,7 @@ Leave at 50Hz for fixed wing.</string>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="label_8">
|
||||
<widget class="QLabel" name="label_9">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>75</weight>
|
||||
@ -194,9 +194,9 @@ Leave at 50Hz for fixed wing.</string>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_3">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_7">
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_3">
|
||||
<spacer name="horizontalSpacer_4">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
@ -232,45 +232,12 @@ Leave at 50Hz for fixed wing.</string>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="verticalSpacer_3">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>40</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QGridLayout" name="gridLayout_2">
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="actuator0Label">
|
||||
<property name="text">
|
||||
<string>Channel 1</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QComboBox" name="ch0Output">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>8</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Ubuntu'; font-size:8pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans';">This is the actuator connected to this channel.</span></p>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans';">You can change this through the &quot;Airframe&quot; dialog (on the left).</span></p></body></html></string>
|
||||
<string>Channel 1:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -388,27 +355,7 @@ p, li { white-space: pre-wrap; }
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="actuator1Label">
|
||||
<property name="text">
|
||||
<string>Channel 2</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<widget class="QComboBox" name="ch1Output">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>8</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Ubuntu'; font-size:8pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans';">This is the actuator connected to this channel.</span></p>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans';">You can change this through the &quot;Airframe&quot; dialog (on the left).</span></p></body></html></string>
|
||||
<string>Channel 2:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -495,27 +442,7 @@ p, li { white-space: pre-wrap; }
|
||||
<item row="3" column="0">
|
||||
<widget class="QLabel" name="actuator2Label">
|
||||
<property name="text">
|
||||
<string>Channel 3</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="1">
|
||||
<widget class="QComboBox" name="ch2Output">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>8</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Ubuntu'; font-size:8pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans';">This is the actuator connected to this channel.</span></p>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans';">You can change this through the &quot;Airframe&quot; dialog (on the left).</span></p></body></html></string>
|
||||
<string>Channel 3:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -602,27 +529,7 @@ p, li { white-space: pre-wrap; }
|
||||
<item row="4" column="0">
|
||||
<widget class="QLabel" name="actuator3Label">
|
||||
<property name="text">
|
||||
<string>Channel 4</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="1">
|
||||
<widget class="QComboBox" name="ch3Output">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>8</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Ubuntu'; font-size:8pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans';">This is the actuator connected to this channel.</span></p>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans';">You can change this through the &quot;Airframe&quot; dialog (on the left).</span></p></body></html></string>
|
||||
<string>Channel 4:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -709,27 +616,7 @@ p, li { white-space: pre-wrap; }
|
||||
<item row="5" column="0">
|
||||
<widget class="QLabel" name="actuator4Label">
|
||||
<property name="text">
|
||||
<string>Channel 5</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="1">
|
||||
<widget class="QComboBox" name="ch4Output">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>8</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Ubuntu'; font-size:8pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans';">This is the actuator connected to this channel.</span></p>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans';">You can change this through the &quot;Airframe&quot; dialog (on the left).</span></p></body></html></string>
|
||||
<string>Channel 5:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -807,27 +694,7 @@ p, li { white-space: pre-wrap; }
|
||||
<item row="6" column="0">
|
||||
<widget class="QLabel" name="actuator5Label">
|
||||
<property name="text">
|
||||
<string>Channel 6</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="1">
|
||||
<widget class="QComboBox" name="ch5Output">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>8</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Ubuntu'; font-size:8pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans';">This is the actuator connected to this channel.</span></p>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans';">You can change this through the &quot;Airframe&quot; dialog (on the left).</span></p></body></html></string>
|
||||
<string>Channel 6:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -905,54 +772,14 @@ p, li { white-space: pre-wrap; }
|
||||
<item row="7" column="0">
|
||||
<widget class="QLabel" name="actuator6Label">
|
||||
<property name="text">
|
||||
<string>Channel 7</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="7" column="1">
|
||||
<widget class="QComboBox" name="ch6Output">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>8</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Ubuntu'; font-size:8pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans';">This is the actuator connected to this channel.</span></p>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans';">You can change this through the &quot;Airframe&quot; dialog (on the left).</span></p></body></html></string>
|
||||
<string>Channel 7:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="8" column="0">
|
||||
<widget class="QLabel" name="actuator7Label">
|
||||
<property name="text">
|
||||
<string>Channel 8</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="8" column="1">
|
||||
<widget class="QComboBox" name="ch7Output">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>8</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Ubuntu'; font-size:8pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans';">This is the actuator connected to this channel.</span></p>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans';">You can change this through the &quot;Airframe&quot; dialog (on the left).</span></p></body></html></string>
|
||||
<string>Channel 8:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -1098,6 +925,133 @@ p, li { white-space: pre-wrap; }
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QLabel" name="ch0Output">
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>9</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>-</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<widget class="QLabel" name="ch1Output">
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>9</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>-</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="1">
|
||||
<widget class="QLabel" name="ch2Output">
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>9</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>-</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="1">
|
||||
<widget class="QLabel" name="ch3Output">
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>9</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>-</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="1">
|
||||
<widget class="QLabel" name="ch4Output">
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>9</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>-</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="1">
|
||||
<widget class="QLabel" name="ch5Output">
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>9</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>-</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="7" column="1">
|
||||
<widget class="QLabel" name="ch6Output">
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>9</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>-</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="8" column="1">
|
||||
<widget class="QLabel" name="ch7Output">
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>9</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>-</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QLabel" name="label_4">
|
||||
<property name="text">
|
||||
<string>Assignment</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="0">
|
||||
<widget class="QPushButton" name="channelValuesHelp">
|
||||
<property name="sizePolicy">
|
||||
@ -1137,7 +1091,7 @@ p, li { white-space: pre-wrap; }
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||
<item>
|
||||
<widget class="QPushButton" name="spinningArmedlHelp">
|
||||
<property name="sizePolicy">
|
||||
@ -1168,6 +1122,19 @@ p, li { white-space: pre-wrap; }
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_2">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
@ -1316,35 +1283,27 @@ Applies and Saves all settings to SD</string>
|
||||
<tabstop>ch6OutMax</tabstop>
|
||||
<tabstop>ch7OutMin</tabstop>
|
||||
<tabstop>ch7OutMax</tabstop>
|
||||
<tabstop>ch0Output</tabstop>
|
||||
<tabstop>ch0OutSlider</tabstop>
|
||||
<tabstop>ch0Rev</tabstop>
|
||||
<tabstop>ch0Link</tabstop>
|
||||
<tabstop>ch1Output</tabstop>
|
||||
<tabstop>ch1OutSlider</tabstop>
|
||||
<tabstop>ch1Rev</tabstop>
|
||||
<tabstop>ch1Link</tabstop>
|
||||
<tabstop>ch2Output</tabstop>
|
||||
<tabstop>ch2OutSlider</tabstop>
|
||||
<tabstop>ch2Rev</tabstop>
|
||||
<tabstop>ch2Link</tabstop>
|
||||
<tabstop>ch3Output</tabstop>
|
||||
<tabstop>ch3OutSlider</tabstop>
|
||||
<tabstop>ch3Rev</tabstop>
|
||||
<tabstop>ch3Link</tabstop>
|
||||
<tabstop>ch4Output</tabstop>
|
||||
<tabstop>ch4OutSlider</tabstop>
|
||||
<tabstop>ch4Rev</tabstop>
|
||||
<tabstop>ch4Link</tabstop>
|
||||
<tabstop>ch5Output</tabstop>
|
||||
<tabstop>ch5OutSlider</tabstop>
|
||||
<tabstop>ch5Rev</tabstop>
|
||||
<tabstop>ch5Link</tabstop>
|
||||
<tabstop>ch6Output</tabstop>
|
||||
<tabstop>ch6OutSlider</tabstop>
|
||||
<tabstop>ch6Rev</tabstop>
|
||||
<tabstop>ch6Link</tabstop>
|
||||
<tabstop>ch7Output</tabstop>
|
||||
<tabstop>ch7OutSlider</tabstop>
|
||||
<tabstop>ch7Rev</tabstop>
|
||||
<tabstop>ch7Link</tabstop>
|
||||
|
||||
@ -268,6 +268,10 @@ void deviceWidget::uploadFirmware()
|
||||
if (firmwareBoard != board) {
|
||||
status("Error: firmware does not match board", STATUSICON_FAIL);
|
||||
return;
|
||||
} else {
|
||||
// Not a structured description: warn user
|
||||
myDevice->buildDate->setText("Warning: development firmware");
|
||||
myDevice->commitTag->setText("");
|
||||
}
|
||||
|
||||
// Check the firmware embedded in the file:
|
||||
|
||||
@ -100,7 +100,7 @@ DFUObject::DFUObject(bool _debug,bool _use_serial,QString portname):
|
||||
if (devices.length()==1) {
|
||||
hidHandle.open(1,devices.first().vendorID,devices.first().productID,0,0);
|
||||
} else {
|
||||
qDebug() << "More than one device, don't know what to do!";
|
||||
qDebug() << devices.length() << " device(s) detected, don't know what to do!";
|
||||
mready = false;
|
||||
}
|
||||
|
||||
|
||||
@ -161,6 +161,7 @@ void UploaderGadgetWidget::goToBootloader(UAVObject* callerObj, bool success)
|
||||
|
||||
switch (currentStep) {
|
||||
case IAP_STATE_READY:
|
||||
m_config->haltButton->setEnabled(false);
|
||||
getSerialPorts(); // Useful in case a new serial port appeared since the initial list,
|
||||
// otherwise we won't find it when we stop the board.
|
||||
// The board is running, send the 1st IAP Reset order:
|
||||
@ -179,6 +180,7 @@ void UploaderGadgetWidget::goToBootloader(UAVObject* callerObj, bool success)
|
||||
log("Reset did NOT happen");
|
||||
currentStep = IAP_STATE_READY;
|
||||
disconnect(fwIAP, SIGNAL(transactionCompleted(UAVObject*,bool)),this,SLOT(goToBootloader(UAVObject*, bool)));
|
||||
m_config->haltButton->setEnabled(true);
|
||||
break;
|
||||
}
|
||||
delay::msleep(600);
|
||||
@ -193,6 +195,7 @@ void UploaderGadgetWidget::goToBootloader(UAVObject* callerObj, bool success)
|
||||
log("Reset did NOT happen");
|
||||
currentStep = IAP_STATE_READY;
|
||||
disconnect(fwIAP, SIGNAL(transactionCompleted(UAVObject*,bool)),this,SLOT(goToBootloader(UAVObject*, bool)));
|
||||
m_config->haltButton->setEnabled(true);
|
||||
break;
|
||||
}
|
||||
delay::msleep(600);
|
||||
@ -208,6 +211,7 @@ void UploaderGadgetWidget::goToBootloader(UAVObject* callerObj, bool success)
|
||||
log("Oops, failure step 3");
|
||||
log("Reset did NOT happen");
|
||||
disconnect(fwIAP, SIGNAL(transactionCompleted(UAVObject*,bool)),this,SLOT(goToBootloader(UAVObject*, bool)));
|
||||
m_config->haltButton->setEnabled(true);
|
||||
break;
|
||||
}
|
||||
|
||||
@ -247,6 +251,7 @@ void UploaderGadgetWidget::goToBootloader(UAVObject* callerObj, bool success)
|
||||
cm->resumePolling();
|
||||
currentStep = IAP_STATE_READY;
|
||||
m_config->boardStatus->setText("Bootloader?");
|
||||
m_config->haltButton->setEnabled(true);
|
||||
return;
|
||||
}
|
||||
dfu->AbortOperation();
|
||||
@ -360,7 +365,6 @@ void UploaderGadgetWidget::systemBoot()
|
||||
dfu->JumpToApp();
|
||||
// Restart the polling thread
|
||||
cm->resumePolling();
|
||||
m_config->bootButton->setEnabled(true);
|
||||
m_config->rescueButton->setEnabled(true);
|
||||
m_config->telemetryLink->setEnabled(true);
|
||||
m_config->boardStatus->setText("Running");
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
<field name="RollRatePI" units="" type="float" elementnames="Kp,Ki,ILimit" defaultvalue="0.002,0,0.3"/>
|
||||
<field name="PitchRatePI" units="" type="float" elementnames="Kp,Ki,ILimit" defaultvalue="0.002,0,0.3"/>
|
||||
<field name="YawRatePI" units="" type="float" elementnames="Kp,Ki,ILimit" defaultvalue="0.003,0.003,0.3"/>
|
||||
<field name="YawRatePI" units="" type="float" elementnames="Kp,Ki,ILimit" defaultvalue="0.0035,0.0035,0.3"/>
|
||||
<field name="RollPI" units="" type="float" elementnames="Kp,Ki,ILimit" defaultvalue="2,0,50"/>
|
||||
<field name="PitchPI" units="" type="float" elementnames="Kp,Ki,ILimit" defaultvalue="2,0,50"/>
|
||||
<field name="YawPI" units="" type="float" elementnames="Kp,Ki,ILimit" defaultvalue="2,0,50"/>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user