|
|
|
@ -945,18 +945,18 @@ Sensors::parameters_update()
@@ -945,18 +945,18 @@ Sensors::parameters_update()
|
|
|
|
|
DevHandle h_baro; |
|
|
|
|
DevMgr::getHandle(BARO0_DEVICE_PATH, h_baro); |
|
|
|
|
|
|
|
|
|
if (!h_baro.isValid()) { |
|
|
|
|
warnx("ERROR: no barometer found on %s (%d)", BARO0_DEVICE_PATH, h_baro.getError()); |
|
|
|
|
return ERROR; |
|
|
|
|
//if (!h_baro.isValid()) {
|
|
|
|
|
// warnx("ERROR: no barometer found on %s (%d)", BARO0_DEVICE_PATH, h_baro.getError());
|
|
|
|
|
// return ERROR;
|
|
|
|
|
|
|
|
|
|
} else { |
|
|
|
|
int baroret = h_baro.ioctl(BAROIOCSMSLPRESSURE, (unsigned long)(_parameters.baro_qnh * 100)); |
|
|
|
|
//} else {
|
|
|
|
|
// int baroret = h_baro.ioctl(BAROIOCSMSLPRESSURE, (unsigned long)(_parameters.baro_qnh * 100));
|
|
|
|
|
|
|
|
|
|
if (baroret) { |
|
|
|
|
warnx("qnh could not be set"); |
|
|
|
|
return ERROR; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
// if (baroret) {
|
|
|
|
|
// warnx("qnh could not be set");
|
|
|
|
|
// return ERROR;
|
|
|
|
|
// }
|
|
|
|
|
//}
|
|
|
|
|
|
|
|
|
|
return OK; |
|
|
|
|
} |
|
|
|
@ -2091,25 +2091,25 @@ Sensors::task_main()
@@ -2091,25 +2091,25 @@ Sensors::task_main()
|
|
|
|
|
int ret = 0; |
|
|
|
|
|
|
|
|
|
do { /* create a scope to handle exit with break */ |
|
|
|
|
ret = accel_init(); |
|
|
|
|
//ret = accel_init();
|
|
|
|
|
|
|
|
|
|
if (ret) { break; } |
|
|
|
|
//if (ret) { break; }
|
|
|
|
|
|
|
|
|
|
ret = gyro_init(); |
|
|
|
|
//ret = gyro_init();
|
|
|
|
|
|
|
|
|
|
if (ret) { break; } |
|
|
|
|
//if (ret) { break; }
|
|
|
|
|
|
|
|
|
|
ret = mag_init(); |
|
|
|
|
//ret = mag_init();
|
|
|
|
|
|
|
|
|
|
if (ret) { break; } |
|
|
|
|
//if (ret) { break; }
|
|
|
|
|
|
|
|
|
|
ret = baro_init(); |
|
|
|
|
//ret = baro_init();
|
|
|
|
|
|
|
|
|
|
if (ret) { break; } |
|
|
|
|
//if (ret) { break; }
|
|
|
|
|
|
|
|
|
|
ret = adc_init(); |
|
|
|
|
//ret = adc_init();
|
|
|
|
|
|
|
|
|
|
if (ret) { break; } |
|
|
|
|
//if (ret) { break; }
|
|
|
|
|
|
|
|
|
|
break; |
|
|
|
|
} while (0); |
|
|
|
|