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

UAVCAN: Proper CDev initialization from sensor bridges

Browse Source
This commit is contained in:
Pavel Kirienko
2014-08-23 23:30:49 +04:00
parent 4e0d7c6b0e
commit ce73be514e
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/uavcan/sensors/baro.cpp
+6 -1
View File
@@ -53,7 +53,12 @@ _sub_air_data(node)
int UavcanBarometerBridge::init() int UavcanBarometerBridge::init()
{ {
int res = _sub_air_data.start(AirDataCbBinder(this, &UavcanBarometerBridge::air_data_sub_cb)); int res = device::CDev::init();
if (res < 0) {
return res;
}
res = _sub_air_data.start(AirDataCbBinder(this, &UavcanBarometerBridge::air_data_sub_cb));
if (res < 0) { if (res < 0) {
log("failed to start uavcan sub: %d", res); log("failed to start uavcan sub: %d", res);
return res; return res;
src/modules/uavcan/sensors/mag.cpp
+6 -1
View File
@@ -56,7 +56,12 @@ _sub_mag(node)
int UavcanMagnetometerBridge::init() int UavcanMagnetometerBridge::init()
{ {
int res = _sub_mag.start(MagCbBinder(this, &UavcanMagnetometerBridge::mag_sub_cb)); int res = device::CDev::init();
if (res < 0) {
return res;
}
res = _sub_mag.start(MagCbBinder(this, &UavcanMagnetometerBridge::mag_sub_cb));
if (res < 0) { if (res < 0) {
log("failed to start uavcan sub: %d", res); log("failed to start uavcan sub: %d", res);
return res; return res;