From f761d7ba8d335bbb41b106c008a636f37af8cbd3 Mon Sep 17 00:00:00 2001 From: Shivani Ghanta Date: Tue, 17 Jan 2017 19:59:52 -0800 Subject: [PATCH] add Motor value in constants --- src/org/usfirst/frc/team3501/robot/Constants.java | 6 ++++++ .../team3501/robot/commands/climber/StopWinch.java | 2 ++ .../frc/team3501/robot/subsystems/Climber.java | 12 ++++++++++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java index f416b33..4978c31 100644 --- a/src/org/usfirst/frc/team3501/robot/Constants.java +++ b/src/org/usfirst/frc/team3501/robot/Constants.java @@ -37,6 +37,12 @@ public class Constants { public static final int ENCODER_RIGHT_B = 3; } + public static class Climber { + // MOTOR CONTROLLERS + public static final int MOTOR_VAL = 1; + + } + public static enum Direction { LEFT, RIGHT, DOWN, UP, FORWARD, BACKWARD; } diff --git a/src/org/usfirst/frc/team3501/robot/commands/climber/StopWinch.java b/src/org/usfirst/frc/team3501/robot/commands/climber/StopWinch.java index 8fa01a3..a11eee8 100644 --- a/src/org/usfirst/frc/team3501/robot/commands/climber/StopWinch.java +++ b/src/org/usfirst/frc/team3501/robot/commands/climber/StopWinch.java @@ -13,6 +13,8 @@ import edu.wpi.first.wpilibj.command.Command; public class StopWinch extends Command { public StopWinch() { + requires(Robot.getClimber()); + } @Override diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/Climber.java b/src/org/usfirst/frc/team3501/robot/subsystems/Climber.java index 9dd7361..3d49f90 100644 --- a/src/org/usfirst/frc/team3501/robot/subsystems/Climber.java +++ b/src/org/usfirst/frc/team3501/robot/subsystems/Climber.java @@ -1,10 +1,17 @@ package org.usfirst.frc.team3501.robot.subsystems; -public class Climber { +import org.usfirst.frc.team3501.robot.Constants; + +import com.ctre.CANTalon; + +import edu.wpi.first.wpilibj.command.Subsystem; + +public class Climber extends Subsystem { private static Climber climber; + private final CANTalon motor; private Climber() { - + motor = new CANTalon(Constants.Climber.MOTOR); } public static Climber getClimber() { @@ -19,6 +26,7 @@ public class Climber { } public void setMotorValue(final double val) { + motor.set(MOTOR); } } -- 2.30.2