Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-23 22:58:10 +08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

mavlink: move GIMBAL_DEVICE_SET_ATTITUDE to separate stream header

Browse Source
This commit is contained in:
Daniel Agar
2021-02-20 13:10:04 -05:00
parent ddca669852
commit 581e28eb33
2 changed files with 98 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mavlink/mavlink_messages.cpp
+4 -77
View File
@@ -69,7 +69,6 @@
#include <uORB/topics/estimator_status.h>
#include <uORB/topics/geofence_result.h>
#include <uORB/topics/gimbal_device_attitude_status.h>
#include <uORB/topics/gimbal_device_set_attitude.h>
#include <uORB/topics/gimbal_manager_information.h>
#include <uORB/topics/gimbal_manager_status.h>
#include <uORB/topics/home_position.h>
@@ -148,6 +147,7 @@ using matrix::wrap_2pi;
# include "streams/DEBUG.hpp"
# include "streams/DEBUG_FLOAT_ARRAY.hpp"
# include "streams/DEBUG_VECT.hpp"
# include "streams/GIMBAL_DEVICE_SET_ATTITUDE.hpp"
# include "streams/LINK_NODE_STATUS.hpp"
# include "streams/NAMED_VALUE_FLOAT.hpp"
# include "streams/ODOMETRY.hpp"
@@ -2195,81 +2195,6 @@ protected:
}
};
class MavlinkStreamGimbalDeviceSetAttitude : public MavlinkStream
{
public:
const char *get_name() const override
{
return MavlinkStreamGimbalDeviceSetAttitude::get_name_static();
}
static constexpr const char *get_name_static()
{
return "GIMBAL_DEVICE_SET_ATTITUDE";
}
static constexpr uint16_t get_id_static()
{
return MAVLINK_MSG_ID_GIMBAL_DEVICE_SET_ATTITUDE;
}
uint16_t get_id() override
{
return get_id_static();
}
static MavlinkStream *new_instance(Mavlink *mavlink)
{
return new MavlinkStreamGimbalDeviceSetAttitude(mavlink);
}
unsigned get_size() override
{
return _gimbal_device_set_attitude_sub.advertised() ? (MAVLINK_MSG_ID_GIMBAL_DEVICE_SET_ATTITUDE_LEN +
MAVLINK_NUM_NON_PAYLOAD_BYTES) : 0;
}
private:
uORB::Subscription _gimbal_device_set_attitude_sub{ORB_ID(gimbal_device_set_attitude)};
/* do not allow top copying this class */
MavlinkStreamGimbalDeviceSetAttitude(MavlinkStreamGimbalDeviceSetAttitude &) = delete;
MavlinkStreamGimbalDeviceSetAttitude &operator = (const MavlinkStreamGimbalDeviceSetAttitude &) = delete;
protected:
explicit MavlinkStreamGimbalDeviceSetAttitude(Mavlink *mavlink) : MavlinkStream(mavlink)
{}
bool send() override
{
gimbal_device_set_attitude_s gimbal_device_set_attitude;
if (_gimbal_device_set_attitude_sub.advertised() && _gimbal_device_set_attitude_sub.copy(&gimbal_device_set_attitude)) {
mavlink_gimbal_device_set_attitude_t msg{};
msg.flags = gimbal_device_set_attitude.flags;
msg.target_system = gimbal_device_set_attitude.target_system;
msg.target_component = gimbal_device_set_attitude.target_component;
msg.q[0] = gimbal_device_set_attitude.q[0];
msg.q[1] = gimbal_device_set_attitude.q[1];
msg.q[2] = gimbal_device_set_attitude.q[2];
msg.q[3] = gimbal_device_set_attitude.q[3];
msg.angular_velocity_x = gimbal_device_set_attitude.angular_velocity_x;
msg.angular_velocity_y = gimbal_device_set_attitude.angular_velocity_y;
msg.angular_velocity_z = gimbal_device_set_attitude.angular_velocity_z;
mavlink_msg_gimbal_device_set_attitude_send_struct(_mavlink->get_channel(), &msg);
return true;
}
return false;
}
};
#endif
class MavlinkStreamCameraTrigger : public MavlinkStream
@@ -2511,8 +2436,10 @@ static const StreamListItem streams_list[] = {
create_stream_list_item<MavlinkStreamGimbalManagerInformation>(),
create_stream_list_item<MavlinkStreamGimbalManagerStatus>(),
create_stream_list_item<MavlinkStreamAutopilotStateForGimbalDevice>(),
create_stream_list_item<MavlinkStreamGimbalDeviceSetAttitude>(),
#endif
#if defined(GIMBAL_DEVICE_SET_ATTITUDE_HPP)
create_stream_list_item<MavlinkStreamGimbalDeviceSetAttitude>(),
#endif // GIMBAL_DEVICE_SET_ATTITUDE_HPP
#if defined(HOME_POSITION_HPP)
create_stream_list_item<MavlinkStreamHomePosition>(),
#endif // HOME_POSITION_HPP
src/modules/mavlink/streams/GIMBAL_DEVICE_SET_ATTITUDE.hpp
+94
View File
@@ -0,0 +1,94 @@
/****************************************************************************
*
* Copyright (c) 2021 PX4 Development Team. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name PX4 nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
****************************************************************************/
#ifndef GIMBAL_DEVICE_SET_ATTITUDE_HPP
#define GIMBAL_DEVICE_SET_ATTITUDE_HPP
#include <uORB/topics/gimbal_device_set_attitude.h>
class MavlinkStreamGimbalDeviceSetAttitude : public MavlinkStream
{
public:
static MavlinkStream *new_instance(Mavlink *mavlink) { return new MavlinkStreamGimbalDeviceSetAttitude(mavlink); }
static constexpr const char *get_name_static() { return "GIMBAL_DEVICE_SET_ATTITUDE"; }
static constexpr uint16_t get_id_static() { return MAVLINK_MSG_ID_GIMBAL_DEVICE_SET_ATTITUDE; }
const char *get_name() const override { return get_name_static(); }
uint16_t get_id() override { return get_id_static(); }
unsigned get_size() override
{
if (_gimbal_device_set_attitude_sub.advertised()) {
return (MAVLINK_MSG_ID_GIMBAL_DEVICE_SET_ATTITUDE_LEN + MAVLINK_NUM_NON_PAYLOAD_BYTES);
}
return 0;
}
private:
explicit MavlinkStreamGimbalDeviceSetAttitude(Mavlink *mavlink) : MavlinkStream(mavlink) {}
uORB::Subscription _gimbal_device_set_attitude_sub{ORB_ID(gimbal_device_set_attitude)};
bool send() override
{
gimbal_device_set_attitude_s gimbal_device_set_attitude;
if (_gimbal_device_set_attitude_sub.advertised() && _gimbal_device_set_attitude_sub.copy(&gimbal_device_set_attitude)) {
mavlink_gimbal_device_set_attitude_t msg{};
msg.target_system = gimbal_device_set_attitude.target_system;
msg.target_component = gimbal_device_set_attitude.target_component;
msg.flags = gimbal_device_set_attitude.flags;
msg.q[0] = gimbal_device_set_attitude.q[0];
msg.q[1] = gimbal_device_set_attitude.q[1];
msg.q[2] = gimbal_device_set_attitude.q[2];
msg.q[3] = gimbal_device_set_attitude.q[3];
msg.angular_velocity_x = gimbal_device_set_attitude.angular_velocity_x;
msg.angular_velocity_y = gimbal_device_set_attitude.angular_velocity_y;
msg.angular_velocity_z = gimbal_device_set_attitude.angular_velocity_z;
mavlink_msg_gimbal_device_set_attitude_send_struct(_mavlink->get_channel(), &msg);
return true;
}
return false;
}
};
#endif // GIMBAL_DEVICE_SET_ATTITUDE_HPP