From 388eab4c2c86ef863d4902ddebcb9a3f0d8303dc Mon Sep 17 00:00:00 2001 From: Tenumars Date: Mon, 29 Jan 2024 16:31:29 -0500 Subject: [PATCH] housekeeping fo mister poletee --- src/main/java/com/team1701/robot/Constants.java | 6 ++++-- src/main/java/com/team1701/robot/RobotContainer.java | 2 +- src/main/java/com/team1701/robot/commands/IndexCommand.java | 2 -- .../java/com/team1701/robot/subsystems/indexer/Indexer.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/team1701/robot/Constants.java b/src/main/java/com/team1701/robot/Constants.java index 340bb126..67b8ed03 100644 --- a/src/main/java/com/team1701/robot/Constants.java +++ b/src/main/java/com/team1701/robot/Constants.java @@ -220,8 +220,10 @@ public static final class Elevator { public static final class Indexer { // TODO: Update values and set names public static final double kIndexerReduction = 1; - public static final int kIndexerDeviceId = 3; - public static final int kIndexerDeviceId2 = 4; + public static final int kIntakeEntranceId = 1; + public static final int kIntakeExitId = 3; + public static final int kShooterEnterId = 4; + public static final int kShooterExitId = 5; public static final double kIndexerLoadPercent = .25; public static final double kIndexerFeedPercent = 1; diff --git a/src/main/java/com/team1701/robot/RobotContainer.java b/src/main/java/com/team1701/robot/RobotContainer.java index bf15f68f..0791e43a 100644 --- a/src/main/java/com/team1701/robot/RobotContainer.java +++ b/src/main/java/com/team1701/robot/RobotContainer.java @@ -106,7 +106,7 @@ public RobotContainer() { new DigitalIOSensor(Constants.Shooter.kShooterExitSensorId), new EncoderIOAnalog(Constants.Shooter.kShooterThroughBoreEncoderId))); indexer = Optional.of(new Indexer( - IndexerMotorFactory.createDriveMotorIOSparkFlex(Constants.Indexer.kIndexerDeviceId), + IndexerMotorFactory.createDriveMotorIOSparkFlex(Constants.Indexer.kIntakeExitId), new DigitalIOSensor(Constants.Indexer.kIndexerEntranceSensorId), new DigitalIOSensor(Constants.Indexer.kIndexerExitSensorId))); break; diff --git a/src/main/java/com/team1701/robot/commands/IndexCommand.java b/src/main/java/com/team1701/robot/commands/IndexCommand.java index 12ee25bf..6c20d263 100644 --- a/src/main/java/com/team1701/robot/commands/IndexCommand.java +++ b/src/main/java/com/team1701/robot/commands/IndexCommand.java @@ -8,8 +8,6 @@ public class IndexCommand extends Command { private final Indexer mIndexer; private final BooleanSupplier mShouldLoad; - // private boolean elevatorReady = elevator is down - // private boolean intakeSensor = intake has piece public IndexCommand(Indexer indexer, BooleanSupplier shouldLoad) { mIndexer = indexer; diff --git a/src/main/java/com/team1701/robot/subsystems/indexer/Indexer.java b/src/main/java/com/team1701/robot/subsystems/indexer/Indexer.java index 7b31e8ce..9c53f630 100644 --- a/src/main/java/com/team1701/robot/subsystems/indexer/Indexer.java +++ b/src/main/java/com/team1701/robot/subsystems/indexer/Indexer.java @@ -41,7 +41,7 @@ public void periodic() { Logger.processInputs("Indexer/Motor", mIndexerMotorInputsAutoLogged); Logger.processInputs("Indexer/ExitSensor", mExitSensorInputs); - // TODO: update sensor values + }