Skip to content
This repository has been archived by the owner on Mar 17, 2024. It is now read-only.

Box Movement #36

Merged
merged 19 commits into from
Jan 20, 2024
Merged

Box Movement #36

merged 19 commits into from
Jan 20, 2024

Conversation

cadenceforney
Copy link
Contributor

Created the Box API and added gamepad controls to the teleOp

@cadenceforney
Box API
fdcb4b1 
initialized servos
created functions to move box
@cadenceforney
rebind slow mode
e9b0074 
Ben requested formally that we rebind the slowmode button
@cadenceforney
Box and Gripper Movement
8e481b3 
Adds gamepad functionality to the box
@cadenceforney cadenceforney self-assigned this Dec 7, 2023
@cadenceforney cadenceforney added this to the Tartan Scrimmage milestone Dec 7, 2023
@cadenceforney cadenceforney added the feature New feature or request label Dec 7, 2023
@cadenceforney
position update
1563eaf 
Changed position to represent the 0 to 1 scale used for servos
BD103
BD103 suggested changes Dec 7, 2023
View reviewed changes
Copy link
Member

@BD103 BD103 left a comment

Choose a reason for hiding this comment

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

This is the final round of review! Most of it is comment related, though I did catch one logic error.

All that's left is to wait for the builders to finish making the box and for us to test it. :D

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/api/Box.kt Show resolved Hide resolved
TeamCode/src/main/java/org/firstinspires/ftc/teamcode/components/TeleOpMovement.kt Outdated Show resolved Hide resolved
TeamCode/src/main/java/org/firstinspires/ftc/teamcode/components/TeleOpMovement.kt Outdated Show resolved Hide resolved
TeamCode/src/main/java/org/firstinspires/ftc/teamcode/components/TeleOpMovement.kt Outdated Show resolved Hide resolved
TeamCode/src/main/java/org/firstinspires/ftc/teamcode/api/Box.kt Outdated Show resolved Hide resolved
@cadenceforney
documentation changes
b08fa1b 
added more descriptions
fixed logic error
BD103
BD103 approved these changes Dec 11, 2023
View reviewed changes
Copy link
Member

@BD103 BD103 left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Looks good, thank you!

Two things before merging:

  • Test the code on the robot
  • Possibly reverse box servos

Additionally I need to fix the merge conflicts, but you don't need to worry about that.

cadenceforney
cadenceforney commented Dec 14, 2023
View reviewed changes
Copy link
Contributor Author

@cadenceforney cadenceforney left a comment

Choose a reason for hiding this comment

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

Will need updated for two player movement

@BD103 BD103 added the on hold Something where work is paused for the time being label Jan 8, 2024
@cadenceforney
init the box api
e4e9842 
the box api needed to be initialized
cadenceforney and others added 2 commits January 14, 2024 16:14
@BD103 BD103 removed the on hold Something where work is paused for the time being label Jan 14, 2024
cadenceforney and others added 2 commits January 18, 2024 21:46
@cadenceforney @Vif15
fine tune
4b7c970 
ben gave numbers

Co-Authored-By: Vifi5 <117041326+Vif15@users.noreply.github.com>
@cadenceforney @Vif15
fine tuning
e75b3ae 
ben gave number

Co-Authored-By: Vifi5 <117041326+Vif15@users.noreply.github.com>
BD103
BD103 suggested changes Jan 20, 2024
View reviewed changes
Copy link
Member

@BD103 BD103 left a comment

Choose a reason for hiding this comment

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

Could you add a comment to TeleOpMovement so it says Requires the [TriWheels] and [Box] APIs.?

@cadenceforney
comment
335f95c 
stated that requires the box API
changed grip position
@cadenceforney
you are welcome
03f27f3 
fixed formatting
@cadenceforney
i am sorry
4d439b8 
:(
BD103
BD103 approved these changes Jan 20, 2024
View reviewed changes
Copy link
Member

@BD103 BD103 left a comment

Choose a reason for hiding this comment

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

D:

cadenceforney and others added 2 commits January 19, 2024 23:06
@cadenceforney @Vif15
Update Box.kt
8698b38 
updated to run the box movement off of one servo.

Co-Authored-By: Vifi5 <117041326+Vif15@users.noreply.github.com>
@BD103
Merge branch 'main' into box
2956c46
@BD103 BD103 merged commit 62899d7 into main Jan 20, 2024
1 check failed
@BD103 BD103 deleted the box branch January 20, 2024 04:21
@BD103 BD103 mentioned this pull request Jan 22, 2024
Merged
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@BD103 BD103 BD103 approved these changes

Assignees

@cadenceforney cadenceforney

Labels
feature New feature or request
Projects
None yet
Milestone
Nittany Lion Qualifier
Development

Successfully merging this pull request may close these issues.
3 participants
@cadenceforney @BD103 @Vif15