projects
/
3501
/
2017steamworks
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c726d04
)
fill in intake and gear-shift ports, edit pistons
author
Cindy Zhang
<cindyzyx9@gmail.com>
Tue, 14 Feb 2017 03:04:17 +0000
(19:04 -0800)
committer
Cindy Zhang
<cindyzyx9@gmail.com>
Tue, 14 Feb 2017 03:04:17 +0000
(19:04 -0800)
src/org/usfirst/frc/team3501/robot/Constants.java
patch
|
blob
|
blame
|
history
src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
patch
|
blob
|
blame
|
history
src/org/usfirst/frc/team3501/robot/subsystems/Intake.java
patch
|
blob
|
blame
|
history
diff --git
a/src/org/usfirst/frc/team3501/robot/Constants.java
b/src/org/usfirst/frc/team3501/robot/Constants.java
index 13e8b27989eaf0190fb260d9efd6be07a3bf026c..d4e8f7e1213fd16b7d4cc6a34e86cf1b493baeed 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/
src/org/usfirst/frc/team3501/robot/Constants.java
@@
-20,9
+20,9
@@
public class Constants {
public final static int TOGGLE_FLYWHEEL_PORT = 0;
public final static int TOGGLE_INDEXWHEEL_PORT = 0;
public final static int REVERSE_INDEXWHEEL_PORT = 0;
public final static int TOGGLE_FLYWHEEL_PORT = 0;
public final static int TOGGLE_INDEXWHEEL_PORT = 0;
public final static int REVERSE_INDEXWHEEL_PORT = 0;
- public final static int TOGGLE_GEAR_PORT =
0
;
- public final static int TOGGLE_INTAKE_PORT =
0
;
- public final static int REVERSE_INTAKE_PORT =
0
;
+ public final static int TOGGLE_GEAR_PORT =
5
;
+ public final static int TOGGLE_INTAKE_PORT =
1
;
+ public final static int REVERSE_INTAKE_PORT =
2
;
}
public static class Shooter {
}
public static class Shooter {
@@
-40,9
+40,9
@@
public class Constants {
public static class DriveTrain {
// GEARS
public static class DriveTrain {
// GEARS
- public static final int
MODULE_NUMBER = 10, LEFT_GEAR_PISTON_FORWARD = 6
,
- LEFT_GEAR_PISTON_REVERSE =
5, RIGHT_GEAR_PISTON_FORWARD = 0
,
- RIGHT_GEAR_PISTON_REVERSE =
1
;
+ public static final int
LEFT_GEAR_PISTON_FORWARD = 0
,
+ LEFT_GEAR_PISTON_REVERSE =
1, RIGHT_GEAR_PISTON_FORWARD = 2
,
+ RIGHT_GEAR_PISTON_REVERSE =
3
;
public static final Value HIGH_GEAR = DoubleSolenoid.Value.kForward;
public static final Value LOW_GEAR = DoubleSolenoid.Value.kReverse;
public static final Value HIGH_GEAR = DoubleSolenoid.Value.kForward;
public static final Value LOW_GEAR = DoubleSolenoid.Value.kReverse;
@@
-62,7
+62,7
@@
public class Constants {
}
public static class Intake {
}
public static class Intake {
- public static final int INTAKE_ROLLER_PORT =
0
;
+ public static final int INTAKE_ROLLER_PORT =
8
;
}
}
diff --git
a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
index 3f76a860f6907505d1431d64db159c0944de708d..0a3dea262175bb2b2474772dd88990d2d92bc2ee 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
+++ b/
src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
@@
-59,10
+59,10
@@
public class DriveTrain extends Subsystem {
this.imu = new ADXRS450_Gyro(Constants.DriveTrain.GYRO_PORT);
// TODO: Not sure if MODULE_NUMBER should be the same for both
this.imu = new ADXRS450_Gyro(Constants.DriveTrain.GYRO_PORT);
// TODO: Not sure if MODULE_NUMBER should be the same for both
- leftGearPiston = new DoubleSolenoid(
Constants.DriveTrain.MODULE_NUMBER,
+ leftGearPiston = new DoubleSolenoid(
Constants.DriveTrain.LEFT_GEAR_PISTON_FORWARD,
Constants.DriveTrain.LEFT_GEAR_PISTON_REVERSE);
Constants.DriveTrain.LEFT_GEAR_PISTON_FORWARD,
Constants.DriveTrain.LEFT_GEAR_PISTON_REVERSE);
- rightGearPiston = new DoubleSolenoid(
Constants.DriveTrain.MODULE_NUMBER,
+ rightGearPiston = new DoubleSolenoid(
Constants.DriveTrain.RIGHT_GEAR_PISTON_FORWARD,
Constants.DriveTrain.RIGHT_GEAR_PISTON_REVERSE);
}
Constants.DriveTrain.RIGHT_GEAR_PISTON_FORWARD,
Constants.DriveTrain.RIGHT_GEAR_PISTON_REVERSE);
}
diff --git
a/src/org/usfirst/frc/team3501/robot/subsystems/Intake.java
b/src/org/usfirst/frc/team3501/robot/subsystems/Intake.java
index 2ca8776697f1ad6dfe70a1f59a09ae4ce8f34ade..efde6a33e85ea0ba30ed35e43de36b3acf835cce 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/subsystems/Intake.java
+++ b/
src/org/usfirst/frc/team3501/robot/subsystems/Intake.java
@@
-12,8
+12,8
@@
import edu.wpi.first.wpilibj.command.Subsystem;
public class Intake extends Subsystem {
private static Intake intake = null;
private CANTalon intakeWheel;
public class Intake extends Subsystem {
private static Intake intake = null;
private CANTalon intakeWheel;
- public static final double INTAKE_SPEED =
0
;
- public static final double REVERSE_SPEED =
0
;
+ public static final double INTAKE_SPEED =
1
;
+ public static final double REVERSE_SPEED =
-1
;
public Intake() {
intakeWheel = new CANTalon(Constants.Intake.INTAKE_ROLLER_PORT);
public Intake() {
intakeWheel = new CANTalon(Constants.Intake.INTAKE_ROLLER_PORT);