diff --git a/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp b/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
index 15163a142..03f4727f2 100644
--- a/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
@@ -448,7 +448,7 @@ 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\""));
+ setWarning(tr("OneShot only works with MainPort settings marked with \"+OneShot\"\nUsing \"PPM_PIN6+OneShot\" bank 4 (output 6) must be set to PWM"));
return;
}
}
diff --git a/ground/openpilotgcs/src/plugins/config/output.ui b/ground/openpilotgcs/src/plugins/config/output.ui
index 4a9211f24..0ce1d0a9b 100644
--- a/ground/openpilotgcs/src/plugins/config/output.ui
+++ b/ground/openpilotgcs/src/plugins/config/output.ui
@@ -122,7 +122,7 @@
0
0
- 799
+ 831
659
@@ -160,13 +160,13 @@
Output configuration
- -
-
+
-
+
- -
+ Bank(Channels):
- Qt::AlignCenter
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
@@ -180,88 +180,86 @@
- -
-
+
-
+
- Bank(Channels):
+ -
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+ 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
+
+
+
+
-
-
-
-
- 52
- 52
-
-
-
-
- 52
- 52
-
-
-
- background: transparent
-
-
- QFrame::NoFrame
-
-
- QPainter::HighQualityAntialiasing
-
-
+
+ 50
+
-
-
-
-
- 0
- 0
-
-
-
-
- 200
- 50
-
-
-
-
- 16777215
- 50
-
-
-
-
- 10
- 50
- false
-
-
-
- Calibration status
-
-
- QFrame::NoFrame
-
-
- Qt::ScrollBarAlwaysOff
-
-
- QAbstractScrollArea::AdjustIgnored
-
-
- Qt::NoTextInteraction
-
-
+
+ 60
+
-
+ -
+
+ 125
+
+
+ -
+
+ 165
+
+
+ -
+
+ 270
+
+
+ -
+
+ 330
+
+
+ -
+
+ 400
+
+
+ -
+
+ 490
+
+
+
-
@@ -273,6 +271,275 @@
+ -
+
+
+ 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).
+
+
+
-
@@ -368,8 +635,8 @@
- -
-
+
-
+
false
@@ -392,51 +659,88 @@
- Setup PWM rate here: usual value is 490 Hz for multirotor airframes. OneShot and OneShot125 does not use this value
+ 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.
+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
+
+
+
+
+ 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).
-
-
-
- 50
-
-
- -
-
- 60
-
-
- -
-
- 125
-
-
- -
-
- 165
-
-
- -
-
- 270
-
-
- -
-
- 330
-
-
- -
-
- 400
-
-
- -
-
- 490
-
-
-
@@ -461,79 +765,8 @@
- -
-
-
- 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
@@ -613,312 +846,6 @@
- -
-
-
- 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
-
-
-
-
- -
-
-
-
- 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.
-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
-
-
-
-
- 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).
-
-
-
- -
-
-
- 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).
-
-
-
-
@@ -947,6 +874,88 @@ When using OneShot125 all values set in min/max and idle are divided by eight be
+ -
+
+
+ 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
+
+
+
+
+