projects
/
3501
/
stronghold-2016
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fix merge conflicts
[3501/stronghold-2016]
/
src
/
org
/
usfirst
/
frc
/
team3501
/
robot
/
subsystems
/
Shooter.java
diff --git
a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
index ab5eb66ffe6831db965cb078366dc21798e6f556..6e0c7acfb443a9106e46ed27d0c40e985732ebf4 100755
(executable)
--- a/
src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
+++ b/
src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
@@
-51,10
+51,12
@@
public class Shooter extends Subsystem {
*/
public boolean isBallInside() {
+
if (usePhotogate())
return photogate.isBallPresent();
else
return true;
+
}
public void setSpeed(double speed) {