projects
/
3501
/
2017steamworks
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fix merge conflicts
[3501/2017steamworks]
/
src
/
org
/
usfirst
/
frc
/
team3501
/
robot
/
commands
/
accessories
/
ToggleCameraFeed.java
diff --git
a/src/org/usfirst/frc/team3501/robot/commands/accessories/ToggleCameraFeed.java
b/src/org/usfirst/frc/team3501/robot/commands/accessories/ToggleCameraFeed.java
index d5c9c60f508b200b111274568c1d0d924ab8c195..7671e2a2eb3a26e83c9f803853a45b4a528e6944 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/commands/accessories/ToggleCameraFeed.java
+++ b/
src/org/usfirst/frc/team3501/robot/commands/accessories/ToggleCameraFeed.java
@@
-10,7
+10,7
@@
public class ToggleCameraFeed extends Command {
@Override
protected void execute() {
CameraFeeds cf = Robot.getCameraFeeds();
-
// System.out.println(cf.getCurrentCamName()
);
+
System.out.println("Button Pressed"
);
cf.toggleCamera();
}