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.

Sign up for GitHub

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

Jump to bottom

Add Bling Subsystem and Command #46

Merged
merged 4 commits into from
Feb 10, 2024
Merged

Add Bling Subsystem and Command #46

merged 4 commits into from
Feb 10, 2024

Conversation

Patchy-pirate
Copy link
Contributor

@Patchy-pirate Patchy-pirate commented Feb 3, 2024 •
edited
Loading

Describe your changes

  • Bug fix
  • New feature

Explain what you did:

i added bling command and bling subsystem and changed the SetBlingCommand to BlingCommand

Issue ticket (add number)

https://github.com/FRC2706/2024-2706-Robot-Code/issues/...

Checklist before requesting a review

  • I have performed a self-review of my code.
  • I have tested thoroughly.
  • I have written documentation and explained about my changes to the best of my ability.

@GabbyGenereux GabbyGenereux linked an issue Feb 3, 2024 that may be closed by this pull request
Bling Subsystem and Command in the 2024 codebase #8
Open
@weizhang-2706
Copy link
Contributor

It looks like this branch has conflicts. First pull from main and then fix the conflicts.

@GabbyGenereux GabbyGenereux changed the title Added Bling subsystem and command Merge main into BlingCommand Feb 3, 2024
@GabbyGenereux GabbyGenereux changed the title Merge main into BlingCommand Add Bling Subsystem and Command Feb 3, 2024
@GabbyGenereux
Copy link

It looks like this branch has conflicts. First pull from main and then fix the conflicts.

Done

@GabbyGenereux GabbyGenereux changed the base branch from main to Integration February 3, 2024 20:16
ErikCald
ErikCald approved these changes Feb 10, 2024
View reviewed changes
Copy link
Collaborator

@ErikCald ErikCald left a comment

Choose a reason for hiding this comment

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

!evorppA

@Patchy-pirate Patchy-pirate merged commit 783eb22 into Integration Feb 10, 2024
@Patchy-pirate Patchy-pirate deleted the BlingCommand branch February 10, 2024 18:48
@Patchy-pirate Patchy-pirate self-assigned this Feb 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@weizhang-2706 weizhang-2706 weizhang-2706 approved these changes

@ErikCald ErikCald ErikCald approved these changes

@GabbyGenereux GabbyGenereux Awaiting requested review from GabbyGenereux

Assignees

@Patchy-pirate Patchy-pirate

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Bling Subsystem and Command in the 2024 codebase
4 participants
@Patchy-pirate @weizhang-2706 @GabbyGenereux @ErikCald