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

This commit is contained in:
Lorenz Meier
2013-05-28 17:49:06 +02:00
+1 -3
View File
@@ -329,7 +329,7 @@ HMC5883::HMC5883(int bus) :
_calibrated(false) _calibrated(false)
{ {
// enable debug() calls // enable debug() calls
_debug_enabled = true; _debug_enabled = false;
// default scaling // default scaling
_scale.x_offset = 0; _scale.x_offset = 0;
@@ -1224,12 +1224,10 @@ start()
errx(1, "already started"); errx(1, "already started");
/* create the driver, attempt expansion bus first */ /* create the driver, attempt expansion bus first */
warnx("probing for external sensor..");
g_dev = new HMC5883(PX4_I2C_BUS_EXPANSION); g_dev = new HMC5883(PX4_I2C_BUS_EXPANSION);
if (g_dev != nullptr && OK != g_dev->init()) { if (g_dev != nullptr && OK != g_dev->init()) {
delete g_dev; delete g_dev;
g_dev = nullptr; g_dev = nullptr;
warnx("no external sensor, using internal..");
} }