From decf027281268568035bdb37cc0c94f7d0242ba0 Mon Sep 17 00:00:00 2001 From: Abhishrek05 <90010729+Abhishrek05@users.noreply.github.com> Date: Mon, 22 Jan 2024 18:04:12 -0700 Subject: [PATCH] Shooter and Intake boiler code (im geekin) --- src/main/java/frc4388/robot/subsystems/Intake.java | 6 +++--- src/main/java/frc4388/robot/subsystems/Shooter.java | 12 +++++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/frc4388/robot/subsystems/Intake.java b/src/main/java/frc4388/robot/subsystems/Intake.java index fc77f25..dd1d96f 100644 --- a/src/main/java/frc4388/robot/subsystems/Intake.java +++ b/src/main/java/frc4388/robot/subsystems/Intake.java @@ -14,9 +14,9 @@ import frc4388.robot.Constants.IntakeConstants; public class Intake extends SubsystemBase { /** Creates a new Intake. */ - private Spark intakeMotor; - private Spark pivot; - public Intake(Spark intakeMotor, Spark pivot) { + private CANSparkMax intakeMotor; + private CANSparkMax pivot; + public Intake(CANSparkMax intakeMotor, CANSparkMax pivot) { this.intakeMotor = intakeMotor; this.pivot = pivot; } diff --git a/src/main/java/frc4388/robot/subsystems/Shooter.java b/src/main/java/frc4388/robot/subsystems/Shooter.java index 9044eae..c7724af 100644 --- a/src/main/java/frc4388/robot/subsystems/Shooter.java +++ b/src/main/java/frc4388/robot/subsystems/Shooter.java @@ -8,20 +8,22 @@ import edu.wpi.first.wpilibj2.command.SubsystemBase; import frc4388.robot.Constants.ShooterConstants; import com.ctre.phoenix.motorcontrol.can.WPI_TalonFX; +import com.ctre.phoenix6.hardware.TalonFX; +import com.ctre.phoenix6.signals.NeutralModeValue; import com.ctre.phoenix.motorcontrol.NeutralMode; public class Shooter extends SubsystemBase { - private WPI_TalonFX leftShooter; - private WPI_TalonFX rightShooter; + private TalonFX leftShooter; + private TalonFX rightShooter; /** Creates a new Shooter. */ - public Shooter(WPI_TalonFX leftTalonFX, WPI_TalonFX rightTalonFX) { + public Shooter(TalonFX leftTalonFX, TalonFX rightTalonFX) { leftShooter = leftTalonFX; rightShooter = rightTalonFX; - leftShooter.setNeutralMode(NeutralMode.Coast); - rightShooter.setNeutralMode(NeutralMode.Coast); + leftShooter.setNeutralMode(NeutralModeValue.Coast); + rightShooter.setNeutralMode(NeutralModeValue.Coast); } public void spin() {