Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
stwiggy committed Apr 25, 2024
1 parent 9dfd743 commit fc2d396
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 46 deletions.
28 changes: 0 additions & 28 deletions src/main/java/org/carlmontrobotics/RobotContainer.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,13 @@
import org.carlmontrobotics.subsystems.*;

import com.pathplanner.lib.auto.AutoBuilder;
//pathplanner
import com.pathplanner.lib.auto.NamedCommands;
import com.pathplanner.lib.commands.PathPlannerAuto;
import com.pathplanner.lib.path.GoalEndState;
import com.pathplanner.lib.path.PathPlannerPath;

import com.pathplanner.lib.auto.AutoBuilder;
//pathplanner
import com.pathplanner.lib.auto.NamedCommands;
import com.pathplanner.lib.commands.PathPlannerAuto;
import com.pathplanner.lib.path.GoalEndState;
import com.pathplanner.lib.path.PathPlannerPath;

// wpilib geometry classes
// wpilib geometry classes
import edu.wpi.first.math.geometry.Pose2d;
import edu.wpi.first.math.geometry.Rotation2d;
Expand All @@ -66,32 +59,12 @@
import edu.wpi.first.wpilibj2.command.PrintCommand;
import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;

// control bindings

// control bindings
import edu.wpi.first.wpilibj2.command.button.JoystickButton;
import edu.wpi.first.wpilibj2.command.button.POVButton;
import edu.wpi.first.wpilibj2.command.button.Trigger;
import edu.wpi.first.wpilibj2.command.sysid.SysIdRoutine;
//pathplanner
import com.pathplanner.lib.auto.NamedCommands;
import com.pathplanner.lib.commands.PathPlannerAuto;
import com.pathplanner.lib.path.GoalEndState;
import com.pathplanner.lib.path.PathConstraints;
import com.pathplanner.lib.path.PathPlannerPath;
import static com.pathplanner.lib.auto.AutoBuilder.*;
import com.pathplanner.lib.auto.AutoBuilder;
import org.carlmontrobotics.subsystems.Led;

//java
import java.util.function.DoubleSupplier;
import java.util.function.BooleanSupplier;
import java.io.FileReader;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;

public class RobotContainer {
// 1. using GenericHID allows us to use different kinds of controllers
// 2. Use absolute paths from constants to reduce confusion
Expand All @@ -104,7 +77,6 @@ public class RobotContainer {
private final Arm arm = new Arm();
private final Drivetrain drivetrain = new Drivetrain();
private final Limelight limelight = new Limelight(drivetrain);
//private final Camera camera = new Camera();

/* These are assumed to be equal to the AUTO ames in pathplanner */
/* These must be equal to the pathPlanner path names from the GUI! */
Expand Down
7 changes: 1 addition & 6 deletions src/main/java/org/carlmontrobotics/commands/Intake.java
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
package org.carlmontrobotics.commands;

import static org.carlmontrobotics.Constants.Effectorc.*;

import org.carlmontrobotics.Constants;

import org.carlmontrobotics.subsystems.IntakeShooter;
import org.carlmontrobotics.subsystems.Led;

import edu.wpi.first.wpilibj.Timer;
import edu.wpi.first.wpilibj2.command.Command;
import edu.wpi.first.wpilibj2.command.Subsystem;

public class Intake extends Command {
// intake until sees game peice or 4sec has passed
private Timer timer = new Timer();
Expand Down
6 changes: 0 additions & 6 deletions src/main/java/org/carlmontrobotics/commands/PassToIntake.java
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
package org.carlmontrobotics.commands;


import static org.carlmontrobotics.Constants.Effectorc.*;
import static org.carlmontrobotics.Constants.Led.*;

import org.carlmontrobotics.Constants;
import org.carlmontrobotics.subsystems.IntakeShooter;

import edu.wpi.first.wpilibj2.command.Command;

public class PassToIntake extends Command{
Expand Down
6 changes: 0 additions & 6 deletions src/main/java/org/carlmontrobotics/commands/RampToRPM.java
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
package org.carlmontrobotics.commands;

import static org.carlmontrobotics.Constants.Effectorc.*;
import static org.carlmontrobotics.Constants.Led.*;

import org.carlmontrobotics.Constants;

import org.carlmontrobotics.subsystems.IntakeShooter;

import edu.wpi.first.wpilibj.Timer;
import edu.wpi.first.wpilibj2.command.Command;

Expand Down

0 comments on commit fc2d396

Please sign in to comment.