projects
/
3501
/
2017steamworks
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move code to more updated branch.
[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 9d178dadd1796ec79f931ff99f7c02610d2bf2bc..1ad62e1f4de0b8a7d9d6c262680d41a0e4b19ea3 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/
src/org/usfirst/frc/team3501/robot/Robot.java
@@
-1,25
+1,34
@@
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;
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 org.usfirst.frc.team3501.robot.subsystems.Shooter;
+import edu.wpi.cscore.AxisCamera;
+import edu.wpi.cscore.UsbCamera;
+import edu.wpi.first.wpilibj.CameraServer;
import edu.wpi.first.wpilibj.IterativeRobot;
import edu.wpi.first.wpilibj.command.Scheduler;
public class Robot extends IterativeRobot {
private static DriveTrain driveTrain;
import edu.wpi.first.wpilibj.IterativeRobot;
import edu.wpi.first.wpilibj.command.Scheduler;
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;
+ private static UsbCamera usbCamera;
+ private static CameraServer cameraServer2;
+ private static AxisCamera axisCamera;
@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();
+
+ usbCamera = CameraServer.getInstance().startAutomaticCapture();
+ // cameraServer2 = CameraServer;getInstance();
+ // axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
}
}
@@
-27,25
+36,23
@@
public class Robot extends IterativeRobot {
return DriveTrain.getDriveTrain();
}
return DriveTrain.getDriveTrain();
}
- public static
Climber getClimb
er() {
- return
Climber.getClimb
er();
+ public static
Shooter getShoot
er() {
+ return
Shooter.getShoot
er();
}
public static OI getOI() {
return OI.getOI();
}
}
public static OI getOI() {
return OI.getOI();
}
- public static Climber getClimber() {
- return Climber.getClimber();
- }
-
- public static Shooter getShooter() {
- return Shooter.getShooter();
+ 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
@@
-56,6
+63,7
@@
public class Robot extends IterativeRobot {
@Override
public void teleopInit() {
@Override
public void teleopInit() {
+
}
@Override
}
@Override