undoing last changes as both branch merged

Evolution2626 · Feb 6, 2024 · 18a452e · 18a452e
1 parent 070f5a2
commit 18a452e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/main/java/frc/robot/Robot.java b/src/main/java/frc/robot/Robot.java
@@ -32,7 +32,7 @@ public void robotInit() {
     // Instantiate our RobotContainer.  This will perform all our button bindings, and put our
     // autonomous chooser on the dashboard.
     m_robotContainer = new RobotContainer();
-    compressor = new Compressor(1, PneumaticsModuleType.REVPH);
+    compressor = new Compressor(1, PneumaticsModuleType.CTREPCM);
   }
 
   /**

diff --git a/src/main/java/frc/robot/subsystems/AmpShooter.java b/src/main/java/frc/robot/subsystems/AmpShooter.java
@@ -24,7 +24,7 @@ public AmpShooter() {
     piston =
         new DoubleSolenoid(
             1,
-            PneumaticsModuleType.REVPH,
+PneumaticsModuleType.CTREPCM,
             pcm.PISTON_AMP_SHOOTER_FORWARD,
             pcm.PISTON_AMP_SHOOTER_REVERSE);
 

diff --git a/src/main/java/frc/robot/subsystems/ClimberInAnBox.java b/src/main/java/frc/robot/subsystems/ClimberInAnBox.java
@@ -30,13 +30,13 @@ public ClimberInAnBox() {
     piston1 =
         new DoubleSolenoid(
             1,
-            PneumaticsModuleType.REVPH,
+            PneumaticsModuleType.CTREPCM,
             pcm.PISTON_CLIMBER_FORWARD_1,
             pcm.PISTON_CLIMBER_REVERSE_1);
     piston2 =
         new DoubleSolenoid(
             1,
-            PneumaticsModuleType.REVPH,
+            PneumaticsModuleType.CTREPCM,
             pcm.PISTON_CLIMBER_FORWARD_2,
             pcm.PISTON_CLIMBER_REVERSE_2);
     piston1.set(DoubleSolenoid.Value.kReverse);

diff --git a/src/main/java/frc/robot/subsystems/Drivetrain.java b/src/main/java/frc/robot/subsystems/Drivetrain.java
@@ -45,7 +45,7 @@ public class Drivetrain extends SubsystemBase {
   private MecanumDrive m_robotDrive;
 
     piston =
-        new DoubleSolenoid(1, PneumaticsModuleType.REVPH, pcm.PISTON_FORWARD, pcm.PISTON_REVERSE);
+        new DoubleSolenoid(1, PneumaticsModuleType.CTREPCM, pcm.PISTON_FORWARD, pcm.PISTON_REVERSE);
 
     avantgauche = new CANSparkMax(deviceNumber.DeviceNumberAvantGauche, MotorType.kBrushless);
     avantdroit = new CANSparkMax(deviceNumber.DeviceNumberAvantDroit, MotorType.kBrushless);