Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-29 02:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Artf4179: Allow alternate I2C addresses for ADXL345_I2C"

Browse Source
This commit is contained in:
Peter Johnson (294)
2016-01-01 19:34:47 -08:00
committed by Gerrit Code Review
parent 5cee85f921 376fc6be6f
commit 3e71573c51
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
wpilibj/src/athena/java/edu/wpi/first/wpilibj/ADXL345_I2C.java
View File

@@ -58,13 +58,24 @@ public class ADXL345_I2C extends SensorBase implements Accelerometer, LiveWindow
private I2C m_i2c;
/**
* Constructor.
* Constructs the ADXL345 Accelerometer with I2C address 0x1D.
*$
* @param port The I2C port the accelerometer is attached to
* @param range The range (+ or -) that the accelerometer will measure.
*/
public ADXL345_I2C(I2C.Port port, Range range) {
m_i2c = new I2C(port, kAddress);
this(port, range, kAddress);
}
/**
* Constructs the ADXL345 Accelerometer over I2C.
*$
* @param port The I2C port the accelerometer is attached to
* @param range The range (+ or -) that the accelerometer will measure.
* @param the I2C address of the accelerometer (0x1D or 0x53)
*/
public ADXL345_I2C(I2C.Port port, Range range, int deviceAddress) {
m_i2c = new I2C(port, deviceAddress);
// Turn on the measurements
m_i2c.write(kPowerCtlRegister, kPowerCtl_Measure);