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

Userspace refactor, adding leader key functionality #7790

Merged
merged 6 commits into from
Jan 9, 2020

Conversation

Curry
Copy link
Contributor

@Curry Curry commented Jan 4, 2020

Description

Updating my userspace that was recently commited to be more uniform, as well as fix a couple of problems that I missed the first time through.

  • Separated rgb_stuff.c logic into two files, one for rgb_matrix & one for rgb_lighting
  • Added support for leader keys, moved matrix_scan_user to leader.c
  • Moved common rules from keymap rules.mk to userspace rules.mk
  • Fixed lily58 not building due to redefining OLED_FONT_H
  • Made pre-processor statements uniform throughout all files
  • Removed unnecessary pre-processor statements for the scope of my keyboards
  • Enabled Unicode and added them to the keymaps ಠ_ಠ
  • Formatting based on clang-format
  • Fixed layout switching, accidentally deleted block of code that allowed for layout switches.

Types of Changes

  • Bugfix
  • Keymap/layout/userspace (addition or update)

Checklist

  • My code follows the code style of this project.
  • I have read the CONTRIBUTING document.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

Comments

I refactored most of the header files in my userspace to use least amount of #includes. If this is not a practice that you guys enforce, and prefer me to put as many includes as possible in the headers to simplify the includes in the source file, let me know and I will change them.

@drashna drashna requested a review from a team January 5, 2020 00:43
@drashna drashna added the keymap label Jan 5, 2020
@Curry Curry force-pushed the user_curry_refactor branch 2 times, most recently from 35d913b to 1152ee5 Compare January 8, 2020 02:31
@Curry
Copy link
Contributor Author

Curry commented Jan 8, 2020

Rebased with master to hopefully have CI build pass

@Curry Curry force-pushed the user_curry_refactor branch from b5ea9a3 to 45ae34d Compare January 9, 2020 14:29
Copy link
Contributor

@ridingqwerty ridingqwerty 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

@drashna drashna merged commit caa70df into qmk:master Jan 9, 2020
@drashna
Copy link
Member

drashna commented Jan 9, 2020

Thanks!

@Curry Curry deleted the user_curry_refactor branch January 9, 2020 22:26
HokieGeek pushed a commit to HokieGeek/qmk_firmware that referenced this pull request Feb 21, 2020
* Userspace refactor

* Fixed missed ifdef

* tapcode16, adjust layout

* glcdfont changes from qmk#7745

* Modify Keymaps, add workman

* RGB & OLED update
kylekuj pushed a commit to kylekuj/qmk_firmware that referenced this pull request Apr 21, 2020
* Userspace refactor

* Fixed missed ifdef

* tapcode16, adjust layout

* glcdfont changes from qmk#7745

* Modify Keymaps, add workman

* RGB & OLED update
BorisTestov pushed a commit to BorisTestov/qmk_firmware that referenced this pull request May 23, 2024
* Userspace refactor

* Fixed missed ifdef

* tapcode16, adjust layout

* glcdfont changes from qmk#7745

* Modify Keymaps, add workman

* RGB & OLED update
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