Move more messages to auto-generation, work on C++ code style

This commit is contained in:
James Goppert
2015-05-20 08:57:29 +02:00
committed by Lorenz Meier
parent e7a522edbc
commit e1d2c0c5ad
27 changed files with 293 additions and 682 deletions
+17 -29
View File
@@ -2066,35 +2066,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;
}
/*
@@ -2237,8 +2227,6 @@ Sensors::task_main()
}
warnx("exiting.");
exit_immediate:
_sensors_task = -1;
_exit(ret);
}