Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-03 03:01:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Accelerometer classes no longer use PIMPL pattern

Browse Source 
Change-Id: I792ac05e7080190ce268818a2bb94dacbeba274c
This commit is contained in:
Tyler Veness
2015-07-21 01:38:17 -07:00
committed by Tyler Veness (3512)
parent b5695581c3
commit 93b0dab7e4
3 changed files with 29 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wpilibc/wpilibC++Devices/src/ADXL345_I2C.cpp
View File

@@ -23,8 +23,6 @@ constexpr double ADXL345_I2C::kGsPerLSB;
* @param range The range (+ or -) that the accelerometer will measure.
*/
ADXL345_I2C::ADXL345_I2C(Port port, Range range) : I2C(port, kAddress) {
// m_i2c = new I2C((I2C::Port)port, kAddress);
// Turn on the measurements
Write(kPowerCtlRegister, kPowerCtl_Measure);
// Specify the data format to read
@@ -57,10 +55,7 @@ double ADXL345_I2C::GetZ() { return GetAcceleration(kAxis_Z); }
*/
double ADXL345_I2C::GetAcceleration(ADXL345_I2C::Axes axis) {
int16_t rawAccel = 0;
// if(m_i2c)
//{
Read(kDataRegister + (uint8_t)axis, sizeof(rawAccel), (uint8_t *)&rawAccel);
//}
return rawAccel * kGsPerLSB;
}
@@ -73,14 +68,11 @@ double ADXL345_I2C::GetAcceleration(ADXL345_I2C::Axes axis) {
ADXL345_I2C::AllAxes ADXL345_I2C::GetAccelerations() {
AllAxes data = AllAxes();
int16_t rawData[3];
// if (m_i2c)
//{
Read(kDataRegister, sizeof(rawData), (uint8_t *)rawData);
data.XAxis = rawData[0] * kGsPerLSB;
data.YAxis = rawData[1] * kGsPerLSB;
data.ZAxis = rawData[2] * kGsPerLSB;
//}
return data;
}