fix: use semantic can package name

FRC3636 · Jan 24, 2024 · 7818156 · 7818156
1 parent 18dd87d
commit 7818156
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 15 deletions.
diff --git a/src/main/java/com/frcteam3636/frc2024/CAN.kt b/src/main/java/com/frcteam3636/frc2024/CAN.kt
@@ -1,4 +1,4 @@
-package com.frcteam3636.frc2024.can
+package com.frcteam3636.frc2024
 
 import com.ctre.phoenix6.hardware.TalonFX
 import com.revrobotics.CANSparkFlex
@@ -12,8 +12,10 @@ enum class REVMotorControllerId(val num: Int) {
     BackLeftTurningMotor(2),
     BackRightTurningMotor(3),
     FrontRightTurningMotor(4),
+    // fixme: these can ids should probably be updated in hardware because 15 and 7 are pretty random
     LeftShooterFlywheel(15),
     RightShooterFlywheel(7),
+    // todo: the following `3x` CAN ids are placeholders
     OverTheBumperIntakeArm(31),
     OverTheBumperIntakeFeed(32),
     UnderTheBumperIntakeRoller(33),

diff --git a/src/main/java/com/frcteam3636/frc2024/subsystems/climber/ClimberIO.kt b/src/main/java/com/frcteam3636/frc2024/subsystems/climber/ClimberIO.kt
@@ -1,7 +1,7 @@
 package com.frcteam3636.frc2024.subsystems.climber
 
-import com.frcteam3636.frc2024.can.CANSparkMax
-import com.frcteam3636.frc2024.can.REVMotorControllerId
+import com.frcteam3636.frc2024.CANSparkMax
+import com.frcteam3636.frc2024.REVMotorControllerId
 import com.revrobotics.CANSparkLowLevel
 import com.revrobotics.SparkAbsoluteEncoder
 import edu.wpi.first.math.geometry.Rotation2d

diff --git a/src/main/java/com/frcteam3636/frc2024/subsystems/drivetrain/Drivetrain.kt b/src/main/java/com/frcteam3636/frc2024/subsystems/drivetrain/Drivetrain.kt
@@ -1,7 +1,7 @@
 package com.frcteam3636.frc2024.subsystems.drivetrain
 
-import com.frcteam3636.frc2024.can.CTREMotorControllerId
-import com.frcteam3636.frc2024.can.REVMotorControllerId
+import com.frcteam3636.frc2024.CTREMotorControllerId
+import com.frcteam3636.frc2024.REVMotorControllerId
 import com.frcteam3636.frc2024.utils.swerve.PerCorner
 import com.frcteam3636.frc2024.utils.swerve.cornerStatesToChassisSpeeds
 import com.frcteam3636.frc2024.utils.swerve.toCornerSwerveModuleStates

diff --git a/src/main/java/com/frcteam3636/frc2024/subsystems/drivetrain/Module.kt b/src/main/java/com/frcteam3636/frc2024/subsystems/drivetrain/Module.kt
@@ -3,11 +3,7 @@ package com.frcteam3636.frc2024.subsystems.drivetrain
 import com.ctre.phoenix6.configs.CurrentLimitsConfigs
 import com.ctre.phoenix6.configs.SlotConfigs
 import com.ctre.phoenix6.controls.VelocityVoltage
-import com.frcteam3636.frc2024.Robot
-import com.frcteam3636.frc2024.can.CANSparkMax
-import com.frcteam3636.frc2024.can.CTREMotorControllerId
-import com.frcteam3636.frc2024.can.REVMotorControllerId
-import com.frcteam3636.frc2024.can.TalonFX
+import com.frcteam3636.frc2024.*
 import com.frcteam3636.frc2024.utils.math.*
 import com.revrobotics.CANSparkBase
 import com.revrobotics.CANSparkLowLevel

diff --git a/src/main/java/com/frcteam3636/frc2024/subsystems/intake/IntakeIO.kt b/src/main/java/com/frcteam3636/frc2024/subsystems/intake/IntakeIO.kt
@@ -1,9 +1,9 @@
 package com.frcteam3636.frc2024.subsystems.intake
 
+import com.frcteam3636.frc2024.CANSparkFlex
+import com.frcteam3636.frc2024.CANSparkMax
+import com.frcteam3636.frc2024.REVMotorControllerId
 import com.frcteam3636.frc2024.Robot
-import com.frcteam3636.frc2024.can.CANSparkFlex
-import com.frcteam3636.frc2024.can.CANSparkMax
-import com.frcteam3636.frc2024.can.REVMotorControllerId
 import com.revrobotics.CANSparkLowLevel
 import edu.wpi.first.math.geometry.Rotation2d
 import edu.wpi.first.math.system.plant.DCMotor

diff --git a/src/main/java/com/frcteam3636/frc2024/subsystems/shooter/ShooterIOReal.kt b/src/main/java/com/frcteam3636/frc2024/subsystems/shooter/ShooterIOReal.kt
@@ -1,7 +1,7 @@
 package com.frcteam3636.frc2024.subsystems.shooter
 
-import com.frcteam3636.frc2024.can.CANSparkMax
-import com.frcteam3636.frc2024.can.REVMotorControllerId
+import com.frcteam3636.frc2024.CANSparkMax
+import com.frcteam3636.frc2024.REVMotorControllerId
 import com.revrobotics.CANSparkLowLevel
 import edu.wpi.first.math.geometry.Rotation2d
 import edu.wpi.first.math.util.Units