zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Px4 volt/amp calculators (#3691) 

* Add volt/amp calculators

* Correct amps per volt calculation
QGC4.4
Don Gagne 9 years ago committed by GitHub
parent
79bfc087d0
commit
e6efa19a56
1 changed files with 246 additions and 112 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 358
      src/AutoPilotPlugins/PX4/PowerComponent.qml

358
src/AutoPilotPlugins/PX4/PowerComponent.qml
Unescape View File

@ -12,16 +12,17 @@
/// @brief Battery, propeller and magnetometer settings /// @brief Battery, propeller and magnetometer settings
/// @author Gus Grubba <mavlink@grubba.com> /// @author Gus Grubba <mavlink@grubba.com>
import QtQuick 2.2 import QtQuick 2.2
import QtQuick.Controls 1.2 import QtQuick.Controls 1.2
import QtQuick.Dialogs 1.2 import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.2
import QGroundControl.FactSystem 1.0 import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0 import QGroundControl.FactControls 1.0
import QGroundControl.Palette 1.0 import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0 import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0 import QGroundControl.ScreenTools 1.0
import QGroundControl.Controllers 1.0 import QGroundControl.Controllers 1.0
QGCView { QGCView {
id: rootQGCView id: rootQGCView
@ -29,11 +30,13 @@ QGCView {
property int textEditWidth: ScreenTools.defaultFontPixelWidth * 8 property int textEditWidth: ScreenTools.defaultFontPixelWidth * 8
property Fact battNumCells: controller.getParameterFact(-1, "BAT_N_CELLS") property Fact battNumCells: controller.getParameterFact(-1, "BAT_N_CELLS")
property Fact battHighVolt: controller.getParameterFact(-1, "BAT_V_CHARGED") property Fact battHighVolt: controller.getParameterFact(-1, "BAT_V_CHARGED")
property Fact battLowVolt: controller.getParameterFact(-1, "BAT_V_EMPTY") property Fact battLowVolt: controller.getParameterFact(-1, "BAT_V_EMPTY")
property Fact battVoltLoadDrop: controller.getParameterFact(-1, "BAT_V_LOAD_DROP") property Fact battVoltLoadDrop: controller.getParameterFact(-1, "BAT_V_LOAD_DROP")
property Fact uavcanEnable: controller.getParameterFact(-1, "UAVCAN_ENABLE", false) property Fact battVoltageDivider: controller.getParameterFact(-1, "BAT_V_DIV")
property Fact battAmpsPerVolt: controller.getParameterFact(-1, "BAT_A_PER_V")
property Fact uavcanEnable: controller.getParameterFact(-1, "UAVCAN_ENABLE", false)
readonly property string highlightPrefix: "<font color=\"" + qgcPal.warningText + "\">" readonly property string highlightPrefix: "<font color=\"" + qgcPal.warningText + "\">"
readonly property string highlightSuffix: "</font>" readonly property string highlightSuffix: "</font>"
@ -42,13 +45,13 @@ QGCView {
function getBatteryImage() function getBatteryImage()
{ {
switch(battNumCells.value) { switch(battNumCells.value) {
case 1: return "/qmlimages/PowerComponentBattery_01cell.svg"; case 1: return "/qmlimages/PowerComponentBattery_01cell.svg";
case 2: return "/qmlimages/PowerComponentBattery_02cell.svg" case 2: return "/qmlimages/PowerComponentBattery_02cell.svg"
case 3: return "/qmlimages/PowerComponentBattery_03cell.svg" case 3: return "/qmlimages/PowerComponentBattery_03cell.svg"
case 4: return "/qmlimages/PowerComponentBattery_04cell.svg" case 4: return "/qmlimages/PowerComponentBattery_04cell.svg"
case 5: return "/qmlimages/PowerComponentBattery_05cell.svg" case 5: return "/qmlimages/PowerComponentBattery_05cell.svg"
case 6: return "/qmlimages/PowerComponentBattery_06cell.svg" case 6: return "/qmlimages/PowerComponentBattery_06cell.svg"
default: return "/qmlimages/PowerComponentBattery_01cell.svg"; default: return "/qmlimages/PowerComponentBattery_01cell.svg";
} }
} }
@ -92,6 +95,122 @@ QGCView {
QGCPalette { id: palette; colorGroupEnabled: panel.enabled } QGCPalette { id: palette; colorGroupEnabled: panel.enabled }
Component {
id: calcVoltageDividerDlgComponent
QGCViewDialog {
id: calcVoltageDividerDlg
QGCFlickable {
anchors.fill: parent
contentHeight: column.height
contentWidth: column.width
Column {
id: column
width: calcVoltageDividerDlg.width
spacing: ScreenTools.defaultFontPixelHeight
QGCLabel {
width: parent.width
wrapMode: Text.WordWrap
text: "Measure battery voltage using an external voltmeter and enter the value below. Click Calculate to set the new voltage multiplier."
}
Grid {
columns: 2
spacing: ScreenTools.defaultFontPixelHeight / 2
verticalItemAlignment: Grid.AlignVCenter
QGCLabel {
text: "Measured voltage:"
}
QGCTextField { id: measuredVoltage }
QGCLabel { text: "Vehicle voltage:" }
QGCLabel { text: controller.vehicle.battery.voltage.valueString }
QGCLabel { text: "Voltage divider:" }
FactLabel { fact: battVoltageDivider }
}
QGCButton {
text: "Calculate"
onClicked: {
var measuredVoltageValue = parseFloat(measuredVoltage.text)
if (measuredVoltageValue == 0) {
return
}
var newVoltageDivider = (measuredVoltageValue * battVoltageDivider.value) / controller.vehicle.battery.voltage.value
if (newVoltageDivider != 0) {
battVoltageDivider.value = newVoltageDivider
}
}
}
} // Column
} // QGCFlickable
} // QGCViewDialog
} // Component - calcVoltageDividerDlgComponent
Component {
id: calcAmpsPerVoltDlgComponent
QGCViewDialog {
id: calcAmpsPerVoltDlg
QGCFlickable {
anchors.fill: parent
contentHeight: column.height
contentWidth: column.width
Column {
id: column
width: calcAmpsPerVoltDlg.width
spacing: ScreenTools.defaultFontPixelHeight
QGCLabel {
width: parent.width
wrapMode: Text.WordWrap
text: "Measure current draw using an external current meter and enter the value below. Click Calculate to set the new amps per volt value."
}
Grid {
columns: 2
spacing: ScreenTools.defaultFontPixelHeight / 2
verticalItemAlignment: Grid.AlignVCenter
QGCLabel {
text: "Measured current:"
}
QGCTextField { id: measuredCurrent }
QGCLabel { text: "Vehicle current:" }
QGCLabel { text: controller.vehicle.battery.current.valueString }
QGCLabel { text: "Amps per volt:" }
FactLabel { fact: battAmpsPerVolt }
}
QGCButton {
text: "Calculate"
onClicked: {
var measuredCurrentValue = parseFloat(measuredCurrent.text)
if (measuredCurrentValue == 0) {
return
}
var newAmpsPerVolt = (measuredCurrentValue * battAmpsPerVolt.value) / controller.vehicle.battery.current.value
if (newAmpsPerVolt != 0) {
battAmpsPerVolt.value = newAmpsPerVolt
}
}
}
} // Column
} // QGCFlickable
} // QGCViewDialog
} // Component - calcAmpsPerVoltDlgComponent
QGCViewPanel { QGCViewPanel {
id: panel id: panel
anchors.fill: parent anchors.fill: parent
@ -100,7 +219,7 @@ QGCView {
anchors.fill: parent anchors.fill: parent
clip: true clip: true
contentHeight: innerColumn.height contentHeight: innerColumn.height
contentWidth: panel.width contentWidth: panel.width
flickableDirection: Flickable.VerticalFlick flickableDirection: Flickable.VerticalFlick
Column { Column {
@ -115,123 +234,138 @@ QGCView {
Rectangle { Rectangle {
width: parent.width width: parent.width
height: voltageCol.height + ScreenTools.defaultFontPixelHeight height: batteryGrid.height + ScreenTools.defaultFontPixelHeight
color: palette.windowShade color: palette.windowShade
Column { GridLayout {
id: voltageCol id: batteryGrid
anchors.margins: ScreenTools.defaultFontPixelHeight / 2 anchors.margins: ScreenTools.defaultFontPixelHeight / 2
anchors.left: parent.left anchors.left: parent.left
anchors.top: parent.top anchors.top: parent.top
spacing: ScreenTools.defaultFontPixelHeight / 2 columns: 5
columnSpacing: ScreenTools.defaultFontPixelWidth
property real firstColumnWidth: Math.max(Math.max(cellsLabel.contentWidth, battHighLabel.contentWidth), battLowLabel.contentWidth) + ScreenTools.defaultFontPixelWidth QGCLabel {
text: qsTr("Number of Cells (in Series)")
}
Row { FactTextField {
spacing: ScreenTools.defaultFontPixelWidth id: cellsField
width: textEditWidth
fact: battNumCells
showUnits: true
}
QGCLabel { QGCColoredImage {
id: cellsLabel id: batteryImage
text: qsTr("Number of Cells (in Series)") Layout.rowSpan: 3
anchors.baseline: cellsField.baseline width: height * 0.75
} height: 100
sourceSize.height: height
fillMode: Image.PreserveAspectFit
smooth: true
color: palette.text
cache: false
source: getBatteryImage();
}
FactTextField { Item { width: 1; height: 1; Layout.columnSpan: 2 }
id: cellsField
x: voltageCol.firstColumnWidth QGCLabel {
width: textEditWidth id: battHighLabel
fact: battNumCells text: qsTr("Full Voltage (per cell)")
showUnits: true
}
} }
Row { FactTextField {
spacing: ScreenTools.defaultFontPixelWidth id: battHighField
width: textEditWidth
fact: battHighVolt
showUnits: true
}
QGCLabel { QGCLabel {
id: battHighLabel text: qsTr("Battery Max:")
text: qsTr("Full Voltage (per cell)") }
anchors.baseline: battHighField.baseline
}
FactTextField { QGCLabel {
id: battHighField text: (battNumCells.value * battHighVolt.value).toFixed(1) + ' V'
x: voltageCol.firstColumnWidth
width: textEditWidth
fact: battHighVolt
showUnits: true
}
} }
Row { QGCLabel {
spacing: ScreenTools.defaultFontPixelWidth id: battLowLabel
text: qsTr("Empty Voltage (per cell)")
}
QGCLabel { FactTextField {
id: battLowLabel id: battLowField
text: qsTr("Empty Voltage (per cell)") width: textEditWidth
anchors.baseline: battLowField.baseline fact: battLowVolt
} showUnits: true
}
FactTextField { QGCLabel {
id: battLowField text: qsTr("Battery Min:")
x: voltageCol.firstColumnWidth
width: textEditWidth
fact: battLowVolt
showUnits: true
}
} }
} // Column
QGCColoredImage {
id: batteryImage
anchors.verticalCenter: voltageCol.verticalCenter
x: voltageCol.firstColumnWidth + textEditWidth + (ScreenTools.defaultFontPixelWidth * 2)
width: height * 0.75
height: voltageCol.height
sourceSize.height: height
fillMode: Image.PreserveAspectFit
smooth: true
color: palette.text
cache: false
source: getBatteryImage();
}
Column { QGCLabel {
id: batteryMinMaxColumn text: (battNumCells.value * battLowVolt.value).toFixed(1) + ' V'
anchors.leftMargin: ScreenTools.defaultFontPixelWidth }
anchors.left: batteryImage.right
anchors.verticalCenter: voltageCol.verticalCenter
spacing: ScreenTools.defaultFontPixelHeight
property real firstColumnWidth: Math.max(batteryMaxLabel.width, batteryMinLabel.contentWidth) + ScreenTools.defaultFontPixelWidth QGCLabel {
text: qsTr("Voltage divider")
}
Row { FactTextField {
spacing: ScreenTools.defaultFontPixelWidth id: voltMultField
fact: battVoltageDivider
}
QGCLabel { QGCButton {
id: batteryMaxLabel id: voltMultCalculateButton
text: qsTr("Battery Max:") text: "Calculate"
} onClicked: showDialog(calcVoltageDividerDlgComponent, qsTr("Calculate Voltage Divider"), qgcView.showDialogDefaultWidth, StandardButton.Close)
}
QGCLabel { Item { width: 1; height: 1; Layout.columnSpan: 2 }
x: batteryMinMaxColumn.firstColumnWidth
text: (battNumCells.value * battHighVolt.value).toFixed(1) + ' V' QGCLabel {
} id: voltMultHelp
Layout.columnSpan: batteryGrid.columns
Layout.fillWidth: true
font.pointSize: ScreenTools.smallFontPointSize
wrapMode: Text.WordWrap
text: "If the battery voltage reported by the vehicle is largely different than the voltage read externally using a voltmeter you can adjust the voltage multiplier value to correct this. " +
"Click the Calculate button for help with calculating a new value."
} }
Row {
spacing: ScreenTools.defaultFontPixelWidth
QGCLabel { QGCLabel {
id: batteryMinLabel id: ampPerVoltLabel
text: qsTr("Battery Min:") text: qsTr("Amps per volt")
} }
QGCLabel { FactTextField {
x: batteryMinMaxColumn.firstColumnWidth id: ampPerVoltField
text: (battNumCells.value * battLowVolt.value).toFixed(1) + ' V' fact: battAmpsPerVolt
}
} }
}
QGCButton {
id: ampPerVoltCalculateButton
text: "Calculate"
onClicked: showDialog(calcAmpsPerVoltDlgComponent, qsTr("Calculate Amps per Volt"), qgcView.showDialogDefaultWidth, StandardButton.Close)
}
Item { width: 1; height: 1; Layout.columnSpan: 2 }
QGCLabel {
id: ampPerVoltHelp
Layout.columnSpan: batteryGrid.columns
Layout.fillWidth: true
font.pointSize: ScreenTools.smallFontPointSize
wrapMode: Text.WordWrap
text: "If the current draw reported by the vehicle is largely different than the current read externally using a current meter you can adjust the amps per volt value to correct this. " +
"Click the Calculate button for help with calculating a new value."
}
} // Grid
} // Rectangle - Battery settings } // Rectangle - Battery settings
QGCLabel { QGCLabel {
@ -408,7 +542,7 @@ QGCView {
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
text: qsTr("Batteries show less voltage at high throttle. Enter the difference in Volts between idle throttle and full ") + text: qsTr("Batteries show less voltage at high throttle. Enter the difference in Volts between idle throttle and full ") +
qsTr("throttle, divided by the number of battery cells. Leave at the default if unsure. ") + qsTr("throttle, divided by the number of battery cells. Leave at the default if unsure. ") +
highlightPrefix + qsTr("If this value is set too high, the battery might be deep discharged and damaged.") + highlightSuffix highlightPrefix + qsTr("If this value is set too high, the battery might be deep discharged and damaged.") + highlightSuffix
} }
Row { Row {

Write Preview
Loading…
Cancel
Save