From e580c626fbf82ed273238152ccff695d15950249 Mon Sep 17 00:00:00 2001 From: alexander-mcdowell Date: Sun, 10 Feb 2019 12:20:28 -0800 Subject: [PATCH 1/2] Enter correct hatch solenoid numbers --- Robot2019/src/main/java/frc/robot/RobotMap.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Robot2019/src/main/java/frc/robot/RobotMap.java b/Robot2019/src/main/java/frc/robot/RobotMap.java index d7d8897..d831fe7 100644 --- a/Robot2019/src/main/java/frc/robot/RobotMap.java +++ b/Robot2019/src/main/java/frc/robot/RobotMap.java @@ -60,7 +60,7 @@ public class RobotMap { cargoRoller = new VictorSP(0); // Initialize solenoid on hatch panel mech - hatchPistons = new DoubleSolenoid(0, 1); + hatchPistons = new DoubleSolenoid(7, 0); // 7 is A/Forward, 0 is B/Reverse leftEnc = new Encoder(new DigitalInput(0), new DigitalInput(1)); rightEnc = new Encoder(new DigitalInput(2), new DigitalInput(3)); From 3db3ce7068c59d8f54a8a5881c16096acad459ed Mon Sep 17 00:00:00 2001 From: alexander-mcdowell Date: Sun, 10 Feb 2019 13:46:35 -0800 Subject: [PATCH 2/2] Fix null error in cargo intake and eject --- Robot2019/src/main/java/frc/robot/RobotMap.java | 2 +- Robot2019/src/main/java/frc/robot/commands/EjectCargo.java | 1 + Robot2019/src/main/java/frc/robot/commands/IntakeCargo.java | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Robot2019/src/main/java/frc/robot/RobotMap.java b/Robot2019/src/main/java/frc/robot/RobotMap.java index d831fe7..975b8cd 100644 --- a/Robot2019/src/main/java/frc/robot/RobotMap.java +++ b/Robot2019/src/main/java/frc/robot/RobotMap.java @@ -74,7 +74,7 @@ public class RobotMap { cameraServer = CameraServer.getInstance().getServer(); cameraServer.setSource(driveCamera); - cargoPDPPort = -1; // TODO: set ports to actual cargo motor port in pdp + cargoPDPPort = 5; // TODO: set ports to actual cargo motor port in pdp } private static BaseMotorController createConfiguredMotorController(int port) { diff --git a/Robot2019/src/main/java/frc/robot/commands/EjectCargo.java b/Robot2019/src/main/java/frc/robot/commands/EjectCargo.java index 9a7d088..6a2a8ea 100644 --- a/Robot2019/src/main/java/frc/robot/commands/EjectCargo.java +++ b/Robot2019/src/main/java/frc/robot/commands/EjectCargo.java @@ -21,6 +21,7 @@ public class EjectCargo extends Command { public EjectCargo(Cargo cargo) { requires(cargo); this.cargo = cargo; + timer = new Timer(); } @Override diff --git a/Robot2019/src/main/java/frc/robot/commands/IntakeCargo.java b/Robot2019/src/main/java/frc/robot/commands/IntakeCargo.java index 28264b3..24d3e1a 100644 --- a/Robot2019/src/main/java/frc/robot/commands/IntakeCargo.java +++ b/Robot2019/src/main/java/frc/robot/commands/IntakeCargo.java @@ -19,6 +19,7 @@ public class IntakeCargo extends Command { public IntakeCargo(Cargo cargo) { requires(cargo); this.cargo = cargo; + timer = new Timer(); overdraw = false; }