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

Clean up ATSAM ifdefs #8808

Merged
merged 1 commit into from
Apr 20, 2020
Merged

Conversation

fauxpark
Copy link
Member

Description

For some reason the ATSAM code uses these three-letter defines for NKRO/mousekeys/extrakeys/console/raw/virtser/etc, when it really doesn't need to. I also reformatted the descriptors to be more readable.

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.
  • 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 April 15, 2020 09:52
@drashna
Copy link
Member

drashna commented Apr 19, 2020

/sigh

I know it's needed, but I would really love to see the massive PR from massdrop merged before this is, ... mostly so we can just get it in.

@fauxpark
Copy link
Member Author

fauxpark commented Apr 19, 2020

Well, the only changes to the arm_atsam/usb directory in #6568 is the USB2422 code, so these PRs don't actually overlap.

EDIT: Just grepped through the PR and there are exactly 0 instances of these old defines in the diff, so this should be OK to merge first.

Copy link
Member

@noroadsleft noroadsleft left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@noroadsleft noroadsleft merged commit 99f7fe6 into qmk:master Apr 20, 2020
@noroadsleft
Copy link
Member

Thanks!

@fauxpark fauxpark deleted the atsam-ifdef-cleanups branch April 20, 2020 22:39
kylekuj pushed a commit to kylekuj/qmk_firmware that referenced this pull request Apr 21, 2020
rockwarrior added a commit to rockwarrior/qmk_firmware that referenced this pull request Apr 23, 2020
* upstream: (1037 commits)
  [Keyboard] Add wasdat code controller (qmk#8858)
  fix sample code indent in feature_encoders.md (qmk#8883)
  [Keymap] Clean up my ergo keymaps and userspace (qmk#8857)
  idb 60 Bugfixes / Preparations for Open Source Hardware (qmk#8866)
  Rebound: add rev2 and thus rev1 as well (qmk#8630)
  Update vitamins included default keymap, enable NKRO, rev2 rgbsplit (qmk#8871)
  Update to xealousbrown. (qmk#8215)
  [Keyboard] DMQ Design SPIN (qmk#8820)
  Wheatfield Blocked65: Update RGBLED num (qmk#8725)
  Add VIA support to ID80 (qmk#8791)
  CFTKB Mysterium & Discipad VIA support (qmk#8794)
  Clean up ATSAM ifdefs (qmk#8808)
  [Docs] Japanese translation of docs/feature_encoders.md (qmk#8843)
  Add naked60 layout, clean up my userspace files and rules.mk. (qmk#8848)
  Fixing DecadePad Numlock LED Bug (qmk#8831)
  [Docs] Japanese translation of docs/feature_command.md (qmk#8672)
  Add support for YMD75 rev 2 (qmk#8853)
  Remove no-longer-necessary LTO checks from keyboards' config.h files (qmk#8773)
  Fix ta-65 tsangan layouts (qmk#8855)
  Fix Plain60 layout (qmk#8854)
  ...
violet-fish pushed a commit to violet-fish/qmk_firmware that referenced this pull request May 3, 2020
bitherder pushed a commit to bitherder/qmk_firmware that referenced this pull request May 15, 2020
drashna pushed a commit to zsa/qmk_firmware that referenced this pull request May 24, 2020
sowbug pushed a commit to sowbug/qmk_firmware that referenced this pull request May 24, 2020
fdidron pushed a commit to zsa/qmk_firmware that referenced this pull request Jun 12, 2020
turky pushed a commit to turky/qmk_firmware that referenced this pull request Jun 13, 2020
jakobaa pushed a commit to jakobaa/qmk_firmware that referenced this pull request Jul 7, 2020
sjmacneil pushed a commit to sjmacneil/qmk_firmware that referenced this pull request Feb 19, 2021
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