Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wpilib] Replace internal usages of Analog getAverageVoltage (#8271)

Browse Source
This commit is contained in:
Thad House
2025-10-02 22:40:45 -07:00
committed by GitHub
parent e369c721ca
commit 7d34f43e44
4 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wpilibc/src/main/native/cpp/AnalogAccelerometer.cpp
View File

@@ -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) {

3
wpilibc/src/main/native/cpp/AnalogPotentiometer.cpp
View File

@@ -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;
}

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogAccelerometer.java
View File

@@ -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;
}
/**

3
wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogPotentiometer.java
View File

@@ -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