summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-05-24Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne
2016-05-24Converted audio play functions to *_user (#349)Jack Humbert
* 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
2016-05-24Clean up #343's code (#348)Eric Tang
2016-05-23updates midi in play_note to better octaveJack Humbert
2016-05-23Optimize matrix scanning (#343)Eric Tang
2016-05-20adds petereichinger's planck keymap (#340)Peter
* Add custom keymap * A little readme and remove old layout comments
2016-05-19Merge pull request #324 from Bubblepoint/masterErez Zukerman
Add adnw/k_o_y layout
2016-05-19fixed small bug with AUDIO_ENABLED (#339)purpleP
2016-05-18adapts unicode to quantum.c (#333)Jack Humbert
* 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
2016-05-18outputs size when make dfuingJack Humbert
2016-05-18adds music and audio toggles (#337)Jack Humbert
* 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
2016-05-18Added Swiss-German keymap. (#335)heartsekai
2016-05-17adds KC_NUBS, KC_NUHS and shifted versions to default keymapsJack Humbert
2016-05-16fixes default planck keymapJack Humbert
2016-05-15Folders for each keymap.c file (#332)Jacob Bilger
* Add folders to keymaps * test * test
2016-05-15cleans up default keymaps (olkb)Jack Humbert
2016-05-15updates midi functionality (#331)Jack Humbert
* 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
2016-05-15splits process_action up to handle records separately (#329)Jack Humbert
* 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 * merging?
2016-05-15adds a sequencer to the music mode (#330)Jack Humbert
* 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
2016-05-15Leader key implementation (#326)Erez Zukerman
* 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
2016-05-14Adds explanatory note re history of TMK and QMKErez Zukerman
2016-05-14adds Bilger321's planck keymapJacob Bilger
2016-05-14readme addedTobias Matt
2016-05-13Merge pull request #320 from Townk/townkmapErez Zukerman
Townkmap
2016-05-13Merge pull request #317 from Twey/masterErez Zukerman
Updates to `keymaps/twey` to the media layer and for Plover 3.0
2016-05-13Merge pull request #307 from sboesebeck/masterErez Zukerman
minor change to default layouts
2016-05-13Merge remote-tracking branch 'upstream/master'Tobias Matt
2016-05-12[planck] adds button for toggling output in plover app (#323)cwhits
* [planck] toggle plover output in app when toggling plover layer on keyboard * [planck] moved plover toggle to separate key * [planck] renamed toggle button
2016-05-11Remove unused variable on the keymap.Thiago Alves
2016-05-11Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck
2016-05-11Add an initial Readme to the keymap.Thiago Alves
2016-05-10[Erez & Jack] Documents audio outputErez Zukerman
2016-05-10Tweak some key positions and changed macro location.Thiago Alves
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.
2016-05-10Add custom config.h and revert the changes on the global one.Thiago Alves
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.
2016-05-10keymaps/twey: fix documentationJames ‘Twey’ Kay
2016-05-10keymaps/twey: Plover 3.0 has a standard TOGGLE keybinding; use that insteadJames ‘Twey’ Kay
2016-05-10keymaps/twey: Add more history keys to media layer; stop using toggleable ↵James ‘Twey’ Kay
media layer
2016-05-09Update build guide with instructions to copy the whole keymap folder (#315)Peter
2016-05-09Update the .hex file on the keymap folder.Thiago Alves
2016-05-09Revert the Makefile to the original one.Thiago Alves
Make sure I customize things as much as possible inside the keymap itself.
2016-05-09Change the access to the extra layer to be simetric.Thiago Alves
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.
2016-05-09Add my personal keymap for OSX use.Thiago Alves
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.
2016-05-09Backlight Breathing for Planck and AtomicJack Humbert
* 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 * adds backlight pulse to planck
2016-05-09quantum accommodates more than 16 columnsJack Humbert
2016-05-08Adds next tab/prev tab back to symb layer and updates legendErez Zukerman
2016-05-08A little more tweakingErez Zukerman
2016-05-08Tweaks layers 1 & 2 in my experimental layoutErez Zukerman
2016-05-06Merge pull request #311 from adiabatic/ergodox-zweihander-osxErez Zukerman
Add KC_LABK and KC_RABK (< and >)
2016-05-06Add KC_L[LR]ABK to top-level READMENathan Sharfi
2016-05-06Merge pull request #310 from nrrkeene/masterErez Zukerman
Lock layers by pressing both shift keys