Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
e5e72455
Commit
e5e72455
authored
May 22, 2017
by
Don Gagne
Committed by
GitHub
May 22, 2017
Browse files
Merge pull request #5179 from DonLakeFlyer/CameraTest
Camere trigger button for testing
parents
aa6f066a
a95b2c4a
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/AutoPilotPlugins/PX4/CameraComponent.qml
View file @
e5e72455
...
...
@@ -36,10 +36,10 @@ SetupPage {
property
real
_margins
:
ScreenTools
.
defaultFontPixelHeight
property
real
_editFieldWidth
:
ScreenTools
.
defaultFontPixelWidth
*
25
property
Fact
_camTriggerMode
:
controller
.
getParameterFact
(
-
1
,
"
TRIG_MODE
"
)
property
Fact
_camTriggerInterface
:
controller
.
getParameterFact
(
-
1
,
"
TRIG_INTERFACE
"
,
false
)
property
Fact
_camTriggerPol
:
controller
.
getParameterFact
(
-
1
,
"
TRIG_POLARITY
"
,
false
)
/
/ Don't bitch about missing as these only exist if trigger mode is enabled
property
Fact
_auxPins
:
controller
.
getParameterFact
(
-
1
,
"
TRIG_PINS
"
,
false
)
/
/ Ditto
property
Fact
_camTriggerMode
:
controller
.
getParameterFact
(
-
1
,
"
TRIG_MODE
"
)
property
Fact
_camTriggerInterface
:
controller
.
getParameterFact
(
-
1
,
"
TRIG_INTERFACE
"
,
false
/* reportMissing */
)
property
Fact
_camTriggerPol
:
controller
.
getParameterFact
(
-
1
,
"
TRIG_POLARITY
"
,
false
/
* reportMissing */
)
property
Fact
_auxPins
:
controller
.
getParameterFact
(
-
1
,
"
TRIG_PINS
"
,
false
/
* reportMissing */
)
property
bool
_rebooting
:
false
property
var
_auxChannels
:
[
0
,
0
,
0
,
0
,
0
,
0
]
...
...
@@ -154,26 +154,28 @@ SetupPage {
text
:
qsTr
(
"
Time Interval
"
)
anchors.baseline
:
timeIntervalField
.
baseline
color
:
qgcPal
.
text
visible
:
timeIntervalField
.
visible
}
FactTextField
{
id
:
timeIntervalField
fact
:
controller
.
getParameterFact
(
-
1
,
"
TRIG_INTERVAL
"
,
false
)
showUnits
:
true
Layout.minimumWidth
:
_editFieldWidth
ena
ble
d
:
_camTriggerMode
.
value
===
2
visi
ble
:
_camTriggerMode
.
value
===
2
}
QGCLabel
{
text
:
qsTr
(
"
Distance Interval
"
)
anchors.baseline
:
trigDistField
.
baseline
color
:
qgcPal
.
text
visible
:
trigDistField
.
visible
}
FactTextField
{
id
:
trigDistField
fact
:
controller
.
getParameterFact
(
-
1
,
"
TRIG_DISTANCE
"
,
false
)
showUnits
:
true
Layout.minimumWidth
:
_editFieldWidth
ena
ble
d
:
_camTriggerMode
.
value
===
3
visi
ble
:
_camTriggerMode
.
value
===
3
}
}
}
// QGCGroupBox - Camera Trigger
...
...
@@ -298,6 +300,17 @@ SetupPage {
}
}
}
}
// QGCGroupBox - Hardware Settings
QGCGroupBox
{
title
:
qsTr
(
"
Camera Test
"
)
Layout.fillWidth
:
true
QGCButton
{
anchors.horizontalCenter
:
parent
.
horizontalCenter
text
:
qsTr
(
"
Trigger Camera
"
)
onClicked
:
controller
.
vehicle
.
triggerCamera
()
}
}
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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