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

Allow APM32 MCUs on certain CannonKeys PCBs #10899

Merged
merged 5 commits into from
Dec 4, 2020

Conversation

awkannan
Copy link
Contributor

@awkannan awkannan commented Nov 9, 2020

Description

Allow APM32 MCUs on certain CannonKeys PCBs
We'll do this by removing the DFU suffix which locks in the firmware to just STM32 device ids.

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).

@drashna
Copy link
Member

drashna commented Nov 16, 2020

Didn't we want FFFF for the VID/PID combo, as this seems to work with dfu-util?

@awkannan
Copy link
Contributor Author

Yup, I haven't had a chance to update my PRs since that convo - I will make the changes

keyboards/cannonkeys/an_c/rules.mk Show resolved Hide resolved
keyboards/cannonkeys/db60/rules.mk Show resolved Hide resolved
keyboards/cannonkeys/devastatingtkl/rules.mk Show resolved Hide resolved
keyboards/cannonkeys/instant60/rules.mk Show resolved Hide resolved
keyboards/cannonkeys/instant65/rules.mk Show resolved Hide resolved
keyboards/cannonkeys/obliterated75/rules.mk Show resolved Hide resolved
keyboards/cannonkeys/rekt1800/rules.mk Show resolved Hide resolved
keyboards/cannonkeys/satisfaction75/rules.mk Show resolved Hide resolved
keyboards/cannonkeys/savage65/rules.mk Show resolved Hide resolved
keyboards/cannonkeys/tmov2/rules.mk Show resolved Hide resolved
@zvecr zvecr requested a review from a team December 2, 2020 19:18
Co-authored-by: Joel Challis <git@zvecr.com>
@zvecr zvecr requested a review from a team December 2, 2020 22:06
@drashna drashna requested a review from a team December 4, 2020 02:20
@drashna drashna merged commit 0f086df into qmk:master Dec 4, 2020
xgnxs pushed a commit to xgnxs/qmk_firmware that referenced this pull request Jan 9, 2021
* Allow APM32 MCUs on certain CannonKeys PCBs

* another one

* Update DFU suffix args

* missed one

* Apply suggestions from code review

Co-authored-by: Joel Challis <git@zvecr.com>

Co-authored-by: Joel Challis <git@zvecr.com>
mgmanzella pushed a commit to mgmanzella/qmk_firmware that referenced this pull request Feb 16, 2021
* Allow APM32 MCUs on certain CannonKeys PCBs

* another one

* Update DFU suffix args

* missed one

* Apply suggestions from code review

Co-authored-by: Joel Challis <git@zvecr.com>

Co-authored-by: Joel Challis <git@zvecr.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants