projects
/
3501
/
2017steamworks
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
08a5c95
)
Add buttons to OI class
author
shainachen
<shaina.sierra@gmail.com>
Sun, 15 Jan 2017 00:30:13 +0000
(16:30 -0800)
committer
Arunima DIvya
<adivya822@student.fuhsd.org>
Thu, 26 Jan 2017 04:19:01 +0000
(20:19 -0800)
src/org/usfirst/frc/team3501/robot/Constants.java
patch
|
blob
|
blame
|
history
src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java
patch
|
blob
|
blame
|
history
src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.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 95d4ba14bd7cee8707ab08d76e5a613a0843fb8a..df33dfc4adb3c6f906ff5483b2da44258027dac8 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/
src/org/usfirst/frc/team3501/robot/Constants.java
@@
-19,6
+19,8
@@
public class Constants {
// MOTOR CONTROLLERS
public static final int FLY_WHEEL = 0;
public static final int INDEX_WHEEL = 0;
+ public final static int TOGGLE_FLYWHEEL_PORT = 0;
+ public final static int TOGGLE_INDEXWHEEL_PORT = 0;
}
public static class DriveTrain {
diff --git
a/src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java
b/src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java
index ca5f90d78262065dad305b8e5c7255f01bb4249f..cc07893019111c9e88f0115784de98d079981862 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java
+++ b/
src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java
@@
-54,7
+54,7
@@
public class RunFlyWheelContinuous extends Command {
@Override
protected boolean isFinished() {
- return
false
;
+ return
!Robot.getOI().toggleFlyWheel.get()
;
}
}
diff --git
a/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java
b/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java
index 2a5ccbede9710e1e9ce2a3c711afb5dff2517c67..83b66c08b0d8d8e31d3927489ae8fe4129cad5e3 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java
+++ b/
src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java
@@
-54,7
+54,7
@@
public class RunIndexWheelContinuous extends Command {
@Override
protected boolean isFinished() {
- return
false
;
+ return
Robot.getOI().toggleIndexWheel.get()
;
}
}