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
10afa650
Unverified
Commit
10afa650
authored
Jun 26, 2018
by
Don Gagne
Committed by
GitHub
Jun 26, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6660 from DonLakeFlyer/ArduPilotBattery
ArduPilot: More work for new battery stuff
parents
141239cc
58b85d0b
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
134 additions
and
111 deletions
+134
-111
APMPowerComponent.qml
src/AutoPilotPlugins/APM/APMPowerComponent.qml
+16
-2
APMSafetyComponent.qml
src/AutoPilotPlugins/APM/APMSafetyComponent.qml
+118
-109
No files found.
src/AutoPilotPlugins/APM/APMPowerComponent.qml
View file @
10afa650
...
...
@@ -43,6 +43,8 @@ SetupPage {
property
bool
_batt2MonitorEnabled
:
_batt2MonitorAvailable
&&
_batt2Monitor
.
rawValue
!==
0
property
bool
_batt1ParamsAvailable
:
controller
.
parameterExists
(
-
1
,
"
BATT_CAPACITY
"
)
property
bool
_batt2ParamsAvailable
:
controller
.
parameterExists
(
-
1
,
"
BATT2_CAPACITY
"
)
property
bool
_showBatt1Reboot
:
_batt1MonitorEnabled
&&
!
_batt1ParamsAvailable
property
bool
_showBatt2Reboot
:
_batt2MonitorEnabled
&&
!
_batt2ParamsAvailable
property
string
_restartRequired
:
qsTr
(
"
Requires vehicle reboot
"
)
...
...
@@ -84,7 +86,13 @@ SetupPage {
QGCLabel
{
text
:
_restartRequired
visible
:
_batt1MonitorEnabled
&&
!
_batt1ParamsAvailable
visible
:
_showBatt1Reboot
}
QGCButton
{
text
:
qsTr
(
"
Reboot vehicle
"
)
visible
:
_showBatt1Reboot
onClicked
:
controller
.
vehicle
.
rebootVehicle
()
}
}
}
...
...
@@ -162,7 +170,13 @@ SetupPage {
QGCLabel
{
text
:
_restartRequired
visible
:
_batt2MonitorEnabled
&&
!
_batt2ParamsAvailable
visible
:
_showBatt2Reboot
}
QGCButton
{
text
:
qsTr
(
"
Reboot vehicle
"
)
visible
:
_showBatt2Reboot
onClicked
:
controller
.
vehicle
.
rebootVehicle
()
}
}
}
...
...
src/AutoPilotPlugins/APM/APMSafetyComponent.qml
View file @
10afa650
This diff is collapsed.
Click to expand it.
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