Moved the maps to the correct place

chopshop-166 · Jan 11, 2025 · e091708 · e091708
1 parent 9316395
commit e091708
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/src/main/java/frc/robot/maps/Alpha.java b/src/main/java/frc/robot/maps/Alpha.java
@@ -26,8 +26,8 @@
 import edu.wpi.first.math.util.Units;
 import edu.wpi.first.wpilibj.PowerDistribution;
 import edu.wpi.first.wpilibj.PowerDistribution.ModuleType;
-import frc.robot.maps.subsystems.patterns.AlgaeDestageMap;
-import frc.robot.maps.subsystems.patterns.OuttakeMap;
+import frc.robot.maps.subsystems.AlgaeDestageMap;
+import frc.robot.maps.subsystems.OuttakeMap;
 
 @RobotMapFor("00:80:2F:17:F7:AF")
 

diff --git a/src/main/java/frc/robot/maps/RobotMap.java b/src/main/java/frc/robot/maps/RobotMap.java
@@ -9,8 +9,8 @@
 import com.chopshop166.chopshoplib.maps.MockLedMap;
 import com.chopshop166.chopshoplib.maps.SwerveDriveMap;
 
-import frc.robot.maps.subsystems.patterns.AlgaeDestageMap;
-import frc.robot.maps.subsystems.patterns.OuttakeMap;
+import frc.robot.maps.subsystems.AlgaeDestageMap;
+import frc.robot.maps.subsystems.OuttakeMap;
 
 public class RobotMap {
 

diff --git a/.../subsystems/patterns/AlgaeDestageMap.java → ...obot/maps/subsystems/AlgaeDestageMap.java b/.../subsystems/patterns/AlgaeDestageMap.java → ...obot/maps/subsystems/AlgaeDestageMap.java
@@ -1,4 +1,4 @@
-package frc.robot.maps.subsystems.patterns;
+package frc.robot.maps.subsystems;
 
 import com.chopshop166.chopshoplib.logging.DataWrapper;
 import com.chopshop166.chopshoplib.logging.LoggableMap;

diff --git a/.../maps/subsystems/patterns/OuttakeMap.java → ...frc/robot/maps/subsystems/OuttakeMap.java b/.../maps/subsystems/patterns/OuttakeMap.java → ...frc/robot/maps/subsystems/OuttakeMap.java
@@ -1,4 +1,4 @@
-package frc.robot.maps.subsystems.patterns;
+package frc.robot.maps.subsystems;
 
 import java.util.function.BooleanSupplier;
 

diff --git a/src/main/java/frc/robot/subsystems/AlgaeDestage.java b/src/main/java/frc/robot/subsystems/AlgaeDestage.java
@@ -6,8 +6,8 @@
 import com.chopshop166.chopshoplib.motors.SmartMotorController;
 
 import edu.wpi.first.wpilibj2.command.Command;
-import frc.robot.maps.subsystems.patterns.AlgaeDestageMap;
-import frc.robot.maps.subsystems.patterns.AlgaeDestageMap.Data;
+import frc.robot.maps.subsystems.AlgaeDestageMap;
+import frc.robot.maps.subsystems.AlgaeDestageMap.Data;
 
 public class AlgaeDestage extends LoggedSubsystem<Data, AlgaeDestageMap> {
 
@@ -27,6 +27,7 @@ public Command destageAlgae() {
         });
     }
 
+    @Override
     public void safeState() {
         getData().motor.setpoint = OFF;
     }

diff --git a/src/main/java/frc/robot/subsystems/Outtake.java b/src/main/java/frc/robot/subsystems/Outtake.java
@@ -6,9 +6,8 @@
 import com.chopshop166.chopshoplib.motors.SmartMotorController;
 
 import edu.wpi.first.wpilibj2.command.Command;
-
-import frc.robot.maps.subsystems.patterns.OuttakeMap;
-import frc.robot.maps.subsystems.patterns.OuttakeMap.Data;
+import frc.robot.maps.subsystems.OuttakeMap;
+import frc.robot.maps.subsystems.OuttakeMap.Data;
 
 public class Outtake extends LoggedSubsystem<Data, OuttakeMap> {