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
fb57f430
Commit
fb57f430
authored
Apr 25, 2016
by
dogmaphobic
Committed by
Lorenz Meier
Apr 25, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adding data link loss and removing COM_DL_LOSS_EN.
parent
a269adf6
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
123 additions
and
44 deletions
+123
-44
qgcresources.qrc
qgcresources.qrc
+2
-0
DatalinkLoss.svg
src/AutoPilotPlugins/PX4/Images/DatalinkLoss.svg
+26
-0
DatalinkLossLight.svg
src/AutoPilotPlugins/PX4/Images/DatalinkLossLight.svg
+23
-0
SafetyComponent.qml
src/AutoPilotPlugins/PX4/SafetyComponent.qml
+57
-37
SafetyComponentSummary.qml
src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml
+15
-7
No files found.
qgcresources.qrc
View file @
fb57f430
...
@@ -49,6 +49,8 @@
...
@@ -49,6 +49,8 @@
<file alias="FirmwareUpgradeIcon.png">src/VehicleSetup/FirmwareUpgradeIcon.png</file>
<file alias="FirmwareUpgradeIcon.png">src/VehicleSetup/FirmwareUpgradeIcon.png</file>
<file alias="FlightModesComponentIcon.png">src/AutoPilotPlugins/PX4/Images/FlightModesComponentIcon.png</file>
<file alias="FlightModesComponentIcon.png">src/AutoPilotPlugins/PX4/Images/FlightModesComponentIcon.png</file>
<file alias="CameraComponentIcon.png">src/AutoPilotPlugins/PX4/Images/CameraComponentIcon.png</file>
<file alias="CameraComponentIcon.png">src/AutoPilotPlugins/PX4/Images/CameraComponentIcon.png</file>
<file alias="DatalinkLoss.svg">src/AutoPilotPlugins/PX4/Images/DatalinkLoss.svg</file>
<file alias="DatalinkLossLight.svg">src/AutoPilotPlugins/PX4/Images/DatalinkLossLight.svg</file>
<file alias="GeoFence.svg">src/AutoPilotPlugins/PX4/Images/GeoFence.svg</file>
<file alias="GeoFence.svg">src/AutoPilotPlugins/PX4/Images/GeoFence.svg</file>
<file alias="GeoFenceLight.svg">src/AutoPilotPlugins/PX4/Images/GeoFenceLight.svg</file>
<file alias="GeoFenceLight.svg">src/AutoPilotPlugins/PX4/Images/GeoFenceLight.svg</file>
<file alias="LandMode.svg">src/AutoPilotPlugins/PX4/Images/LandMode.svg</file>
<file alias="LandMode.svg">src/AutoPilotPlugins/PX4/Images/LandMode.svg</file>
...
...
src/AutoPilotPlugins/PX4/Images/DatalinkLoss.svg
0 → 100644
View file @
fb57f430
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg
version=
"1.1"
id=
"Layer_1"
xmlns=
"http://www.w3.org/2000/svg"
xmlns:xlink=
"http://www.w3.org/1999/xlink"
x=
"0px"
y=
"0px"
viewBox=
"194 896 87.1 74.8"
style=
"enable-background:new 194 896 87.1 74.8;"
xml:space=
"preserve"
>
<style
type=
"text/css"
>
.st0{fill:#FFFFFF;}
.st1{fill:none;stroke:#FFFFFF;stroke-width:5.4819;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
.st2{fill:none;stroke:#A10000;stroke-width:10;stroke-linecap:round;stroke-miterlimit:10;}
</style>
<g>
<path
class=
"st0"
d=
"M198.2,910.3c0.4-0.7,0.9-1,1.6-1l67.1,0.1c0.4,0,0.7,0.1,1.1,0.3c0.3,0.2,0.5,0.5,0.6,0.9
c0.3,0.7,0.1,1.4-0.4,2L228,954.5c-0.4,0.4-0.9,0.6-1.5,0.6c-0.3,0-0.6-0.2-0.9-0.3c-0.2-0.1-0.4-0.3-0.5-0.5L214.7,938l-6.9,3.2
c-0.7,0.3-1.3,0.3-1.9-0.1s-0.8-1-0.8-1.7l1.4-14l-8.4-13.1C197.9,911.6,197.9,911,198.2,910.3L198.2,910.3z M203.3,913.1l6.5,10.2
c0,0.1,0.1,0.2,0.1,0.4l0.1,0.2l45.2-10.7L203.3,913.1z M210.4,925.7l-1.1,10.6l51.8-22.6L210.4,925.7z M217.1,935
c0.3,0.3,0.6,0.6,0.8,0.9l9.1,14.3l32.1-33.4L217.1,935z"
/>
<g>
<path
id=
"path3890"
inkscape:connector-curvature=
"0"
class=
"st1"
d=
"M249.8,952.8c6.2,6.2,16.4,6.2,22.7,0
c6.2-6.2,6.2-16.4,0-22.7"
/>
<path
id=
"path3892"
inkscape:connector-curvature=
"0"
class=
"st1"
d=
"M255.5,945.3c2.7,2.7,7,2.7,9.7,0c2.7-2.7,2.7-7,0-9.7"
/>
</g>
</g>
<g>
<line
class=
"st2"
x1=
"207.1"
y1=
"963.9"
x2=
"268"
y2=
"903"
/>
<line
class=
"st2"
x1=
"268"
y1=
"963.9"
x2=
"207.1"
y2=
"902.9"
/>
</g>
</svg>
src/AutoPilotPlugins/PX4/Images/DatalinkLossLight.svg
0 → 100644
View file @
fb57f430
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg
version=
"1.1"
id=
"Layer_1"
xmlns=
"http://www.w3.org/2000/svg"
xmlns:xlink=
"http://www.w3.org/1999/xlink"
x=
"0px"
y=
"0px"
viewBox=
"194 896 87.1 74.8"
style=
"enable-background:new 194 896 87.1 74.8;"
xml:space=
"preserve"
>
<style
type=
"text/css"
>
.st0{fill:none;stroke:#000000;stroke-width:5.4819;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
.st1{fill:none;stroke:#CB2027;stroke-width:10;stroke-linecap:round;stroke-miterlimit:10;}
</style>
<path
d=
"M198.2,910.3c0.4-0.7,0.9-1,1.6-1l67.1,0.1c0.4,0,0.7,0.1,1.1,0.3c0.3,0.2,0.5,0.5,0.6,0.9c0.3,0.7,0.1,1.4-0.4,2L228,954.5
c-0.4,0.4-0.9,0.6-1.5,0.6c-0.3,0-0.6-0.2-0.9-0.3c-0.2-0.1-0.4-0.3-0.5-0.5L214.7,938l-6.9,3.2c-0.7,0.3-1.3,0.3-1.9-0.1
s-0.8-1-0.8-1.7l1.4-14l-8.4-13.1C197.9,911.6,197.9,911,198.2,910.3L198.2,910.3z M203.3,913.1l6.5,10.2c0,0.1,0.1,0.2,0.1,0.4
l0.1,0.2l45.2-10.7L203.3,913.1z M210.4,925.7l-1.1,10.6l51.8-22.6L210.4,925.7z M217.1,935c0.3,0.3,0.6,0.6,0.8,0.9l9.1,14.3
l32.1-33.4L217.1,935z"
/>
<g>
<path
id=
"path3890"
inkscape:connector-curvature=
"0"
class=
"st0"
d=
"M249.8,952.8c6.2,6.2,16.4,6.2,22.7,0
c6.2-6.2,6.2-16.4,0-22.7"
/>
<path
id=
"path3892"
inkscape:connector-curvature=
"0"
class=
"st0"
d=
"M255.5,945.3c2.7,2.7,7,2.7,9.7,0c2.7-2.7,2.7-7,0-9.7"
/>
</g>
<g>
<line
class=
"st1"
x1=
"207.1"
y1=
"963.9"
x2=
"268"
y2=
"903"
/>
<line
class=
"st1"
x1=
"268"
y1=
"963.9"
x2=
"207.1"
y2=
"902.9"
/>
</g>
</svg>
src/AutoPilotPlugins/PX4/SafetyComponent.qml
View file @
fb57f430
This diff is collapsed.
Click to expand it.
src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml
View file @
fb57f430
...
@@ -17,8 +17,10 @@ FactPanel {
...
@@ -17,8 +17,10 @@ FactPanel {
property
Fact
returnAltFact
:
controller
.
getParameterFact
(
-
1
,
"
RTL_RETURN_ALT
"
)
property
Fact
returnAltFact
:
controller
.
getParameterFact
(
-
1
,
"
RTL_RETURN_ALT
"
)
property
Fact
descendAltFact
:
controller
.
getParameterFact
(
-
1
,
"
RTL_DESCEND_ALT
"
)
property
Fact
descendAltFact
:
controller
.
getParameterFact
(
-
1
,
"
RTL_DESCEND_ALT
"
)
property
Fact
landDelayFact
:
controller
.
getParameterFact
(
-
1
,
"
RTL_LAND_DELAY
"
)
property
Fact
landDelayFact
:
controller
.
getParameterFact
(
-
1
,
"
RTL_LAND_DELAY
"
)
property
Fact
commDLLossFact
:
controller
.
getParameterFact
(
-
1
,
"
COM_DL_LOSS_EN
"
)
property
Fact
commRCLossFact
:
controller
.
getParameterFact
(
-
1
,
"
COM_RC_LOSS_T
"
)
property
Fact
commRCLossFact
:
controller
.
getParameterFact
(
-
1
,
"
COM_RC_LOSS_T
"
)
property
Fact
lowBattAction
:
controller
.
getParameterFact
(
-
1
,
"
COM_LOW_BAT_ACT
"
)
property
Fact
rcLossAction
:
controller
.
getParameterFact
(
-
1
,
"
NAV_RCL_ACT
"
)
property
Fact
dataLossAction
:
controller
.
getParameterFact
(
-
1
,
"
NAV_DLL_ACT
"
)
Column
{
Column
{
anchors.fill
:
parent
anchors.fill
:
parent
...
@@ -35,18 +37,24 @@ FactPanel {
...
@@ -35,18 +37,24 @@ FactPanel {
}
}
VehicleSummaryRow
{
VehicleSummaryRow
{
labelText
:
qsTr
(
"
R
TL loiter delay
:
"
)
labelText
:
qsTr
(
"
R
C loss RTL (seconds)
:
"
)
valueText
:
landDelayFact
?
(
landDelayFact
.
value
<
0
?
qsTr
(
"
Disabled
"
)
:
landDelayFact
.
valueString
)
:
""
valueText
:
commRCLossFact
?
commRCLossFact
.
valueString
:
""
}
}
VehicleSummaryRow
{
VehicleSummaryRow
{
labelText
:
qsTr
(
"
Telemetry loss RTL
:
"
)
labelText
:
qsTr
(
"
RC loss action
:
"
)
valueText
:
commDLLossFact
?
(
commDLLossFact
.
value
!=
-
1
?
qsTr
(
"
Disabled
"
)
:
commDLLossFact
.
valueString
)
:
""
valueText
:
rcLossAction
?
rcLossAction
.
enumStringValue
:
""
}
}
VehicleSummaryRow
{
VehicleSummaryRow
{
labelText
:
qsTr
(
"
RC loss RTL (seconds)
:
"
)
labelText
:
qsTr
(
"
Link loss action
:
"
)
valueText
:
commRCLossFact
?
commRCLossFact
.
valueString
:
""
valueText
:
dataLossAction
?
dataLossAction
.
enumStringValue
:
""
}
}
VehicleSummaryRow
{
labelText
:
qsTr
(
"
Low battery action:
"
)
valueText
:
lowBattAction
?
lowBattAction
.
enumStringValue
:
""
}
}
}
}
}
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