From: nbhargava Date: Tue, 17 Nov 2015 05:06:01 +0000 (-0800) Subject: Added analog input object X-Git-Url: http://challenge-bot.com/repos/?a=commitdiff_plain;h=6cc00a79e87609c29e4bd5b0ce867f85dca061de;p=3501%2F2015-FRC-Spark Added analog input object --- diff --git a/src/org/usfirst/frc3501/RiceCatRobot/subsystems/Arm.java b/src/org/usfirst/frc3501/RiceCatRobot/subsystems/Arm.java index fe5a621..a17a635 100644 --- a/src/org/usfirst/frc3501/RiceCatRobot/subsystems/Arm.java +++ b/src/org/usfirst/frc3501/RiceCatRobot/subsystems/Arm.java @@ -2,6 +2,7 @@ package org.usfirst.frc3501.RiceCatRobot.subsystems; import org.usfirst.frc3501.RiceCatRobot.RobotMap; +import edu.wpi.first.wpilibj.AnalogInput; import edu.wpi.first.wpilibj.AnalogPotentiometer; import edu.wpi.first.wpilibj.CANJaguar; import edu.wpi.first.wpilibj.command.Subsystem; @@ -9,10 +10,13 @@ import edu.wpi.first.wpilibj.command.Subsystem; public class Arm extends Subsystem { private CANJaguar left, right; public AnalogPotentiometer analogPotentiometer; + public Arm() { left = new CANJaguar(RobotMap.ARM_LEFT); right = new CANJaguar(RobotMap.ARM_RIGHT); + AnalogInput ai = new AnalogInput(1); + analogPotentiometer = new AnalogPotentiometer(ai, 360, 30); } public void initDefaultCommand() {