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
462186c6
Unverified
Commit
462186c6
authored
Nov 02, 2018
by
Don Gagne
Committed by
GitHub
Nov 02, 2018
Browse files
Merge pull request #6982 from DonLakeFlyer/Orbit
Turn Orbit back on, allow custom build to turn off firmware version check
parents
73a900d4
94d3abcc
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc
View file @
462186c6
...
...
@@ -233,7 +233,7 @@ bool PX4FirmwarePlugin::isCapable(const Vehicle *vehicle, FirmwareCapabilities c
{
int
available
=
SetFlightModeCapability
|
PauseVehicleCapability
|
GuidedModeCapability
;
if
(
vehicle
->
multiRotor
()
||
vehicle
->
vtol
())
{
available
|=
TakeoffVehicleCapability
;
available
|=
TakeoffVehicleCapability
|
OrbitModeCapability
;
}
return
(
capabilities
&
available
)
==
capabilities
;
...
...
src/api/QGCOptions.h
View file @
462186c6
...
...
@@ -52,6 +52,7 @@ public:
Q_PROPERTY
(
bool
disableVehicleConnection
READ
disableVehicleConnection
CONSTANT
)
Q_PROPERTY
(
float
devicePixelRatio
READ
devicePixelRatio
NOTIFY
devicePixelRatioChanged
)
Q_PROPERTY
(
float
devicePixelDensity
READ
devicePixelDensity
NOTIFY
devicePixelDensityChanged
)
Q_PROPERTY
(
bool
checkFirmwareVersion
READ
checkFirmwareVersion
CONSTANT
)
/// Should QGC hide its settings menu and colapse it into one single menu (Settings and Vehicle Setup)?
/// @return true if QGC should consolidate both menus into one.
...
...
@@ -94,6 +95,7 @@ public:
virtual
bool
showMissionAbsoluteAltitude
()
const
{
return
true
;
}
virtual
bool
showSimpleMissionStart
()
const
{
return
false
;
}
virtual
bool
disableVehicleConnection
()
const
{
return
false
;
}
///< true: vehicle connection is disabled
virtual
bool
checkFirmwareVersion
()
const
{
return
true
;
}
#if defined(__mobile__)
virtual
bool
useMobileFileDialog
()
const
{
return
true
;}
...
...
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