From 0a46a3a618692fbf694c2f9ad097bbd294242354 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Fri, 5 Jan 2024 16:59:30 -0800 Subject: [PATCH] [wpilib] Make ADXL345 default I2C address public (#6163) pybind needs it. --- wpilibc/src/main/native/include/frc/ADXL345_I2C.h | 4 +++- wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL345_I2C.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/wpilibc/src/main/native/include/frc/ADXL345_I2C.h b/wpilibc/src/main/native/include/frc/ADXL345_I2C.h index e1fb1ef491..4c6d9dffe2 100644 --- a/wpilibc/src/main/native/include/frc/ADXL345_I2C.h +++ b/wpilibc/src/main/native/include/frc/ADXL345_I2C.h @@ -64,6 +64,9 @@ class ADXL345_I2C : public nt::NTSendable, double ZAxis = 0.0; }; + /// Default I2C device address. + static constexpr int kAddress = 0x1D; + /** * Constructs the ADXL345 Accelerometer over I2C. * @@ -137,7 +140,6 @@ class ADXL345_I2C : public nt::NTSendable, hal::SimDouble m_simY; hal::SimDouble m_simZ; - static constexpr int kAddress = 0x1D; static constexpr int kPowerCtlRegister = 0x2D; static constexpr int kDataFormatRegister = 0x31; static constexpr int kDataRegister = 0x32; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL345_I2C.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL345_I2C.java index d59f682141..4f6803d0b8 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL345_I2C.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL345_I2C.java @@ -27,7 +27,9 @@ import java.nio.ByteOrder; */ @SuppressWarnings({"TypeName", "PMD.UnusedPrivateField"}) public class ADXL345_I2C implements NTSendable, AutoCloseable { - private static final byte kAddress = 0x1D; + /** Default I2C device address. */ + public static final byte kAddress = 0x1D; + private static final byte kPowerCtlRegister = 0x2D; private static final byte kDataFormatRegister = 0x31; private static final byte kDataRegister = 0x32;