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

Feature/newscrimmagebot #598

Merged
merged 4 commits into from
Nov 25, 2023
Merged

Feature/newscrimmagebot #598

merged 4 commits into from
Nov 25, 2023

Conversation

28mpetrino
Copy link

Changes:

I changed the grabber home positions so they don't rub against the belt controlling the intake. I also changed some of the positions for the claw mechanism.

Controls and Usage:

Dpad Down turns the intake off and on. Dpad Left moves the left grabber and Dpad Right moves the right grabber.

Reviewers:

@XaverianTeamRobotics/senior-programmers

@28mpetrino 28mpetrino requested a review from a team as a code owner November 23, 2023 15:43
Copy link
Member

@michaell4438 michaell4438 left a comment

Choose a reason for hiding this comment

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

Judging by the fact that there are currently merge conflicts, I want to take a look at these changes when I get my hands on the physical robot.

# Conflicts:
#	TeamCode/src/main/java/org/firstinspires/ftc/teamcode/features/ArmClaw.java
Copy link
Member

@michaell4438 michaell4438 left a comment

Choose a reason for hiding this comment

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

Upon resolving conflicts, its now good to merge

@michaell4438 michaell4438 merged commit d3821b5 into master Nov 25, 2023
6 checks passed
@michaell4438 michaell4438 deleted the feature/newscrimmagebot branch November 25, 2023 19:43
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants