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

[FL-3896] Split BadUSB into BadUSB and BadBLE #3931

Merged
merged 6 commits into from
Oct 6, 2024
Merged

[FL-3896] Split BadUSB into BadUSB and BadBLE #3931

merged 6 commits into from
Oct 6, 2024

Conversation

Astrrra
Copy link
Member

@Astrrra Astrrra commented Oct 4, 2024 •
edited by skotopes
Loading

What's new

  • BadUSB no longer has any BLE functionality
  • Those features have been moved into a new app called BadBLE

Verification

  • Check that BadUSB works as expected over USB
  • Check that BadBLE works as expected over BLE

Checklist (For Reviewer)

  • PR has description of feature/bug or link to Confluence/Jira task
  • Description contains actions to verify feature/bugfix
  • I've built this code, uploaded it to the device and verified feature/bugfix

@Astrrra Astrrra marked this pull request as ready for review October 4, 2024 13:10
@github-actions GitHub Actions
Copy link

github-actions bot commented Oct 4, 2024 •
edited
Loading

Compiled f7 firmware for commit 94970171:

@skotopes skotopes merged commit 0eaad8b into dev Oct 6, 2024
11 checks passed
@skotopes skotopes deleted the astra/3896-bad-usble branch October 6, 2024 19:21
Astrrra added a commit that referenced this pull request Oct 15, 2024
@Astrrra
Revert "[FL-3896] Split BadUSB into BadUSB and BadBLE (#3931)"
3c5faf1 
This reverts commit 0eaad8b.
@Astrrra Astrrra mentioned this pull request Oct 15, 2024
Merged
3 tasks
skotopes added a commit that referenced this pull request Oct 15, 2024
@Astrrra @skotopes
[FL-3914] BackUSB (#3951)
a34e090 
* Revert "[FL-3896] Split BadUSB into BadUSB and BadBLE (#3931)"
  This reverts commit 0eaad8b.
* Better USB-BLE switch UX
* Format sources
* Format images

Co-authored-by: あく <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@skotopes skotopes skotopes approved these changes

@DrZlo13 DrZlo13 Awaiting requested review from DrZlo13 DrZlo13 is a code owner

@hedger hedger Awaiting requested review from hedger hedger is a code owner

@gsurkov gsurkov Awaiting requested review from gsurkov gsurkov is a code owner

@nminaylov nminaylov Awaiting requested review from nminaylov nminaylov is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Astrrra @skotopes