Skip to content
This repository was archived by the owner on Sep 14, 2019. It is now read-only.

Commit da75b8a

Browse files
committed
flipped intake motor and solenoid ports (left <--> right)to match actual
wiring/tubing on robot NEEDS TESTING! also corrected javadoc in IntakeEject and made Speed Multiplier on SD value instead of two (one for each side)
1 parent cc76e30 commit da75b8a

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,12 @@ public RobotMap() {
128128
climberMotor = new WPI_TalonSRX(getPort("ClimberTalonSRX", 6));
129129
configSRX(climberMotor);
130130

131-
leftIntakeMotor = new VictorSP(getPort("IntakeLeftVictorSP", 9));
132-
rightIntakeMotor = new VictorSP(getPort("IntakeRightVictorSP", 8));
133-
leftIntakeHorizontalSolenoid = new DoubleSolenoid(getPort("IntakeLeftHorizontalSolenoidPort1", 2),
134-
getPort("IntakeLeftHorizontalSolenoidPort2", 3));
135-
rightIntakeHorizontalSolenoid = new DoubleSolenoid(getPort("IntakeRightHorizontalSolenoidPort1", 4),
136-
getPort("IntakeRightHorizontalSolenoidPort2", 5));
131+
leftIntakeMotor = new VictorSP(getPort("IntakeLeftVictorSP", 8));
132+
rightIntakeMotor = new VictorSP(getPort("IntakeRightVictorSP", 9));
133+
leftIntakeHorizontalSolenoid = new DoubleSolenoid(getPort("IntakeLeftHorizontalSolenoidPort1", 4),
134+
getPort("IntakeLeftHorizontalSolenoidPort2", 5));
135+
rightIntakeHorizontalSolenoid = new DoubleSolenoid(getPort("IntakeRightHorizontalSolenoidPort1", 2),
136+
getPort("IntakeRightHorizontalSolenoidPort2", 3));
137137
// leftIntakeVerticalSolenoid = new
138138
// DoubleSolenoid(getPort("IntakeLeftVerticalSolenoidPort1", 6),
139139
// getPort("IntakeLeftVerticalSolenoidPort2", 7));

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public void stopIntake() {
7272
* Speed the left motor should run at
7373
*/
7474
public void runLeftIntake(double speed) {
75-
double actualSpeed = speed * Robot.getConst("Intake Motor Left Speed Multiplier", 1);
75+
double actualSpeed = speed * Robot.getConst("Intake Motor Speed Multiplier", 0.5);
7676
leftIntakeMotor.set(actualSpeed);
7777
}
7878

@@ -83,15 +83,15 @@ public void runLeftIntake(double speed) {
8383
* Speed the left motor should run at
8484
*/
8585
public void runRightIntake(double speed) {
86-
double actualSpeed = speed * Robot.getConst("Intake Motor Right Speed Multiplier", 1);
86+
double actualSpeed = speed * Robot.getConst("Intake Motor Speed Multiplier", 0.5);
8787
rightIntakeMotor.set(actualSpeed);
8888
}
8989

9090
/**
9191
* Spins the rollers
9292
*
9393
* @param speed
94-
* - positive -> rollers in, negative -> rollers out
94+
* - negative -> rollers in, positive -> rollers out
9595
*/
9696
public void runIntake(double speed) {
9797
runLeftIntake(speed);

0 commit comments

Comments
 (0)