Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-06 06:43:21 +08:00
Code Issues Actions 30 Packages Projects Releases Wiki Activity

fixed merge conflict

Browse Source 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
This commit is contained in:
Mark Charlebois
2017-01-05 13:10:30 -08:00
committed by Lorenz Meier
parent b08e70b65a
commit 830eb8528e
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/uORB/uORBManager.cpp
-5
View File
@@ -143,11 +143,6 @@ int uORB::Manager::orb_exists(const struct orb_metadata *meta, int instance)
#endif
}
orb_advert_t uORB::Manager::orb_advertise(const struct orb_metadata *meta, const void *data, unsigned int queue_size)
{
return orb_advertise_multi(meta, data, nullptr, ORB_PRIO_DEFAULT, queue_size);
}
orb_advert_t uORB::Manager::orb_advertise_multi(const struct orb_metadata *meta, const void *data, int *instance,
int priority, unsigned int queue_size)
{