Skip to content
Snippets Groups Projects
Commit 313ff2a6 authored by Lorenz Meier's avatar Lorenz Meier Committed by Lorenz Meier
Browse files

UAVCAN: Correct use of unsubscribe

parent 1d98c8f2
No related branches found
No related tags found
No related merge requests found
......@@ -149,9 +149,9 @@ UavcanNode::~UavcanNode()
} while (_task != -1);
}
(void)::close(_armed_sub);
(void)::close(_test_motor_sub);
(void)::close(_actuator_direct_sub);
(void)orb_unsubscribe(_armed_sub);
(void)orb_unsubscribe(_test_motor_sub);
(void)orb_unsubscribe(_actuator_direct_sub);
// Removing the sensor bridges
auto br = _sensor_bridges.getHead();
......@@ -1022,12 +1022,12 @@ UavcanNode::teardown()
for (unsigned i = 0; i < actuator_controls_s::NUM_ACTUATOR_CONTROL_GROUPS; i++) {
if (_control_subs[i] > 0) {
::close(_control_subs[i]);
orb_unsubscribe(_control_subs[i]);
_control_subs[i] = -1;
}
}
return (_armed_sub >= 0) ? ::close(_armed_sub) : 0;
return (_armed_sub >= 0) ? orb_unsubscribe(_armed_sub) : 0;
}
int
......@@ -1054,7 +1054,7 @@ UavcanNode::subscribe()
if (unsub_groups & (1 << i)) {
warnx("unsubscribe from actuator_controls_%d", i);
::close(_control_subs[i]);
orb_unsubscribe(_control_subs[i]);
_control_subs[i] = -1;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment