From 8e57685f4bacaa8353202309b93bd8f7802e0631 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Fri, 29 Jan 2016 21:51:01 -0800 Subject: [PATCH] reset to unix format --- .../team3501/robot/subsystems/DefenseArm.java | 27 -------------- .../team3501/robot/subsystems/IntakeArm.java | 36 ++++++++++++++++++- .../frc/team3501/robot/subsystems/Scaler.java | 19 ++-------- 3 files changed, 37 insertions(+), 45 deletions(-) diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java b/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java index af4158fb..4cd4232e 100755 --- a/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java +++ b/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java @@ -83,33 +83,6 @@ public class DefenseArm extends Subsystem { defenseHand.set(speed); } - public void moveArmDown(int levelsToDegrees) { - // to move arm down levels - if (levelsToDegrees > 0 & levelsToDegrees < 45) { - levelsToDegrees = 0; - if (levelsToDegrees > 45 & levelsToDegrees < 90) { - levelsToDegrees = 45; - - } - } - } - - public void moveArmTo(int levelsToDegrees) { - - } - - public void moveArmUp(int levelsToDegrees) { - // to move arm up levels - if (levelsToDegrees < 45 & levelsToDegrees > 0) { - levelsToDegrees = 45; - if (levelsToDegrees < 90 & levelsToDegrees > 45) { - levelsToDegrees = 90; - - } - - } - } - @Override protected void initDefaultCommand() { } diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java b/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java index 153743e0..0dffb86f 100755 --- a/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java +++ b/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java @@ -6,7 +6,6 @@ import edu.wpi.first.wpilibj.CANTalon; import edu.wpi.first.wpilibj.command.Subsystem; public class IntakeArm extends Subsystem { - private CANTalon intake; private CANTalon chevalDeFriseHand; @@ -43,6 +42,22 @@ public class IntakeArm extends Subsystem { * The speed of the motors that control the rollers. The range of * these motors go from [-1,1]. A negative speed changes the * direction of the motors, making it run backwards. + * ======= + * public IntakeArm() { + * + * } + * + * /*** + * This method allows you to set the speed of the motor(s). The range + * of speed + * is from [-1, 1]. A negative speed changes the direction of the + * motors. + * + * @param speed + * The speed of the motors that control the rollers. The range of + * these motors go from [-1,1]. A negative speed changes the + * direction of the motors. + * >>>>>>> reset to unix format */ public void setRollerSpeed(double speed) { @@ -50,6 +65,7 @@ public class IntakeArm extends Subsystem { } /*** + * <<<<<<< bd5dc4363add71a17f95409115dec96b83146549 * This method gets you the current speed of the motor that controls the * motor. The range of speed is from [-1,1]. A negative speed changes the * direction of the motor, making it run backwards. @@ -57,6 +73,10 @@ public class IntakeArm extends Subsystem { * @return Returns the speed of the motor that controls the roller. The range * of the motor goes from [-1,1]. A negative speed changes the * direction of the motor, making it go backwards. + * ======= + * + * @return + * >>>>>>> reset to unix format */ public double getRollerSpeed() { @@ -64,11 +84,25 @@ public class IntakeArm extends Subsystem { } /*** + * <<<<<<< bd5dc4363add71a17f95409115dec96b83146549 * This method checks to see if the motors controlling the rollers are * currently working. * * @return Returns whether the motors are currently running, and returns the * state of the condition (true or false). + * ======= + * + * @return + */ + + public boolean isBallInside() { + return true; + } + + /*** + * + * @return + * >>>>>>> reset to unix format */ public boolean areRollersRolling() { diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/Scaler.java b/src/org/usfirst/frc/team3501/robot/subsystems/Scaler.java index 09f73021..3c47a476 100755 --- a/src/org/usfirst/frc/team3501/robot/subsystems/Scaler.java +++ b/src/org/usfirst/frc/team3501/robot/subsystems/Scaler.java @@ -15,16 +15,8 @@ public class Scaler extends Subsystem { piston = new DoubleSolenoid(Constants.Scaler.FORWARD_CHANNEL, Constants.Scaler.REVERSE_CHANNEL); winch = new CANTalon(Constants.Scaler.WINCH_MOTOR); - - } - -<<<<<<< 39cd129b533ffb726c00d5d5cd98b541a25d23bd - public void setPistonStatus(int status) { - } -======= ->>>>>>> Add set motor speed methods in defense arm and add potentiometer getter methods public Value getSolenoidValue() { return piston.get(); } @@ -53,12 +45,10 @@ public class Scaler extends Subsystem { winch.set(speed); } -<<<<<<< 39cd129b533ffb726c00d5d5cd98b541a25d23bd -======= /*** * This method returns boolean value true or false on whether piston is * extended or not. - * + * * @return * returns true if piston is extended, false if otherwise. */ @@ -81,7 +71,7 @@ public class Scaler extends Subsystem { /*** * This method sets the piston status for the scissor lift. * The piston can either be extended or not extended. - * + * * @param status * The status of the piston. * 0 for the piston to be extended, 1 for the piston to not be @@ -92,13 +82,8 @@ public class Scaler extends Subsystem { } ->>>>>>> Add set motor speed methods in defense arm and add potentiometer getter methods @Override protected void initDefaultCommand() { } -<<<<<<< 39cd129b533ffb726c00d5d5cd98b541a25d23bd -======= - ->>>>>>> Add set motor speed methods in defense arm and add potentiometer getter methods } -- 2.30.2