diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-01-06 12:37:13 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-01-06 12:37:13 +0100 |
| commit | 2bd4301849d49d2bd2b394644c0e753f2a252572 (patch) | |
| tree | 4baf1d3759c3377c80889a0f4fea10eedcb90475 | |
| parent | f788d452ea02ab4d8af52f644dbd56a06d33dadb (diff) | |
| parent | c94076f6735290dc7aa8742428f46ef51521f9a6 (diff) | |
| download | px4-firmware-2bd4301849d49d2bd2b394644c0e753f2a252572.tar.gz px4-firmware-2bd4301849d49d2bd2b394644c0e753f2a252572.tar.bz2 px4-firmware-2bd4301849d49d2bd2b394644c0e753f2a252572.zip | |
Merge branch 'master' of github.com:PX4/Firmware into fixedwing
| -rw-r--r-- | ROMFS/scripts/rc.sensors | 1 | ||||
| -rw-r--r-- | apps/sensors/sensors.cpp | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ROMFS/scripts/rc.sensors b/ROMFS/scripts/rc.sensors index 536fcfd2c..42c2f52e9 100644 --- a/ROMFS/scripts/rc.sensors +++ b/ROMFS/scripts/rc.sensors @@ -8,6 +8,7 @@ # ms5611 start +adc start if mpu6000 start then diff --git a/apps/sensors/sensors.cpp b/apps/sensors/sensors.cpp index c0195df4f..bf53bb9a9 100644 --- a/apps/sensors/sensors.cpp +++ b/apps/sensors/sensors.cpp @@ -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"); } } |