summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-2812-182/+308
|\
| * Merge pull request #453 from NoahAndrews/update-docsJack Humbert2016-06-271-1/+1
| |\
| | * Update readme to direct people to using the MHV AVR ShellNoah Andrews2016-06-271-1/+1
| |/
| * Long overdue fixes and improvements to environment setup scripts (#448)Noah Andrews2016-06-272-14/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update setup script 1 for new folder structure * Improve script 1 output * Launch elevate if run without admin privileges * Improve MinGW error message * Improvements and fixes to second script * Log elevate output in first script
| * zoom and undo keys for ab's planck keymap (#446)Anand Babu (AB) Periasamy2016-06-273-43/+58
| |
| * Merge pull request #447 from abperiasamy/ergo-browser-zoomErez Zukerman2016-06-273-26/+40
| |\ | | | | | | zoom and undo keys for ab's beginners ergodox-ez keymap
| | * zoom and undo keysAnand Babu (AB) Periasamy2016-06-263-26/+40
| |/
| * Preonic keymap updateJack Humbert2016-06-261-5/+1
| |
| * updates preonic default layoutJack Humbert2016-06-262-32/+40
| |
| * updates planck macros to keycodes, prototype fn_actionsJack Humbert2016-06-262-31/+31
| |
| * Swap up and down on ab's layout to match default (#441)Anand Babu (AB) Periasamy2016-06-243-54/+133
| |
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-24248-139888/+2567
|\|
| * Merge pull request #440 from abperiasamy/ergo-ab-swap-up-downErez Zukerman2016-06-244-14/+26
| |\ | | | | | | Swap up and down keys to match default layout
| | * Swap up and down to match default layoutAnand Babu (AB) Periasamy2016-06-234-14/+26
| | |
| * | Merge pull request #438 from tkuichooseyou/masterErez Zukerman2016-06-243-0/+1334
| |\ \ | | |/ | |/| Added tkuichooseyou keymap; for vim and macOS users
| | * Added tkuichooseyou keymap; for vim and OSX usersTeddy Ku2016-06-233-0/+1334
| | |
| * | updates ez's matrix to specJack Humbert2016-06-233-15/+18
| | |
| * | Backlight abstraction and other changes (#439)Jack Humbert2016-06-23239-139888/+1146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * redoes matrix pins, abstracts backlight code for B5,6,7 * slimming down keyboard stuff, backlight breathing implemented * don't call backlight init when no pin * cleans up user/kb/quantum calls, keyboard files * fix pvc atomic * replaces CHANNEL with correct var in breathing * removes .hexs, updates readmes, updates template * cleans-up clueboards, readmes to lowercase * updates readme
| * | Add OS specific layers that can be switched with macros (#436)Peter2016-06-232-1153/+1225
| |/
* | 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
| |