Reorganize packages

lasarobotics · Dec 22, 2023 · 6970fc9 · 6970fc9
1 parent b9ea8e6
commit 6970fc9
Show file tree

Hide file tree

Showing 15 changed files with 246 additions and 98 deletions.
diff --git a/src/main/java/org/lasarobotics/drive/MAXSwerveModule.java b/src/main/java/org/lasarobotics/drive/MAXSwerveModule.java
@@ -4,10 +4,10 @@
 
 package org.lasarobotics.drive;
 
-import org.lasarobotics.hardware.SparkMax;
+import org.lasarobotics.hardware.rev.SparkMax;
+import org.lasarobotics.hardware.rev.SparkPIDConfig;
 import org.lasarobotics.utils.GlobalConstants;
 import org.lasarobotics.utils.PIDConstants;
-import org.lasarobotics.utils.SparkPIDConfig;
 
 import com.revrobotics.CANSparkMax.ControlType;
 import com.revrobotics.CANSparkMax.IdleMode;

diff --git a/...a/org/lasarobotics/hardware/CANCoder.java → .../lasarobotics/hardware/ctre/CANCoder.java b/...a/org/lasarobotics/hardware/CANCoder.java → .../lasarobotics/hardware/ctre/CANCoder.java
@@ -2,8 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the MIT license file in the root directory of this project.
 
-package org.lasarobotics.hardware;
+package org.lasarobotics.hardware.ctre;
 
+import org.lasarobotics.hardware.LoggableHardware;
 import org.littletonrobotics.junction.AutoLog;
 import org.littletonrobotics.junction.Logger;
 

diff --git a/.../lasarobotics/hardware/PhoenixCANBus.java → ...robotics/hardware/ctre/PhoenixCANBus.java b/.../lasarobotics/hardware/PhoenixCANBus.java → ...robotics/hardware/ctre/PhoenixCANBus.java
@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the MIT license file in the root directory of this project.
 
-package org.lasarobotics.hardware;
+package org.lasarobotics.hardware.ctre;
 
 /** CTRE Phoenix CAN bus */
 public enum PhoenixCANBus {

diff --git a/...a/org/lasarobotics/hardware/Pidgeon2.java → .../lasarobotics/hardware/ctre/Pidgeon2.java b/...a/org/lasarobotics/hardware/Pidgeon2.java → .../lasarobotics/hardware/ctre/Pidgeon2.java
@@ -2,8 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the MIT license file in the root directory of this project.
 
-package org.lasarobotics.hardware;
+package org.lasarobotics.hardware.ctre;
 
+import org.lasarobotics.hardware.LoggableHardware;
 import org.lasarobotics.utils.GlobalConstants;
 import org.littletonrobotics.junction.AutoLog;
 import org.littletonrobotics.junction.Logger;

diff --git a/...rg/lasarobotics/utils/TalonPIDConfig.java → ...obotics/hardware/ctre/TalonPIDConfig.java b/...rg/lasarobotics/utils/TalonPIDConfig.java → ...obotics/hardware/ctre/TalonPIDConfig.java
@@ -2,7 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the MIT license file in the root directory of this project.
 
-package org.lasarobotics.utils;
+package org.lasarobotics.hardware.ctre;
+
+import org.lasarobotics.utils.PIDConstants;
 
 import com.ctre.phoenix.motorcontrol.FeedbackDevice;
 import com.ctre.phoenix.motorcontrol.LimitSwitchNormal;

diff --git a/...ava/org/lasarobotics/hardware/Analog.java → ...lasarobotics/hardware/generic/Analog.java b/...ava/org/lasarobotics/hardware/Analog.java → ...lasarobotics/hardware/generic/Analog.java
@@ -2,8 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the MIT license file in the root directory of this project.
 
-package org.lasarobotics.hardware;
+package org.lasarobotics.hardware.generic;
 
+import org.lasarobotics.hardware.LoggableHardware;
 import org.littletonrobotics.junction.AutoLog;
 import org.littletonrobotics.junction.Logger;
 

diff --git a/...org/lasarobotics/hardware/Compressor.java → ...robotics/hardware/generic/Compressor.java b/...org/lasarobotics/hardware/Compressor.java → ...robotics/hardware/generic/Compressor.java
@@ -2,8 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the MIT license file in the root directory of this project
 
-package org.lasarobotics.hardware;
+package org.lasarobotics.hardware.generic;
 
+import org.lasarobotics.hardware.LoggableHardware;
 import org.littletonrobotics.junction.AutoLog;
 
 import edu.wpi.first.wpilibj.PneumaticsModuleType;

diff --git a/...lasarobotics/hardware/DoubleSolenoid.java → ...tics/hardware/generic/DoubleSolenoid.java b/...lasarobotics/hardware/DoubleSolenoid.java → ...tics/hardware/generic/DoubleSolenoid.java
@@ -2,8 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the MIT license file in the root directory of this project
 
-package org.lasarobotics.hardware;
+package org.lasarobotics.hardware.generic;
 
+import org.lasarobotics.hardware.LoggableHardware;
 import org.littletonrobotics.junction.Logger;
 import org.littletonrobotics.junction.inputs.LoggableInputs;
 

diff --git a/...rg/lasarobotics/hardware/LimitSwitch.java → ...obotics/hardware/generic/LimitSwitch.java b/...rg/lasarobotics/hardware/LimitSwitch.java → ...obotics/hardware/generic/LimitSwitch.java
@@ -2,8 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the MIT license file in the root directory of this project.
 
-package org.lasarobotics.hardware;
+package org.lasarobotics.hardware.generic;
 
+import org.lasarobotics.hardware.LoggableHardware;
 import org.littletonrobotics.junction.AutoLog;
 import org.littletonrobotics.junction.Logger;
 

diff --git a/...java/org/lasarobotics/hardware/Servo.java → .../lasarobotics/hardware/generic/Servo.java b/...java/org/lasarobotics/hardware/Servo.java → .../lasarobotics/hardware/generic/Servo.java
@@ -2,8 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the MIT license file in the root directory of this project.
 
-package org.lasarobotics.hardware;
+package org.lasarobotics.hardware.generic;
 
+import org.lasarobotics.hardware.LoggableHardware;
 import org.littletonrobotics.junction.Logger;
 import org.littletonrobotics.junction.inputs.LoggableInputs;
 

diff --git a/...a/org/lasarobotics/hardware/Solenoid.java → ...sarobotics/hardware/generic/Solenoid.java b/...a/org/lasarobotics/hardware/Solenoid.java → ...sarobotics/hardware/generic/Solenoid.java
@@ -2,8 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the MIT license file in the root directory of this project
 
-package org.lasarobotics.hardware;
+package org.lasarobotics.hardware.generic;
 
+import org.lasarobotics.hardware.LoggableHardware;
 import org.littletonrobotics.junction.Logger;
 import org.littletonrobotics.junction.inputs.LoggableInputs;
 

diff --git a/...java/org/lasarobotics/hardware/NavX2.java → ...asarobotics/hardware/kauailabs/NavX2.java b/...java/org/lasarobotics/hardware/NavX2.java → ...asarobotics/hardware/kauailabs/NavX2.java
@@ -2,8 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the MIT license file in the root directory of this project.
 
-package org.lasarobotics.hardware;
+package org.lasarobotics.hardware.kauailabs;
 
+import org.lasarobotics.hardware.LoggableHardware;
 import org.lasarobotics.utils.GlobalConstants;
 import org.littletonrobotics.junction.AutoLog;
 import org.littletonrobotics.junction.Logger;