Merge branch 'master' of github.com:PX4/Firmware into fixedwing

This commit is contained in:
Lorenz Meier 2013-01-06 12:37:13 +01:00
commit 2bd4301849
2 changed files with 3 additions and 2 deletions

View File

@ -8,6 +8,7 @@
#
ms5611 start
adc start
if mpu6000 start
then

View File

@ -760,8 +760,8 @@ Sensors::adc_init()
_fd_adc = open("/dev/adc0", O_RDONLY | O_NONBLOCK);
if (_fd_adc < 0) {
warn("/dev/adc0");
errx(1, "FATAL: no ADC found");
warnx("/dev/adc0");
warnx(1, "FATAL: no ADC found");
}
}