Merge pull request #57 from frc3197/climb-conflicts

\ Climbing on a button and with a gyro
frc3197 · Mar 24, 2019 · 0c9de26 · 0c9de26
2 parents 9d9db58 + 2f59b57
commit 0c9de26
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/main/java/org/team3197/frc2019/robot/Robot.java b/src/main/java/org/team3197/frc2019/robot/Robot.java
@@ -45,6 +45,7 @@ public void robotInit() {
   @Override
   public void robotPeriodic() {
     SmartDashboard.putNumber("Time", DriverStation.getInstance().getMatchTime());
+    SmartDashboard.putNumber("verticalGyroSpeedReal", climber.getAngle());
   }
 
   @Override

diff --git a/src/main/java/org/team3197/frc2019/robot/commands/AutoClimb.java b/src/main/java/org/team3197/frc2019/robot/commands/AutoClimb.java
@@ -5,8 +5,11 @@
 import org.team3197.frc2019.robot.RobotMap.MaxSpeeds;
 import org.team3197.frc2019.robot.subsystems.Climber;
 import org.team3197.frc2019.robot.subsystems.Erector;
+import org.team3197.frc2019.robot.utilities.FunctionCommand;
 
+import edu.wpi.first.wpilibj.AnalogGyro;
 import edu.wpi.first.wpilibj.command.Command;
+import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
 
 public class AutoClimb extends Command {
   private Climber climber;