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

Fix RESET not working for keyboards with Kiibohd bootloader #15430

Merged
merged 4 commits into from
Dec 8, 2021

Conversation

Andrew-Fahmy
Copy link

@Andrew-Fahmy Andrew-Fahmy commented Dec 8, 2021

This is a fix for #6112. Keyboards with the Kiibohd bootloader would go into secure DFU mode. In secure DFU mode the bootloader would do an extra key verification where it would look for a key in the first block of the new firmware. There is a way to disable this functionality, and after talking with @haata, I was able to implement this fix.

I have a K-type and this fixed the issue on my keyboard. If anyone that has a different keyboard, let me know if this fix also works on your board.

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Issues Fixed or Closed by This PR

Checklist

  • My code follows the code style of this project: C, Python
  • I have read the PR Checklist document and have made the appropriate changes.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

Copy link
Member

@fauxpark fauxpark left a comment

Choose a reason for hiding this comment

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

If I understand this correctly, the change can be simplified as the current code is already modifying the VBAT register.

platforms/chibios/bootloader.c Outdated Show resolved Hide resolved
platforms/chibios/bootloader.c Outdated Show resolved Hide resolved
platforms/chibios/bootloader.c Outdated Show resolved Hide resolved
@Andrew-Fahmy
Copy link
Author

That's definitely a cleaner way of doing it, thanks for the suggestion!

@fauxpark fauxpark requested a review from a team December 8, 2021 02:23
@drashna drashna merged commit 755731f into qmk:master Dec 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

WhiteFox - RESET goes to "Kiibohd DFU Secure", cannot flash - needs to enter "Kiibohd DFU"
4 participants