Merge pull request #93 from DriverStationComputer/master

merge brief intake port change, DSComp master up to date

Author: lhmcgann

Robot2018/src/org/usfirst/frc/team199/Robot2018/RobotMap.java

@@ -127,12 +127,12 @@ public RobotMap() {
 		climberMotor = new WPI_TalonSRX(getPort("ClimberTalonSRX", 6));
 		configSRX(climberMotor);
 
-		leftIntakeMotor = new VictorSP(getPort("IntakeLeftVictorSP", 9));
-		rightIntakeMotor = new VictorSP(getPort("IntakeRightVictorSP", 8));
-		leftIntakeHorizontalSolenoid = new DoubleSolenoid(getPort("IntakeLeftHorizontalSolenoidPort1", 2),
-				getPort("IntakeLeftHorizontalSolenoidPort2", 3));
-		rightIntakeHorizontalSolenoid = new DoubleSolenoid(getPort("IntakeRightHorizontalSolenoidPort1", 4),
-				getPort("IntakeRightHorizontalSolenoidPort2", 5));
+		leftIntakeMotor = new VictorSP(getPort("IntakeLeftVictorSP", 8));
+		rightIntakeMotor = new VictorSP(getPort("IntakeRightVictorSP", 9));
+		leftIntakeHorizontalSolenoid = new DoubleSolenoid(getPort("IntakeLeftHorizontalSolenoidPort1", 4),
+				getPort("IntakeLeftHorizontalSolenoidPort2", 5));
+		rightIntakeHorizontalSolenoid = new DoubleSolenoid(getPort("IntakeRightHorizontalSolenoidPort1", 2),
+				getPort("IntakeRightHorizontalSolenoidPort2", 3));
 		// leftIntakeVerticalSolenoid = new
 		// DoubleSolenoid(getPort("IntakeLeftVerticalSolenoidPort1", 6),
 		// getPort("IntakeLeftVerticalSolenoidPort2", 7));

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

@@ -72,7 +72,7 @@ public void stopIntake() {
 	 *            Speed the left motor should run at
 	 */
 	public void runLeftIntake(double speed) {
-		double actualSpeed = speed * Robot.getConst("Intake Motor Left Speed Multiplier", 1);
+		double actualSpeed = speed * Robot.getConst("Intake Motor Speed Multiplier", 0.5);
 		leftIntakeMotor.set(actualSpeed);
 	}
 
@@ -83,15 +83,15 @@ public void runLeftIntake(double speed) {
 	 *            Speed the left motor should run at
 	 */
 	public void runRightIntake(double speed) {
-		double actualSpeed = speed * Robot.getConst("Intake Motor Right Speed Multiplier", 1);
+		double actualSpeed = speed * Robot.getConst("Intake Motor Speed Multiplier", 0.5);
 		rightIntakeMotor.set(actualSpeed);
 	}
 
 	/**
 	 * Spins the rollers
 	 * 
 	 * @param speed
-	 *            - positive -> rollers in, negative -> rollers out
+	 *            - negative -> rollers in, positive -> rollers out
 	 */
 	public void runIntake(double speed) {
 		runLeftIntake(speed);