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
acfd001f
Unverified
Commit
acfd001f
authored
Jul 30, 2019
by
Gus Grubba
Committed by
GitHub
Jul 30, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7645 from mavlink/customFlightModes
Custom flight modes
parents
dee1314f
f185e875
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
71 additions
and
41 deletions
+71
-41
CustomCameraControl.qml
custom-example/res/CustomCameraControl.qml
+13
-7
CustomModeIndicator.qml
custom-example/res/MainToolbar/CustomModeIndicator.qml
+50
-34
CustomFirmwarePlugin.cc
custom-example/src/FirmwarePlugin/CustomFirmwarePlugin.cc
+8
-0
No files found.
custom-example/res/CustomCameraControl.qml
View file @
acfd001f
...
...
@@ -88,7 +88,7 @@ Item {
id
:
backgroundRect
width
:
buttonsRow
.
width
+
(
ScreenTools
.
defaultFontPixelWidth
*
4
)
height
:
buttonsRow
.
height
+
(
ScreenTools
.
defaultFontPixelHeight
)
visible
:
_irPaletteFact
&&
QGroundControl
.
videoManager
.
hasThermal
||
_camera
.
vendor
===
"
NextVision
"
visible
:
_irPaletteFact
&&
(
QGroundControl
.
videoManager
.
hasThermal
||
_camera
.
vendor
===
"
NextVision
"
)
anchors.horizontalCenter
:
parent
.
horizontalCenter
Component.onCompleted
:
{
if
(
_irPaletteFact
&&
QGroundControl
.
videoManager
.
hasThermal
)
{
...
...
@@ -965,19 +965,25 @@ Item {
contentHeight
:
comboListCol
.
height
contentWidth
:
comboListCol
.
width
anchors.horizontalCenter
:
parent
.
horizontalCenter
Column
{
Column
Layout
{
id
:
comboListCol
spacing
:
ScreenTools
.
defaultFontPixelHeight
anchors.margins
:
ScreenTools
.
defaultFontPixelHeight
anchors.horizontalCenter
:
parent
.
horizontalCenter
QGCLabel
{
text
:
qsTr
(
"
Thermal Palettes
"
)
Layout.alignment
:
Qt
.
AlignHCenter
}
Repeater
{
model
:
_irPaletteFact
?
_irPaletteFact
.
enumStrings
:
[]
QGCButton
{
text
:
modelData
width
:
ScreenTools
.
defaultFontPixelWidth
*
30
height
:
ScreenTools
.
defaultFontPixelHeight
*
2
checked
:
index
===
_irPaletteFact
.
value
anchors.horizontalCenter
:
parent
.
horizontalCenter
text
:
modelData
Layout.minimumHeight
:
ScreenTools
.
defaultFontPixelHeight
*
3
Layout.minimumWidth
:
ScreenTools
.
defaultFontPixelWidth
*
30
Layout.fillHeight
:
true
Layout.fillWidth
:
true
Layout.alignment
:
Qt
.
AlignHCenter
checked
:
index
===
_irPaletteFact
.
value
onClicked
:
{
_irPaletteFact
.
value
=
index
thermalPalettes
.
close
()
...
...
custom-example/res/MainToolbar/CustomModeIndicator.qml
View file @
acfd001f
...
...
@@ -9,8 +9,11 @@
* @author Gus Grubba <gus@auterion.com>
*/
import
QtQuick
2.11
import
QtQuick
.
Controls
1.4
import
QtQuick
2.11
import
QtQuick
.
Controls
2.4
import
QtQuick
.
Layouts
1.11
import
QtQuick
.
Dialogs
1.3
import
QGroundControl
1.0
import
QGroundControl
.
Controls
1.0
...
...
@@ -25,10 +28,6 @@ Item {
anchors.bottom
:
parent
.
bottom
width
:
selectorRow
.
width
property
var
_flightModes
:
activeVehicle
?
activeVehicle
.
flightModes
:
[
]
on_FlightModesChanged
:
flightModeSelector
.
updateFlightModesMenu
()
Row
{
id
:
selectorRow
spacing
:
ScreenTools
.
defaultFontPixelWidth
...
...
@@ -39,32 +38,6 @@ Item {
color
:
qgcPal
.
text
font.pointSize
:
ScreenTools
.
defaultFontPointSize
anchors.verticalCenter
:
parent
.
verticalCenter
Menu
{
id
:
flightModesMenu
}
Component
{
id
:
flightModeMenuItemComponent
MenuItem
{
onTriggered
:
activeVehicle
.
flightMode
=
text
}
}
property
var
flightModesMenuItems
:
[]
function
updateFlightModesMenu
()
{
if
(
activeVehicle
&&
activeVehicle
.
flightModeSetAvailable
)
{
// Remove old menu items
var
i
=
0
for
(
i
=
0
;
i
<
flightModesMenuItems
.
length
;
i
++
)
{
flightModesMenu
.
removeItem
(
flightModesMenuItems
[
i
])
}
flightModesMenuItems
.
length
=
0
// Add new items
for
(
i
=
0
;
i
<
_flightModes
.
length
;
i
++
)
{
var
menuItem
=
flightModeMenuItemComponent
.
createObject
(
null
,
{
"
text
"
:
_flightModes
[
i
]
})
flightModesMenuItems
.
push
(
menuItem
)
flightModesMenu
.
insertItem
(
i
,
menuItem
)
}
}
}
}
QGCColoredImage
{
anchors.verticalCenter
:
parent
.
verticalCenter
...
...
@@ -76,10 +49,53 @@ Item {
color
:
qgcPal
.
text
}
}
Component.onCompleted
:
flightModeSelector
.
updateFlightModesMenu
()
MouseArea
{
visible
:
activeVehicle
&&
activeVehicle
.
flightModeSetAvailable
anchors.fill
:
parent
onClicked
:
flightModesMenu
.
popup
()
onClicked
:
flightModesMenu
.
open
()
}
//-------------------------------------------------------------------------
//-- Flight Modes
Popup
{
id
:
flightModesMenu
width
:
Math
.
min
(
mainWindow
.
width
*
0.666
,
ScreenTools
.
defaultFontPixelWidth
*
40
)
height
:
mainWindow
.
height
*
0.5
modal
:
true
focus
:
true
parent
:
Overlay
.
overlay
x
:
Math
.
round
((
mainWindow
.
width
-
width
)
*
0.5
)
y
:
Math
.
round
((
mainWindow
.
height
-
height
)
*
0.5
)
closePolicy
:
Popup
.
CloseOnEscape
|
Popup
.
CloseOnPressOutside
property
int
selectedIndex
:
0
background
:
Rectangle
{
anchors.fill
:
parent
color
:
qgcPal
.
globalTheme
===
QGCPalette
.
Light
?
Qt
.
rgba
(
1
,
1
,
1
,
0.95
)
:
Qt
.
rgba
(
0
,
0
,
0
,
0.75
)
border.color
:
qgcPal
.
text
radius
:
ScreenTools
.
defaultFontPixelWidth
}
ColumnLayout
{
id
:
comboListCol
spacing
:
ScreenTools
.
defaultFontPixelHeight
anchors.centerIn
:
parent
QGCLabel
{
text
:
qsTr
(
"
Flight Modes
"
)
Layout.alignment
:
Qt
.
AlignHCenter
}
Repeater
{
model
:
activeVehicle
?
activeVehicle
.
flightModes
:
[
]
QGCButton
{
text
:
modelData
Layout.minimumHeight
:
ScreenTools
.
defaultFontPixelHeight
*
3
Layout.minimumWidth
:
ScreenTools
.
defaultFontPixelWidth
*
30
Layout.fillHeight
:
true
Layout.fillWidth
:
true
Layout.alignment
:
Qt
.
AlignHCenter
onClicked
:
{
activeVehicle
.
flightMode
=
modelData
flightModesMenu
.
close
()
}
}
}
}
}
}
custom-example/src/FirmwarePlugin/CustomFirmwarePlugin.cc
View file @
acfd001f
...
...
@@ -19,6 +19,14 @@
//-----------------------------------------------------------------------------
CustomFirmwarePlugin
::
CustomFirmwarePlugin
()
{
for
(
int
i
=
0
;
i
<
_flightModeInfoList
.
count
();
i
++
)
{
FlightModeInfo_t
&
info
=
_flightModeInfoList
[
i
];
//-- Narrow the options to only these two
if
(
info
.
name
!=
_altCtlFlightMode
&&
info
.
name
!=
_posCtlFlightMode
)
{
info
.
canBeSet
=
false
;
}
}
}
//-----------------------------------------------------------------------------
...
...
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