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
d3dcf3f8
Commit
d3dcf3f8
authored
Mar 07, 2017
by
Jacob Walser
Committed by
Willian Galvani
Oct 25, 2018
Browse files
Revert "Remove motor test"
This reverts commit
c69a49e6
.
parent
bcabdc26
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/AutoPilotPlugins/APM/APMAutoPilotPlugin.cc
View file @
d3dcf3f8
...
...
@@ -40,10 +40,7 @@ APMAutoPilotPlugin::APMAutoPilotPlugin(Vehicle* vehicle, QObject* parent)
,
_subFrameComponent
(
NULL
)
,
_flightModesComponent
(
NULL
)
,
_powerComponent
(
NULL
)
#if 0
// Temporarily removed, waiting for new command implementation
,
_motorComponent
(
NULL
)
#endif
,
_radioComponent
(
NULL
)
,
_safetyComponent
(
NULL
)
,
_sensorsComponent
(
NULL
)
...
...
@@ -89,15 +86,11 @@ const QVariantList& APMAutoPilotPlugin::vehicleComponents(void)
_powerComponent
->
setupTriggerSignals
();
_components
.
append
(
QVariant
::
fromValue
((
VehicleComponent
*
)
_powerComponent
));
#if 0
// Temporarily removed, waiting for new command implementation
if
(
_vehicle
->
multiRotor
()
||
_vehicle
->
vtol
())
{
_motorComponent
=
new
MotorComponent
(
_vehicle
,
this
);
_motorComponent
->
setupTriggerSignals
();
_components
.
append
(
QVariant
::
fromValue
((
VehicleComponent
*
)
_motorComponent
));
}
#endif
_safetyComponent
=
new
APMSafetyComponent
(
_vehicle
,
this
);
_safetyComponent
->
setupTriggerSignals
();
...
...
src/AutoPilotPlugins/APM/APMAutoPilotPlugin.h
View file @
d3dcf3f8
...
...
@@ -50,10 +50,7 @@ protected:
APMSubFrameComponent
*
_subFrameComponent
;
APMFlightModesComponent
*
_flightModesComponent
;
APMPowerComponent
*
_powerComponent
;
#if 0
// Temporarily removed, waiting for new command implementation
MotorComponent
*
_motorComponent
;
#endif
APMRadioComponent
*
_radioComponent
;
APMSafetyComponent
*
_safetyComponent
;
APMSensorsComponent
*
_sensorsComponent
;
...
...
src/Vehicle/Vehicle.cc
View file @
d3dcf3f8
...
...
@@ -3290,13 +3290,10 @@ void Vehicle::setSoloFirmware(bool soloFirmware)
}
}
#if 0
// Temporarily removed, waiting for new command implementation
void
Vehicle
::
motorTest
(
int
motor
,
int
percent
,
int
timeoutSecs
)
{
doCommandLongUnverifie
d(_defaultComponentId, MAV_CMD_DO_MOTOR_TEST, motor, MOTOR_TEST_THROTTLE_PERCENT, percent, timeoutSecs);
sendMavComman
d
(
_defaultComponentId
,
MAV_CMD_DO_MOTOR_TEST
,
motor
,
MOTOR_TEST_THROTTLE_PERCENT
,
percent
,
timeoutSecs
);
}
#endif
QString
Vehicle
::
brandImageIndoor
(
void
)
const
{
...
...
src/Vehicle/Vehicle.h
View file @
d3dcf3f8
...
...
@@ -744,14 +744,11 @@ public:
Q_INVOKABLE
void
triggerCamera
(
void
);
Q_INVOKABLE
void
sendPlan
(
QString
planFile
);
#if 0
// Temporarily removed, waiting for new command implementation
/// Test motor
/// @param motor Motor number, 1-based
/// @param percent 0-no power, 100-full power
/// @param timeoutSecs Number of seconds for motor to run
Q_INVOKABLE
void
motorTest
(
int
motor
,
int
percent
,
int
timeoutSecs
);
#endif
bool
guidedModeSupported
(
void
)
const
;
bool
pauseVehicleSupported
(
void
)
const
;
...
...
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