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

Merge remote-tracking branch 'upstream/pr/1040' into uorbtinymerge

Browse Source 
Conflicts:
	mavlink/include/mavlink/v1.0
	src/modules/mc_att_control/mc_att_control_main.cpp
This commit is contained in:
Thomas Gubler
2014-11-25 10:49:29 +01:00
parent c37ff71e62 72f9fab4a2
commit 5b80a2ae38
8 changed files with 199 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/uORB/Subscription.cpp
+4 -12
View File
@@ -56,21 +56,13 @@
namespace uORB
{
bool __EXPORT SubscriptionBase::updated()
{
bool isUpdated = false;
orb_check(_handle, &isUpdated);
return isUpdated;
}
template<class T>
Subscription<T>::Subscription(
List<SubscriptionBase *> * list,
const struct orb_metadata *meta, unsigned interval) :
const struct orb_metadata *meta,
unsigned interval,
List<SubscriptionNode *> * list) :
T(), // initialize data structure to zero
SubscriptionBase(list, meta) {
setHandle(orb_subscribe(getMeta()));
orb_set_interval(getHandle(), interval);
SubscriptionNode(meta, interval, list) {
}
template<class T>