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
67c9d52f
Commit
67c9d52f
authored
May 31, 2016
by
Rustom Jehangir
Browse files
Disable "MANUAL_CONTROL" warning message for ArduSub, which supports it.
parent
e6e0429b
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/FlightDisplay/FlightDisplayView.qml
View file @
67c9d52f
...
...
@@ -91,7 +91,7 @@ QGCView {
}
function
px4JoystickCheck
()
{
if
(
_activeVehicle
&&
!
_activeVehicle
.
px4Firmware
&&
(
QGroundControl
.
virtualTabletJoystick
||
_activeVehicle
.
joystickEnabled
))
{
if
(
_activeVehicle
&&
!
_activeVehicle
.
supportsManualControl
&&
(
QGroundControl
.
virtualTabletJoystick
||
_activeVehicle
.
joystickEnabled
))
{
px4JoystickSupport
.
open
()
}
}
...
...
src/Vehicle/Vehicle.cc
View file @
67c9d52f
...
...
@@ -1505,6 +1505,19 @@ bool Vehicle::vtol(void) const
}
}
bool
Vehicle
::
supportsManualControl
(
void
)
const
{
// PX4 Firmware supports manual control message
if
(
px4Firmware
()
)
{
return
true
;
}
// ArduSub supports manual control message (identified by APM + Submarine type)
if
(
apmFirmware
()
&&
vehicleType
()
==
MAV_TYPE_SUBMARINE
)
{
return
true
;
}
return
false
;
}
void
Vehicle
::
_setCoordinateValid
(
bool
coordinateValid
)
{
if
(
coordinateValid
!=
_coordinateValid
)
{
...
...
src/Vehicle/Vehicle.h
View file @
67c9d52f
...
...
@@ -275,6 +275,7 @@ public:
Q_PROPERTY
(
bool
multiRotor
READ
multiRotor
CONSTANT
)
Q_PROPERTY
(
bool
vtol
READ
vtol
CONSTANT
)
Q_PROPERTY
(
bool
rover
READ
rover
CONSTANT
)
Q_PROPERTY
(
bool
supportsManualControl
READ
supportsManualControl
CONSTANT
)
Q_PROPERTY
(
bool
autoDisconnect
MEMBER
_autoDisconnect
NOTIFY
autoDisconnectChanged
)
Q_PROPERTY
(
QString
prearmError
READ
prearmError
WRITE
setPrearmError
NOTIFY
prearmErrorChanged
)
Q_PROPERTY
(
int
motorCount
READ
motorCount
CONSTANT
)
...
...
@@ -466,6 +467,8 @@ public:
bool
vtol
(
void
)
const
;
bool
rover
(
void
)
const
;
bool
supportsManualControl
(
void
)
const
;
void
setFlying
(
bool
flying
);
void
setGuidedMode
(
bool
guidedMode
);
...
...
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