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

Updates to personal keymaps #8665

Merged
merged 1 commit into from
Apr 9, 2020
Merged

Updates to personal keymaps #8665

merged 1 commit into from
Apr 9, 2020

Conversation

yanfali
Copy link
Contributor

@yanfali yanfali commented Apr 3, 2020

Personal keymap updates for WKL and upcoming TKC1800 changes

Description

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

@yanfali yanfali requested a review from a team April 3, 2020 20:03
@noroadsleft noroadsleft requested a review from a team April 5, 2020 04:15
@drashna drashna requested a review from a team April 5, 2020 05:53
@noroadsleft noroadsleft merged commit 6ef13f8 into qmk:master Apr 9, 2020
@noroadsleft
Copy link
Member

Thanks!

Shinichi-Ohki added a commit to Shinichi-Ohki/qmk_firmware that referenced this pull request Apr 9, 2020
@Shinichi-Ohki
Merge branch 'master' of https://github.com/qmk/qmk_firmware
e7edb70 
* 'master' of https://github.com/qmk/qmk_firmware: (53 commits)
  Set the correct RGB LED count on YD60MQ (qmk#8629)
  [Keymap] Updates to personal keymaps (qmk#8665)
  Fix compile issues related to NO_ACTION_MACRO/FUNCTION and LTO_ENABLE (qmk#8663)
  [Keymap] Userspace update Rgb layers code (qmk#8659)
  Add Choconum (qmk#8709)
  Add Via keymap for BM16-A (qmk#8681)
  Fix edge-case with config
  Don't hide for devs...
  Apply @skullydazed's suggestions, move 'import milc'
  Make dedicated sections for user/dev commands in docs
  Rebase on master, hide some other subcommands
  Use milc for config check, requirements fixes
  CLI: Add development mode support
  Update info.json (qmk#8723)
  format code according to conventions [skip ci]
  spi_master for AVR (qmk#8299)
  DennyTom's buttery_engine (qmk#8138)
  add via support for kira80 (qmk#8677)
  [Keyboard] Wheatfield Split75 (qmk#8511)
  Correctly handle json keymaps with ANY()
  ...
loadedsith added a commit to loadedsith/qmk_firmware that referenced this pull request Apr 9, 2020
@loadedsith
Merge branch 'master' into grahampheath
dfdbdca 
* master: (3035 commits)
  [Keymap] Update personal userspace and keymaps (qmk#8747)
  Add PS2_MOUSE_ROTATE to compensate for device orientation (qmk#8650)
  Add RGB support in via to launchpad (qmk#8621)
  VIA support for the KBDFans KBD6x (qmk#8680)
  Set the correct RGB LED count on YD60MQ (qmk#8629)
  [Keymap] Updates to personal keymaps (qmk#8665)
  Fix compile issues related to NO_ACTION_MACRO/FUNCTION and LTO_ENABLE (qmk#8663)
  [Keymap] Userspace update Rgb layers code (qmk#8659)
  Add Choconum (qmk#8709)
  Add Via keymap for BM16-A (qmk#8681)
  Fix edge-case with config
  Don't hide for devs...
  Apply @skullydazed's suggestions, move 'import milc'
  Make dedicated sections for user/dev commands in docs
  Rebase on master, hide some other subcommands
  Use milc for config check, requirements fixes
  CLI: Add development mode support
  Update info.json (qmk#8723)
  format code according to conventions [skip ci]
  spi_master for AVR (qmk#8299)
  ...

# Conflicts:
#	layouts/community/ortho_4x12/grahampheath/keymap.c
#	lib/lufa
loadedsith added a commit to loadedsith/qmk_firmware that referenced this pull request Apr 9, 2020
@loadedsith
Merge branch 'master' into grahampheath-iris
c625827 
* master: (208 commits)
  [Keymap] Update personal userspace and keymaps (qmk#8747)
  Add PS2_MOUSE_ROTATE to compensate for device orientation (qmk#8650)
  Add RGB support in via to launchpad (qmk#8621)
  VIA support for the KBDFans KBD6x (qmk#8680)
  Set the correct RGB LED count on YD60MQ (qmk#8629)
  [Keymap] Updates to personal keymaps (qmk#8665)
  Fix compile issues related to NO_ACTION_MACRO/FUNCTION and LTO_ENABLE (qmk#8663)
  [Keymap] Userspace update Rgb layers code (qmk#8659)
  Add Choconum (qmk#8709)
  Add Via keymap for BM16-A (qmk#8681)
  Fix edge-case with config
  Don't hide for devs...
  Apply @skullydazed's suggestions, move 'import milc'
  Make dedicated sections for user/dev commands in docs
  Rebase on master, hide some other subcommands
  Use milc for config check, requirements fixes
  CLI: Add development mode support
  Update info.json (qmk#8723)
  format code according to conventions [skip ci]
  spi_master for AVR (qmk#8299)
  ...
loadedsith added a commit to loadedsith/qmk_firmware that referenced this pull request Apr 9, 2020
@loadedsith
Merge branch 'master' into mygithub/launchpad
497cef9 
* master: (208 commits)
  [Keymap] Update personal userspace and keymaps (qmk#8747)
  Add PS2_MOUSE_ROTATE to compensate for device orientation (qmk#8650)
  Add RGB support in via to launchpad (qmk#8621)
  VIA support for the KBDFans KBD6x (qmk#8680)
  Set the correct RGB LED count on YD60MQ (qmk#8629)
  [Keymap] Updates to personal keymaps (qmk#8665)
  Fix compile issues related to NO_ACTION_MACRO/FUNCTION and LTO_ENABLE (qmk#8663)
  [Keymap] Userspace update Rgb layers code (qmk#8659)
  Add Choconum (qmk#8709)
  Add Via keymap for BM16-A (qmk#8681)
  Fix edge-case with config
  Don't hide for devs...
  Apply @skullydazed's suggestions, move 'import milc'
  Make dedicated sections for user/dev commands in docs
  Rebase on master, hide some other subcommands
  Use milc for config check, requirements fixes
  CLI: Add development mode support
  Update info.json (qmk#8723)
  format code according to conventions [skip ci]
  spi_master for AVR (qmk#8299)
  ...
HokieGeek pushed a commit to HokieGeek/qmk_firmware that referenced this pull request Apr 10, 2020
@yanfali @HokieGeek
[Keymap] Updates to personal keymaps (qmk#8665)
d9056b3
@yanfali yanfali deleted the yanfali-updates branch April 11, 2020 23:43
mrlinuxfish pushed a commit to mrlinuxfish/qmk_firmware that referenced this pull request Apr 12, 2020
@yanfali @mrlinuxfish
[Keymap] Updates to personal keymaps (qmk#8665)
8ac0be6
Quarren42 pushed a commit to Quarren42/qmk_firmware that referenced this pull request Apr 15, 2020
@yanfali @Quarren42
[Keymap] Updates to personal keymaps (qmk#8665)
b345b3b
kylekuj pushed a commit to kylekuj/qmk_firmware that referenced this pull request Apr 21, 2020
@yanfali @kujawakk
[Keymap] Updates to personal keymaps (qmk#8665)
d85ec91
bitherder pushed a commit to bitherder/qmk_firmware that referenced this pull request May 15, 2020
@yanfali @lorenzoernesto
[Keymap] Updates to personal keymaps (qmk#8665)
5950543
sowbug pushed a commit to sowbug/qmk_firmware that referenced this pull request May 24, 2020
@yanfali @sowbug
[Keymap] Updates to personal keymaps (qmk#8665)
52d5e80
turky pushed a commit to turky/qmk_firmware that referenced this pull request Jun 13, 2020
@yanfali @turky
[Keymap] Updates to personal keymaps (qmk#8665)
afa9d28
jakobaa pushed a commit to jakobaa/qmk_firmware that referenced this pull request Jul 7, 2020
@yanfali @jakobaa
[Keymap] Updates to personal keymaps (qmk#8665)
5a1ddb2
thorstenweber83 pushed a commit to thorstenweber83/qmk_firmware that referenced this pull request Sep 2, 2020
@yanfali @thorstenweber83
[Keymap] Updates to personal keymaps (qmk#8665)
1ce76a9
BorisTestov pushed a commit to BorisTestov/qmk_firmware that referenced this pull request May 23, 2024
@yanfali
[Keymap] Updates to personal keymaps (qmk#8665)
f369069
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@drashna drashna drashna approved these changes

@noroadsleft noroadsleft noroadsleft 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.

None yet
3 participants
@yanfali @noroadsleft @drashna