projects
/
3501
/
stronghold-2016
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fd8da47
)
Change to more descriptive names
author
Kevin Zhang
<icestormf1@gmail.com>
Tue, 16 Feb 2016 19:28:26 +0000
(11:28 -0800)
committer
Kevin Zhang
<icestormf1@gmail.com>
Tue, 16 Feb 2016 19:28:26 +0000
(11:28 -0800)
src/org/usfirst/frc/team3501/robot/Constants.java
patch
|
blob
|
blame
|
history
src/org/usfirst/frc/team3501/robot/OI.java
patch
|
blob
|
blame
|
history
src/org/usfirst/frc/team3501/robot/commands/auton/LiftRobot.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 df64a8157f983c29d9c6d3d46e62047895906256..df2ed0b6b61b87bb749bbfb57c7703532c763fdf 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/
src/org/usfirst/frc/team3501/robot/Constants.java
@@
-86,11
+86,11
@@
public class Constants {
// Winch speeds
public final static double WINCH_STOP_SPEED = 0.0;
// Winch speeds
public final static double WINCH_STOP_SPEED = 0.0;
- public final static double
WINCH_IN
_SPEED = 0;
+ public final static double
SCALE
_SPEED = 0;
public final static double SECONDS_TO_CLAMP = 2.0;
// Winch timeout
public final static double SECONDS_TO_CLAMP = 2.0;
// Winch timeout
- public final static int
WINCH_TIMEOUT
= 0;
+ public final static int
SECONDS_TO_SCALE
= 0;
public static boolean SCALING = false;
public static boolean SCALING = false;
diff --git
a/src/org/usfirst/frc/team3501/robot/OI.java
b/src/org/usfirst/frc/team3501/robot/OI.java
index ad43c2a1ef3f163b884781742b6c721fa7502cb1..aa58ffccde0c62a84520a6426eeaf1a3154be266 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/OI.java
+++ b/
src/org/usfirst/frc/team3501/robot/OI.java
@@
-131,7
+131,7
@@
public class OI {
// intake button stops the winch
// shoot button extends the lift
toggleShooter.whenPressed(new RunWinchContinuous(
// intake button stops the winch
// shoot button extends the lift
toggleShooter.whenPressed(new RunWinchContinuous(
- Constants.Scaler.
WINCH_IN_SPEED, Constants.Scaler.WINCH_TIMEOUT
));
+ Constants.Scaler.
SCALE_SPEED, Constants.Scaler.SECONDS_TO_SCALE
));
compactRobot_1.whenPressed(new RetractLift());
compactRobot_2.whenPressed(new RetractLift());
compactRobot_1.whenPressed(new RetractLift());
compactRobot_2.whenPressed(new RetractLift());
diff --git
a/src/org/usfirst/frc/team3501/robot/commands/auton/LiftRobot.java
b/src/org/usfirst/frc/team3501/robot/commands/auton/LiftRobot.java
index dcf2095293c978f11363496871020834c02e537e..a2f1f26290329e4c21889befc8ef96bd520599e1 100755
(executable)
--- a/
src/org/usfirst/frc/team3501/robot/commands/auton/LiftRobot.java
+++ b/
src/org/usfirst/frc/team3501/robot/commands/auton/LiftRobot.java
@@
-19,7
+19,7
@@
public class LiftRobot extends CommandGroup {
public LiftRobot() {
requires(Robot.scaler);
public LiftRobot() {
requires(Robot.scaler);
- addSequential(new RunWinchContinuous(Constants.Scaler.
WINCH_IN_SPEED, Constants.Scaler.WINCH_TIMEOUT
));
+ addSequential(new RunWinchContinuous(Constants.Scaler.
SCALE_SPEED, Constants.Scaler.SECONDS_TO_SCALE
));
addSequential(new StopWinch());
}
}
addSequential(new StopWinch());
}
}