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
8192004c
Commit
8192004c
authored
May 03, 2017
by
Don Gagne
Committed by
GitHub
May 03, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5083 from bluerobotics/pr-fence-alt
(APM Sub) Fix fence alt parameter in safety page
parents
a59bc40b
42aa336b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
APMSafetyComponentSub.qml
src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml
+5
-5
ArduSubFirmwarePlugin.cc
src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.cc
+2
-0
No files found.
src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml
View file @
8192004c
...
...
@@ -34,15 +34,15 @@ SetupPage {
QGCPalette
{
id
:
ggcPal
;
colorGroupEnabled
:
true
}
property
Fact
_failsafeGCSEnable
:
controller
.
getParameterFact
(
-
1
,
"
FS_GCS_ENABLE
"
)
property
Fact
_failsafeLeakEnable
:
controller
.
getParameterFact
(
-
1
,
"
FS_LEAK_ENABLE
"
)
property
Fact
_failsafeGCSEnable
:
controller
.
getParameterFact
(
-
1
,
"
FS_GCS_ENABLE
"
)
property
Fact
_failsafeLeakEnable
:
controller
.
getParameterFact
(
-
1
,
"
FS_LEAK_ENABLE
"
)
property
Fact
_failsafePressureEnable
:
controller
.
getParameterFact
(
-
1
,
"
FS_PRESS_ENABLE
"
)
property
Fact
_failsafePressureValue
:
controller
.
getParameterFact
(
-
1
,
"
FS_PRESS_MAX
"
)
property
Fact
_failsafeTempEnable
:
controller
.
getParameterFact
(
-
1
,
"
FS_TEMP_ENABLE
"
)
property
Fact
_failsafeTempValue
:
controller
.
getParameterFact
(
-
1
,
"
FS_TEMP_MAX
"
)
property
Fact
_failsafeTempEnable
:
controller
.
getParameterFact
(
-
1
,
"
FS_TEMP_ENABLE
"
)
property
Fact
_failsafeTempValue
:
controller
.
getParameterFact
(
-
1
,
"
FS_TEMP_MAX
"
)
property
Fact
_fenceAction
:
controller
.
getParameterFact
(
-
1
,
"
FENCE_ACTION
"
)
property
Fact
_fenceAltMax
:
controller
.
getParameterFact
(
-
1
,
"
FENCE_ALT_MAX
"
)
property
Fact
_fenceAltMax
:
controller
.
getParameterFact
(
-
1
,
"
r.FENCE_ALT_MIN
"
)
property
Fact
_fenceEnable
:
controller
.
getParameterFact
(
-
1
,
"
FENCE_ENABLE
"
)
property
Fact
_fenceMargin
:
controller
.
getParameterFact
(
-
1
,
"
FENCE_MARGIN
"
)
property
Fact
_fenceType
:
controller
.
getParameterFact
(
-
1
,
"
FENCE_TYPE
"
)
...
...
src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.cc
View file @
8192004c
...
...
@@ -62,6 +62,8 @@ ArduSubFirmwarePlugin::ArduSubFirmwarePlugin(void)
remapV3_5
[
"SERVO13_FUNCTION"
]
=
QStringLiteral
(
"RC13_FUNCTION"
);
remapV3_5
[
"SERVO14_FUNCTION"
]
=
QStringLiteral
(
"RC14_FUNCTION"
);
remapV3_5
[
"FENCE_ALT_MIN"
]
=
QStringLiteral
(
"FENCE_DEPTH_MAX"
);
_remapParamNameIntialized
=
true
;
}
}
...
...
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