projects
/
3501
/
2017steamworks
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove pointless code and add print commands.
[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 63a11d04b6286e9e61e517e65d3785943cf1691b..655b3427585bed2d4d8b09be073896388a956d8a 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/
src/org/usfirst/frc/team3501/robot/Robot.java
@@
-1,6
+1,5
@@
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.DriveTrain;
import org.usfirst.frc.team3501.robot.subsystems.Intake;
import org.usfirst.frc.team3501.robot.subsystems.Shooter;
import org.usfirst.frc.team3501.robot.subsystems.DriveTrain;
import org.usfirst.frc.team3501.robot.subsystems.Intake;
import org.usfirst.frc.team3501.robot.subsystems.Shooter;
@@
-12,9
+11,11
@@
public class Robot extends IterativeRobot {
private static DriveTrain driveTrain;
private static Shooter shooter;
private static OI oi;
private static DriveTrain driveTrain;
private static Shooter shooter;
private static OI oi;
- private static Shooter shooter;
- private static OI oi;
private static Intake intake;
private static Intake intake;
+ // private static UsbCamera usbCamera;
+ // private static CameraServer cameraServer2;
+ // private static AxisCamera axisCamera;
+ private static CameraFeeds cameraFeeds;
@Override
public void robotInit() {
@Override
public void robotInit() {
@@
-22,6
+23,9
@@
public class Robot extends IterativeRobot {
oi = OI.getOI();
shooter = Shooter.getShooter();
intake = Intake.getIntake();
oi = OI.getOI();
shooter = Shooter.getShooter();
intake = Intake.getIntake();
+
+ cameraFeeds = CameraFeeds.getCameraFeeds();
+
}
public static DriveTrain getDriveTrain() {
}
public static DriveTrain getDriveTrain() {
@@
-32,8
+36,8
@@
public class Robot extends IterativeRobot {
return Shooter.getShooter();
}
return Shooter.getShooter();
}
- public static
OI getOI
() {
- return
OI.getOI()
;
+ public static
CameraFeeds getCameraFeeds
() {
+ return
cameraFeeds
;
}
public static OI getOI() {
}
public static OI getOI() {
@@
-44,14
+48,11
@@
public class Robot extends IterativeRobot {
return Intake.getIntake();
}
return Intake.getIntake();
}
- public static Intake getIntake() {
- return Intake.getIntake();
-
- }
-
+ // If the gear values do not match in the left and right piston, then they are
+ // both set to high gear
@Override
public void autonomousInit() {
@Override
public void autonomousInit() {
-
Scheduler.getInstance().add(new TimeDrive(1.5, 0.4)
);
+
driveTrain.setHighGear(
);
}
@Override
}
@Override
@@
-67,6
+68,5
@@
public class Robot extends IterativeRobot {
@Override
public void teleopPeriodic() {
Scheduler.getInstance().run();
@Override
public void teleopPeriodic() {
Scheduler.getInstance().run();
-
}
}
}
}