From 1826a8dc87107766f95c8f93b9ac536d1d8b0fe4 Mon Sep 17 00:00:00 2001 From: Yamini Adusumelli Date: Thu, 28 Jan 2016 19:12:55 -0800 Subject: [PATCH] add second defenseArmMotor related constants --- src/org/usfirst/frc/team3501/robot/Constants.java | 14 ++++++++------ .../frc/team3501/robot/subsystems/DefenseArm.java | 1 + 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java index a4fe655c..d6fadc17 100644 --- a/src/org/usfirst/frc/team3501/robot/Constants.java +++ b/src/org/usfirst/frc/team3501/robot/Constants.java @@ -70,6 +70,14 @@ public class Constants { public static final double OUTPUT_SPEED = -0.5; } + public static class DefenseArm { + // Potentiometer related ports + public static final int ARM_CHANNEL = 0; + public static final int ARM_PORT = 0; + public static final int HAND_CHANNEL = 1; + public static final int HAND_PORT = 1; + } + public static enum Direction { LEFT, RIGHT, DOWN, UP, FORWARD, BACKWARD; } @@ -77,10 +85,4 @@ public class Constants { public enum Defense { PORTCULLIS, SALLY_PORT, ROUGH_TERRAIN, LOW_BAR, CHEVAL_DE_FRISE, DRAWBRIDGE, MOAT, ROCK_WALL, RAMPART; } - - public static class DefenseArm { - // Potentiometer related ports - public static final int CHANNEL = 0; - public static final int PORT = 0; - } } diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java b/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java index e59481d7..b9fd25bc 100755 --- a/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java +++ b/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java @@ -9,6 +9,7 @@ import edu.wpi.first.wpilibj.command.Subsystem; public class DefenseArm extends Subsystem { // Defense arm related objects public AnalogPotentiometer defenseArmPotentiometer; + public AnalogPotentiometer defenseHandPotentiometer; public CANTalon defenseArmMotor; public CANTalon defenseHandMotor; -- 2.30.2