Skip to content

Commit

Permalink
Automatically applied spotless
Browse files Browse the repository at this point in the history
  • Loading branch information
Ronan-B authored and github-actions[bot] committed Jan 26, 2025
1 parent b672f6f commit 8c73218
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 17 deletions.
6 changes: 2 additions & 4 deletions src/main/java/frc/robot/constants/ENDEFFECTOR.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,12 @@ public class ENDEFFECTOR {
public static final double kD = 0.0;
public static final double endEffectorGearRatio = 1.0;

//Pivot motor stuff
// Pivot motor stuff
public static final double kPivotP = 0.0;
public static final double kPivotI = 0.0;
public static final double kPivotD = 0.0;

public static final double endEffectorPivotGearRatio = 1.0;

public enum STATE {

}
public enum STATE {}
}
2 changes: 1 addition & 1 deletion src/main/java/frc/robot/subsystems/EndEffector.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import com.ctre.phoenix6.hardware.TalonFX;
import com.ctre.phoenix6.signals.NeutralModeValue;
import edu.wpi.first.wpilibj2.command.SubsystemBase;
import frc.robot.constants.V2CAN;
import frc.robot.constants.ENDEFFECTOR;
import frc.robot.constants.V2CAN;
import frc.robot.utils.CtreUtils;

public class EndEffector extends SubsystemBase {
Expand Down
19 changes: 7 additions & 12 deletions src/main/java/frc/robot/subsystems/EndEffectorWrist.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@
package frc.robot.subsystems;

import com.ctre.phoenix6.configs.TalonFXConfiguration;
import com.ctre.phoenix6.controls.MotionMagicDutyCycle;
import com.ctre.phoenix6.controls.MotionMagicTorqueCurrentFOC;
import com.ctre.phoenix6.hardware.CANcoder;
import com.ctre.phoenix6.hardware.TalonFX;
import com.ctre.phoenix6.signals.NeutralModeValue;

import edu.wpi.first.wpilibj2.command.SubsystemBase;
import frc.robot.constants.ENDEFFECTOR;
import frc.robot.constants.V2CAN;
Expand All @@ -23,19 +21,16 @@ public class EndEffectorWrist extends SubsystemBase {
private final NeutralModeValue m_neutralMode = NeutralModeValue.Brake;

private final MotionMagicTorqueCurrentFOC m_request = new MotionMagicTorqueCurrentFOC(0);
// private doulbe m_desiredRotations =
/** Creates a nepw EndEffectorWrist. */

// private doulbe m_desiredRotations =
/** Creates a nepw EndEffectorWrist. */
public EndEffectorWrist() {
TalonFXConfiguration configuration = new TalonFXConfiguration();
configuration.Slot0.kP = ENDEFFECTOR.kP;
configuration.Slot0.kI = ENDEFFECTOR.kI;
configuration.Slot0.kD = ENDEFFECTOR.kD;
configuration.MotorOutput.NeutralMode = m_neutralMode;
configuration.Feedback.RotorToSensorRatio = ENDEFFECTOR.endEffectorGearRatio;



configuration.Slot0.kP = ENDEFFECTOR.kP;
configuration.Slot0.kI = ENDEFFECTOR.kI;
configuration.Slot0.kD = ENDEFFECTOR.kD;
configuration.MotorOutput.NeutralMode = m_neutralMode;
configuration.Feedback.RotorToSensorRatio = ENDEFFECTOR.endEffectorGearRatio;
}

@Override
Expand Down

0 comments on commit 8c73218

Please sign in to comment.