Fix package naming (#31)

* Rename stopAll to stopAllDriveMotors * remove import * Start more OOP approach to codriver controls * implement OOP based codriver controls * implent OOP to inputted driver controls * Fix package naming * Fix build issue
WTMCRobotics · Mar 2, 2024 · f6cefe7 · f6cefe7
1 parent a3d8781
commit f6cefe7
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 16 deletions.
diff --git a/src/main/java/frc/robot/Constants.java b/src/main/java/frc/robot/Constants.java
@@ -62,5 +62,5 @@ public class Constants {
     /* ROTATION PID CONSTANTS */
 
     public static final double ROTATION_ERROR_DEGREES = 5.;
-    public static final double SHOOTING_VELOCITY = 4000;
+    public static final double SHOOTING_VELOCITY_RPM = 4000;
 }
diff --git a/src/main/java/frc/robot/InputtedCoDriverControls.java b/src/main/java/frc/robot/InputtedCoDriverControls.java
@@ -1,9 +1,9 @@
 package frc.robot;
 
 import edu.wpi.first.wpilibj.XboxController;
-import frc.robot.RobotComponents.Climber;
-import frc.robot.RobotComponents.Intake;
-import frc.robot.RobotComponents.Shooter;
+import frc.robot.robotcomponents.Climber;
+import frc.robot.robotcomponents.Intake;
+import frc.robot.robotcomponents.Shooter;
 
 public class InputtedCoDriverControls {
 

diff --git a/src/main/java/frc/robot/InputtedDriverControls.java b/src/main/java/frc/robot/InputtedDriverControls.java
@@ -1,7 +1,7 @@
 package frc.robot;
 
 import edu.wpi.first.wpilibj.XboxController;
-import frc.robot.RobotComponents.DriveTrain;
+import frc.robot.robotcomponents.DriveTrain;
 
 public class InputtedDriverControls {
 

diff --git a/src/main/java/frc/robot/Robot.java b/src/main/java/frc/robot/Robot.java
@@ -11,14 +11,13 @@
 import edu.wpi.first.wpilibj.XboxController;
 import edu.wpi.first.wpilibj.smartdashboard.SendableChooser;
 import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
-import frc.robot.RobotComponents.DriveTrain;
-import frc.robot.Vision.AprilTagHighlighter;
 import frc.robot.auton.AutonAction;
 import frc.robot.auton.AutonRoutes;
 import frc.robot.auton.ParallelActionRunner;
 import frc.robot.auton.SequentialActionRunner;
 import frc.robot.motor.MotorController;
 import frc.robot.motor.MotorControllerFactory;
+import frc.robot.vision.AprilTagHighlighter;
 import java.util.ArrayDeque;
 
 /**

diff --git a/src/main/java/frc/robot/RobotComponents/Climber.java b/src/main/java/frc/robot/RobotComponents/Climber.java
@@ -1,4 +1,4 @@
-package frc.robot.RobotComponents;
+package frc.robot.robotcomponents;
 
 import frc.robot.Constants;
 import frc.robot.Robot;

diff --git a/src/main/java/frc/robot/RobotComponents/DriveTrain.java b/src/main/java/frc/robot/RobotComponents/DriveTrain.java
@@ -1,4 +1,4 @@
-package frc.robot.RobotComponents;
+package frc.robot.robotcomponents;
 
 import frc.robot.Constants;
 import frc.robot.QuickActions;

diff --git a/src/main/java/frc/robot/RobotComponents/Intake.java b/src/main/java/frc/robot/RobotComponents/Intake.java
@@ -1,4 +1,4 @@
-package frc.robot.RobotComponents;
+package frc.robot.robotcomponents;
 
 import frc.robot.Robot;
 

diff --git a/src/main/java/frc/robot/RobotComponents/Shooter.java b/src/main/java/frc/robot/RobotComponents/Shooter.java
@@ -1,4 +1,4 @@
-package frc.robot.RobotComponents;
+package frc.robot.robotcomponents;
 
 import frc.robot.Constants;
 import frc.robot.Robot;
@@ -8,8 +8,8 @@
 public class Shooter {
 
     public static void startShooterMotors() {
-        Robot.motors.getLeftFlywheel().setVelocity(Constants.SHOOTING_VELOCITY);
-        Robot.motors.getRightFlywheel().setVelocity(Constants.SHOOTING_VELOCITY);
+        Robot.motors.getLeftFlywheel().setVelocity(Constants.SHOOTING_VELOCITY_RPM);
+        Robot.motors.getRightFlywheel().setVelocity(Constants.SHOOTING_VELOCITY_RPM);
     }
 
     public static void stopShooterMotors() {

diff --git a/src/main/java/frc/robot/Vision/AprilTagHighlighter.java b/src/main/java/frc/robot/Vision/AprilTagHighlighter.java
@@ -1,4 +1,4 @@
-package frc.robot.Vision;
+package frc.robot.vision;
 
 import edu.wpi.first.apriltag.AprilTagDetection;
 import edu.wpi.first.apriltag.AprilTagPoseEstimator;
@@ -8,8 +8,8 @@
 import edu.wpi.first.math.geometry.Translation3d;
 import edu.wpi.first.wpilibj.XboxController;
 import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
-import frc.robot.Vision.Vision.AprilTagLocation;
 import frc.robot.auton.AutonRotate;
+import frc.robot.vision.Vision.AprilTagLocation;
 import java.util.HashMap;
 import java.util.Map;
 import org.opencv.core.Mat;

diff --git a/src/main/java/frc/robot/Vision/Vision.java b/src/main/java/frc/robot/Vision/Vision.java
@@ -1,4 +1,4 @@
-package frc.robot.Vision;
+package frc.robot.vision;
 
 import edu.wpi.first.apriltag.AprilTagDetection;
 import edu.wpi.first.apriltag.AprilTagDetector;