FRCSim artf2604: Synchronized the codebases of WPILibJ-Simulation

and the main WPILibJ.

Change-Id: I9b933b6f21be21cd5e9808b6f8d127a995a742e7
This commit is contained in:
Colby Skeggs
2014-06-21 12:45:07 -07:00
parent 698f38d404
commit f5862582e6
32 changed files with 910 additions and 918 deletions

View File

@@ -446,7 +446,7 @@ public class AnalogInput extends SensorBase implements PIDSource,
}
/**
* Get the average value for usee with PIDController
* Get the average value for use with PIDController
*
* @return the average value
*/
@@ -454,7 +454,7 @@ public class AnalogInput extends SensorBase implements PIDSource,
return getAverageValue();
}
/*
/**
* Live Window code, only does anything if live window is activated.
*/
public String getSmartDashboardType() {

View File

@@ -156,7 +156,7 @@ public abstract class RobotBase {
* the robot.
* @throws javax.microedition.midlet.MIDletStateChangeException
*/
public static void main(String args[]) { // TODO: expose main to teams?{
public static void main(String args[]) { // TODO: expose main to teams?
boolean errorOnExit = false;
// /* JNI Testing */

View File

@@ -43,7 +43,7 @@ public class Talon extends SafePWM implements SpeedController, IDeviceController
/**
* Constructor.
*
* @param channel The PWM channel that the Victor is attached to.
* @param channel The PWM channel that the Talon is attached to.
*/
public Talon(final int channel) {
super(channel);

View File

@@ -13,5 +13,5 @@ import edu.wpi.first.wpilibj.PIDSource;
* @author alex
*/
public interface Potentiometer extends PIDSource {
double get();
double get();
}