Skip to content

Commit

Permalink
fixed constants
Browse files Browse the repository at this point in the history
  • Loading branch information
sofiebudman committed Mar 2, 2024
1 parent 8a91064 commit 44b3ccd
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
12 changes: 10 additions & 2 deletions src/main/java/org/carlmontrobotics/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ public static final class Drivetrain {

public static final class Arm {
//Motor port
public static final int LEFT_MOTOR_PORT = 7;
public final static int RIGHT_MOTOR_PORT = 8;
public static final int ARM_MOTOR_PORT_1 = 7;
public final static int ARM_MOTOR_PORT_2 = 8;
//all angles in rot here
//TODO: finish understand why this is broken public static final Measure<Angle> INTAKE_ANGLE = Degrees.to(-1);

Expand Down Expand Up @@ -75,6 +75,14 @@ public static final class Arm {
public static final int raiseToGroundButton = Button.kStart.value;
public static final int raiseToClimberButton = Button.kLeftBumper.value;
public static final int lowerToClimberButton = Button.kRightBumper.value;
//other
public static final boolean motorInverted = true; //Todo: find all these
public static final double rotationToRad = 2 * Math.PI;
public static final boolean encoderInverted = false;
public static final double ARM_TELEOP_MAX_GOAL_DIFF_FROM_CURRENT_RAD = 0;
public static final double posToleranceRad = 0;
public static final double velToleranceRadPSec = 0;

}
public static final class IntakeShooter {
//in set() speed
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/org/carlmontrobotics/subsystems/Arm.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@
// Arm angle is measured from horizontal on the intake side of the robot and bounded between -3π/2 and π/2
// Wrist angle is measured relative to the arm with 0 being parallel to the arm and bounded between -π and π (Center of Mass of Roller)
public class Arm extends SubsystemBase {


///GOALS
/*
* public static final double intakeAngle = Math.toRadians(0);
Expand Down Expand Up @@ -81,7 +79,7 @@ public Arm() {

//armProfileTimer.start(); <-- don't neeed timer anymore

setArmTarget(goalState.position, 0);
setArmTarget(goalState.position);

// SmartDashboard.putNumber("Arm Max Vel", MAX_FF_VEL );
// SmartDashboard.putNumber("Wrist Max Vel", MAX_FF_VEL[WRIST]);
Expand Down

0 comments on commit 44b3ccd

Please sign in to comment.