added sensors (rotation + dist)

Author: Robotics

FRC2020/.gradle/6.0.1/executionHistory/executionHistory.bin

@@ -135,6 +135,8 @@ public void robotPeriodic() {
 		SmartDashboard.putNumber("Shooter Velocity", -1 * shooterVel);
 		SmartDashboard.putNumber("Top Limit switch", RobotMap.topLimitSwitch.get() ? 1:0); // converts boolean to int
 		SmartDashboard.putNumber("Bottom Limit Switch", RobotMap.bottomLimitSwitch.get() ? 1:0);
+		SmartDashboard.putNumber("Distance sensor value(in)", RobotMap.distanceSensor.getValue() * 0.125);
+		SmartDashboard.putNumber("Encoder velocity(rpm)", RobotMap.CANCoder.getVelocity() / -360.0);
 
 		if (ColorCycle.colorCycleValue == 3) {
 			ColorCycle.colorCycleStop();

FRC2020/.gradle/6.0.1/executionHistory/executionHistory.lock

@@ -4,6 +4,7 @@
 import edu.wpi.first.wpilibj.Joystick;
 import edu.wpi.first.wpilibj.Relay;
 import edu.wpi.first.wpilibj.XboxController;
+import edu.wpi.first.wpilibj.AnalogInput;
 import edu.wpi.first.wpilibj.DigitalInput;
 import edu.wpi.first.wpilibj.Spark;
 import com.ctre.phoenix.motorcontrol.can.WPI_TalonSRX;
@@ -51,6 +52,9 @@ public class RobotMap {
 	// RPM SenSor setup
 	public static CANCoder CANCoder = new CANCoder(7);
 
+	// Distance sensor setup
+	public static AnalogInput distanceSensor = new AnalogInput(0);
+
 	// Relay
 	public static Relay GreenLED = new Relay(3);
 }

FRC2020/.gradle/6.0.1/fileHashes/fileHashes.bin

@@ -37,10 +37,10 @@ protected boolean isFinished() {
     }
 
     protected void end() {
-        Robot.winch.winchStop();
+        Winch.winchStop();
     }
 
     protected void interrupted() {
-        Robot.winch.winchStop();
+        Winch.winchStop();
     }
 }