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

Remapped Buttons Finalization #29

Merged
merged 16 commits into from
Mar 12, 2024
Merged

Conversation

EuphoniumPlayer
Copy link
Member

Summary

Known Functionality:

Button 1 (trigger) dumps,
button 2 (thumb button) closes the dump bed,
button 3 moves the front and conveyor inward,
button 4 moves the front and conveyor out,
button 5 moves the sushi roller and conveyor in,
button 6 moves the sushi rollers and conveyor out,
button 7 is one of the flywheel reverse buttons,
button 8 has no functionality,
button 9 moves the conveyor backwards,
button 10 moves the conveyor forwards,
button 11 reverses the flywheels (exact same function as button 7)
button 12 moves the flywheels forward at 65% speed.

POV forward and to either of the forward 45's moves the flywheels forward at 100% speed,
POV backward and to either of the backward 45's moves the flywheels forward at 15% speed,
POV to either side does nothing.

Requires Testing:

Throttle + activates the elevator (will lift),
Throttle - deactivates the elevator (will lower),
Throttle middle maintains last action (in theory).

EuphoniumPlayer and others added 16 commits March 5, 2024 15:56
The intake commands for the sushi rollers and the front rollers have been split up and assigned to different buttons. Sushi in: 5, Sushi out: 6, Front in, 3, Front out: 4. The conveyor runs in the appropriate direction for each button (5 & 3 in, 3 & 4 out).
All buttons for intake control have been remapped as suggested by Andrew.
Matched the name of the joystick in the FlyWCommand class to match the pattern found within all other Command classes.
Upwards to the 45s and center is temporarily set to reduced speed until they clear to go full/adjusted speed.
Downwards is 15% speed (center and 45s). Button 7 is reverse (reverse is set to 15% speed).
Full speed (100%) is now default forward POV speed (not 65%). To go 65% speed, press button 12.
Typo "FlyWJoystick.getPOV() == >>>215<<<" has been corrected to "FlyWJoystick.getPOV() == >>>315<<<" in FlyWCommand.java. Additionally, some completed //TODO's have been cleared due to completion of their task in previous commits.
Dump commands were flipped (fixed), openThenClose starts death spiral that disables the bot. As a result, openThenClose has been abandoned for the time being.
STILL NEEDS REVIEW WITH BOTH BELTS FUNCTIONAL! But it seems that the problem is fixed.
REQUIRES TESTING, IF IT DOES NOT WORK CHANGE CONVEYOR_MOTOR_1_INVERTED BACK TO TRUE AND 2 BACK TO FALSE
Added backup buttons for elevator control in the event that the throttle does not trigger actions correctly
Kinda useless
Removed a TODO and an empty space
Reformatted to make the if (true)'s less lengthy and messy. Additionally, the fly wheels now reverse from button 11 AND 7 (pulled it closer). One more thing, the conveyor can now be controlled separately from other parts of the intake by using button 9 to reverse it and button 10 to advance it.
@EuphoniumPlayer EuphoniumPlayer self-assigned this Mar 12, 2024
@EuphoniumPlayer EuphoniumPlayer marked this pull request as ready for review March 12, 2024 03:24
@EuphoniumPlayer EuphoniumPlayer changed the title Remapped Buttons Finilization Remapped Buttons Finalization Mar 12, 2024
Copy link
Member

@garrettsummerfi3ld garrettsummerfi3ld left a comment

Choose a reason for hiding this comment

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

Looks good! Merging.

Copy link
Member

Choose a reason for hiding this comment

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

Comments are helpful, however it should only be noted as what the function does in reference to the function.

@garrettsummerfi3ld garrettsummerfi3ld merged commit 4e4dccf into main Mar 12, 2024
7 checks passed
@garrettsummerfi3ld garrettsummerfi3ld deleted the Intake/Remap-Buttons branch March 12, 2024 17:08
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.

3 participants