Set the SD keys in intake to use smartdashboard instead of preferences

Author: dfang314

Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/IntakeEject.java

@@ -125,10 +125,10 @@ public void lowerIntake() {
 	}
 
 	/**
-	 * <<<<<<< HEAD Toggles the left intake between open and closed
+	 * Toggles the left intake between open and closed
 	 */
 	public void toggleLeftIntake() {
-		boolean open = Robot.getBool("Left Horizontal Solenoid Open", true);
+		boolean open = SmartDashboard.getBoolean("Left Horizontal Solenoid Open", true);
 		DoubleSolenoid.Value set;
 		if (open) {
 			set = Robot.getBool("Intake Left Horizontal Solenoid Inverted", false) ? DoubleSolenoid.Value.kForward
@@ -138,14 +138,14 @@ public void toggleLeftIntake() {
 					: DoubleSolenoid.Value.kForward;
 		}
 		leftHorizontalSolenoid.set(set);
-		SmartDashboard.putBoolean("Bool/Left Horizontal Solenoid Open", !open);
+		SmartDashboard.putBoolean("Left Horizontal Solenoid Open", !open);
 	}
 
 	/**
 	 * Toggles the right intake between open and closed
 	 */
 	public void toggleRightIntake() {
-		boolean open = Robot.getBool("Right Horizontal Solenoid Open", true);
+		boolean open = SmartDashboard.getBoolean("Right Horizontal Solenoid Open", true);
 		DoubleSolenoid.Value set;
 		if (open) {
 			set = Robot.getBool("Intake Right Horizontal Solenoid Inverted", false) ? DoubleSolenoid.Value.kForward
@@ -155,7 +155,7 @@ public void toggleRightIntake() {
 					: DoubleSolenoid.Value.kForward;
 		}
 		rightHorizontalSolenoid.set(set);
-		SmartDashboard.putBoolean("Bool/Right Horizontal Solenoid Open", !open);
+		SmartDashboard.putBoolean("Right Horizontal Solenoid Open", !open);
 	}
 
 	/**
@@ -168,8 +168,8 @@ public void closeIntake() {
 		DoubleSolenoid.Value rightSet = Robot.getBool("Intake Right Horizontal Solenoid Inverted", false)
 				? DoubleSolenoid.Value.kReverse
 				: DoubleSolenoid.Value.kForward;
-		SmartDashboard.putBoolean("Bool/Left Horizontal Solenoid Open", false);
-		SmartDashboard.putBoolean("Bool/Right Horizontal Solenoid Open", false);
+		SmartDashboard.putBoolean("Left Horizontal Solenoid Open", false);
+		SmartDashboard.putBoolean("Right Horizontal Solenoid Open", false);
 		leftHorizontalSolenoid.set(leftSet);
 		rightHorizontalSolenoid.set(rightSet);
 	}
@@ -184,8 +184,8 @@ public void openIntake() {
 		DoubleSolenoid.Value rightSet = Robot.getBool("Intake Right Horizontal Solenoid Inverted", false)
 				? DoubleSolenoid.Value.kForward
 				: DoubleSolenoid.Value.kReverse;
-		SmartDashboard.putBoolean("Bool/Left Horizontal Solenoid Open", true);
-		SmartDashboard.putBoolean("Bool/Right Horizontal Solenoid Open", true);
+		SmartDashboard.putBoolean("Left Horizontal Solenoid Open", true);
+		SmartDashboard.putBoolean("Right Horizontal Solenoid Open", true);
 		leftHorizontalSolenoid.set(leftSet);
 		rightHorizontalSolenoid.set(rightSet);
 	}