projects
/
3501
/
2017steamworks
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fix merging errors with climber subclass
[3501/2017steamworks]
/
src
/
org
/
usfirst
/
frc
/
team3501
/
robot
/
Constants.java
diff --git
a/src/org/usfirst/frc/team3501/robot/Constants.java
b/src/org/usfirst/frc/team3501/robot/Constants.java
index af9000050c27fa1eccc0571f3d962a3b24bea69a..0c4880ea29d559b6ea96a5393c4b613b04adffb0 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/
src/org/usfirst/frc/team3501/robot/Constants.java
@@
-20,6
+20,7
@@
public class Constants {
public static final int FLY_WHEEL = 0;
public static final int INDEX_WHEEL = 0;
public final static int TOGGLE_WINCH_PORT = 0;
+
public final static int TOGGLE_FLYWHEEL_PORT = 0;
public final static int TOGGLE_INDEXWHEEL_PORT = 0;