Skip to content

Commit

Permalink
Math changed
Browse files Browse the repository at this point in the history
  • Loading branch information
NoraZitnick committed Dec 5, 2023
1 parent 4466c95 commit 2138d0f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions src/main/java/frc/robot/Commands/AdvancedIntakeSequence.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
// Open Source Software; you can modify and/or share it under the terms of
// the WPILib BSD license file in the root directory of this project.

package frc.robot.Commands;
package frc.robot.commands;

import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;
import frc.robot.Constants;
import frc.robot.Subsystems.IntakeSubsystem;
import frc.robot.subsystems.IntakeSubsystem;

// NOTE: Consider using this command inline, rather than writing a subclass. For more
// information, see:
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/frc/robot/RobotContainer.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
import edu.wpi.first.wpilibj2.command.button.CommandXboxController;
import frc.robot.commands.SequentialCommands;
import frc.robot.subsystems.WristSubsystem;
import frc.robot.Commands.AdvancedIntakeSequence;
import frc.robot.Subsystems.IntakeSubsystem;
import frc.robot.commands.AdvancedIntakeSequence;
import frc.robot.subsystems.IntakeSubsystem;

/**
* This class is where the bulk of the robot should be declared. Since Command-based is a
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/frc/robot/subsystems/WristSubsystem.java
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public void setTargetAngle(double targetAngle) {
}

public static double ticksToDegrees(double ticks) {
return ((ticks / Wrist.TICKS) * Wrist.GEAR_RATIO*360);
return ((ticks / Wrist.TICKS) * (Wrist.GEAR_RATIO/360));
}

private double getCurrentAngle() {
Expand Down

0 comments on commit 2138d0f

Please sign in to comment.