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

Fixes for rebasing.

Browse Source 
Change-Id: I765d2f2fc044fb30caef3cda8ff6bd03fef6b4e0
This commit is contained in:
Alex Henning
2014-06-17 14:09:58 -07:00
parent bd1aea0d24
commit 9ff7412780
5 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,7 +43,7 @@ public class AnalogPotentiometer implements Potentiometer, LiveWindowSendable {
public AnalogPotentiometer(final int channel, double scale, double offset) {
initPot(channel, scale, offset);
}
/**
* AnalogPotentiometer constructor.
*
@@ -79,7 +79,6 @@ public class AnalogPotentiometer implements Potentiometer, LiveWindowSendable {
return m_analog_input.getVoltage() * m_scale + m_offset;
}
/**
* Implement the PIDSource interface.
*
@@ -89,6 +88,7 @@ public class AnalogPotentiometer implements Potentiometer, LiveWindowSendable {
return get();
}
/*
* Live Window code, only does anything if live window is activated.
*/