projects
/
3501
/
2017steamworks
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix bugs
[3501/2017steamworks]
/
src
/
org
/
usfirst
/
frc
/
team3501
/
robot
/
Robot.java
diff --git
a/src/org/usfirst/frc/team3501/robot/Robot.java
b/src/org/usfirst/frc/team3501/robot/Robot.java
index 5fbfe4043d6b58bca46b2daffc35783c2ae74251..908a52dcf0339b44735147d174f069500b873280 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/
src/org/usfirst/frc/team3501/robot/Robot.java
@@
-1,8
+1,11
@@
package org.usfirst.frc.team3501.robot;
package org.usfirst.frc.team3501.robot;
-import org.usfirst.frc.team3501.robot.commands.driving.TimeDrive;
-import org.usfirst.frc.team3501.robot.subsystems.Climber;
+<<<<<<< HEAD
+=======
+import org.usfirst.frc.team3501.robot.commands.driving.DriveDistance;
+>>>>>>> fix bugs
import org.usfirst.frc.team3501.robot.subsystems.DriveTrain;
import org.usfirst.frc.team3501.robot.subsystems.DriveTrain;
+import org.usfirst.frc.team3501.robot.subsystems.Intake;
import org.usfirst.frc.team3501.robot.subsystems.Shooter;
import edu.wpi.first.wpilibj.IterativeRobot;
import org.usfirst.frc.team3501.robot.subsystems.Shooter;
import edu.wpi.first.wpilibj.IterativeRobot;
@@
-10,38
+13,40
@@
import edu.wpi.first.wpilibj.command.Scheduler;
public class Robot extends IterativeRobot {
private static DriveTrain driveTrain;
public class Robot extends IterativeRobot {
private static DriveTrain driveTrain;
- private static OI oi;
- private static Climber climber;
private static Shooter shooter;
private static Shooter shooter;
+ private static OI oi;
+ private static Intake intake;
@Override
public void robotInit() {
driveTrain = DriveTrain.getDriveTrain();
oi = OI.getOI();
@Override
public void robotInit() {
driveTrain = DriveTrain.getDriveTrain();
oi = OI.getOI();
- climber = Climber.getClimber();
shooter = Shooter.getShooter();
shooter = Shooter.getShooter();
-
+ intake = Intake.getIntake();
}
public static DriveTrain getDriveTrain() {
return DriveTrain.getDriveTrain();
}
}
public static DriveTrain getDriveTrain() {
return DriveTrain.getDriveTrain();
}
- public static
OI getOI
() {
- return
OI.getOI
();
+ public static
Shooter getShooter
() {
+ return
Shooter.getShooter
();
}
}
- public static
Climber getClimber
() {
- return
Climber.getClimber
();
+ public static
OI getOI
() {
+ return
OI.getOI
();
}
}
- public static
Shooter getShooter
() {
- return
Shooter.getShooter
();
+ public static
Intake getIntake
() {
+ return
Intake.getIntake
();
}
@Override
public void autonomousInit() {
}
@Override
public void autonomousInit() {
- Scheduler.getInstance().add(new TimeDrive(1.5, 0.4));
+<<<<<<< HEAD
+=======
+ Scheduler.getInstance().add(new DriveDistance(25, 10));
+>>>>>>> fix bugs
}
@Override
}
@Override