diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-16 15:26:22 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-16 15:26:22 +0200 |
| commit | c5e4f33bb33689df5acb26ee4f40c70496f9b1eb (patch) | |
| tree | 381976022f870a4543281589e7d42b67ad76926d /src/drivers/hmc5883 | |
| parent | ca98070f8b479f5d643d810a077ad09e84d32721 (diff) | |
| parent | 654aaa0ca852b95e4e2bec5cf9b77ca3242d1d63 (diff) | |
| download | px4-firmware-c5e4f33bb33689df5acb26ee4f40c70496f9b1eb.tar.gz px4-firmware-c5e4f33bb33689df5acb26ee4f40c70496f9b1eb.tar.bz2 px4-firmware-c5e4f33bb33689df5acb26ee4f40c70496f9b1eb.zip | |
Merge sensor_startup_cleanup
Diffstat (limited to 'src/drivers/hmc5883')
| -rw-r--r-- | src/drivers/hmc5883/hmc5883.cpp | 12 | ||||
| -rw-r--r-- | src/drivers/hmc5883/module.mk | 7 |
2 files changed, 14 insertions, 5 deletions
diff --git a/src/drivers/hmc5883/hmc5883.cpp b/src/drivers/hmc5883/hmc5883.cpp index f229ecc32..0e9a961ac 100644 --- a/src/drivers/hmc5883/hmc5883.cpp +++ b/src/drivers/hmc5883/hmc5883.cpp @@ -338,6 +338,9 @@ private: */ int check_offset(); + /* this class has pointer data members, do not allow copying it */ + HMC5883(const HMC5883&); + HMC5883 operator=(const HMC5883&); }; /* @@ -348,8 +351,10 @@ extern "C" __EXPORT int hmc5883_main(int argc, char *argv[]); HMC5883::HMC5883(int bus, const char *path, enum Rotation rotation) : I2C("HMC5883", path, bus, HMC5883L_ADDRESS, 400000), + _work{}, _measure_ticks(0), _reports(nullptr), + _scale{}, _range_scale(0), /* default range scale from counts to gauss */ _range_ga(1.3f), _collect_phase(false), @@ -1174,7 +1179,7 @@ int HMC5883::calibrate(struct file *filp, unsigned enable) out: if (OK != ioctl(filp, MAGIOCSSCALE, (long unsigned int)&mscale_previous)) { - warn("WARNING: failed to set new scale / offsets for mag"); + warn("failed to set new scale / offsets for mag"); } /* set back to normal mode */ @@ -1370,6 +1375,9 @@ void usage(); /** * Start the driver. + * + * This function call only returns once the driver + * is either successfully up and running or failed to start. */ void start(int bus, enum Rotation rotation) @@ -1465,7 +1473,7 @@ test(int bus) int fd = open(path, O_RDONLY); if (fd < 0) - err(1, "%s open failed (try 'hmc5883 start' if the driver is not running", path); + err(1, "%s open failed (try 'hmc5883 start')", path); /* do a simple demand read */ sz = read(fd, &report, sizeof(report)); diff --git a/src/drivers/hmc5883/module.mk b/src/drivers/hmc5883/module.mk index 07377556d..5daa01dc5 100644 --- a/src/drivers/hmc5883/module.mk +++ b/src/drivers/hmc5883/module.mk @@ -37,7 +37,8 @@ MODULE_COMMAND = hmc5883 -# XXX seems excessive, check if 2048 is sufficient -MODULE_STACKSIZE = 4096 - SRCS = hmc5883.cpp + +MODULE_STACKSIZE = 1200 + +EXTRACXXFLAGS = -Weffc++ |