mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-11-05 07:31:35 +08:00
Merge pull request #4271 from jgoppert/uorb_update
Added control state subscription.
This commit is contained in:
@@ -62,6 +62,7 @@
|
|||||||
#include "topics/actuator_armed.h"
|
#include "topics/actuator_armed.h"
|
||||||
#include "topics/att_pos_mocap.h"
|
#include "topics/att_pos_mocap.h"
|
||||||
#include "topics/vision_position_estimate.h"
|
#include "topics/vision_position_estimate.h"
|
||||||
|
#include "topics/control_state.h"
|
||||||
|
|
||||||
#include <px4_defines.h>
|
#include <px4_defines.h>
|
||||||
|
|
||||||
@@ -125,6 +126,13 @@ Subscription<T>::Subscription(const struct orb_metadata *meta,
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template <class T>
|
||||||
|
Subscription<T>::Subscription(const Subscription &other) :
|
||||||
|
SubscriptionNode(other._meta, other._interval, other._instance, nullptr),
|
||||||
|
_data() // initialize data structure to zero
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
template <class T>
|
template <class T>
|
||||||
Subscription<T>::~Subscription()
|
Subscription<T>::~Subscription()
|
||||||
{
|
{
|
||||||
@@ -164,5 +172,6 @@ template class __EXPORT Subscription<optical_flow_s>;
|
|||||||
template class __EXPORT Subscription<distance_sensor_s>;
|
template class __EXPORT Subscription<distance_sensor_s>;
|
||||||
template class __EXPORT Subscription<att_pos_mocap_s>;
|
template class __EXPORT Subscription<att_pos_mocap_s>;
|
||||||
template class __EXPORT Subscription<vision_position_estimate_s>;
|
template class __EXPORT Subscription<vision_position_estimate_s>;
|
||||||
|
template class __EXPORT Subscription<control_state_s>;
|
||||||
|
|
||||||
} // namespace uORB
|
} // namespace uORB
|
||||||
|
|||||||
@@ -172,6 +172,8 @@ public:
|
|||||||
int instance = 0,
|
int instance = 0,
|
||||||
List<SubscriptionNode *> *list = nullptr);
|
List<SubscriptionNode *> *list = nullptr);
|
||||||
|
|
||||||
|
Subscription(const Subscription &);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Deconstructor
|
* Deconstructor
|
||||||
*/
|
*/
|
||||||
|
|||||||
Reference in New Issue
Block a user