more lab changes

Author: Robotics

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

@@ -53,7 +53,7 @@ public void robotInit() {
 		RobotMap.colorMatcher.addColorMatch(kGreenTarget);
 		RobotMap.colorMatcher.addColorMatch(kRedTarget);
 		RobotMap.colorMatcher.addColorMatch(kYellowTarget);
-		/*
+		
 		if (DriverStation.Alliance.valueOf("Blue") == blueTeam) {
 			Scheduler.getInstance().add(new Detector(true));
 			teamColor = "Blue";
@@ -63,9 +63,7 @@ public void robotInit() {
 		} else {
 			teamColor = "Invalid";
 		}
-
 		SmartDashboard.putString("Team Color", teamColor);
-		*/
 	}
 
 	@Override

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

@@ -27,31 +27,31 @@ protected void initialize(boolean color) {
 	}
 
 	protected void execute() {
-
-		int script_choice = get_script_choice();
-		obj.update_choice(script_choice);
-
-		// Store networktables output
-		double[] output = new double[2];
-		output = obj.get_output_of_selected_action();
-
-		// If stop signal is received, end command
-		if (output[0] == 0) {
-			//As of now, if theres no script we just dont control motors
-
-		} else {
-			// PID
-			double[] speeds = PID(output[0]);
-
-			// If ball is closer than threshold, stop
-			if (output[2] < setpointWidth && error < 100) {
-				speeds[0] = 0;
-				speeds[1] = 0;
+		if (false) {
+			int script_choice = get_script_choice();
+			obj.update_choice(script_choice);
+
+			// Store networktables output
+			double[] output = new double[2];
+			output = obj.get_output_of_selected_action();
+
+			// If stop signal is received, end command
+			if (output[0] == 0) {
+					//As of now, if theres no script we just dont control motors
+
+			} else {
+				// PID
+				double[] speeds = PID(output[0]);
+
+				// If ball is closer than threshold, stop
+				if (output[2] < setpointWidth && error < 100) {
+					speeds[0] = 0;
+					speeds[1] = 0;
+				}
+
+				// Actuate motors
+				Robot.driveTrain.tankDrive(speeds[0], speeds[1]); // Turns each motor according to the error.
 			}
-
-			// Actuate motors
-			Robot.driveTrain.tankDrive(speeds[0], speeds[1]); // Turns each motor according to the error.
-
 		}
 	}
 

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

@@ -16,17 +16,14 @@ public void initDefaultCommand() {
     public static void colorCycleStart() {
         RobotMap.Spinner.set(1);
 
-        while (colorCycleValue < 3) {
-
-            Color firstColor = RobotMap.colorSensor.getColor();
-            ColorMatchResult matched = RobotMap.colorMatcher.matchClosestColor(firstColor);
-            while (RobotMap.colorMatcher.matchClosestColor(RobotMap.colorSensor.getColor()) == matched) {
-                // nothing
-            }
-
-            colorCycleValue = colorCycleValue + 0.125;
-            colorsPassedValue = colorsPassedValue + 1;
+        Color firstColor = RobotMap.colorSensor.getColor();
+        ColorMatchResult matched = RobotMap.colorMatcher.matchClosestColor(firstColor);
+        while (RobotMap.colorMatcher.matchClosestColor(RobotMap.colorSensor.getColor()) == matched) {
+            // nothing
         }
+
+        colorCycleValue = colorCycleValue + 0.125;
+        colorsPassedValue = colorsPassedValue + 1;
     }
 
     public static void colorCycleStop() {