From 7d34f43e440aa10cfce62fa41084cd9ea232cfd8 Mon Sep 17 00:00:00 2001
From: Thad House <ThadHouse@users.noreply.github.com>
Date: Thu, 2 Oct 2025 22:40:45 -0700
Subject: [PATCH] [wpilib] Replace internal usages of Analog getAverageVoltage
 (#8271)

---
 wpilibc/src/main/native/cpp/AnalogAccelerometer.cpp            | 2 +-
 wpilibc/src/main/native/cpp/AnalogPotentiometer.cpp            | 3 +--
 .../main/java/edu/wpi/first/wpilibj/AnalogAccelerometer.java   | 2 +-
 .../main/java/edu/wpi/first/wpilibj/AnalogPotentiometer.java   | 3 +--
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/wpilibc/src/main/native/cpp/AnalogAccelerometer.cpp b/wpilibc/src/main/native/cpp/AnalogAccelerometer.cpp
index 4f5a26c60b..1df5e31270 100644
--- a/wpilibc/src/main/native/cpp/AnalogAccelerometer.cpp
+++ b/wpilibc/src/main/native/cpp/AnalogAccelerometer.cpp
@@ -35,7 +35,7 @@ AnalogAccelerometer::AnalogAccelerometer(std::shared_ptr<AnalogInput> channel)
 }
 
 double AnalogAccelerometer::GetAcceleration() const {
-  return (m_analogInput->GetAverageVoltage() - m_zeroGVoltage) / m_voltsPerG;
+  return (m_analogInput->GetVoltage() - m_zeroGVoltage) / m_voltsPerG;
 }
 
 void AnalogAccelerometer::SetSensitivity(double sensitivity) {
diff --git a/wpilibc/src/main/native/cpp/AnalogPotentiometer.cpp b/wpilibc/src/main/native/cpp/AnalogPotentiometer.cpp
index b4d911297a..71242ea4e8 100644
--- a/wpilibc/src/main/native/cpp/AnalogPotentiometer.cpp
+++ b/wpilibc/src/main/native/cpp/AnalogPotentiometer.cpp
@@ -38,8 +38,7 @@ AnalogPotentiometer::AnalogPotentiometer(std::shared_ptr<AnalogInput> input,
 }
 
 double AnalogPotentiometer::Get() const {
-  return (m_analog_input->GetAverageVoltage() /
-          RobotController::GetVoltage3V3()) *
+  return (m_analog_input->GetVoltage() / RobotController::GetVoltage3V3()) *
              m_fullRange +
          m_offset;
 }
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogAccelerometer.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogAccelerometer.java
index e7c8f76429..7ff0afa76f 100644
--- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogAccelerometer.java
+++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogAccelerometer.java
@@ -83,7 +83,7 @@ public class AnalogAccelerometer implements Sendable, AutoCloseable {
     if (m_analogChannel == null) {
       return 0.0;
     }
-    return (m_analogChannel.getAverageVoltage() - m_zeroGVoltage) / m_voltsPerG;
+    return (m_analogChannel.getVoltage() - m_zeroGVoltage) / m_voltsPerG;
   }
 
   /**
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogPotentiometer.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogPotentiometer.java
index 4f9b275f2d..57debffd77 100644
--- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogPotentiometer.java
+++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogPotentiometer.java
@@ -125,8 +125,7 @@ public class AnalogPotentiometer implements Sendable, AutoCloseable {
     if (m_analogInput == null) {
       return m_offset;
     }
-    return (m_analogInput.getAverageVoltage() / RobotController.getVoltage3V3()) * m_fullRange
-        + m_offset;
+    return (m_analogInput.getVoltage() / RobotController.getVoltage3V3()) * m_fullRange + m_offset;
   }
 
   @Override