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

Merge branch 'release_v1.0.0'

Browse Source
This commit is contained in:
Lorenz Meier
2015-05-20 09:00:57 +02:00
parent fee48a77ae e1d2c0c5ad
commit 2903ceaacc
28 changed files with 312 additions and 689 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/sensors/sensors.cpp
+17 -29
View File
@@ -2070,35 +2070,25 @@ Sensors::task_main()
{
/* start individual sensors */
int ret;
ret = accel_init();
int ret = 0;
do { /* create a scope to handle exit with break */
ret = accel_init();
if (ret) break;
ret = gyro_init();
if (ret) break;
ret = mag_init();
if (ret) break;
ret = baro_init();
if (ret) break;
ret = adc_init();
if (ret) break;
break;
} while (0);
if (ret) {
goto exit_immediate;
}
ret = gyro_init();
if (ret) {
goto exit_immediate;
}
ret = mag_init();
if (ret) {
goto exit_immediate;
}
ret = baro_init();
if (ret) {
goto exit_immediate;
}
ret = adc_init();
if (ret) {
goto exit_immediate;
_sensors_task = -1;
_exit(ret);
return;
}
/*
@@ -2241,8 +2231,6 @@ Sensors::task_main()
}
warnx("exiting.");
exit_immediate:
_sensors_task = -1;
px4_task_exit(ret);
}