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

LSM303D: Ensure init and constructors

This commit is contained in:
Lorenz Meier 2014-07-16 08:47:49 +02:00
parent 8107205b9e
commit f162a3e8d4
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/drivers/lsm303d/lsm303d.cpp
View File

@ -461,6 +461,10 @@ private:
* @return OK if the value can be supported. * @return OK if the value can be supported.
*/ */
int mag_set_samplerate(unsigned frequency); int mag_set_samplerate(unsigned frequency);
/* this class cannot be copied */
LSM303D(const LSM303D&);
LSM303D operator=(const LSM303D&);
}; };
/** /**
@ -490,20 +494,28 @@ private:
void measure(); void measure();
void measure_trampoline(void *arg); void measure_trampoline(void *arg);
/* this class does not allow copying due to ptr data members */
LSM303D_mag(const LSM303D_mag&);
LSM303D_mag operator=(const LSM303D_mag&);
}; };
LSM303D::LSM303D(int bus, const char* path, spi_dev_e device, enum Rotation rotation) : LSM303D::LSM303D(int bus, const char* path, spi_dev_e device, enum Rotation rotation) :
SPI("LSM303D", path, bus, device, SPIDEV_MODE3, 11*1000*1000 /* will be rounded to 10.4 MHz, within safety margins for LSM303D */), SPI("LSM303D", path, bus, device, SPIDEV_MODE3, 11*1000*1000 /* will be rounded to 10.4 MHz, within safety margins for LSM303D */),
_mag(new LSM303D_mag(this)), _mag(new LSM303D_mag(this)),
_accel_call{},
_mag_call{},
_call_accel_interval(0), _call_accel_interval(0),
_call_mag_interval(0), _call_mag_interval(0),
_accel_reports(nullptr), _accel_reports(nullptr),
_mag_reports(nullptr), _mag_reports(nullptr),
_accel_scale{},
_accel_range_m_s2(0.0f), _accel_range_m_s2(0.0f),
_accel_range_scale(0.0f), _accel_range_scale(0.0f),
_accel_samplerate(0), _accel_samplerate(0),
_accel_onchip_filter_bandwith(0), _accel_onchip_filter_bandwith(0),
_mag_scale{},
_mag_range_ga(0.0f), _mag_range_ga(0.0f),
_mag_range_scale(0.0f), _mag_range_scale(0.0f),
_mag_samplerate(0), _mag_samplerate(0),
@ -524,6 +536,7 @@ LSM303D::LSM303D(int bus, const char* path, spi_dev_e device, enum Rotation rota
_reg7_expected(0), _reg7_expected(0),
_accel_log_fd(-1), _accel_log_fd(-1),
_accel_logging_enabled(false), _accel_logging_enabled(false),
_last_extreme_us(0),
_last_log_us(0), _last_log_us(0),
_last_log_sync_us(0), _last_log_sync_us(0),
_last_log_reg_us(0), _last_log_reg_us(0),

2
src/drivers/lsm303d/module.mk
View File

@ -6,3 +6,5 @@ MODULE_COMMAND = lsm303d
SRCS = lsm303d.cpp SRCS = lsm303d.cpp
MODULE_STACKSIZE = 1200 MODULE_STACKSIZE = 1200
EXTRACXXFLAGS = -Weffc++