From cb16c238f1f8c21ce3dc8797027d9dbba374a1de Mon Sep 17 00:00:00 2001 From: Kaitlyn Date: Fri, 29 Jan 2016 20:16:04 -0800 Subject: [PATCH] add winch variable --- src/org/usfirst/frc/team3501/robot/Constants.java | 3 +++ src/org/usfirst/frc/team3501/robot/subsystems/Scaler.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java index 0cd7a7e9..d004cd0d 100644 --- a/src/org/usfirst/frc/team3501/robot/Constants.java +++ b/src/org/usfirst/frc/team3501/robot/Constants.java @@ -37,6 +37,9 @@ public class Constants { //Piston channels public final static int FORWARD_CHANNEL = 0; public final static int REVERSE_CHANNEL = 0; + + //Winch port + public final static int WINCH_MOTOR = 0; } public static class Shooter { diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/Scaler.java b/src/org/usfirst/frc/team3501/robot/subsystems/Scaler.java index 0ef62a42..b926178b 100755 --- a/src/org/usfirst/frc/team3501/robot/subsystems/Scaler.java +++ b/src/org/usfirst/frc/team3501/robot/subsystems/Scaler.java @@ -1,6 +1,7 @@ package org.usfirst.frc.team3501.robot.subsystems; import org.usfirst.frc.team3501.robot.Constants; +import edu.wpi.first.wpilibj.CANTalon; import edu.wpi.first.wpilibj.DoubleSolenoid; import edu.wpi.first.wpilibj.DoubleSolenoid.Value; import edu.wpi.first.wpilibj.command.Subsystem; @@ -8,10 +9,12 @@ import edu.wpi.first.wpilibj.command.Subsystem; public class Scaler extends Subsystem { //Scaler related objects private DoubleSolenoid piston; + private CANTalon winch; public Scaler() { piston = new DoubleSolenoid(Constants.Scaler.FORWARD_CHANNEL, Constants.Scaler.REVERSE_CHANNEL); + winch = new CANTalon(Constants.Scaler.WINCH_MOTOR); } @Override -- 2.30.2