diff --git a/ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui b/ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui index a96e1f7a6..e7c7ddf10 100644 --- a/ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui +++ b/ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui @@ -116,8 +116,8 @@ 0 0 - 622 - 519 + 624 + 510 @@ -309,18 +309,14 @@ - - - - - - - - - + + - + + + + USB HID Port @@ -330,49 +326,14 @@ - - - - - + + - - true - - - - - - - - MainPort - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - - - - - - - - FlexiPort - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - + USB VCP Port @@ -382,17 +343,40 @@ - - + + - RcvrPort + - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + false - + + + + Main Port + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + + Flexi Port + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + + Qt::Horizontal @@ -405,6 +389,22 @@ + + + + + + + + + + Receiver Port + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + diff --git a/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp b/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp index 03f4727f2..4db18b685 100644 --- a/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp @@ -53,6 +53,7 @@ ConfigOutputWidget::ConfigOutputWidget(QWidget *parent) : ConfigTaskWidget(paren ui->setupUi(this); ui->gvWarning->setScene(new QGraphicsScene(this)); + ui->gvFrame->setVisible(false); ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance(); Core::Internal::GeneralSettings *settings = pm->getObject(); @@ -460,8 +461,10 @@ void ConfigOutputWidget::setWarning(QString message) ui->gvWarning->scene()->clear(); if (!message.isNull()) { warningPic.load(":/configgadget/images/error.svg"); + ui->gvFrame->setVisible(true); } else { warningPic.load(""); + ui->gvFrame->setVisible(false); } ui->gvWarning->scene()->addPixmap(warningPic); ui->gvWarning->setSceneRect(warningPic.rect()); diff --git a/ground/openpilotgcs/src/plugins/config/output.ui b/ground/openpilotgcs/src/plugins/config/output.ui index 0ce1d0a9b..e2e921dc3 100644 --- a/ground/openpilotgcs/src/plugins/config/output.ui +++ b/ground/openpilotgcs/src/plugins/config/output.ui @@ -122,11 +122,11 @@ 0 0 - 831 - 659 + 743 + 668 - + 6 @@ -143,819 +143,900 @@ 12 - - - - 0 - 0 - - - - - 0 - 0 - - + - Output configuration + GroupBox - - - - - Bank(Channels): + + + 9 + + + 9 + + + 9 + + + 9 + + + + + QFrame::NoFrame - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + QFrame::Raised - - - - - - - - - - Qt::AlignCenter - - - - - - - - - - - Qt::AlignCenter - - - - - - - false - - - - 0 - 0 - - - - - 0 - 20 - - - - - 70 - 16777215 - - - - Setup PWM rate here: usual value is 490 Hz for multirotor airframes. OneShot and OneShot125 does not use this value - - - - - - - 50 + + + 0 - - - - 60 + + 0 - - - - 125 + + 0 - - - - 165 + + 0 - - - - 270 - - - - - 330 - - - - - 400 - - - - - 490 - - - - - - - - - - - Qt::AlignCenter - - - - - - - false - - - - 0 - 0 - - - - - 0 - 20 - - - - - 70 - 16777215 - - - - Setup PWM rate here: usual value is 490 Hz for multirotor airframes. OneShot and OneShot125 does not use this value - - - - - - - 50 - - - - - 60 - - - - - 125 - - - - - 165 - - - - - 270 - - - - - 330 - - - - - 400 - - - - - 490 - - - - - - - - false - - - - 0 - 0 - - - - - 0 - 20 - - - - - 70 - 16777215 - - - - Setup PWM rate here: usual value is 490 Hz for multirotor airframes. OneShot and OneShot125 does not use this value - - - - - - - 50 - - - - - 60 - - - - - 125 - - - - - 165 - - - - - 270 - - - - - 330 - - - - - 400 - - - - - 490 - - - - - - - - false - - - - 0 - 0 - - - - - 0 - 20 - - - - - 70 - 16777215 - - - - Setup PWM rate here: usual value is 490 Hz for multirotor airframes. OneShot and OneShot125 does not use this value - - - - - - - 50 - - - - - 60 - - - - - 125 - - - - - 165 - - - - - 270 - - - - - 330 - - - - - 400 - - - - - 490 - - - - - - - - false - - - - 0 - 0 - - - - - 0 - 20 - - - - - 70 - 16777215 - - - - Setup output mode. Use PWM or OneShot with Standard ESCs.\nSeveral other ESCs like BLHeli 13+ can use the more advanced OneShot125.\nWhen using OneShot125 all values set in min/max and idle are divided by eight before being sent to esc (i.e. 1000 = 125, 2000 = 250). - - - - - - - false - - - - 0 - 0 - - - - - 0 - 20 - - - - - 70 - 16777215 - - - - Setup output mode. Use PWM or OneShot with Standard ESCs.\nSeveral other ESCs like BLHeli 13+ can use the more advanced OneShot125.\nWhen using OneShot125 all values set in min/max and idle are divided by eight before being sent to esc (i.e. 1000 = 125, 2000 = 250). - - - - - - - - - - - Qt::AlignCenter - - - - - - - - - - - Qt::AlignCenter - - - - - - - false - - - - 0 - 0 - - - - - 0 - 20 - - - - - 70 - 16777215 - - - - Setup PWM rate here: usual value is 490 Hz for multirotor airframes. OneShot and OneShot125 does not use this value + + + + QFrame::NoFrame + + + QFrame::Raised + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Bank(Channels): + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 0 + 20 + + + + Update rate: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 0 + 20 + + + + Mode: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + - + + + Qt::AlignCenter + + + + + + + - + + + Qt::AlignCenter + + + + + + + false + + + + 0 + 0 + + + + + 0 + 20 + + + + + 16777215 + 16777215 + + + + Setup PWM rate here: usual value is 490 Hz for multirotor airframes. OneShot and OneShot125 does not use this value + + + + + + + 50 + + + + + 60 + + + + + 125 + + + + + 165 + + + + + 270 + + + + + 330 + + + + + 400 + + + + + 490 + + + + + + + + + + + Qt::AlignCenter + + + + + + + false + + + + 0 + 0 + + + + + 0 + 20 + + + + + 16777215 + 16777215 + + + + Setup PWM rate here: usual value is 490 Hz for multirotor airframes. OneShot and OneShot125 does not use this value + + + + + + + 50 + + + + + 60 + + + + + 125 + + + + + 165 + + + + + 270 + + + + + 330 + + + + + 400 + + + + + 490 + + + + + + + + false + + + + 0 + 0 + + + + + 0 + 20 + + + + + 16777215 + 16777215 + + + + Setup PWM rate here: usual value is 490 Hz for multirotor airframes. OneShot and OneShot125 does not use this value + + + + + + + 50 + + + + + 60 + + + + + 125 + + + + + 165 + + + + + 270 + + + + + 330 + + + + + 400 + + + + + 490 + + + + + + + + false + + + + 0 + 0 + + + + + 0 + 20 + + + + + 16777215 + 16777215 + + + + Setup PWM rate here: usual value is 490 Hz for multirotor airframes. OneShot and OneShot125 does not use this value + + + + + + + 50 + + + + + 60 + + + + + 125 + + + + + 165 + + + + + 270 + + + + + 330 + + + + + 400 + + + + + 490 + + + + + + + + false + + + + 0 + 0 + + + + + 0 + 20 + + + + + 16777215 + 16777215 + + + + Setup output mode. Use PWM or OneShot with Standard ESCs.\nSeveral other ESCs like BLHeli 13+ can use the more advanced OneShot125.\nWhen using OneShot125 all values set in min/max and idle are divided by eight before being sent to esc (i.e. 1000 = 125, 2000 = 250). + + + + + + + false + + + + 0 + 0 + + + + + 0 + 20 + + + + + 16777215 + 16777215 + + + + Setup output mode. Use PWM or OneShot with Standard ESCs.\nSeveral other ESCs like BLHeli 13+ can use the more advanced OneShot125.\nWhen using OneShot125 all values set in min/max and idle are divided by eight before being sent to esc (i.e. 1000 = 125, 2000 = 250). + + + + + + + - + + + Qt::AlignCenter + + + + + + + - + + + Qt::AlignCenter + + + + + + + false + + + + 0 + 0 + + + + + 0 + 20 + + + + + 16777215 + 16777215 + + + + Setup PWM rate here: usual value is 490 Hz for multirotor airframes. OneShot and OneShot125 does not use this value - - - false - - - - - - - 50 - - - - - 60 - - - - - 125 - - - - - 165 - - - - - 270 - - - - - 330 - - - - - 400 - - - - - 490 - - - - - - - - false - - - - 0 - 0 - - - - - 0 - 20 - - - - - 70 - 16777215 - - - - Setup output mode. Use PWM or OneShot with Standard ESCs.\nSeveral other ESCs like BLHeli 13+ can use the more advanced OneShot125.\nWhen using OneShot125 all values set in min/max and idle are divided by eight before being sent to esc (i.e. 1000 = 125, 2000 = 250). - - - - - - - - 0 - 0 - - - - - 0 - 20 - - - - Mode: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - false - - - - 0 - 0 - - - - - 0 - 20 - - - - - 70 - 16777215 - - - - Setup output mode. Use PWM or OneShot with Standard ESCs. + + + false + + + + + + + 50 + + + + + 60 + + + + + 125 + + + + + 165 + + + + + 270 + + + + + 330 + + + + + 400 + + + + + 490 + + + + + + + + false + + + + 0 + 0 + + + + + 0 + 20 + + + + + 16777215 + 16777215 + + + + Setup output mode. Use PWM or OneShot with Standard ESCs.\nSeveral other ESCs like BLHeli 13+ can use the more advanced OneShot125.\nWhen using OneShot125 all values set in min/max and idle are divided by eight before being sent to esc (i.e. 1000 = 125, 2000 = 250). + + + + + + + false + + + + 0 + 0 + + + + + 0 + 20 + + + + + 16777215 + 16777215 + + + + Setup output mode. Use PWM or OneShot with Standard ESCs. Several other ESCs like BLHeli 13+ can use the more advanced OneShot125. When using OneShot125 all values set in min/max and idle are divided by eight before being sent to esc (i.e. 1000 = 125, 2000 = 250). - + + + + + + + false + + + + 0 + 0 + + + + + 0 + 20 + + + + + 16777215 + 16777215 + + + + Setup output mode. Use PWM or OneShot with Standard ESCs.\nSeveral other ESCs like BLHeli 13+ can use the more advanced OneShot125.\nWhen using OneShot125 all values set in min/max and idle are divided by eight before being sent to esc (i.e. 1000 = 125, 2000 = 250). + + + + + + + false + + + + 0 + 0 + + + + + 0 + 20 + + + + + 16777215 + 16777215 + + + + Setup PWM rate here: usual value is 490 Hz for multirotor airframes. OneShot and OneShot125 does not use this value + + + + + + + 50 + + + + + 60 + + + + + 125 + + + + + 165 + + + + + 270 + + + + + 330 + + + + + 400 + + + + + 490 + + + + + + + + - + + + Qt::AlignCenter + + + + + + + false + + + + 0 + 0 + + + + + 0 + 20 + + + + + 16777215 + 16777215 + + + + Setup output mode. Use PWM or OneShot with Standard ESCs.\nSeveral other ESCs like BLHeli 13+ can use the more advanced OneShot125.\nWhen using OneShot125 all values set in min/max and idle are divided by eight before being sent to esc (i.e. 1000 = 125, 2000 = 250). + + + + + + + - - - - false - + + - + 0 0 - - - 0 - 20 - + + QFrame::NoFrame - - - 70 - 16777215 - - - - Setup output mode. Use PWM or OneShot with Standard ESCs.\nSeveral other ESCs like BLHeli 13+ can use the more advanced OneShot125.\nWhen using OneShot125 all values set in min/max and idle are divided by eight before being sent to esc (i.e. 1000 = 125, 2000 = 250). + + QFrame::Raised + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 32 + 32 + + + + + 32 + 32 + + + + background: transparent + + + QFrame::NoFrame + + + Qt::AlignCenter + + + QPainter::HighQualityAntialiasing + + + + + + + + 0 + 0 + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + - - - - - 0 - 0 - - - - - 0 - 20 - - - - Update rate: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - false - - - - 0 - 0 - - - - - 0 - 20 - - - - - 70 - 16777215 - - - - Setup PWM rate here: usual value is 490 Hz for multirotor airframes. OneShot and OneShot125 does not use this value - - - - - - - 50 - - - - - 60 - - - - - 125 - - - - - 165 - - - - - 270 - - - - - 330 - - - - - 400 - - - - - 490 - - - - - - - - - - - - Qt::AlignCenter - - - - - - - false - - - - 0 - 0 - - - - - 0 - 20 - - - - - 70 - 16777215 - - - - Setup output mode. Use PWM or OneShot with Standard ESCs.\nSeveral other ESCs like BLHeli 13+ can use the more advanced OneShot125.\nWhen using OneShot125 all values set in min/max and idle are divided by eight before being sent to esc (i.e. 1000 = 125, 2000 = 250). - - - - - - - 0 - - - - - - 32 - 32 - - - - - 32 - 32 - - - - background: transparent - - - QFrame::NoFrame - - - Qt::AlignCenter - - - QPainter::HighQualityAntialiasing - - - - - - - - 0 - 0 - - - - - 200 - 50 - - - - - 16777215 - 90 - - - - - 10 - 50 - false - - - - Calibration status - - - background-color: transparent; - - - QFrame::NoFrame - - - Qt::ScrollBarAlwaysOff - - - QAbstractScrollArea::AdjustIgnored - - - Qt::NoTextInteraction - - - - -