projects
/
3501
/
stronghold-2016
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed merge conflict in Robot.java
[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 3633c04ca10e2fea9e5c63a656427a86642eaea1..0d9187a441b6a734e4fc0e61ef3d848a7034d16f 100755
(executable)
--- a/
src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
+++ b/
src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
@@
-2,6
+2,7
@@
package org.usfirst.frc.team3501.robot.subsystems;
import org.usfirst.frc.team3501.robot.Constants;
import org.usfirst.frc.team3501.robot.sensors.Lidar;
import org.usfirst.frc.team3501.robot.Constants;
import org.usfirst.frc.team3501.robot.sensors.Lidar;
+import org.usfirst.frc.team3501.robot.sensors.Photogate;
import edu.wpi.first.wpilibj.CANTalon;
import edu.wpi.first.wpilibj.CounterBase.EncodingType;
import edu.wpi.first.wpilibj.CANTalon;
import edu.wpi.first.wpilibj.CounterBase.EncodingType;
@@
-24,6
+25,7
@@
public class Shooter extends Subsystem {
private DoubleSolenoid hood1, hood2, punch;
private Encoder encoder;
private Lidar lidar;
private DoubleSolenoid hood1, hood2, punch;
private Encoder encoder;
private Lidar lidar;
+ private Photogate photogate;
public Shooter() {
shooter = new CANTalon(Constants.Shooter.PORT);
public Shooter() {
shooter = new CANTalon(Constants.Shooter.PORT);
@@
-47,7
+49,7
@@
public class Shooter extends Subsystem {
*/
public boolean isBallInside() {
*/
public boolean isBallInside() {
- return
true
;
+ return
photogate.isBallPresent()
;
}
public void setSpeed(double speed) {
}
public void setSpeed(double speed) {