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.

Sign up for GitHub

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

Jump to bottom

Add @cjuniet's keymap/layout/userspace #8258

Merged
merged 5 commits into from
Mar 5, 2020
Merged

Add @cjuniet's keymap/layout/userspace #8258

merged 5 commits into from
Mar 5, 2020

Conversation

cjuniet
Copy link

@cjuniet cjuniet commented Feb 27, 2020 •
edited
Loading

Description

Add @cjuniet's userspace and keymap for Kyria keyboards.

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

  • This firmware will show modifiers & locks states as a status bar on the master OLED display, with icons from a custom font:
    IMG_20200228_210427

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 changes Feb 27, 2020
View reviewed changes
keyboards/kyria/keymaps/cjuniet/keymap.c Outdated Show resolved Hide resolved
keyboards/kyria/keymaps/cjuniet/keymap.c Outdated Show resolved Hide resolved
users/cjuniet/glcdfont.c Outdated Show resolved Hide resolved
users/cjuniet/cjuniet.h Outdated Show resolved Hide resolved
users/cjuniet/cjuniet.h Outdated Show resolved Hide resolved
@fauxpark fauxpark requested a review from a team February 27, 2020 15:18
@cjuniet
Copy link
Author

cjuniet commented Feb 27, 2020

@fauxpark Thanks for the review. I've applied all your requested changes.

drashna
drashna approved these changes Mar 1, 2020
View reviewed changes
Copy link
Member

@drashna drashna 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!

keyboards/kyria/keymaps/cjuniet/keymap.c Outdated Show resolved Hide resolved
@drashna drashna requested a review from a team March 1, 2020 00:34
@drashna drashna requested a review from a team March 1, 2020 01:01
@drashna drashna requested a review from a team March 4, 2020 09:54
@noroadsleft noroadsleft merged commit 8fd8454 into qmk:master Mar 5, 2020
@noroadsleft
Copy link
Member

For future reference, we recommend against committing to your master branch as you've done here, because pull requests from modified master branches can make it more difficult to keep your QMK fork updated. It is highly recommended for QMK development – regardless of what is being done or where – to keep your master updated, but NEVER commit to it. Instead, do all your changes in a branch (branches are basically free in Git) and issue PRs from your branches when you're developing.

There are instructions on how to keep your fork updated here:

Best Practices: Your Fork's Master: Update Often, Commit Never

Part 3 of our Best Git Practices section walks you through how to resynchronize your branch. If you need any help with this just ask.

Thanks for your contribution!

HokieGeek pushed a commit to HokieGeek/qmk_firmware that referenced this pull request Mar 5, 2020
@noroadsleft @HokieGeek
[Keymap] Add @cjuniet's keymap/layout/userspace (qmk#8258)
59499f9 
* Add Colemak layout

* Add status bar for mods & locks with a custom font

* Swap DEL and TAB

* Fix media keys and add QMK Configurator layout

* Add dead grave accent on <leader>e
c0psrul3 pushed a commit to c0psrul3/qmk_firmware that referenced this pull request Mar 23, 2020
@noroadsleft @c0psrul3
[Keymap] Add @cjuniet's keymap/layout/userspace (qmk#8258)
a7dbfdb 
* Add Colemak layout

* Add status bar for mods & locks with a custom font

* Swap DEL and TAB

* Fix media keys and add QMK Configurator layout

* Add dead grave accent on <leader>e
sowbug pushed a commit to sowbug/qmk_firmware that referenced this pull request Apr 2, 2020
@noroadsleft @sowbug
[Keymap] Add @cjuniet's keymap/layout/userspace (qmk#8258)
ef3dfbf 
* Add Colemak layout

* Add status bar for mods & locks with a custom font

* Swap DEL and TAB

* Fix media keys and add QMK Configurator layout

* Add dead grave accent on <leader>e
kylekuj pushed a commit to kylekuj/qmk_firmware that referenced this pull request Apr 21, 2020
@noroadsleft @kujawakk
[Keymap] Add @cjuniet's keymap/layout/userspace (qmk#8258)
36d42be 
* Add Colemak layout

* Add status bar for mods & locks with a custom font

* Swap DEL and TAB

* Fix media keys and add QMK Configurator layout

* Add dead grave accent on <leader>e
nesth pushed a commit to nesth/qmk_firmware that referenced this pull request Jun 11, 2020
Merge remote-tracking branch 'upstream/master'
a3f6921 
* upstream/master:
  [Keyboard] add miller/gm-862 keyboard (qmk#8230)
  update lily58/rev1:yshrsmz (qmk#8298)
  [Keyboard] CapsUnlocked CU80 (qmk#8257)
  Update config.h - Fixed number of RGB LEDs (qmk#8316)
  [Keymap] Add @cjuniet's keymap/layout/userspace (qmk#8258)
  [Keymap] Wilba/Singav3 nk65 keymap updates (qmk#8267)
jakeisnt pushed a commit to jakeisnt/qmk_firmware that referenced this pull request Aug 20, 2020
@noroadsleft @jakeisnt
[Keymap] Add @cjuniet's keymap/layout/userspace (qmk#8258)
2c8f3d4 
* Add Colemak layout

* Add status bar for mods & locks with a custom font

* Swap DEL and TAB

* Fix media keys and add QMK Configurator layout

* Add dead grave accent on <leader>e
BorisTestov pushed a commit to BorisTestov/qmk_firmware that referenced this pull request May 23, 2024
@noroadsleft
[Keymap] Add @cjuniet's keymap/layout/userspace (qmk#8258)
720302b 
* Add Colemak layout

* Add status bar for mods & locks with a custom font

* Swap DEL and TAB

* Fix media keys and add QMK Configurator layout

* Add dead grave accent on <leader>e
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@noroadsleft noroadsleft noroadsleft approved these changes

@fauxpark fauxpark fauxpark approved these changes

@drashna drashna drashna approved these changes

Assignees
No one assigned
Labels
keymap
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@cjuniet @noroadsleft @drashna @fauxpark