Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #666 from fredizzimo/makefile_overhaul | Jack Humbert | 2016-08-27 | 115 | -3308/+3666 |
|\ | | | | | Makefile overhaul | ||||
| * | Fix travis_compiled_push | Fred Sundvik | 2016-08-27 | 1 | -2/+2 |
| | | |||||
| * | Merge remote-tracking branch 'upstream/master' into makefile_overhaul | Fred Sundvik | 2016-08-26 | 2 | -25/+144 |
| |\ | |/ |/| | |||||
* | | Merge pull request #664 from linsomniac/infinity_readme | Erez Zukerman | 2016-08-26 | 1 | -23/+144 |
|\ \ | | | | | | | Adding nicer Infinity build instructions. | ||||
| * | | Making the existing firmware link better | Sean Reifschneider | 2016-08-24 | 1 | -1/+2 |
| | | | |||||
| * | | Changes based on @fredizzimo review, flashing Infinity details | Sean Reifschneider | 2016-08-24 | 1 | -0/+34 |
| | | | |||||
| * | | Changes from review by @fredizzimo and @Xyverz | Sean Reifschneider | 2016-08-22 | 1 | -19/+16 |
| | | | |||||
| * | | Tweaks after review. | Sean Reifschneider | 2016-08-19 | 1 | -3/+3 |
| | | | |||||
| * | | Restructuring of the ergodox README. | Sean Reifschneider | 2016-08-19 | 1 | -29/+105 |
| | | | |||||
| * | | Noting the change directory. | Sean Reifschneider | 2016-08-19 | 1 | -0/+1 |
| | | | |||||
| * | | Adding submodule note. | Sean Reifschneider | 2016-08-19 | 1 | -0/+1 |
| | | | |||||
| * | | Adding nicer Infinity build instructions. | Sean Reifschneider | 2016-08-19 | 1 | -0/+11 |
| | | | |||||
* | | | Merge pull request #685 from fredizzimo/windows10_instructions_typo | Erez Zukerman | 2016-08-26 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Fix minor typo in the readme | ||||
| * | | | Fix minor typo in the readme | Fred Sundvik | 2016-08-25 | 1 | -2/+2 |
|/ / / | |||||
| | * | Fix bad merge | Fred Sundvik | 2016-08-26 | 2 | -4/+2 |
| | | | | | | | | | | | | Led should have been added to KC60, not GH60 | ||||
| | * | Remove google test submodule | Fred Sundvik | 2016-08-25 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | It had been added for some strange reason, allthough it's supposed to be there only in another branch. | ||||
| | * | Split vision_division into Makefile/rules.mk | Fred Sundvik | 2016-08-25 | 2 | -75/+72 |
| | | | |||||
| | * | Merge branch 'master' into makefile_overhaul | Fred Sundvik | 2016-08-25 | 55 | -336/+2855 |
| | |\ | |_|/ |/| | | |||||
* | | | Merge pull request #659 from Dbroqua/master | Jack Humbert | 2016-08-25 | 15 | -161/+319 |
|\ \ \ | | | | | | | | | - Updated dbroqua layout for planck keyboard | ||||
| * | | | - Added capslock led for KC60 keyboard (based on gitbug.com/jpec/kc60 works) | dbroqua | 2016-08-25 | 2 | -1/+33 |
| | | | | |||||
| * | | | Merge pull request #1 from jackhumbert/master | Damien | 2016-08-25 | 3 | -3/+7 |
| |\ \ \ | | | | | | | | | | | Merge from jackhumbert | ||||
| * | | | | - Updated kc60/readme | dbroqua | 2016-08-25 | 2 | -0/+76 |
| | | | | | | | | | | | | | | | | | | | | - Added layout examples for kc60 | ||||
| * | | | | - Fixed layout for kc60 | dbroqua | 2016-08-24 | 6 | -18/+18 |
| | | | | | |||||
| * | | | | - Updated kc60.h for 2x 1u backspace (K49) | dbroqua | 2016-08-24 | 3 | -3/+119 |
| | | | | | | | | | | | | | | | | | | | | - Added dbroqua layout | ||||
| * | | | | - Updated readme by adding link on kle for each layer | dbroqua | 2016-08-24 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'upstream/master' | dbroqua | 2016-08-23 | 9 | -4/+695 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge remote-tracking branch 'upstream/master' | dbroqua | 2016-08-23 | 86 | -2749/+4770 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # keyboards/planck/keymaps/dbroqua/keymap.c | ||||
| * | | | | | | - Added PrintScreen key on multimedia layer | dbroqua | 2016-08-22 | 2 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | - Inverted key Tab and Esc | dbroqua | 2016-08-21 | 2 | -12/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Reorganised bottom row | ||||
| * | | | | | | - Moved Insert/Del in Esc layer | dbroqua | 2016-08-19 | 3 | -7/+7 |
| | | | | | | | |||||
| * | | | | | | - Updated lower and raise layer | dbroqua | 2016-08-19 | 2 | -126/+46 |
| | | | | | | | |||||
| * | | | | | | - Added readme file and layout preview | dbroqua | 2016-08-19 | 2 | -0/+11 |
| | | | | | | | |||||
| * | | | | | | - Moved Home/End/PgUp/PgDn on arrow keys | dbroqua | 2016-08-19 | 1 | -9/+9 |
| | | | | | | | |||||
| * | | | | | | - Moved Brite function on esc to avoid conflict with ctrl key. | dbroqua | 2016-08-19 | 1 | -4/+4 |
| | | | | | | | |||||
| * | | | | | | - Updated dbroqua layout for planck keyboard | dbroqua | 2016-08-19 | 1 | -0/+314 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #683 from ickerwx/master | Jack Humbert | 2016-08-25 | 9 | -53/+322 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | LEDs work now, fixed Kitten Paw default keymap, added my own keymap as a better example | ||||
| * \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into kitten_paw | René Werner | 2016-08-25 | 12 | -7/+702 |
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||||
| * | | | | | | | fixed defaulf keymap, added my own keymap | René Werner | 2016-08-25 | 7 | -105/+123 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | now the LEDs are working like they should | ||||
| * | | | | | | | added my personal keymap | René Werner | 2016-08-23 | 2 | -0/+251 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I ported my keymap from tmk to QMK. | ||||
| * | | | | | | | Merge branch 'kitten_paw' | René Werner | 2016-08-23 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| | * | | | | | | Fixed wrong keycode in default keymap | René Werner | 2016-08-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Where I used KC_MENU I should have used KC_APP instead. | ||||
* | | | | | | | | Merge pull request #681 from IBNobody/vision_division_dev | Jack Humbert | 2016-08-25 | 15 | -51/+1313 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Added Port A Pin Mapping / Added Vision Division (WIP) | ||||
| * | | | | | | | | Fixed naming of Analog pins to differentiate them from DIO pins used by ↵ | IBNobody | 2016-08-25 | 1 | -32/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quantum Matrix | ||||
| * | | | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into ↵ | IBNobody | 2016-08-25 | 3 | -3/+7 |
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | vision_division_dev | ||||
| * | | | | | | | | Added pin support for A0-A7 | IBNobody | 2016-08-25 | 4 | -13/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vision Division - It works! | ||||
| * | | | | | | | | Nightly | IBNobody | 2016-08-23 | 5 | -55/+652 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prep for Vision build | ||||
| * | | | | | | | | Merge remote-tracking branch 'refs/remotes/origin/master' into ↵ | IBNobody | 2016-08-23 | 76 | -2666/+4492 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vision_division_dev | ||||
| | * \ \ \ \ \ \ \ | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' | IBNobody | 2016-08-23 | 30 | -10/+1519 |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | | | |||||
| | * | | | | | | | | Fixed line ending | IBNobody | 2016-08-23 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' | IBNobody | 2016-08-23 | 46 | -2656/+2973 |
| | |\ \ \ \ \ \ \ \ |