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

Cleanup Default Keymaps #5442

Merged
merged 3 commits into from Mar 19, 2019
Merged

Conversation

drashna
Copy link
Member

@drashna drashna commented Mar 19, 2019

Description

Cleans up the default keymap files for all keyboards:

  • Remove includes for config.h or config_common.h from keymap's config.h files
  • Replace include for keyboard file, with QMK_KEYBOARD_H
  • Remove extra includes that aren't needed (like action_layer.h, eeconfig.h, audio.h, rgblight.h, etc)
  • Remove unnecessary defines for XXXXXXX and _______ from default keymap.c

Types of Changes

  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)

Issues Fixed or Closed by This PR

Checklist

  • My code follows the code style of this project.
  • 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
Contributor

@yanfali yanfali left a comment

Choose a reason for hiding this comment

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

LGTM

@drashna
Copy link
Member Author

drashna commented Mar 19, 2019

I did find a couple of errors when doing this, but they're compiler specific stuff.... And Travis CI is having some issues. I've opened PRs for those fixes separately.

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.

I do still see some redundant defines in default keymaps, but this is great for now IMO.

Copy link
Contributor

@mechmerlin mechmerlin left a comment

Choose a reason for hiding this comment

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

How dare you fix other people's keymaps!!!??? Default is going to be very mad at you! =P

@mechmerlin mechmerlin merged commit 0072fdd into qmk:master Mar 19, 2019
@drashna drashna deleted the cleanup/default_keymaps branch March 19, 2019 20:49
@drashna
Copy link
Member Author

drashna commented Mar 19, 2019

@noroadsleft I wasn't too concerned about the defines. I was more concerned about the includes, actually. Also, some of the _____ and xxxxx defines are not 7 characters long, which is why I left those.

loadedsith added a commit to loadedsith/qmk_firmware that referenced this pull request Mar 19, 2019
* master: (476 commits)
  [Keymap] Boy_314's Halfnhalf layout update (qmk#5441)
  [Keyboard] Remove unnecessary IS_COMMAND definitions from a couple of boards (qmk#5269)
  Cleanup Default Keymaps  (qmk#5442)
  Fix dk60 compiler issue on newer compiler versions (qmk#5444)
  correct typo in eeprom split target for dfu (qmk#5445)
  [Docs] Recursively clone qmk_firmware repo (qmk#5378)
  [Docs] Smallish overhaul of the docs (qmk#5281)
  [Keyboard] Reduce compile size of the Lily58 Keyboard (qmk#5412)
  [Docs] Add music_map to audio documentation (qmk#5419)
  [Keymap] PyroL's TMO50 layout update (qmk#5435)
  [Keymap] Add vim-style keymap for lets split (qmk#5399)
  [Keyboard] CannonKeys Instant60 Keyboard (qmk#5433)
  [Keymap] add android studio keyboard shortcuts to dvorak 42 key atreus / ergodox layouts (qmk#5423)
  [Keymap] Updated layout after some months of testing. (qmk#5427)
  [Keyboard] Corrected layout for top row keys (qmk#5429)
  [Keyboard] Add Jot50 handwired board (qmk#5431)
  [Keyboard] layout fixed in jotanck.h (qmk#5432)
  [Keyboard] correct indicator light states (qmk#5434)
  [Keyboard] Fix matrix positions for HotDox (qmk#5437)
  [Keymap] Arkag Userspace Update (qmk#5438)
  ...

# Conflicts:
#	keyboards/keebio/iris/rules.mk
#	layouts/community/ortho_4x12/grahampheath/keymap.c
chie4hao pushed a commit to chie4hao/qmk_firmware that referenced this pull request Mar 28, 2019
* Cleanup Default Keymaps to conform to QMK Firmware standards

* Minor fixes

* Revert some changes
zer09 pushed a commit to zer09/qmk_firmware that referenced this pull request Mar 31, 2019
* Cleanup Default Keymaps to conform to QMK Firmware standards

* Minor fixes

* Revert some changes
danielo515 pushed a commit to danielo515/qmk_firmware that referenced this pull request May 15, 2019
* Cleanup Default Keymaps to conform to QMK Firmware standards

* Minor fixes

* Revert some changes
Timbus pushed a commit to Timbus/qmk_firmware that referenced this pull request Jun 23, 2019
* Cleanup Default Keymaps to conform to QMK Firmware standards

* Minor fixes

* Revert some changes
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.

None yet

4 participants