Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-05-11 | 51 | -2722/+4081 |
|\ | |||||
| * | [Erez & Jack] Documents audio output | Erez Zukerman | 2016-05-10 | 1 | -0/+49 |
| | | |||||
| * | Update build guide with instructions to copy the whole keymap folder (#315) | Peter | 2016-05-09 | 1 | -2/+2 |
| | | |||||
| * | Backlight Breathing for Planck and Atomic | Jack Humbert | 2016-05-09 | 21 | -201/+1153 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| * | quantum accommodates more than 16 columns | Jack Humbert | 2016-05-09 | 1 | -5/+12 |
| | | |||||
| * | Adds next tab/prev tab back to symb layer and updates legend | Erez Zukerman | 2016-05-08 | 2 | -4/+4 |
| | | |||||
| * | A little more tweaking | Erez Zukerman | 2016-05-08 | 2 | -12/+12 |
| | | |||||
| * | Tweaks layers 1 & 2 in my experimental layout | Erez Zukerman | 2016-05-08 | 3 | -29/+37 |
| | | |||||
| * | Merge pull request #311 from adiabatic/ergodox-zweihander-osx | Erez Zukerman | 2016-05-06 | 3 | -10/+18 |
| |\ | | | | | | | Add KC_LABK and KC_RABK (< and >) | ||||
| | * | Add KC_L[LR]ABK to top-level README | Nathan Sharfi | 2016-05-06 | 1 | -0/+2 |
| | | | |||||
| | * | Rearrange code layer on Zweihander | Nathan Sharfi | 2016-05-06 | 1 | -6/+6 |
| | | | | | | | | | | | | Makes it more like the iOS keyboard (and therefore easier to remember). Also adds angle brackets for HTML and comparisons. | ||||
| | * | Add KC_LABK and KC_RABK (< and >) | Nathan Sharfi | 2016-05-06 | 1 | -0/+6 |
| | | | |||||
| | * | zweihander: add ⌘X, ⌘C, ⌘V to media thumb keys | Nathan Sharfi | 2016-05-06 | 1 | -4/+4 |
| | | | |||||
| * | | Merge pull request #310 from nrrkeene/master | Erez Zukerman | 2016-05-06 | 11 | -1317/+1400 |
| |\ \ | | | | | | | | | Lock layers by pressing both shift keys | ||||
| | * | | The Ordinary Layout is the layout you are looking for. Come and see. | Nicholas Keene | 2016-05-05 | 2 | -1075/+1075 |
| | | | | |||||
| | * | | The Ordinary Layout is extraordinarily familiar and powerful | Nicholas Keene | 2016-05-05 | 11 | -1325/+1373 |
| | | | | |||||
| | * | | The Ordinary Layout is the most natural and powerful layout for the Ergodox ↵ | Nicholas Keene | 2016-05-04 | 9 | -1249/+1284 |
| | | | | | | | | | | | | | | | | EZ. Come check it out. | ||||
| * | | | Uses @eltang's famous macro! Still not perfect though :( | Erez Zukerman | 2016-05-05 | 2 | -1150/+1162 |
| | | | | |||||
| * | | | [Erez & Jack] Updates docs with one-shot information and config_user.h | Erez Zukerman | 2016-05-05 | 1 | -1/+13 |
| | | | | |||||
| * | | | [Jack & Erez] Defines MOD_HYPR and MOD_MEH | Erez Zukerman | 2016-05-05 | 1 | -0/+3 |
| | | | | |||||
| * | | | [Jack & Erez] Creates a makefile.mk and a config file for the experimental ↵ | Erez Zukerman | 2016-05-05 | 2 | -0/+13 |
| | | | | | | | | | | | | | | | | layout | ||||
| * | | | [Jack & Erez] Enables config_user.h per keymap | Erez Zukerman | 2016-05-05 | 1 | -0/+16 |
| | | | | |||||
| * | | | [Jack & Erez] Adds an option for user-specific config.h files | Erez Zukerman | 2016-05-05 | 1 | -0/+9 |
| | | | | |||||
| * | | | [Jack & Erez] Removes duplicate reference, sorts whitespace | Erez Zukerman | 2016-05-05 | 1 | -2/+3 |
| | | | | |||||
| * | | | adds keycode shortcuts for OSL and OSM | Jack Humbert | 2016-05-05 | 2 | -0/+14 |
| | | | | |||||
| * | | | Adds oneshot layer and oneshot tap toggling (#308) | Thiago Alves | 2016-05-05 | 5 | -14/+186 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit is mostly a cherry-pick from `ahtn` at https://github.com/tmk/tmk_keyboard/pull/255. These are the changes: * Adds ACTION_LAYER_ONESHOT * Adds ONESHOT_TAP_TOGGLE * Mentions sticky keys in the docs on oneshot. | ||||
| * | | | Referencing the hex file (#309) | Tom Duckering | 2016-05-05 | 1 | -2/+2 |
| | | | | | | | | | | | | Seems that this is a typo. When I used the hex file it worked so presuming that means it's right ;) | ||||
| * | | | updates atreus's column mapping | Jack Humbert | 2016-05-05 | 1 | -1/+1 |
| | | | | |||||
* | | | | remove typo | Stephan Bösebeck | 2016-05-05 | 1 | -1/+1 |
| | | | | |||||
* | | | | making default osx more ELG conform | Stephan Bösebeck | 2016-05-05 | 1 | -4/+4 |
| | | | | |||||
* | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-05-05 | 7 | -1548/+1505 |
|\| | | | |||||
| * | | | Merge pull request #305 from nrrkeene/master | Erez Zukerman | 2016-05-04 | 7 | -1548/+1505 |
| |\| | | | | | | | | | | Custom handling for shift keys, improved media layer | ||||
| | * | | The Ordinary Layout is arranged as close as possible to a traditional ↵ | Nicholas Keene | 2016-05-03 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | keyboard, but with extra special features | ||||
| | * | | The Ordinary Layout works the way you expect it to, with extra powerful features | Nicholas Keene | 2016-05-03 | 1 | -979/+1008 |
| | | | | |||||
| | * | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Nicholas Keene | 2016-05-02 | 255 | -7159/+39956 |
| | |\ \ | |||||
| | * | | | The Ordinary Layout is the layout you are looking for. Come and see v3.14. | Nicholas Keene | 2016-05-01 | 7 | -1541/+1469 |
| | | | | | |||||
* | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-05-04 | 17 | -892/+1447 |
|\| | | | | |||||
| * | | | | Merge pull request #304 from adiabatic/ergodox-zweihander-osx | Erez Zukerman | 2016-05-03 | 1 | -0/+3 |
| |\ \ \ \ | | | |_|/ | | |/| | | zweihander: comment out action_get_macro() | ||||
| | * | | | zweihander: comment out action_get_macro() | Nathan Sharfi | 2016-05-03 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Clarified audio.c (#302) | IBNobody | 2016-05-03 | 16 | -892/+1444 |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-05-03 | 1 | -58/+50 |
|\| | | | |||||
| * | | | Merge pull request #300 from Twey/tweymap-momentary | Erez Zukerman | 2016-05-02 | 1 | -58/+50 |
| |\ \ \ | | | | | | | | | | | Swap steno/media layers to allow using media keys in the Plover layer… | ||||
| | * | | | Swap steno/media layers to allow using media keys in the Plover layer; ↵ | James ‘Twey’ Kay | 2016-05-02 | 1 | -58/+50 |
| |/ / / | | | | | | | | | | | | | display all active layers, not just the top; use only momentary modifiers | ||||
* | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-05-02 | 14 | -0/+5137 |
|\| | | | |||||
| * | | | Merge pull request #298 from adiabatic/ergodox-zweihander-osx | Erez Zukerman | 2016-05-02 | 3 | -0/+1381 |
| |\| | | | | | | | | | | ergodox-zweihander-osx: initial commit | ||||
| | * | | zweihander: move dim/brighten to 1/2, add ⌘Q | Nathan Sharfi | 2016-05-01 | 2 | -11/+11 |
| | | | | |||||
| | * | | zweihander: Add ⌘`, ⌘⇧`, ⌥⇥, ⌥⇧⇥ | Nathan Sharfi | 2016-05-01 | 3 | -11/+16 |
| | | | | |||||
| | * | | Ergodox EZ: add zweihander-osx.hex | Nathan Sharfi | 2016-04-30 | 1 | -0/+1152 |
| | | | | |||||
| | * | | ergodox-zweihander: initial commit | Nathan Sharfi | 2016-04-30 | 2 | -0/+224 |
| | | | | |||||
| * | | | Merge pull request #294 from sneako/master | Erez Zukerman | 2016-05-02 | 3 | -0/+1345 |
| |\ \ \ | | | | | | | | | | | Add my Ergodox EZ config |