summaryrefslogtreecommitdiff
path: root/src/org/usfirst/frc
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-01-16 12:56:01 -0500
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-01-16 12:56:01 -0500
commit0e7c82c6173c0d230c1a921150d691bd8ebfde7d (patch)
tree8eb9f1d3465d3a81e12393cae4e0bbcfa690beef /src/org/usfirst/frc
parent75c2407dd85a69b8f80e9b376da1bfb9ed0bb173 (diff)
trailing whitespace cleanup
Diffstat (limited to 'src/org/usfirst/frc')
-rw-r--r--src/org/usfirst/frc/team4272/robot2016/Autonomous.java2
-rw-r--r--src/org/usfirst/frc/team4272/robot2016/HwRobot.java4
-rw-r--r--src/org/usfirst/frc/team4272/robot2016/Teleop.java2
-rw-r--r--src/org/usfirst/frc/team4272/robotlib/DoubleSolenoid.java10
-rw-r--r--src/org/usfirst/frc/team4272/robotlib/LimitSwitchedPIDOutput.java6
-rw-r--r--src/org/usfirst/frc/team4272/robotlib/Xbox360Controller.java10
6 files changed, 17 insertions, 17 deletions
diff --git a/src/org/usfirst/frc/team4272/robot2016/Autonomous.java b/src/org/usfirst/frc/team4272/robot2016/Autonomous.java
index 749e4cb..4fab67f 100644
--- a/src/org/usfirst/frc/team4272/robot2016/Autonomous.java
+++ b/src/org/usfirst/frc/team4272/robot2016/Autonomous.java
@@ -19,7 +19,7 @@ public class Autonomous {
c.rDrive = c.lDrive = 0.7;
//initially -0.7 to drive backwards
//0 to 9787 for going backwards
- //0 to negative for forward
+ //0 to negative for forward
//INDY: (15.5*140*1.1)
//PURDUE: (15.5*140*1.15) for a drop further
} else {
diff --git a/src/org/usfirst/frc/team4272/robot2016/HwRobot.java b/src/org/usfirst/frc/team4272/robot2016/HwRobot.java
index 27e64d8..9b3e4e1 100644
--- a/src/org/usfirst/frc/team4272/robot2016/HwRobot.java
+++ b/src/org/usfirst/frc/team4272/robot2016/HwRobot.java
@@ -22,13 +22,13 @@ public class HwRobot {
* - PWM: 0-9
* - PCM: 0-7 (the PCM is connected via CAN).
* - CAN
- *
+ *
* For completeness, the roboRIO also has: i2c, RS-232, SPI,
* RSL, 2xUSB-A, an accelerometer, and an expansion port.
*
* And, for communication: USB-B and Ethernet.
*/
-
+
public Encoder lDriveE = new Encoder(/*DIO*/2,/*DIO*/3);
private PIDOutput lDriveM = new PIDOutputSplitter(new Talon(/*PWM*/0),
new Talon(/*PWM*/1));
diff --git a/src/org/usfirst/frc/team4272/robot2016/Teleop.java b/src/org/usfirst/frc/team4272/robot2016/Teleop.java
index 4bc1b46..be88308 100644
--- a/src/org/usfirst/frc/team4272/robot2016/Teleop.java
+++ b/src/org/usfirst/frc/team4272/robot2016/Teleop.java
@@ -50,7 +50,7 @@ public class Teleop {
control.grab = grabButton.update(oi.xbox.getButton(Button.A));
control.push = pushButton.update(oi.xbox.getButton(Button.B));
-
+
if (camButton.update(oi.xbox.getButton(Button.RT))) {
try {
ProcessBuilder pb = new ProcessBuilder("/home/lvuser/tweeterbot/bin/snapPhoto");
diff --git a/src/org/usfirst/frc/team4272/robotlib/DoubleSolenoid.java b/src/org/usfirst/frc/team4272/robotlib/DoubleSolenoid.java
index 8698277..33524f1 100644
--- a/src/org/usfirst/frc/team4272/robotlib/DoubleSolenoid.java
+++ b/src/org/usfirst/frc/team4272/robotlib/DoubleSolenoid.java
@@ -3,7 +3,7 @@ package org.usfirst.frc.team4272.robotlib;
public class DoubleSolenoid extends edu.wpi.first.wpilibj.DoubleSolenoid {
private boolean enabled = true;
private Value value;
-
+
public DoubleSolenoid(int forwardChannel, int reverseChannel) {
super(forwardChannel, reverseChannel);
value = get();
@@ -12,7 +12,7 @@ public class DoubleSolenoid extends edu.wpi.first.wpilibj.DoubleSolenoid {
super(moduleNumber, forwardChannel, reverseChannel);
value = get();
}
-
+
public void setEnabled(boolean enabled) {
this.enabled = enabled;
if (enabled) {
@@ -21,15 +21,15 @@ public class DoubleSolenoid extends edu.wpi.first.wpilibj.DoubleSolenoid {
set(Value.kOff);
}
}
-
+
public void setForward(boolean forward) {
set(forward ? Value.kForward : Value.kReverse);
}
-
+
public boolean getForward() {
return value == Value.kForward;
}
-
+
public void set(Value value) {
this.value = value;
if (enabled) {
diff --git a/src/org/usfirst/frc/team4272/robotlib/LimitSwitchedPIDOutput.java b/src/org/usfirst/frc/team4272/robotlib/LimitSwitchedPIDOutput.java
index aa3aeaf..695d418 100644
--- a/src/org/usfirst/frc/team4272/robotlib/LimitSwitchedPIDOutput.java
+++ b/src/org/usfirst/frc/team4272/robotlib/LimitSwitchedPIDOutput.java
@@ -9,7 +9,7 @@ public class LimitSwitchedPIDOutput implements PIDOutput {
private final DigitalInput bakward;
private final boolean for_pressed;
private final boolean bak_pressed;
-
+
public LimitSwitchedPIDOutput(PIDOutput out,
DigitalInput forward, boolean for_pressed,
DigitalInput backward, boolean back_pressed) {
@@ -19,11 +19,11 @@ public class LimitSwitchedPIDOutput implements PIDOutput {
this.for_pressed = for_pressed;
this.bak_pressed = back_pressed;
}
-
+
public LimitSwitchedPIDOutput(PIDOutput out, DigitalInput forward, DigitalInput backward) {
this(out, forward, true, backward, true);
}
-
+
public void pidWrite(double v) {
if (forward.get() == for_pressed) { v = Math.min(v, 0); }
if (bakward.get() == bak_pressed) { v = Math.max(v, 0); }
diff --git a/src/org/usfirst/frc/team4272/robotlib/Xbox360Controller.java b/src/org/usfirst/frc/team4272/robotlib/Xbox360Controller.java
index d04fa23..0a4df83 100644
--- a/src/org/usfirst/frc/team4272/robotlib/Xbox360Controller.java
+++ b/src/org/usfirst/frc/team4272/robotlib/Xbox360Controller.java
@@ -56,7 +56,7 @@ public class Xbox360Controller extends Joystick {
}
/* Core functions *******************************************/
-
+
/**
* Get the value of an axis base on an enumerated type.
*
@@ -77,7 +77,7 @@ public class Xbox360Controller extends Joystick {
return getRawButton(button.id);
}
-
+
/* The actual code is done. The rest is boilerplate. See,
* this is why Java is terrible. Just 30% of the file
* actually doing useful stuff, the rest just filling
@@ -153,7 +153,7 @@ public class Xbox360Controller extends Joystick {
return getButton(Button.RB);
return false;
}
-
+
/**
* Get the state of a trigger; whether it is more than
* half-way pressed or not.
@@ -210,7 +210,7 @@ public class Xbox360Controller extends Joystick {
return Math.toDegrees(getDirectionRadians(Hand.kRight));
}
-
+
/* Unused wrappers for GenericHID/Joystick ******************/
/**
@@ -230,7 +230,7 @@ public class Xbox360Controller extends Joystick {
public double getThrottle() {
return 0.0;
}
-
+
/**
* This method is only here to complete the Joystick interface.
*