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

Feature/alfrdmalr/keymap update #8174

Merged
merged 44 commits into from
Mar 3, 2020
Merged

Feature/alfrdmalr/keymap update #8174

merged 44 commits into from
Mar 3, 2020

Conversation

alfrdmalr
Copy link
Contributor

Description

  • add keymap for planck-sized boards
  • add fake trilayer function to handle two keys which both activate the same layer
  • moved some symbols around

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

@alfrdmalr
WIP do not merge
5d01cdf
@alfrdmalr
first pass at custom preonic layout
a8af5bd
@alfrdmalr
add auto shift and reset via leader key
99ec959
@alfrdmalr
revert WIP changes
a03b69b
@alfrdmalr
Update readme
9a929ca
@alfrdmalr
update copyright notice
01dc84d
@alfrdmalr
formatting changes
795e328
@alfrdmalr
fix: use MO instead of process_record_user
e4558f7
@alfrdmalr
added backslash and moved grave position
48b1828
@alfrdmalr
remove extraneous 'j' characer in NUMPAD template
0b8d7f3
@alfrdmalr
update template formatting
3ef6a5a
@alfrdmalr
remove process_record_user
d53a51d
@alfrdmalr
swap "!" with "@"
d58470a
@alfrdmalr
fix readme formatting
9788639
@alfrdmalr
update readme layout image
2aac6cb
@alfrdmalr
restore settings layer
c75f0a3
@alfrdmalr
add windows minimize sequence
12eb00b
@alfrdmalr
Merge branch 'master' into feature/userspace-alfrdmalr
c723fb9 
also add windows minimize leader sequence and fix settings layer
@alfrdmalr
fix: switch to correct seq function for three-key sequence
de7c5ad
@alfrdmalr
fix: missing semicolon
d2e50e3
@alfrdmalr
refactor: move keymap to userspace and generic 5x12 layout
2f0fbb1
@alfrdmalr
add numlock to numpad layer
bc10b60
@alfrdmalr
add readme
acd1002
@alfrdmalr
update readme formatting
e25cde7
@alfrdmalr
Merge branch 'master' into feature/userspace-alfrdmalr
33d160e
@alfrdmalr
remove unused wrappers from layout keymap
b98c72e
@alfrdmalr
update readme title to reflect new location
0a9eacc
@alfrdmalr
remove alfrdmalr directory from preonic/keymaps
cc035dd
@alfrdmalr
add ortho 4x12 support
d1b7855
@alfrdmalr
add 'trilayer' settings and update keymap
dca932c
@alfrdmalr
remove minimize sequence
5b48ab7
@alfrdmalr
clean up user config
757a627
@alfrdmalr
Merge pull request #1 from alfrdmalr/feature/userspace-alfrdmalr
cb9d629 
Feature/userspace alfrdmalr
@alfrdmalr
Merge branch 'feature/userspace-alfrdmalr' into feature/alfrdmalr/tri…
95df5f4 
…layer-settings
@alfrdmalr
add brightness controls
457ff88
@alfrdmalr
Merge branch 'master' of https://github.com/alfrdmalr/qmk_firmware
d14bc31
@alfrdmalr
Merge branch 'master' into feature/layouts/community/ortho4x12/alfrdmalr
3f9c300
@alfrdmalr
Merge branch 'master' into feature/alfrdmalr/trilayer-settings
c487df7
@alfrdmalr
Merge pull request #2 from alfrdmalr/feature/layouts/community/ortho4…
a050a33 
…x12/alfrdmalr

Feature/layouts/community/ortho4x12/alfrdmalr
@alfrdmalr
Merge branch 'master' into feature/alfrdmalr/trilayer-settings
5948fce
@alfrdmalr
Merge pull request #3 from alfrdmalr/feature/alfrdmalr/trilayer-settings
1e66ac6 
Feature/alfrdmalr/trilayer settings
@alfrdmalr
update settings ascii
2f86688
@alfrdmalr
moved some symbols around to make vim/linux smoother
f68b26f
@fauxpark fauxpark requested a review from a team February 27, 2020 18:11
noroadsleft
noroadsleft approved these changes Mar 3, 2020
View reviewed changes
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 ed6586e into qmk:master Mar 3, 2020
@noroadsleft
Copy link
Member

Thanks!

HokieGeek pushed a commit to HokieGeek/qmk_firmware that referenced this pull request Mar 5, 2020
@alfrdmalr @HokieGeek
[Keymap] Feature/alfrdmalr/keymap update (qmk#8174)
31b7e4f 
* WIP do not merge

* first pass at custom preonic layout

* add auto shift and reset via leader key

* Update readme

* update copyright notice

* formatting changes

* fix: use MO instead of process_record_user

* added backslash and moved grave position

* remove extraneous 'j' characer in NUMPAD template

* update template formatting

* remove process_record_user

* swap "!" with "@"

* fix readme formatting

* update readme layout image

* restore settings layer

* add windows minimize sequence

* fix: switch to correct seq function for three-key sequence

* fix: missing semicolon

* refactor: move keymap to userspace and generic 5x12 layout

* add numlock to numpad layer

* add readme

* update readme formatting

* remove unused wrappers from layout keymap

* update readme title to reflect new location

* remove alfrdmalr directory from preonic/keymaps

* add ortho 4x12 support

* add 'trilayer' settings and update keymap

* update SYMBOLS layer to SYMBOL

* remove minimize sequence

* clean up user config

* add brightness controls

* update settings ascii

* moved some symbols around to make vim/linux smoother
nesth pushed a commit to nesth/qmk_firmware that referenced this pull request Mar 5, 2020
Merge remote-tracking branch 'upstream/master'
4aeb119 
* upstream/master: (37 commits)
  Add RGB lighting through one of the free pins (qmk#8294)
  [Keymap] Adding the 4sStylZ xd75 (qmk#8285)
  YD60MQ refactor and Configurator layout support (qmk#8313)
  [Keyboard] Forget to ifdef Super16 led config (qmk#8314)
  [Keyboard] Switch to RGB Matrix for Super16 (qmk#8305)
  [Keymap] Keymap Update (qmk#8309)
  New Keyboard: SiddersKB Majbritt (Pronounced My Brit) (qmk#8260)
  [Keyboard] VIA Support: Tada68 (qmk#8289)
  [Keyboard] LFK78 refactor (qmk#7835)
  [Keymap] new userspace for ibnuda (qmk#8221)
  [Keymap] Add crd's equinox keymap (qmk#8251)
  [Keymap] Feature/alfrdmalr/keymap update (qmk#8174)
  Fix bootloader definition for namecard2x4 (qmk#8301)
  Update Hungarian keymap and add sendstring LUT (qmk#8220)
  Remove "ugly hack in usb_main.c" comments (qmk#8296)
  Update encoder functions for Iris VIA keymap (qmk#8295)
  Reduce PROGMEM usage for sendstring LUT (qmk#8109)
  [Docs] Update ISP Flashing guide (qmk#8149)
  Rewrite the Bathroom Epiphanies Frosty Flake matrix and LED handling (qmk#8243)
  Add onekey keymap for testing reset to bootloader. (qmk#8288)
  ...
@alfrdmalr alfrdmalr deleted the feature/alfrdmalr/keymap-update branch March 18, 2020 02:27
c0psrul3 pushed a commit to c0psrul3/qmk_firmware that referenced this pull request Mar 23, 2020
@alfrdmalr @c0psrul3
[Keymap] Feature/alfrdmalr/keymap update (qmk#8174)
31c6fd6 
* WIP do not merge

* first pass at custom preonic layout

* add auto shift and reset via leader key

* Update readme

* update copyright notice

* formatting changes

* fix: use MO instead of process_record_user

* added backslash and moved grave position

* remove extraneous 'j' characer in NUMPAD template

* update template formatting

* remove process_record_user

* swap "!" with "@"

* fix readme formatting

* update readme layout image

* restore settings layer

* add windows minimize sequence

* fix: switch to correct seq function for three-key sequence

* fix: missing semicolon

* refactor: move keymap to userspace and generic 5x12 layout

* add numlock to numpad layer

* add readme

* update readme formatting

* remove unused wrappers from layout keymap

* update readme title to reflect new location

* remove alfrdmalr directory from preonic/keymaps

* add ortho 4x12 support

* add 'trilayer' settings and update keymap

* update SYMBOLS layer to SYMBOL

* remove minimize sequence

* clean up user config

* add brightness controls

* update settings ascii

* moved some symbols around to make vim/linux smoother
sowbug pushed a commit to sowbug/qmk_firmware that referenced this pull request Apr 2, 2020
@alfrdmalr @sowbug
[Keymap] Feature/alfrdmalr/keymap update (qmk#8174)
a94b8da 
* WIP do not merge

* first pass at custom preonic layout

* add auto shift and reset via leader key

* Update readme

* update copyright notice

* formatting changes

* fix: use MO instead of process_record_user

* added backslash and moved grave position

* remove extraneous 'j' characer in NUMPAD template

* update template formatting

* remove process_record_user

* swap "!" with "@"

* fix readme formatting

* update readme layout image

* restore settings layer

* add windows minimize sequence

* fix: switch to correct seq function for three-key sequence

* fix: missing semicolon

* refactor: move keymap to userspace and generic 5x12 layout

* add numlock to numpad layer

* add readme

* update readme formatting

* remove unused wrappers from layout keymap

* update readme title to reflect new location

* remove alfrdmalr directory from preonic/keymaps

* add ortho 4x12 support

* add 'trilayer' settings and update keymap

* update SYMBOLS layer to SYMBOL

* remove minimize sequence

* clean up user config

* add brightness controls

* update settings ascii

* moved some symbols around to make vim/linux smoother
kylekuj pushed a commit to kylekuj/qmk_firmware that referenced this pull request Apr 21, 2020
@alfrdmalr @kujawakk
[Keymap] Feature/alfrdmalr/keymap update (qmk#8174)
a1cc866 
* WIP do not merge

* first pass at custom preonic layout

* add auto shift and reset via leader key

* Update readme

* update copyright notice

* formatting changes

* fix: use MO instead of process_record_user

* added backslash and moved grave position

* remove extraneous 'j' characer in NUMPAD template

* update template formatting

* remove process_record_user

* swap "!" with "@"

* fix readme formatting

* update readme layout image

* restore settings layer

* add windows minimize sequence

* fix: switch to correct seq function for three-key sequence

* fix: missing semicolon

* refactor: move keymap to userspace and generic 5x12 layout

* add numlock to numpad layer

* add readme

* update readme formatting

* remove unused wrappers from layout keymap

* update readme title to reflect new location

* remove alfrdmalr directory from preonic/keymaps

* add ortho 4x12 support

* add 'trilayer' settings and update keymap

* update SYMBOLS layer to SYMBOL

* remove minimize sequence

* clean up user config

* add brightness controls

* update settings ascii

* moved some symbols around to make vim/linux smoother
jakeisnt pushed a commit to jakeisnt/qmk_firmware that referenced this pull request Aug 20, 2020
@alfrdmalr @jakeisnt
[Keymap] Feature/alfrdmalr/keymap update (qmk#8174)
302daaf 
* WIP do not merge

* first pass at custom preonic layout

* add auto shift and reset via leader key

* Update readme

* update copyright notice

* formatting changes

* fix: use MO instead of process_record_user

* added backslash and moved grave position

* remove extraneous 'j' characer in NUMPAD template

* update template formatting

* remove process_record_user

* swap "!" with "@"

* fix readme formatting

* update readme layout image

* restore settings layer

* add windows minimize sequence

* fix: switch to correct seq function for three-key sequence

* fix: missing semicolon

* refactor: move keymap to userspace and generic 5x12 layout

* add numlock to numpad layer

* add readme

* update readme formatting

* remove unused wrappers from layout keymap

* update readme title to reflect new location

* remove alfrdmalr directory from preonic/keymaps

* add ortho 4x12 support

* add 'trilayer' settings and update keymap

* update SYMBOLS layer to SYMBOL

* remove minimize sequence

* clean up user config

* add brightness controls

* update settings ascii

* moved some symbols around to make vim/linux smoother
BorisTestov pushed a commit to BorisTestov/qmk_firmware that referenced this pull request May 23, 2024
@alfrdmalr
[Keymap] Feature/alfrdmalr/keymap update (qmk#8174)
1acca03 
* WIP do not merge

* first pass at custom preonic layout

* add auto shift and reset via leader key

* Update readme

* update copyright notice

* formatting changes

* fix: use MO instead of process_record_user

* added backslash and moved grave position

* remove extraneous 'j' characer in NUMPAD template

* update template formatting

* remove process_record_user

* swap "!" with "@"

* fix readme formatting

* update readme layout image

* restore settings layer

* add windows minimize sequence

* fix: switch to correct seq function for three-key sequence

* fix: missing semicolon

* refactor: move keymap to userspace and generic 5x12 layout

* add numlock to numpad layer

* add readme

* update readme formatting

* remove unused wrappers from layout keymap

* update readme title to reflect new location

* remove alfrdmalr directory from preonic/keymaps

* add ortho 4x12 support

* add 'trilayer' settings and update keymap

* update SYMBOLS layer to SYMBOL

* remove minimize sequence

* clean up user config

* add brightness controls

* update settings ascii

* moved some symbols around to make vim/linux smoother
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

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

Successfully merging this pull request may close these issues.
3 participants
@alfrdmalr @noroadsleft @fauxpark