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

Add logic for AT90USBxx7 where needed #10203

Merged
merged 2 commits into from
Sep 27, 2020
Merged

Conversation

fauxpark
Copy link
Member

@fauxpark fauxpark commented Aug 30, 2020

Description

Setting MCU = at90usb647 or 1287 would fail to compile, because there were no checks in mcu_selection.mk, bootloader.mk, and a few other places, that would catch it.
The xx7 parts seem to be essentially identical to the xx6, however they also have the ability to act as a USB host. I don't think you can be in both modes at the same time though, but QMK doesn't have any host-mode capability anyway.

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

@fauxpark fauxpark requested a review from a team August 30, 2020 15:58
@tzarc tzarc requested a review from a team August 31, 2020 22:20
@drashna
Copy link
Member

drashna commented Sep 8, 2020

Issue here. if you set the MCU to the xxx7 variant, it won't compile because of the RESET keycode. Removing this keycode fixes the issue.

Specifically, thi issue is in <avr/iousbxx6_7.h>, line 733 (at least for 8.4.0. The at90usbxxx6 has RESET defined as part of it's config. Likely for how the USB is actually handled.

The fix would be to change the RESET keycode name. And would absolutely be a breaking change

@fauxpark fauxpark merged commit 70fce65 into qmk:master Sep 27, 2020
@fauxpark fauxpark deleted the at90usbxx7-add branch September 27, 2020 10:33
tomohisa pushed a commit to tomohisa/qmk_firmware that referenced this pull request Sep 28, 2020
* 'master' of https://github.com/qmk/qmk_firmware: (3643 commits)
  Swapparoo of bottom row keys (qmk#10277)
  [Keyboard] Add PloopyCo devices (qmk#7935)
  Keyboard update: SL40 (qmk#10445)
  [keyboard] Add SP-111 support (qmk#10193)
  Add logic for AT90USBxx7 where needed (qmk#10203)
  Trifecta Keymap
  [Docs] Wording & formatting changes in the Tapping Force Hold section of the Tap Hold page + removed trailing whitespaces (qmk#10391)
  `setrgb()`: Use arrow operator (qmk#10451)
  [Keyboard] add Percent Canoe Gen2 (qmk#10344)
  [Keyboard] add hannah65 by Team Mechlovin (qmk#10284)
  Fix Belgian sendstring properly (qmk#10444)
  Add VIA support for lazydesigners/the30 (qmk#10374)
  [Keyboard] add duckboard by doodboard (qmk#10318)
  Fix Belgian sendstring file (qmk#10443)
  [Keyboard] added Bolsa65 keyboard by FJLabs (qmk#10394)
  CLI/Doctor: Print QMK_HOME (qmk#10398)
  Add Wyvern Keyboard (qmk#10378)
  Adding Bear 65 Ergo Keyboard To QMK (qmk#10384)
  VIA Support: Gray Studio HB85 (qmk#10329)
  format code according to conventions [skip ci]
  ...
rgoulter pushed a commit to rgoulter/qmk_firmware that referenced this pull request Oct 4, 2020
kjganz pushed a commit to kjganz/qmk_firmware that referenced this pull request Oct 28, 2020
BorisTestov pushed a commit to BorisTestov/qmk_firmware that referenced this pull request May 23, 2024
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.

3 participants