Skip to content

Commit 7d34f43

Browse files
authored
[wpilib] Replace internal usages of Analog getAverageVoltage (#8271)
1 parent e369c72 commit 7d34f43

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

wpilibc/src/main/native/cpp/AnalogAccelerometer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ AnalogAccelerometer::AnalogAccelerometer(std::shared_ptr<AnalogInput> channel)
3535
}
3636

3737
double AnalogAccelerometer::GetAcceleration() const {
38-
return (m_analogInput->GetAverageVoltage() - m_zeroGVoltage) / m_voltsPerG;
38+
return (m_analogInput->GetVoltage() - m_zeroGVoltage) / m_voltsPerG;
3939
}
4040

4141
void AnalogAccelerometer::SetSensitivity(double sensitivity) {

wpilibc/src/main/native/cpp/AnalogPotentiometer.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ AnalogPotentiometer::AnalogPotentiometer(std::shared_ptr<AnalogInput> input,
3838
}
3939

4040
double AnalogPotentiometer::Get() const {
41-
return (m_analog_input->GetAverageVoltage() /
42-
RobotController::GetVoltage3V3()) *
41+
return (m_analog_input->GetVoltage() / RobotController::GetVoltage3V3()) *
4342
m_fullRange +
4443
m_offset;
4544
}

wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogAccelerometer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public double getAcceleration() {
8383
if (m_analogChannel == null) {
8484
return 0.0;
8585
}
86-
return (m_analogChannel.getAverageVoltage() - m_zeroGVoltage) / m_voltsPerG;
86+
return (m_analogChannel.getVoltage() - m_zeroGVoltage) / m_voltsPerG;
8787
}
8888

8989
/**

wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogPotentiometer.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,7 @@ public double get() {
125125
if (m_analogInput == null) {
126126
return m_offset;
127127
}
128-
return (m_analogInput.getAverageVoltage() / RobotController.getVoltage3V3()) * m_fullRange
129-
+ m_offset;
128+
return (m_analogInput.getVoltage() / RobotController.getVoltage3V3()) * m_fullRange + m_offset;
130129
}
131130

132131
@Override

0 commit comments

Comments
 (0)