diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-03-23 21:39:01 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-03-23 21:39:01 -0400 |
| commit | 56b07e1b0b9dc3e41a5551f5362fd71392b129d7 (patch) | |
| tree | be8c53bfad899753f4ce9e6009771b39a0895919 | |
| parent | a9cac343eff6edbb265a4e14cee38aa1606ae02c (diff) | |
| parent | e8ec3f88da606cebe54b2ce419b2fcc205973906 (diff) | |
# Conflicts:
# src/org/usfirst/frc/team4272/robot2016/HwRobot.java
| -rw-r--r-- | src/org/usfirst/frc/team4272/robot2016/HwRobot.java | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/org/usfirst/frc/team4272/robot2016/HwRobot.java b/src/org/usfirst/frc/team4272/robot2016/HwRobot.java index 3306486..e61d87f 100644 --- a/src/org/usfirst/frc/team4272/robot2016/HwRobot.java +++ b/src/org/usfirst/frc/team4272/robot2016/HwRobot.java @@ -32,11 +32,16 @@ public class HwRobot { // naming convention: {side_letter}{Thing}{E|M (encoder/motor)} - private final PIDOutput lDriveM1 = new Talon(/*PWM*/1), lDriveM2 = new Talon(/*PWM*/0); - private final PIDOutput rDriveM1 = new Talon(/*PWM*/2), rDriveM2 = new Talon(/*PWM*/4); - private final PIDOutput armM = new Talon(/*PWM*/8); - private final PIDOutput fBallM = new PIDOutputSplitter(new Talon(/*PWM*/9), new Talon(/*PWM*/3)); - private final PIDOutput bBallM = new Talon(/*PWM*/6); + private final PIDOutput + rDriveM1 = new Talon(/*PWM*/2), /* PDP 2, 3 */ + rDriveM2 = new Talon(/*PWM*/4), /* PDP 4 */ + lDriveM1 = new Talon(/*PWM*/1), /* PDP 12, 13 */ + lDriveM2 = new Talon(/*PWM*/0), /* PDP 11 */ + armM = new Talon(/*PWM*/8), /* PDP 15 */ + rfBallM = new Talon(/*PWM*/3), /* PDP 0 */ + lfBallM = new Talon(/*PWM*/9), /* PDP 14 */ + fBallM = new PIDOutputSplitter(rfBallM, lfBallM), + bBallM = new Talon(/*PWM*/6); /* PDP 10, 5 */ public final Encoder armE = new Encoder(/*DIO*/0, /*DIO*/1, /*DIO*/2, true); public final DigitalInput armL = new DigitalInput(/*DIO*/3); |