fix intake smartdashboard keys and streamline code (sorta)

Author: dfang314

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

@@ -128,34 +128,34 @@ public void lowerIntake() {
 	 * Toggles the left intake between open and closed
 	 */
 	public void toggleLeftIntake() {
+		boolean open = Robot.getBool("Left Horizontal Solenoid Open", true);
 		DoubleSolenoid.Value set;
-		if (Robot.getBool("Bool/Left Horizontal Solenoid Open", true)) {
+		if (open) {
 			set = Robot.getBool("Intake Left Horizontal Solenoid Inverted", false) ? DoubleSolenoid.Value.kForward
 					: DoubleSolenoid.Value.kReverse;
 		} else {
 			set = Robot.getBool("Intake Left Horizontal Solenoid Inverted", false) ? DoubleSolenoid.Value.kReverse
 					: DoubleSolenoid.Value.kForward;
 		}
 		leftHorizontalSolenoid.set(set);
-		SmartDashboard.putBoolean("Bool/Left Horizontal Solenoid Open",
-				Robot.getBool("Left Horizontal Solenoid Open", true));
+		SmartDashboard.putBoolean("Bool/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);
 		DoubleSolenoid.Value set;
-		if (Robot.getBool("Bool/Right Horizontal Solenoid Open", true)) {
+		if (open) {
 			set = Robot.getBool("Intake Right Horizontal Solenoid Inverted", false) ? DoubleSolenoid.Value.kForward
 					: DoubleSolenoid.Value.kReverse;
 		} else {
 			set = Robot.getBool("Intake Right Horizontal Solenoid Inverted", false) ? DoubleSolenoid.Value.kReverse
 					: DoubleSolenoid.Value.kForward;
 		}
 		rightHorizontalSolenoid.set(set);
-		SmartDashboard.putBoolean("Bool/Right Horizontal Solenoid Open",
-				Robot.getBool("right Horizontal Solenoid Open", true));
+		SmartDashboard.putBoolean("Bool/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", true);
-		SmartDashboard.putBoolean("Bool/Right Horizontal Solenoid Open", true);
+		SmartDashboard.putBoolean("Bool/Left Horizontal Solenoid Open", false);
+		SmartDashboard.putBoolean("Bool/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", false);
-		SmartDashboard.putBoolean("Bool/Right Horizontal Solenoid Open", false);
+		SmartDashboard.putBoolean("Bool/Left Horizontal Solenoid Open", true);
+		SmartDashboard.putBoolean("Bool/Right Horizontal Solenoid Open", true);
 		leftHorizontalSolenoid.set(leftSet);
 		rightHorizontalSolenoid.set(rightSet);
 	}