From 1b842ec32218cc4c88a83982aa4b3e5de237eb74 Mon Sep 17 00:00:00 2001 From: m_thread Date: Wed, 18 Feb 2015 00:19:58 +0100 Subject: [PATCH 1/5] OP-1685 Fixed Output config layout, fixed HW config layout for CC. Conflicts: ground/openpilotgcs/src/plugins/config/output.ui --- .../src/plugins/config/cc_hw_settings.ui | 112 +- .../src/plugins/config/configoutputwidget.cpp | 3 + .../openpilotgcs/src/plugins/config/output.ui | 1742 +++++++++-------- 3 files changed, 935 insertions(+), 922 deletions(-) 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 36cdcd951..f11b22eaf 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(); @@ -466,8 +467,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 a3389de63..e2e921dc3 100644 --- a/ground/openpilotgcs/src/plugins/config/output.ui +++ b/ground/openpilotgcs/src/plugins/config/output.ui @@ -6,7 +6,7 @@ 0 0 - 1096 + 765 754 @@ -122,11 +122,11 @@ 0 0 - 1078 - 672 + 743 + 668 - + 6 @@ -143,879 +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 - - - - - 100 - 20 - - - - - 120 - 16777215 - - - - - 10 - - - - 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 - - - - - 100 - 20 - - - - - 120 - 16777215 - - - - - 10 - - - - 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 - - - - - 100 - 20 - - - - - 120 - 16777215 - - - - - 10 - - - - 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 - - - - - 100 - 20 - - - - - 120 - 16777215 - - - - - 10 - - - - 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 - - - - - 100 - 20 - - - - - 120 - 16777215 - - - - - 10 - - - - 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 - - - - - 100 - 20 - - - - - 120 - 16777215 - - - - - 10 - - - - 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 - - - - - 100 - 20 - - - - - 120 - 16777215 - - - - - 10 - - - - 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 - - - - - 100 - 20 - - - - - 120 - 16777215 - - - - - 10 - - - - 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 - - - - - 100 - 20 - - - - - 120 - 16777215 - - - - - 10 - - - - 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 - - - 100 - 20 - + + QFrame::NoFrame - - - 120 - 16777215 - - - - - 10 - - - - 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 - - - - - 100 - 20 - - - - - 70 - 16777215 - - - - - 10 - - - - 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 - - - - - 100 - 20 - - - - - 70 - 16777215 - - - - - 10 - - - - 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 - - - - - @@ -1069,17 +1090,6 @@ When using OneShot125 all values set in min/max and idle are divided by eight be - - - 100 - 0 - - - - - 10 - - Qt::Vertical From 6c33fb8185fa3814e38763b19e4303dae1101173 Mon Sep 17 00:00:00 2001 From: m_thread Date: Wed, 18 Feb 2015 10:26:59 +0100 Subject: [PATCH 2/5] OP-1685 Simplifying the warning label code and layout. --- .../src/plugins/config/configoutputwidget.cpp | 19 ++------- .../openpilotgcs/src/plugins/config/output.ui | 40 ++++--------------- 2 files changed, 12 insertions(+), 47 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp b/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp index f11b22eaf..a3ea527de 100644 --- a/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp @@ -52,7 +52,6 @@ ConfigOutputWidget::ConfigOutputWidget(QWidget *parent) : ConfigTaskWidget(paren ui = new Ui_OutputWidget(); ui->setupUi(this); - ui->gvWarning->setScene(new QGraphicsScene(this)); ui->gvFrame->setVisible(false); ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance(); @@ -453,7 +452,8 @@ void ConfigOutputWidget::updateWarnings(UAVObject *) if (systemAlarms.Alarm[SystemAlarms::ALARM_SYSTEMCONFIGURATION] > SystemAlarms::ALARM_WARNING) { switch (systemAlarms.ExtendedAlarmStatus[SystemAlarms::EXTENDEDALARMSTATUS_SYSTEMCONFIGURATION]) { case SystemAlarms::EXTENDEDALARMSTATUS_UNSUPPORTEDCONFIG_ONESHOT: - setWarning(tr("OneShot only works with MainPort settings marked with \"+OneShot\"\nUsing \"PPM_PIN6+OneShot\" bank 4 (output 6) must be set to PWM")); + setWarning(tr("OneShot only works with Receiver Port settings marked with '+OneShot'\n" + "When using Receiver Port setting 'PPM_PIN6+OneShot' Bank 4 (output 6,9-10) must be set to PWM")); return; } } @@ -462,18 +462,7 @@ void ConfigOutputWidget::updateWarnings(UAVObject *) void ConfigOutputWidget::setWarning(QString message) { - QPixmap warningPic; - - 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()); - ui->gvWarning->fitInView(warningPic.rect(), Qt::KeepAspectRatio); + ui->gvFrame->setVisible(!message.isNull()); + ui->picWarning->setPixmap(message.isNull() ? QPixmap() : QPixmap(":/configgadget/images/error.svg")); ui->txtWarning->setText(message); } diff --git a/ground/openpilotgcs/src/plugins/config/output.ui b/ground/openpilotgcs/src/plugins/config/output.ui index e2e921dc3..b77d04ac7 100644 --- a/ground/openpilotgcs/src/plugins/config/output.ui +++ b/ground/openpilotgcs/src/plugins/config/output.ui @@ -972,50 +972,26 @@ When using OneShot125 all values set in min/max and idle are divided by eight be Qt::Horizontal + + QSizePolicy::Fixed + - 40 + 70 20 - - - - - 32 - 32 - - - - - 32 - 32 - - - - background: transparent - - - QFrame::NoFrame - - - Qt::AlignCenter - - - QPainter::HighQualityAntialiasing + + + + - - - 0 - 0 - - From c93c25e65790404c9a398849748f0c5bd43e9c49 Mon Sep 17 00:00:00 2001 From: m_thread Date: Wed, 18 Feb 2015 10:56:31 +0100 Subject: [PATCH 3/5] OP-1685 Made warning message even more informational. --- .../openpilotgcs/src/plugins/config/configoutputwidget.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp b/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp index a3ea527de..1e5959cdb 100644 --- a/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp @@ -452,8 +452,9 @@ void ConfigOutputWidget::updateWarnings(UAVObject *) if (systemAlarms.Alarm[SystemAlarms::ALARM_SYSTEMCONFIGURATION] > SystemAlarms::ALARM_WARNING) { switch (systemAlarms.ExtendedAlarmStatus[SystemAlarms::EXTENDEDALARMSTATUS_SYSTEMCONFIGURATION]) { case SystemAlarms::EXTENDEDALARMSTATUS_UNSUPPORTEDCONFIG_ONESHOT: - setWarning(tr("OneShot only works with Receiver Port settings marked with '+OneShot'\n" - "When using Receiver Port setting 'PPM_PIN6+OneShot' Bank 4 (output 6,9-10) must be set to PWM")); + setWarning(tr("OneShot only works with Receiver Port settings marked with '+OneShot'
" + "When using Receiver Port setting 'PPM_PIN6+OneShot' " + "Bank 4 (output 6,9-10) must be set to PWM")); return; } } From 8c6da7e7eef23b95c1406dfcccc0a3db4e68911e Mon Sep 17 00:00:00 2001 From: m_thread Date: Wed, 18 Feb 2015 13:33:15 +0100 Subject: [PATCH 4/5] OP-1685 Fixed some tooltip texts. --- .../openpilotgcs/src/plugins/config/output.ui | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/output.ui b/ground/openpilotgcs/src/plugins/config/output.ui index b77d04ac7..61c88a66f 100644 --- a/ground/openpilotgcs/src/plugins/config/output.ui +++ b/ground/openpilotgcs/src/plugins/config/output.ui @@ -318,7 +318,7 @@ - Setup PWM rate here: usual value is 490 Hz for multirotor airframes. OneShot and OneShot125 does not use this value + <html><head/><body><p>Setup PWM rate here: usual value is 490 Hz for multirotor airframes.<br/>PWMSync and OneShot125 does not use this value.</p></body></html> @@ -399,7 +399,7 @@ - Setup PWM rate here: usual value is 490 Hz for multirotor airframes. OneShot and OneShot125 does not use this value + <html><head/><body><p>Setup PWM rate here: usual value is 490 Hz for multirotor airframes.<br/>PWMSync and OneShot125 does not use this value.</p></body></html> @@ -470,7 +470,7 @@ - Setup PWM rate here: usual value is 490 Hz for multirotor airframes. OneShot and OneShot125 does not use this value + <html><head/><body><p>Setup PWM rate here: usual value is 490 Hz for multirotor airframes.<br/>PWMSync and OneShot125 does not use this value.</p></body></html> @@ -541,7 +541,7 @@ - Setup PWM rate here: usual value is 490 Hz for multirotor airframes. OneShot and OneShot125 does not use this value + <html><head/><body><p>Setup PWM rate here: usual value is 490 Hz for multirotor airframes.<br/>PWMSync and OneShot125 does not use this value.</p></body></html> @@ -612,7 +612,7 @@ - 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). + <html><head/><body><p>Setup output mode. Use PWM or PWMSync with Standard ESCs.<br/>Several other ESCs like BLHeli 13+ can use the more advanced OneShot125.<br/>When using OneShot125 all values set in min/max and idle are divided by <br/>eight before being sent to esc (i.e. 1000 = 125, 2000 = 250).</p></body></html> @@ -640,7 +640,7 @@ - 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). + <html><head/><body><p>Setup output mode. Use PWM or PWMSync with Standard ESCs.<br/>Several other ESCs like BLHeli 13+ can use the more advanced OneShot125.<br/>When using OneShot125 all values set in min/max and idle are divided by <br/>eight before being sent to esc (i.e. 1000 = 125, 2000 = 250).</p></body></html> @@ -688,8 +688,7 @@ - Setup PWM rate here: usual value is 490 Hz for multirotor airframes. OneShot and OneShot125 does not use this value - + <html><head/><body><p>Setup PWM rate here: usual value is 490 Hz for multirotor airframes.<br/>PWMSync and OneShot125 does not use this value.</p></body></html> false @@ -763,7 +762,7 @@ - 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). + <html><head/><body><p>Setup output mode. Use PWM or PWMSync with Standard ESCs.<br/>Several other ESCs like BLHeli 13+ can use the more advanced OneShot125.<br/>When using OneShot125 all values set in min/max and idle are divided by <br/>eight before being sent to esc (i.e. 1000 = 125, 2000 = 250).</p></body></html> @@ -791,9 +790,7 @@ - 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). + <html><head/><body><p>Setup output mode. Use PWM or PWMSync with Standard ESCs.<br/>Several other ESCs like BLHeli 13+ can use the more advanced OneShot125.<br/>When using OneShot125 all values set in min/max and idle are divided by <br/>eight before being sent to esc (i.e. 1000 = 125, 2000 = 250).</p></body></html> @@ -821,7 +818,7 @@ When using OneShot125 all values set in min/max and idle are divided by eight be - 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). + <html><head/><body><p>Setup output mode. Use PWM or PWMSync with Standard ESCs.<br/>Several other ESCs like BLHeli 13+ can use the more advanced OneShot125.<br/>When using OneShot125 all values set in min/max and idle are divided by <br/>eight before being sent to esc (i.e. 1000 = 125, 2000 = 250).</p></body></html> @@ -849,7 +846,7 @@ When using OneShot125 all values set in min/max and idle are divided by eight be - Setup PWM rate here: usual value is 490 Hz for multirotor airframes. OneShot and OneShot125 does not use this value + <html><head/><body><p>Setup PWM rate here: usual value is 490 Hz for multirotor airframes.<br/>PWMSync and OneShot125 does not use this value.</p></body></html> @@ -930,7 +927,7 @@ When using OneShot125 all values set in min/max and idle are divided by eight be - 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). + <html><head/><body><p>Setup output mode. Use PWM or PWMSync with Standard ESCs.<br/>Several other ESCs like BLHeli 13+ can use the more advanced OneShot125.<br/>When using OneShot125 all values set in min/max and idle are divided by <br/>eight before being sent to esc (i.e. 1000 = 125, 2000 = 250).</p></body></html> From 1b805610efb0498eb59c1f37a188b3c9df658c65 Mon Sep 17 00:00:00 2001 From: m_thread Date: Wed, 18 Feb 2015 13:49:27 +0100 Subject: [PATCH 5/5] OP-1685 Fixed some more tooltip texts. --- .../openpilotgcs/src/plugins/config/outputchannelform.ui | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/outputchannelform.ui b/ground/openpilotgcs/src/plugins/config/outputchannelform.ui index 459841ace..41420fb4a 100644 --- a/ground/openpilotgcs/src/plugins/config/outputchannelform.ui +++ b/ground/openpilotgcs/src/plugins/config/outputchannelform.ui @@ -7,7 +7,7 @@ 0 0 768 - 54 + 55 @@ -289,8 +289,7 @@ margin:1px; Qt::StrongFocus - Minimum PWM value, beware of not overdriving your servo. -Using OneShot125 a value of 1000(uS) here will produce a pulse of 125(uS). + <html><head/><body><p>Minimum PWM value, beware of not overdriving your servo.<br/>Using OneShot125 a value of 1000(µs) here will produce a pulse of 125(µs).</p></body></html> Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -628,8 +627,7 @@ margin:1px; Qt::StrongFocus - Maximum value, beware of not overdriving your servo. -Using OneShot125 a value of 2000(uS) here will produce a pulse of 250(uS). + <html><head/><body><p>Minimum PWM value, beware of not overdriving your servo.<br/>Using OneShot125 a value of 1000(µs) here will produce a pulse of 125(µs).</p></body></html> Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter