Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
620e1b7f
Commit
620e1b7f
authored
Jun 25, 2018
by
DonLakeFlyer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix APM power calculators
parent
a99d190a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
29 additions
and
10 deletions
+29
-10
APMPowerComponent.qml
src/AutoPilotPlugins/APM/APMPowerComponent.qml
+29
-10
No files found.
src/AutoPilotPlugins/APM/APMPowerComponent.qml
View file @
620e1b7f
...
@@ -369,8 +369,14 @@ SetupPage {
...
@@ -369,8 +369,14 @@ SetupPage {
QGCButton
{
QGCButton
{
text
:
qsTr
(
"
Calculate
"
)
text
:
qsTr
(
"
Calculate
"
)
onClicked
:
showDialog
(
calcVoltageMultiplierDlgComponent
,
qsTr
(
"
Calculate Voltage Multiplier
"
),
qgcView
.
showDialogDefaultWidth
,
StandardButton
.
Close
)
visible
:
_showAdvanced
visible
:
_showAdvanced
onClicked
:
{
_calcVoltageDlgVehicleVoltage
=
vehicleVoltage
_calcVoltageDlgBattVoltMultParam
=
battVoltMult
showDialog
(
calcVoltageMultiplierDlgComponent
,
qsTr
(
"
Calculate Voltage Multiplier
"
),
qgcView
.
showDialogDefaultWidth
,
StandardButton
.
Close
)
}
}
}
QGCLabel
{
QGCLabel
{
...
@@ -395,8 +401,13 @@ SetupPage {
...
@@ -395,8 +401,13 @@ SetupPage {
QGCButton
{
QGCButton
{
text
:
qsTr
(
"
Calculate
"
)
text
:
qsTr
(
"
Calculate
"
)
onClicked
:
showDialog
(
calcAmpsPerVoltDlgComponent
,
qsTr
(
"
Calculate Amps per Volt
"
),
qgcView
.
showDialogDefaultWidth
,
StandardButton
.
Close
)
visible
:
_showAdvanced
visible
:
_showAdvanced
onClicked
:
{
_calcAmpsPerVoltDlgVehicleCurrent
=
vehicleCurrent
_calcAmpsPerVoltDlgBattAmpPerVoltParam
=
battAmpPerVolt
showDialog
(
calcAmpsPerVoltDlgComponent
,
qsTr
(
"
Calculate Amps per Volt
"
),
qgcView
.
showDialogDefaultWidth
,
StandardButton
.
Close
)
}
}
}
QGCLabel
{
QGCLabel
{
...
@@ -411,6 +422,10 @@ SetupPage {
...
@@ -411,6 +422,10 @@ SetupPage {
}
// Column
}
// Column
}
// Component - powerSetupComponent
}
// Component - powerSetupComponent
// Must be set prior to use of calcVoltageMultiplierDlgComponent
property
Fact
_calcVoltageDlgVehicleVoltage
property
Fact
_calcVoltageDlgBattVoltMultParam
Component
{
Component
{
id
:
calcVoltageMultiplierDlgComponent
id
:
calcVoltageMultiplierDlgComponent
...
@@ -444,10 +459,10 @@ SetupPage {
...
@@ -444,10 +459,10 @@ SetupPage {
QGCTextField
{
id
:
measuredVoltage
}
QGCTextField
{
id
:
measuredVoltage
}
QGCLabel
{
text
:
qsTr
(
"
Vehicle voltage:
"
)
}
QGCLabel
{
text
:
qsTr
(
"
Vehicle voltage:
"
)
}
QGCLabel
{
text
:
vehicleVoltage
.
valueString
}
FactLabel
{
fact
:
_calcVoltageDlgVehicleVoltage
}
QGCLabel
{
text
:
qsTr
(
"
Voltage multiplier:
"
)
}
QGCLabel
{
text
:
qsTr
(
"
Voltage multiplier:
"
)
}
FactLabel
{
fact
:
battVoltMult
}
FactLabel
{
fact
:
_calcVoltageDlgBattVoltMultParam
}
}
}
QGCButton
{
QGCButton
{
...
@@ -458,9 +473,9 @@ SetupPage {
...
@@ -458,9 +473,9 @@ SetupPage {
if
(
measuredVoltageValue
==
0
||
isNaN
(
measuredVoltageValue
))
{
if
(
measuredVoltageValue
==
0
||
isNaN
(
measuredVoltageValue
))
{
return
return
}
}
var
newVoltageMultiplier
=
(
measuredVoltageValue
*
battVoltMult
.
value
)
/
v
ehicleVoltage
.
value
var
newVoltageMultiplier
=
(
measuredVoltageValue
*
_calcVoltageDlgBattVoltMultParam
.
value
)
/
_calcVoltageDlgV
ehicleVoltage
.
value
if
(
newVoltageMultiplier
>
0
)
{
if
(
newVoltageMultiplier
>
0
)
{
battVoltMult
.
value
=
newVoltageMultiplier
_calcVoltageDlgBattVoltMultParam
.
value
=
newVoltageMultiplier
}
}
}
}
}
}
...
@@ -469,6 +484,10 @@ SetupPage {
...
@@ -469,6 +484,10 @@ SetupPage {
}
// QGCViewDialog
}
// QGCViewDialog
}
// Component - calcVoltageMultiplierDlgComponent
}
// Component - calcVoltageMultiplierDlgComponent
// Must be set prior to use of calcAmpsPerVoltDlgComponent
property
Fact
_calcAmpsPerVoltDlgVehicleCurrent
property
Fact
_calcAmpsPerVoltDlgBattAmpPerVoltParam
Component
{
Component
{
id
:
calcAmpsPerVoltDlgComponent
id
:
calcAmpsPerVoltDlgComponent
...
@@ -502,10 +521,10 @@ SetupPage {
...
@@ -502,10 +521,10 @@ SetupPage {
QGCTextField
{
id
:
measuredCurrent
}
QGCTextField
{
id
:
measuredCurrent
}
QGCLabel
{
text
:
qsTr
(
"
Vehicle current:
"
)
}
QGCLabel
{
text
:
qsTr
(
"
Vehicle current:
"
)
}
QGCLabel
{
text
:
vehicleCurrent
.
valueString
}
FactLabel
{
fact
:
_calcAmpsPerVoltDlgVehicleCurrent
}
QGCLabel
{
text
:
qsTr
(
"
Amps per volt:
"
)
}
QGCLabel
{
text
:
qsTr
(
"
Amps per volt:
"
)
}
FactLabel
{
fact
:
battAmpPerVolt
}
FactLabel
{
fact
:
_calcAmpsPerVoltDlgBattAmpPerVoltParam
}
}
}
QGCButton
{
QGCButton
{
...
@@ -516,9 +535,9 @@ SetupPage {
...
@@ -516,9 +535,9 @@ SetupPage {
if
(
measuredCurrentValue
==
0
)
{
if
(
measuredCurrentValue
==
0
)
{
return
return
}
}
var
newAmpsPerVolt
=
(
measuredCurrentValue
*
battAmpPerVolt
.
value
)
/
v
ehicleCurrent
.
value
var
newAmpsPerVolt
=
(
measuredCurrentValue
*
_calcAmpsPerVoltDlgBattAmpPerVoltParam
.
value
)
/
_calcAmpsPerVoltDlgV
ehicleCurrent
.
value
if
(
newAmpsPerVolt
!=
0
)
{
if
(
newAmpsPerVolt
!=
0
)
{
battAmpPerVolt
.
value
=
newAmpsPerVolt
_calcAmpsPerVoltDlgBattAmpPerVoltParam
.
value
=
newAmpsPerVolt
}
}
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment