diff --git a/.gradle/5.0/fileChanges/last-build.bin b/.gradle/5.0/fileChanges/last-build.bin new file mode 100644 index 0000000..f76dd23 Binary files /dev/null and b/.gradle/5.0/fileChanges/last-build.bin differ diff --git a/.gradle/5.0/fileHashes/fileHashes.lock b/.gradle/5.0/fileHashes/fileHashes.lock new file mode 100644 index 0000000..fba6852 Binary files /dev/null and b/.gradle/5.0/fileHashes/fileHashes.lock differ diff --git a/.gradle/5.0/gc.properties b/.gradle/5.0/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/.gradle/5.0/taskHistory/taskHistory.bin b/.gradle/5.0/taskHistory/taskHistory.bin new file mode 100644 index 0000000..ce38f70 Binary files /dev/null and b/.gradle/5.0/taskHistory/taskHistory.bin differ diff --git a/.gradle/5.0/taskHistory/taskHistory.lock b/.gradle/5.0/taskHistory/taskHistory.lock new file mode 100644 index 0000000..2afb763 Binary files /dev/null and b/.gradle/5.0/taskHistory/taskHistory.lock differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 0000000..d794a3b Binary files /dev/null and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 0000000..061a365 --- /dev/null +++ b/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Sat Jan 19 11:10:27 MST 2019 +gradle.version=5.0 diff --git a/.gradle/vcs-1/gc.properties b/.gradle/vcs-1/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/2019robot/src/main/java/org/usfirst/frc4388/robot/Constants.java b/2019robot/src/main/java/org/usfirst/frc4388/robot/Constants.java index 96a6f89..986f17b 100644 --- a/2019robot/src/main/java/org/usfirst/frc4388/robot/Constants.java +++ b/2019robot/src/main/java/org/usfirst/frc4388/robot/Constants.java @@ -69,4 +69,7 @@ public class Constants { public static double kPathFollowingMaxVel = 120.0; // inches/sec public static double kPathFollowingMaxAccel = 80.0; // inches/sec^2 + //Climbing Constants + public static double kClimbLiftSpeed = 1.0; + } diff --git a/2019robot/src/main/java/org/usfirst/frc4388/robot/commands/InitiateClimber.java b/2019robot/src/main/java/org/usfirst/frc4388/robot/commands/InitiateClimber.java index 8a6e37d..3be9068 100644 --- a/2019robot/src/main/java/org/usfirst/frc4388/robot/commands/InitiateClimber.java +++ b/2019robot/src/main/java/org/usfirst/frc4388/robot/commands/InitiateClimber.java @@ -1,21 +1,20 @@ package org.usfirst.frc4388.robot.commands; import org.usfirst.frc4388.robot.Robot; +import org.usfirst.frc4388.robot.Constants; import edu.wpi.first.wpilibj.command.Command; public class InitiateClimber extends Command { - boolean climb; - public InitiateClimber(boolean climb) { - this.climb=climb; + public InitiateClimber() { requires(Robot.climber); } @Override protected void initialize() { - Robot.climber.setClimbSpeed(climb); + Robot.climber.setClimbSpeed(kClimbLiftSpeed); } @Override diff --git a/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Climber.java b/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Climber.java index 3cacf76..e8046eb 100644 --- a/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Climber.java +++ b/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Climber.java @@ -1,23 +1,12 @@ - - - - package org.usfirst.frc4388.robot.subsystems; import org.usfirst.frc4388.robot.Robot; import org.usfirst.frc4388.robot.RobotMap; import org.usfirst.frc4388.robot.commands.*; -import edu.wpi.first.wpilibj.DoubleSolenoid; -import edu.wpi.first.wpilibj.command.Subsystem; -import edu.wpi.first.wpilibj.livewindow.LiveWindow; - import com.ctre.phoenix.motorcontrol.can.WPI_TalonSRX; -/** - * - */ public class Climber extends Subsystem{ private WPI_TalonSRX Climber; @@ -49,13 +38,8 @@ public class Climber extends Subsystem{ } - public void setClimbSpeed(boolean Climb) { - if (Climb==true) { - Climber.set(1.0); - } - if (Climb==false) { - Climber.set(0); - } + public void setClimbSpeed(double Climb) { + Climber.set(Climb); } // Put methods for controlling this subsystem // here. Call these from Commands.