dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Be a bit quieter and more forgiving about various system configuration and driver non-issues.

This commit is contained in:
px4dev 2012-09-10 00:16:05 -07:00
parent a1b4d32b56
commit 68d4a26b9e
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
apps/sensors/sensors.cpp
View File

@ -533,12 +533,10 @@ Sensors::accel_init()
warnx("using BMA180");
} else {
/* set the accel internal sampling rate up to at leat 500Hz */
if (OK != ioctl(fd, ACCELIOCSSAMPLERATE, 500))
warn("WARNING: failed to set minimum 500Hz sample rate for accel");
ioctl(fd, ACCELIOCSSAMPLERATE, 500);
/* set the driver to poll at 500Hz */
if (OK != ioctl(fd, SENSORIOCSPOLLRATE, 500))
warn("WARNING: failed to set 500Hz poll rate for accel");
ioctl(fd, SENSORIOCSPOLLRATE, 500);
warnx("using system accel");
close(fd);
@ -568,12 +566,10 @@ Sensors::gyro_init()
warn("using L3GD20");
} else {
/* set the gyro internal sampling rate up to at leat 500Hz */
if (OK != ioctl(fd, GYROIOCSSAMPLERATE, 500))
warn("WARNING: failed to set minimum 500Hz sample rate for gyro");
ioctl(fd, GYROIOCSSAMPLERATE, 500);
/* set the driver to poll at 500Hz */
if (OK != ioctl(fd, SENSORIOCSPOLLRATE, 500))
warn("WARNING: failed to set 500Hz poll rate for gyro");
ioctl(fd, SENSORIOCSPOLLRATE, 500);
warnx("using system gyro");
close(fd);
@ -592,12 +588,10 @@ Sensors::mag_init()
}
/* set the mag internal poll rate to at least 150Hz */
if (OK != ioctl(fd, MAGIOCSSAMPLERATE, 150))
warn("WARNING: failed to set minimum 150Hz sample rate for mag");
ioctl(fd, MAGIOCSSAMPLERATE, 150);
/* set the driver to poll at 150Hz */
if (OK != ioctl(fd, SENSORIOCSPOLLRATE, 150))
warn("WARNING: failed to set 150Hz poll rate for mag");
ioctl(fd, SENSORIOCSPOLLRATE, 150);
close(fd);
}
@ -614,8 +608,7 @@ Sensors::baro_init()
}
/* set the driver to poll at 150Hz */
if (OK != ioctl(fd, SENSORIOCSPOLLRATE, 150))
warn("WARNING: failed to set 150Hz poll rate for baro");
ioctl(fd, SENSORIOCSPOLLRATE, 150);
close(fd);
}

2
apps/systemcmds/boardinfo/boardinfo.c
View File

@ -247,7 +247,7 @@ int boardinfo_main(int argc, char *argv[])
int ret = carrier_get_board_info(&info);
if (ret != sizeof(info)) {
fprintf(stderr, "[boardinfo] ERROR loading board info from EEPROM (errno #%d), aborting\n", -ret);
fprintf(stderr, "[boardinfo] no EEPROM for board %d\n", test_boardid);
exit(1);
}