Skip to content

Commit

Permalink
spotless + softer elevator zero
Browse files Browse the repository at this point in the history
  • Loading branch information
JayK445 committed Nov 11, 2023
1 parent e609e7b commit b2ace8c
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 10 deletions.
4 changes: 2 additions & 2 deletions src/main/java/frc/robot/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,8 @@ public static final class Setpoints {
public static final double EXTENSION_EPSILON = 5;
public static final double ANGULAR_OFFSET = 0;

public static final double ZERO_MOTOR_POWER = -0.2;
public static final double ZERO_STATOR_LIMIT = 10;
public static final double ZERO_MOTOR_POWER = -0.12;
public static final double ZERO_STATOR_LIMIT = 5;
public static final double STATOR_LIMIT = 25;

public static final double GRAVITY_OFFSET_PERCENT = .2;
Expand Down
3 changes: 0 additions & 3 deletions src/main/java/frc/robot/RobotContainer.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,10 @@
import frc.robot.Constants.Drive;
import frc.robot.Constants.Elevator;
import frc.robot.autonomous.commands.MobilityAuto;
import frc.robot.autonomous.commands.N1_1ConePlus2CubeHybridMobility;
import frc.robot.autonomous.commands.N1_1ConePlus2CubeHybridMobilityEngage;
import frc.robot.autonomous.commands.N2_Engage;
import frc.robot.autonomous.commands.N3_1ConePlusMobility;
import frc.robot.autonomous.commands.N3_1ConePlusMobilityEngage;
import frc.robot.autonomous.commands.N6_1ConePlusEngage;
import frc.robot.autonomous.commands.N9_1ConePlus2CubeMobility;
import frc.robot.autonomous.commands.N9_1ConePlusMobility;
import frc.robot.autonomous.commands.N9_1ConePlusMobilityEngage;
import frc.robot.commands.DefaultDriveCommand;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,8 @@

import edu.wpi.first.wpilibj2.command.CommandBase;
import frc.robot.Constants;
import frc.robot.Constants.Elevator;
import frc.robot.subsystems.ElevatorSubsystem;
import frc.robot.subsystems.ElevatorSubsystem.Modes;
import frc.util.Util;

import java.util.function.BooleanSupplier;

public class GroundIntakeElevatorCommand extends CommandBase {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/frc/robot/subsystems/IntakeSubsystem.java
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,9 @@ private double getFilterCalculatedValue() {
@Override
public void periodic() {
filterOutput = filter.calculate(intakeMotor.getStatorCurrent());
if(isCube && filterOutput >= Intake.CUBE_STATOR_LIMIT) {
if (isCube && filterOutput >= Intake.CUBE_STATOR_LIMIT) {
currentIntakeMode = Modes.HOLD;
} else if(filterOutput >= Intake.CUBE_STATOR_LIMIT) {
} else if (filterOutput >= Intake.CUBE_STATOR_LIMIT) {
currentIntakeMode = Modes.HOLD;
}

Expand Down

0 comments on commit b2ace8c

Please sign in to comment.