aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-04-08 21:40:05 +0200
committerLorenz Meier <lm@inf.ethz.ch>2014-04-08 21:40:05 +0200
commit27884e49bedfdbd0e259bb9b90e757b45bf7fd44 (patch)
treee51dcd48816640fd90ebee13cbf664f5c49e7531 /src
parent00ef10f307d3c4a262a15ab5747d854eb4c568d5 (diff)
downloadpx4-firmware-27884e49bedfdbd0e259bb9b90e757b45bf7fd44.tar.gz
px4-firmware-27884e49bedfdbd0e259bb9b90e757b45bf7fd44.tar.bz2
px4-firmware-27884e49bedfdbd0e259bb9b90e757b45bf7fd44.zip
Revert "Merge pull request #816 from PX4/mavlink_commandlongstream"
This reverts commit 00ef10f307d3c4a262a15ab5747d854eb4c568d5, reversing changes made to d55e64d1e54542762510387a22897f504c68a5a6.
Diffstat (limited to 'src')
-rw-r--r--src/modules/mavlink/mavlink_messages.cpp46
1 files changed, 0 insertions, 46 deletions
diff --git a/src/modules/mavlink/mavlink_messages.cpp b/src/modules/mavlink/mavlink_messages.cpp
index bb8bba037..47603b390 100644
--- a/src/modules/mavlink/mavlink_messages.cpp
+++ b/src/modules/mavlink/mavlink_messages.cpp
@@ -1271,51 +1271,6 @@ protected:
}
};
-class MavlinkStreamCommandLong : public MavlinkStream
-{
-public:
- const char *get_name()
- {
- return "COMMAND_LONG";
- }
-
- MavlinkStream *new_instance()
- {
- return new MavlinkStreamCommandLong();
- }
-
-private:
- MavlinkOrbSubscription *vehicle_command_sub;
- struct vehicle_command_s *vehicle_command;
-
-protected:
- void subscribe(Mavlink *mavlink)
- {
- vehicle_command_sub = mavlink->add_orb_subscription(ORB_ID(vehicle_command));
- vehicle_command = (struct vehicle_command_s *)vehicle_command_sub->get_data();
- }
-
- void send(const hrt_abstime t)
- {
- if (vehicle_command_sub->update(t)) {
- if (!((vehicle_command->target_system == mavlink_system.sysid) && (vehicle_command->target_component == mavlink_system.compid))) {
- mavlink_msg_command_long_send(_channel,
- vehicle_command->target_system,
- vehicle_command->target_component,
- vehicle_command->command,
- vehicle_command->confirmation,
- vehicle_command->param1,
- vehicle_command->param2,
- vehicle_command->param3,
- vehicle_command->param4,
- vehicle_command->param5,
- vehicle_command->param6,
- vehicle_command->param7);
- }
- }
- }
-};
-
MavlinkStream *streams_list[] = {
new MavlinkStreamHeartbeat(),
new MavlinkStreamSysStatus(),
@@ -1342,6 +1297,5 @@ MavlinkStream *streams_list[] = {
new MavlinkStreamAttitudeControls(),
new MavlinkStreamNamedValueFloat(),
new MavlinkStreamCameraCapture(),
- new MavlinkStreamCommandLong(),
nullptr
};