Commit 81837240 authored by Don Gagne's avatar Don Gagne Committed by GitHub

PWM range is now 800<->2200 (#3644)

parent b6f76e2a
...@@ -176,6 +176,10 @@ QGCView { ...@@ -176,6 +176,10 @@ QGCView {
readonly property int __rcValueMaxJitter: 2 readonly property int __rcValueMaxJitter: 2
property color __barColor: qgcPal.windowShade property color __barColor: qgcPal.windowShade
readonly property int _pwmMin: 800
readonly property int _pwmMax: 2200
readonly property int _pwmRange: _pwmMax - _pwmMin
// Bar // Bar
Rectangle { Rectangle {
id: bar id: bar
...@@ -198,7 +202,7 @@ QGCView { ...@@ -198,7 +202,7 @@ QGCView {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
width: parent.height * 0.75 width: parent.height * 0.75
height: width height: width
x: ((Math.abs((rcValue - 1000) - (reversed ? 1000 : 0)) / 1000) * parent.width) - (width / 2) x: ((Math.abs((rcValue - _pwmMin) - (reversed ? _pwmMin : 0)) / _pwmRange) * parent.width) - (width / 2)
radius: width / 2 radius: width / 2
color: qgcPal.text color: qgcPal.text
visible: mapped visible: mapped
......
...@@ -23,6 +23,10 @@ FactPanel { ...@@ -23,6 +23,10 @@ FactPanel {
id: _root id: _root
height: monitorColumn.height height: monitorColumn.height
readonly property int _pwmMin: 800
readonly property int _pwmMax: 2200
readonly property int _pwmRange: _pwmMax - _pwmMin
QGCPalette { id: qgcPal; colorGroupEnabled: panel.enabled } QGCPalette { id: qgcPal; colorGroupEnabled: panel.enabled }
RCChannelMonitorController { RCChannelMonitorController {
...@@ -63,7 +67,7 @@ FactPanel { ...@@ -63,7 +67,7 @@ FactPanel {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
width: parent.height * 0.75 width: parent.height * 0.75
height: width height: width
x: ((Math.abs((rcValue - 1000) - (reversed ? 1000 : 0)) / 1000) * parent.width) - (width / 2) x: ((Math.abs((rcValue - _pwmMin) - (reversed ? _pwmMin : 0)) / _pwmRange) * parent.width) - (width / 2)
radius: width / 2 radius: width / 2
color: qgcPal.text color: qgcPal.text
visible: mapped visible: mapped
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment