Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-06-23 | 9 | -0/+1507 |
|\ | |||||
| * | AB's practical planck keymap (#435) | Anand Babu (AB) Periasamy | 2016-06-22 | 7 | -0/+1443 |
| | | |||||
| * | Updates overall readme | Jack & Erez | 2016-06-22 | 2 | -1/+18 |
| | | |||||
| * | Adds a Readme for the keyboards subdirectory | Jack & Erez | 2016-06-22 | 1 | -0/+47 |
| | | |||||
* | | Use Space Cadet parens on LSFT | Christopher Browne | 2016-06-22 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-06-22 | 1 | -1/+2 |
|\| | |||||
| * | well that didn't work | Jack Humbert | 2016-06-22 | 1 | -4/+0 |
| | | |||||
| * | adds author block to readme | Jack Humbert | 2016-06-22 | 1 | -1/+6 |
| | | |||||
* | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-06-22 | 559 | -17239/+3753 |
|\| | |||||
| * | Merge pull request #433 from algernon/ergodox-ez/algernon | Erez Zukerman | 2016-06-22 | 11 | -331/+351 |
| |\ | | | | | | | ergodox_ez: Update the algernon keymap to v1.2 | ||||
| | * | ergodox_ez: Update the algernon keymap to v1.2 | Gergely Nagy | 2016-06-22 | 11 | -331/+351 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Noticeable changes since the last pull request: * The forced NKRO mode can be easily toggled off at compile-time, to make the firmware compatible with certain operating systems. * The `:;` key has changed behaviour: to access the `;` symbol, the key needs to be double-tapped, instead of shifted. * The `=` and `\` keys were swapped, `=` moved to the home row, on both the **base** and the **experimental** layers. * The arrow and navigation keys were redone, they are now more accessible, but the navigation keys require an extra tap to access. * The **Emacs** layer is gone, replaced by a simplified **navigation and media** layer. * `LEAD v` types the firmware version, and the keymap version. * On the **experimental** layer, the `L` and `Q`, and the `K` and `G` keys were swapped. * The **Steno** layer gained a few more `#` and `*` keys, to make it easier on my fingers. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org> | ||||
| * | increase leader seq size to 5 | Jack Humbert | 2016-06-21 | 2 | -5/+9 |
| | | |||||
| * | Renames keyboard folder to keyboards, adds couple of tmk's fixes (#432) | Jack Humbert | 2016-06-21 | 545 | -15315/+1752 |
| | | | | | | | | | | | | * fixes from tmk's repo * rename keyboard to keyboards | ||||
| * | adds backlight levels to the satan keyboard (#431) | Jack Humbert | 2016-06-21 | 5 | -1561/+1604 |
| | | | | | | | | | | | | | | | | * enable 4 levels * remove breathing stuff * update channels, comments, hex | ||||
| * | adds fuse settings for atmega32u4, fixes keymap_extras includes | Jack Humbert | 2016-06-21 | 14 | -12/+22 |
| | | |||||
* | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-06-21 | 63 | -23942/+23799 |
|\| | |||||
| * | Warning reductions (#430) | Jack Humbert | 2016-06-21 | 55 | -23923/+23760 |
| | | | | | | Warning reductions | ||||
| * | Change base box to avoid breakage in Arch box (#429) | dragon788 | 2016-06-21 | 1 | -2/+2 |
| | | | | | | I haven't had a chance to update the Arch base box in a while so using the Ubuntu one is far more likely to succeed for a new user (I did test that box recently as I traded my ErgoDox EZ to a friend and needed to reprogram it for him). | ||||
| * | Fix the make all-keyboards command (#422) | fredizzimo | 2016-06-21 | 1 | -9/+26 |
| | | | | | | | | | | Unfortunately the supported targets, like "quick", "all", "clean", and so on has to be repeated two extra times, but this is the best I can do with my makefile skills. | ||||
| * | reduces rgblight warnings, integrates completely (#428) | Jack Humbert | 2016-06-21 | 6 | -8/+11 |
| | | |||||
* | | More notes | Christopher Browne | 2016-06-21 | 2 | -0/+15 |
| | | |||||
* | | Improve docs a bit | Christopher Browne | 2016-06-21 | 2 | -1/+4 |
| | | |||||
* | | Add filler to make layering clearer; | Christopher Browne | 2016-06-21 | 2 | -7/+10 |
| | | | | | | | | KC_TRNS gets used a lot; have the blank _______ mnemonic for it | ||||
* | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-06-21 | 79 | -7711/+7318 |
|\| | |||||
| * | updates all config.h and Makefiles to correct references, text | Jack Humbert | 2016-06-21 | 58 | -2110/+102 |
| | | |||||
| * | Added stanleylai's personal keymap (#420) | Stanley Lai | 2016-06-21 | 12 | -3323/+5024 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added WS2812 support for KC60 * Reorganized WS2812 support into its own keymap * Fixed relative link in README * Moved WS2812 mention in README to the bottom * Fixed titling in WS2812 README * Reverted KC60 Makefile and default keymap back * Moved RGB specific config.h to ws2812 keymap folder * Added my personal keymap * Updated compiled hex * Reverted KC60 files to 3f6fac47 before pull request #419 | ||||
| * | Fresh hes for experimental layout | Jack & Erez | 2016-06-20 | 1 | -1119/+1032 |
| | | |||||
| * | [Jack & Erez] Fixes Space Cadet right shift | Jack & Erez | 2016-06-20 | 2 | -5/+5 |
| | | |||||
| * | Adapts experimental layout file format | Erez Zukerman | 2016-06-20 | 2 | -2/+7 |
| | | |||||
| * | Adds compiled default firmware | Erez Zukerman | 2016-06-20 | 1 | -1157/+1152 |
| | | |||||
| * | [Jack & Erez] Adds dedicated Version key | Erez Zukerman | 2016-06-20 | 1 | -5/+3 |
| | | |||||
| * | [Jack & Erez] Tweaks makefile for sanity | Erez Zukerman | 2016-06-20 | 1 | -7/+7 |
| | | |||||
| * | Removes .gitattributes | Erez Zukerman | 2016-06-20 | 1 | -2/+0 |
| | | |||||
| * | [Erez & Jack] Updates build guide | Erez Zukerman | 2016-06-20 | 2 | -21/+26 |
| | | |||||
* | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-06-20 | 5206 | -2308010/+6111 |
|\| | |||||
| * | endline normalisation, treat .hex as bin, updates kc60 hex files | Jack Humbert | 2016-06-19 | 3 | -3316/+3321 |
| | | |||||
| * | Added WS2812 support for KC60 (#419) | Stanley Lai | 2016-06-19 | 14 | -1458/+3792 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added WS2812 support for KC60 * Reorganized WS2812 support into its own keymap * Fixed relative link in README * Moved WS2812 mention in README to the bottom * Fixed titling in WS2812 README * Reverted KC60 Makefile and default keymap back * Moved RGB specific config.h to ws2812 keymap folder | ||||
| * | Add quick version of the all-* makefile targets (#417) | fredizzimo | 2016-06-18 | 2 | -7/+16 |
| | | |||||
| * | Cleans up quantum/keymap situation, removes extra lufa folders (#416) | Jack Humbert | 2016-06-18 | 5186 | -2306512/+2207 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * sorts out keycodes * move midi around * remove mbed * replaces keymap with qmk/keymap_common * fixes keymap.h * keymap, config, quantum rearrange * removes unneeded lufa stuff | ||||
| * | allow overriding of TARGET | Jack Humbert | 2016-06-17 | 1 | -1/+1 |
| | | |||||
| * | adds power_up to quantum's matrix file | Jack Humbert | 2016-06-17 | 1 | -0/+24 |
| | | |||||
| * | prevents ergodox_ez from waking up machine (#375) | Jack Humbert | 2016-06-17 | 1 | -0/+19 |
| | | |||||
| * | addresses #369 | Jack Humbert | 2016-06-17 | 2 | -8/+24 |
| | | |||||
| * | fix for parent folders with spaces (#403) | Jack Humbert | 2016-06-17 | 1 | -2/+3 |
| | | |||||
| * | removes extra dfu erase (#415) | Eric Tang | 2016-06-17 | 1 | -29/+27 |
| | | |||||
| * | Sample of using build info to generate keystrokes (#412) | Christopher Browne | 2016-06-16 | 6 | -1603/+1595 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * More documentation * Saving crontab for user on host * Restructuring in keeping with recent changes to conventions * Simplify submitting my fave cbbrowne keystroke by using SEND_STRING() * Local change, not apropos to have in this repo * Simplify logic; no need to return so much * Add in a version key * Add docs * Split build date into a separate DEFINE * Ensure there is a value even if not working within a git repo * Should not include the compiled code in the repo * compiled.hex files should not be included in the repo; they represent generated compiled code * Fix spelling in comment * Remove more generated files * Add rule to ignore contents of .build directories; their contents are generated * Revert removals of compiled files | ||||
* | | Revert removals of compiled files | Christopher Browne | 2016-06-16 | 28 | -1/+39270 |
| | | |||||
* | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-06-16 | 1 | -14/+20 |
|\| | |||||
| * | correctly test to see if awk exists | Jack Humbert | 2016-06-16 | 1 | -1/+1 |
| | | |||||
| * | make awk optional (uses cat) | Jack Humbert | 2016-06-16 | 1 | -14/+20 |
| | |