aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-239-0/+1507
|\
| * AB's practical planck keymap (#435)Anand Babu (AB) Periasamy2016-06-227-0/+1443
| |
| * Updates overall readmeJack & Erez2016-06-222-1/+18
| |
| * Adds a Readme for the keyboards subdirectoryJack & Erez2016-06-221-0/+47
| |
* | Use Space Cadet parens on LSFTChristopher Browne2016-06-221-1/+1
| |
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-221-1/+2
|\|
| * well that didn't workJack Humbert2016-06-221-4/+0
| |
| * adds author block to readmeJack Humbert2016-06-221-1/+6
| |
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-22559-17239/+3753
|\|
| * Merge pull request #433 from algernon/ergodox-ez/algernonErez Zukerman2016-06-2211-331/+351
| |\ | | | | | | ergodox_ez: Update the algernon keymap to v1.2
| | * ergodox_ez: Update the algernon keymap to v1.2Gergely Nagy2016-06-2211-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 5Jack Humbert2016-06-212-5/+9
| |
| * Renames keyboard folder to keyboards, adds couple of tmk's fixes (#432)Jack Humbert2016-06-21545-15315/+1752
| | | | | | | | | | | | * fixes from tmk's repo * rename keyboard to keyboards
| * adds backlight levels to the satan keyboard (#431)Jack Humbert2016-06-215-1561/+1604
| | | | | | | | | | | | | | | | * enable 4 levels * remove breathing stuff * update channels, comments, hex
| * adds fuse settings for atmega32u4, fixes keymap_extras includesJack Humbert2016-06-2114-12/+22
| |
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-2163-23942/+23799
|\|
| * Warning reductions (#430)Jack Humbert2016-06-2155-23923/+23760
| | | | | | Warning reductions
| * Change base box to avoid breakage in Arch box (#429)dragon7882016-06-211-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)fredizzimo2016-06-211-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 Humbert2016-06-216-8/+11
| |
* | More notesChristopher Browne2016-06-212-0/+15
| |
* | Improve docs a bitChristopher Browne2016-06-212-1/+4
| |
* | Add filler to make layering clearer;Christopher Browne2016-06-212-7/+10
| | | | | | | | KC_TRNS gets used a lot; have the blank _______ mnemonic for it
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-2179-7711/+7318
|\|
| * updates all config.h and Makefiles to correct references, textJack Humbert2016-06-2158-2110/+102
| |
| * Added stanleylai's personal keymap (#420)Stanley Lai2016-06-2112-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 layoutJack & Erez2016-06-201-1119/+1032
| |
| * [Jack & Erez] Fixes Space Cadet right shiftJack & Erez2016-06-202-5/+5
| |
| * Adapts experimental layout file formatErez Zukerman2016-06-202-2/+7
| |
| * Adds compiled default firmwareErez Zukerman2016-06-201-1157/+1152
| |
| * [Jack & Erez] Adds dedicated Version keyErez Zukerman2016-06-201-5/+3
| |
| * [Jack & Erez] Tweaks makefile for sanityErez Zukerman2016-06-201-7/+7
| |
| * Removes .gitattributesErez Zukerman2016-06-201-2/+0
| |
| * [Erez & Jack] Updates build guideErez Zukerman2016-06-202-21/+26
| |
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-205206-2308010/+6111
|\|
| * endline normalisation, treat .hex as bin, updates kc60 hex filesJack Humbert2016-06-193-3316/+3321
| |
| * Added WS2812 support for KC60 (#419)Stanley Lai2016-06-1914-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)fredizzimo2016-06-182-7/+16
| |
| * Cleans up quantum/keymap situation, removes extra lufa folders (#416)Jack Humbert2016-06-185186-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 TARGETJack Humbert2016-06-171-1/+1
| |
| * adds power_up to quantum's matrix fileJack Humbert2016-06-171-0/+24
| |
| * prevents ergodox_ez from waking up machine (#375)Jack Humbert2016-06-171-0/+19
| |
| * addresses #369Jack Humbert2016-06-172-8/+24
| |
| * fix for parent folders with spaces (#403)Jack Humbert2016-06-171-2/+3
| |
| * removes extra dfu erase (#415)Eric Tang2016-06-171-29/+27
| |
| * Sample of using build info to generate keystrokes (#412)Christopher Browne2016-06-166-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 filesChristopher Browne2016-06-1628-1/+39270
| |
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-161-14/+20
|\|
| * correctly test to see if awk existsJack Humbert2016-06-161-1/+1
| |
| * make awk optional (uses cat)Jack Humbert2016-06-161-14/+20
| |