fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-06-28 04:10:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

uORB delete unused vehicle_force_setpoint

Browse Source
This commit is contained in:
Daniel Agar
2017-11-26 15:51:04 -05:00
parent d3c87c77d2
commit b8e24b5d2f
7 changed files with 4 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mavlink/mavlink_receiver.cpp
+1 -14
View File
@@ -123,7 +123,6 @@ MavlinkReceiver::MavlinkReceiver(Mavlink *parent) :
_global_vel_sp_pub(nullptr),
_att_sp_pub(nullptr),
_rates_sp_pub(nullptr),
_force_sp_pub(nullptr),
_pos_sp_triplet_pub(nullptr),
_att_pos_mocap_pub(nullptr),
_vision_position_pub(nullptr),
@@ -894,20 +893,8 @@ MavlinkReceiver::handle_message_set_position_target_local_ned(mavlink_message_t
if (_control_mode.flag_control_offboard_enabled) {
if (is_force_sp && offboard_control_mode.ignore_position &&
offboard_control_mode.ignore_velocity) {
/* The offboard setpoint is a force setpoint only, directly writing to the force
* setpoint topic and not publishing the setpoint triplet topic */
struct vehicle_force_setpoint_s force_sp;
force_sp.x = set_position_target_local_ned.afx;
force_sp.y = set_position_target_local_ned.afy;
force_sp.z = set_position_target_local_ned.afz;
//XXX: yaw
if (_force_sp_pub == nullptr) {
_force_sp_pub = orb_advertise(ORB_ID(vehicle_force_setpoint), &force_sp);
} else {
orb_publish(ORB_ID(vehicle_force_setpoint), _force_sp_pub, &force_sp);
}
PX4_WARN("force setpoint not supported");
} else {
/* It's not a pure force setpoint: publish to setpoint triplet topic */
src/modules/mavlink/mavlink_receiver.h
-2
View File
@@ -71,7 +71,6 @@
#include <uORB/topics/debug_vect.h>
#include <uORB/topics/airspeed.h>
#include <uORB/topics/battery_status.h>
#include <uORB/topics/vehicle_force_setpoint.h>
#include <uORB/topics/time_offset.h>
#include <uORB/topics/distance_sensor.h>
#include <uORB/topics/follow_target.h>
@@ -234,7 +233,6 @@ private:
orb_advert_t _global_vel_sp_pub;
orb_advert_t _att_sp_pub;
orb_advert_t _rates_sp_pub;
orb_advert_t _force_sp_pub;
orb_advert_t _pos_sp_triplet_pub;
orb_advert_t _att_pos_mocap_pub;
orb_advert_t _vision_position_pub;