Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Climber #12

Merged
merged 16 commits into from
Feb 24, 2024
Merged

Climber #12

merged 16 commits into from
Feb 24, 2024

Conversation

ProgrammingSR
Copy link
Contributor

No description provided.

Copy link
Contributor

@ReeledWarrior14 ReeledWarrior14 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This does not look like it will work. I think we will need to wait until it can be tested before merging it. There are a lot of issues that need to be fixed. Also please update the branch before saying it is ready for a review, half the changes make no sense since it is not up to date with main.

build.gradle Outdated
@@ -68,7 +68,7 @@ dependencies {
simulationRelease wpi.sim.enableRelease()

testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is this?

simgui-ds.json Outdated
@@ -0,0 +1,97 @@
{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove all of these changes, or see what the difference is after merging main into this branch properly.

public static final int kFrontRightTurningEncoderPort = 18;
public static final int kRearRightTurningEncoderPort = 17;

public static final double kFrontLeftTurningEncoderOffset = 0;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These were removed in main, they should not be here.

// configuration

// TODO: Tune this PID before running on a robot on the ground
public static final double kPModuleTurningController = -0.3;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, a change made in main, not updated/being redone in this branch.

}

// Intake PID and Encoder Constants
public static class IntakeConstants {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Intake and shooter changes should not be on this branch.

src/main/java/frc/robot/subsystems/ClimberSubsystem.java Outdated Show resolved Hide resolved
src/main/java/frc/robot/subsystems/ClimberSubsystem.java Outdated Show resolved Hide resolved
src/main/java/frc/robot/subsystems/ClimberSubsystem.java Outdated Show resolved Hide resolved
* Extends both arms
*/
public void forward() {
m_leftSolenoid.set(kOff);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Literally all of these methods with different names set the solenoids to kOff. This is another major bug that really should never even have been committed.

@ReeledWarrior14 ReeledWarrior14 marked this pull request as draft February 21, 2024 22:53
@ReeledWarrior14 ReeledWarrior14 marked this pull request as ready for review February 24, 2024 02:54
@ReeledWarrior14 ReeledWarrior14 dismissed their stale review February 24, 2024 02:54

Will deal with later

@ProgrammingSR ProgrammingSR merged commit c6bc4bc into main Feb 24, 2024
2 checks passed
@ProgrammingSR ProgrammingSR deleted the climber branch February 24, 2024 02:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants