|
|
@ -60,7 +60,6 @@ |
|
|
|
#include <uORB/Subscription.hpp> |
|
|
|
#include <uORB/Subscription.hpp> |
|
|
|
#include <uORB/SubscriptionCallback.hpp> |
|
|
|
#include <uORB/SubscriptionCallback.hpp> |
|
|
|
#include <uORB/Publication.hpp> |
|
|
|
#include <uORB/Publication.hpp> |
|
|
|
#include <uORB/topics/manual_control_setpoint.h> |
|
|
|
|
|
|
|
#include <uORB/topics/parameter_update.h> |
|
|
|
#include <uORB/topics/parameter_update.h> |
|
|
|
#include <uORB/topics/trajectory_setpoint.h> |
|
|
|
#include <uORB/topics/trajectory_setpoint.h> |
|
|
|
#include <uORB/topics/vehicle_attitude.h> |
|
|
|
#include <uORB/topics/vehicle_attitude.h> |
|
|
@ -104,14 +103,12 @@ private: |
|
|
|
uORB::SubscriptionInterval _parameter_update_sub{ORB_ID(parameter_update), 1_s}; |
|
|
|
uORB::SubscriptionInterval _parameter_update_sub{ORB_ID(parameter_update), 1_s}; |
|
|
|
|
|
|
|
|
|
|
|
uORB::Subscription _vehicle_attitude_sub{ORB_ID(vehicle_attitude)}; /**< current vehicle attitude */ |
|
|
|
uORB::Subscription _vehicle_attitude_sub{ORB_ID(vehicle_attitude)}; /**< current vehicle attitude */ |
|
|
|
uORB::Subscription _manual_control_setpoint_sub{ORB_ID(manual_control_setpoint)}; /**< notification of manual control updates */ |
|
|
|
|
|
|
|
uORB::Subscription _trajectory_setpoint_sub{ORB_ID(trajectory_setpoint)}; |
|
|
|
uORB::Subscription _trajectory_setpoint_sub{ORB_ID(trajectory_setpoint)}; |
|
|
|
uORB::Subscription _vcontrol_mode_sub{ORB_ID(vehicle_control_mode)}; /**< vehicle status subscription */ |
|
|
|
uORB::Subscription _vcontrol_mode_sub{ORB_ID(vehicle_control_mode)}; /**< vehicle status subscription */ |
|
|
|
|
|
|
|
|
|
|
|
uORB::SubscriptionCallbackWorkItem _vehicle_local_position_sub{this, ORB_ID(vehicle_local_position)}; |
|
|
|
uORB::SubscriptionCallbackWorkItem _vehicle_local_position_sub{this, ORB_ID(vehicle_local_position)}; |
|
|
|
|
|
|
|
|
|
|
|
//actuator_controls_s _actuators {}; /**< actuator control inputs */
|
|
|
|
//actuator_controls_s _actuators {}; /**< actuator control inputs */
|
|
|
|
manual_control_setpoint_s _manual_control_setpoint {}; /**< r/c channel data */ |
|
|
|
|
|
|
|
vehicle_attitude_s _vehicle_attitude {}; /**< vehicle attitude */ |
|
|
|
vehicle_attitude_s _vehicle_attitude {}; /**< vehicle attitude */ |
|
|
|
trajectory_setpoint_s _trajectory_setpoint{}; /**< vehicle position setpoint */ |
|
|
|
trajectory_setpoint_s _trajectory_setpoint{}; /**< vehicle position setpoint */ |
|
|
|
vehicle_control_mode_s _vcontrol_mode {}; /**< vehicle control mode */ |
|
|
|
vehicle_control_mode_s _vcontrol_mode {}; /**< vehicle control mode */ |
|
|
|