summaryrefslogtreecommitdiffstats
path: root/keyboard
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-05-26241-21344/+3520
|\
| * ergodox_ez: Add a SuperCoder keymapGergely Nagy2016-05-267-0/+965
| | | | | | | | | | | | Inspired by @faxm0dem, and the SuperCoder 2000 "keyboard". Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
| * Add single and double quotes to numpad layerNathan Sharfi2016-05-252-1181/+1240
| | | | | | | | …as well as recover from a bunch of Git user errors.
| * Add double quote for everyone; update ZweihanderNathan Sharfi2016-05-251-4/+11
| |
| * [Erez & Jack] Removes keyboards which are not active on qmkErez Zukerman2016-05-24227-18987/+201
| |
| * [Erez & Jack] Packages Space Cadet shifts into keycodesErez Zukerman2016-05-243-1164/+1044
| |
| * [Erez & Jack] Documents new Leader key functionalityErez Zukerman2016-05-244-1120/+1171
| |
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-05-24130-10106/+24150
|\|
| * Converted audio play functions to *_user (#349)Jack Humbert2016-05-244-228/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Updated personal layouts * tweaked personal * Nightly - Audio Cleanup Refactored the LUTs. Abstracted some of the registers out of audio to use more functional names. Split audio into audio and audio_pwm. WIP * nightly - collapsed code * Added check for note playing to LEDs * Usability tweaks * TWEAE * nightly added extra kcs to keymap common * turned on Plank audio * Added backlight breathing to atomic * reverted accidental merge * Added music and audio toggles to Quantum.c * Redid the audio callbacks * Adjusted default planck layout to use the user tone naming * tabs to spaces * Rewrote the ALL recipe to allow for faster parallel make * tabs to spaces * Renamed custom event functions to be 'startup_user' and 'shutdown_user'. Also moved the prototypes around. * Tweaked pvc atomic layout to work with the pvc planck. * updates midi scale calling
| * Optimize matrix scanning (#343)Eric Tang2016-05-2313-77/+85
| |
| * adds petereichinger's planck keymap (#340)Peter2016-05-203-0/+239
| | | | | | | | | | | | * Add custom keymap * A little readme and remove old layout comments
| * Merge pull request #324 from Bubblepoint/masterErez Zukerman2016-05-193-0/+1344
| |\ | | | | | | Add adnw/k_o_y layout
| | * readme addedTobias Matt2016-05-141-0/+7
| | |
| | * Merge remote-tracking branch 'upstream/master'Tobias Matt2016-05-1399-9693/+21945
| | |\
| | * | switch shift and enter thumb keyTobias Matt2016-04-282-5/+5
| | | |
| | * | update hex fileTobias Matt2016-04-281-1/+1
| | | |
| | * | shift to thumb keyTobias Matt2016-04-281-3/+3
| | | |
| | * | add hex fileTobias Matt2016-04-261-0/+1152
| | | |
| | * | organize in subfolderTobias Matt2016-04-261-0/+0
| | | |
| | * | basic layoutBubblepoint2016-04-261-0/+185
| | | |
| * | | adapts unicode to quantum.c (#333)Jack Humbert2016-05-182-0/+327
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Unicode to have unicode input you need to: - set your OS input method to UNICODE if needed - enable unicode in your makefile - copy the action_function from keyboard/planck/keymaps/unicode/unicode.c to your keymap.c set the target OS method in your keymap.c: void matrix_init_user() { set_unicode_mode(UC_OSX); } you can then switch when you want with: set_unicode_mode(UC_OSX); set_unicode_mode(UC_LNX); set_unicode_mode(UC_WIN); put some unicode codes in your keymap like so: UC(0x0061) I did change the bit mask in quantum/keymap_common.c and .h I’m afraid we will need uint32 to get a total support for all unicode tables or relocate the handler as @mbarkhau did. * rearranges keycode values, hooks-up unicode * removes extra lalt ref * adds unicode shortcuts and example
| * | | adds music and audio toggles (#337)Jack Humbert2016-05-181-20/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Updated personal layouts * tweaked personal * Nightly - Audio Cleanup Refactored the LUTs. Abstracted some of the registers out of audio to use more functional names. Split audio into audio and audio_pwm. WIP * nightly - collapsed code * Added check for note playing to LEDs * Usability tweaks * TWEAE * nightly added extra kcs to keymap common * turned on Plank audio * Added backlight breathing to atomic * reverted accidental merge * Added music and audio toggles to Quantum.c * Redid the audio callbacks * music/audio_on_user
| * | | adds KC_NUBS, KC_NUHS and shifted versions to default keymapsJack Humbert2016-05-173-12/+12
| | | |
| * | | fixes default planck keymapJack Humbert2016-05-161-1/+0
| | | |
| * | | Folders for each keymap.c file (#332)Jacob Bilger2016-05-1525-1151/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add folders to keymaps * test * test
| * | | cleans up default keymaps (olkb)Jack Humbert2016-05-154-184/+7
| | | |
| * | | updates midi functionality (#331)Jack Humbert2016-05-152-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * implements leader key for planck experimental * allows override of leader timeout * adds ability to use the leader key in seq * fixes leader keycode * adds chording prototype * fixes keycode detection * moves music mode to quantum.c * disables chording by default * adds music sequencer functionality * implements audio/music functions in quantum.c * splits up process_action to allow independent processing of actions * moves midi stuff to quantum.c * adds additional scales for midi
| * | | adds a sequencer to the music mode (#330)Jack Humbert2016-05-151-69/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * implements leader key for planck experimental * allows override of leader timeout * adds ability to use the leader key in seq * fixes leader keycode * adds chording prototype * fixes keycode detection * moves music mode to quantum.c * disables chording by default * adds music sequencer functionality * implements audio/music functions in quantum.c * Merge branch 'master' into process-record
| * | | Leader key implementation (#326)Erez Zukerman2016-05-159-48/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * implements leader key for planck experimental * allows override of leader timeout * adds ability to use the leader key in seq * fixes leader keycode * adds chording prototype * fixes keycode detection * moves music mode to quantum.c * disables chording by default * updates process_action functions to return bool
| * | | adds Bilger321's planck keymapJacob Bilger2016-05-144-0/+1208
| | | |
| * | | Merge pull request #320 from Townk/townkmapErez Zukerman2016-05-138-0/+1624
| |\ \ \ | | | | | | | | | | Townkmap
| | * | | Remove unused variable on the keymap.Thiago Alves2016-05-111-2/+0
| | | | |
| | * | | Add an initial Readme to the keymap.Thiago Alves2016-05-114-0/+77
| | | | |
| | * | | Tweak some key positions and changed macro location.Thiago Alves2016-05-102-1242/+1229
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After using the layout a while I learn that the - and = positions should be swapped since I keep typing = when I intend to type -. I also, removed the only macro from the top left on the right hand to put the power button there and since I never use the arrow keys on the separated groups of keys, I added 4 macros there to get a feel for it.
| | * | | Add custom config.h and revert the changes on the global one.Thiago Alves2016-05-103-2/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some options I defined on the config.h file don't make much sense to other keymaps so I revert the global config.h and add those options on the keymap custom one.
| | * | | Update the .hex file on the keymap folder.Thiago Alves2016-05-091-1166/+1179
| | | | |
| | * | | Revert the Makefile to the original one.Thiago Alves2016-05-092-1/+3
| | | | | | | | | | | | | | | | | | | | Make sure I customize things as much as possible inside the keymap itself.
| | * | | Change the access to the extra layer to be simetric.Thiago Alves2016-05-092-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of having a key on the left side for one layer and a key on the right side for the other layer, I put two dedicated layers on each side to get to the proper layers.
| | * | | Add my personal keymap for OSX use.Thiago Alves2016-05-094-1/+1456
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This keymap was created to have a feel keys on a different place and to have as fewer layers as possible. Currently I have only 2 extra layers and only one of them is really required to have all possible keys available. Check out the README.md file for more information.
| * | | | Merge pull request #317 from Twey/masterErez Zukerman2016-05-132-25/+27
| |\ \ \ \ | | | | | | | | | | | | Updates to `keymaps/twey` to the media layer and for Plover 3.0
| | * | | | keymaps/twey: fix documentationJames ‘Twey’ Kay2016-05-101-2/+2
| | | | | |
| | * | | | keymaps/twey: Plover 3.0 has a standard TOGGLE keybinding; use that insteadJames ‘Twey’ Kay2016-05-102-11/+13
| | | | | |
| | * | | | keymaps/twey: Add more history keys to media layer; stop using toggleable ↵James ‘Twey’ Kay2016-05-101-12/+12
| | |/ / / | | | | | | | | | | | | | | | media layer
| * | | | Merge pull request #307 from sboesebeck/masterErez Zukerman2016-05-135-11/+1503
| |\ \ \ \ | | |