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

refactor uorb: rename published to advertised

Browse Source 
No semantic change (yet)
This commit is contained in:
Beat Küng
2019-11-20 09:19:26 +01:00
committed by Daniel Agar
parent 0f6f795aca
commit 63b2befeed
11 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/uORB/uORBManager.cpp
+4 -4
View File
@@ -116,7 +116,7 @@ int uORB::Manager::orb_exists(const struct orb_metadata *meta, int instance)
uORB::DeviceNode *node = _device_master->getDeviceNode(meta, instance);
if (node != nullptr) {
if (node->is_published()) {
if (node->is_advertised()) {
return PX4_OK;
}
}
@@ -150,10 +150,10 @@ int uORB::Manager::orb_exists(const struct orb_metadata *meta, int instance)
int fd = px4_open(path, 0);
if (fd >= 0) {
unsigned long is_published;
unsigned long is_advertised;
if (px4_ioctl(fd, ORBIOCISPUBLISHED, (unsigned long)&is_published) == 0) {
if (!is_published) {
if (px4_ioctl(fd, ORBIOCISADVERTISED, (unsigned long)&is_advertised) == 0) {
if (!is_advertised) {
ret = PX4_ERROR;
}
}