summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix bad mergeFred Sundvik2016-08-262-4/+2
| | | | Led should have been added to KC60, not GH60
* Remove google test submoduleFred Sundvik2016-08-251-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.mkFred Sundvik2016-08-252-75/+72
|
* Merge branch 'master' into makefile_overhaulFred Sundvik2016-08-2555-336/+2855
|\
| * Merge pull request #659 from Dbroqua/masterJack Humbert2016-08-2515-161/+319
| |\ | | | | | | - Updated dbroqua layout for planck keyboard
| | * - Added capslock led for KC60 keyboard (based on gitbug.com/jpec/kc60 works)dbroqua2016-08-252-1/+33
| | |
| | * Merge pull request #1 from jackhumbert/masterDamien2016-08-253-3/+7
| | |\ | | | | | | | | Merge from jackhumbert
| | * | - Updated kc60/readmedbroqua2016-08-252-0/+76
| | | | | | | | | | | | | | | | - Added layout examples for kc60
| | * | - Fixed layout for kc60dbroqua2016-08-246-18/+18
| | | |
| | * | - Updated kc60.h for 2x 1u backspace (K49)dbroqua2016-08-243-3/+119
| | | | | | | | | | | | | | | | - Added dbroqua layout
| | * | - Updated readme by adding link on kle for each layerdbroqua2016-08-241-0/+3
| | | |
| | * | Merge remote-tracking branch 'upstream/master'dbroqua2016-08-239-4/+695
| | |\ \
| | * \ \ Merge remote-tracking branch 'upstream/master'dbroqua2016-08-2386-2749/+4770
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # keyboards/planck/keymaps/dbroqua/keymap.c
| | * | | | - Added PrintScreen key on multimedia layerdbroqua2016-08-222-2/+2
| | | | | |
| | * | | | - Inverted key Tab and Escdbroqua2016-08-212-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | - Reorganised bottom row
| | * | | | - Moved Insert/Del in Esc layerdbroqua2016-08-193-7/+7
| | | | | |
| | * | | | - Updated lower and raise layerdbroqua2016-08-192-126/+46
| | | | | |
| | * | | | - Added readme file and layout previewdbroqua2016-08-192-0/+11
| | | | | |
| | * | | | - Moved Home/End/PgUp/PgDn on arrow keysdbroqua2016-08-191-9/+9
| | | | | |
| | * | | | - Moved Brite function on esc to avoid conflict with ctrl key.dbroqua2016-08-191-4/+4
| | | | | |
| | * | | | - Updated dbroqua layout for planck keyboarddbroqua2016-08-191-0/+314
| | | | | |
| * | | | | Merge pull request #683 from ickerwx/masterJack Humbert2016-08-259-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_pawRené Werner2016-08-2512-7/+702
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | fixed defaulf keymap, added my own keymapRené Werner2016-08-257-105/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | now the LEDs are working like they should
| | * | | | | added my personal keymapRené Werner2016-08-232-0/+251
| | | | | | | | | | | | | | | | | | | | | | | | | | | | I ported my keymap from tmk to QMK.
| | * | | | | Merge branch 'kitten_paw'René Werner2016-08-231-1/+1
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | Fixed wrong keycode in default keymapRené Werner2016-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Where I used KC_MENU I should have used KC_APP instead.
| * | | | | | Merge pull request #681 from IBNobody/vision_division_devJack Humbert2016-08-2515-51/+1313
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Added Port A Pin Mapping / Added Vision Division (WIP)
| | * | | | | | Fixed naming of Analog pins to differentiate them from DIO pins used by ↵IBNobody2016-08-251-32/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quantum Matrix
| | * | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into ↵IBNobody2016-08-253-3/+7
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | | | | | | | | vision_division_dev
| | * | | | | | Added pin support for A0-A7IBNobody2016-08-254-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vision Division - It works!
| | * | | | | | NightlyIBNobody2016-08-235-55/+652
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prep for Vision build
| | * | | | | | Merge remote-tracking branch 'refs/remotes/origin/master' into ↵IBNobody2016-08-2376-2666/+4492
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | vision_division_dev
| | | * \ \ \ \ \ Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-08-2330-10/+1519
| | | |\ \ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | |
| | | * | | | | | Fixed line endingIBNobody2016-08-231-1/+1
| | | | | | | | |
| | | * | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-08-2346-2656/+2973
| | | |\ \ \ \ \ \
| | * | | | | | | | NightlyIBNobody2016-08-217-161/+321
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only major change to qmk was the addition of A0-A7 pins for the AT90USB
| | * | | | | | | | In Progress MergeIBNobody2016-08-204-18/+137
| | | | | | | | | |
| | * | | | | | | | Initial CommmitIBNobody2016-08-2010-1/+387
| | |/ / / / / / /
| | * | | | | | | MergeIBNobody2016-08-201-356/+194
| | | | | | | | |
| | * | | | | | | MergeIBNobody2016-08-200-0/+0
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ MergeIBNobody2016-08-200-0/+0
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge https://github.com/IBNobody/qmk_firmwareIBNobody2016-08-191-22/+22
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | fixed color detection routine in makefileIBNobody2016-06-111-30/+28
| | | | | | | | | | | |
| | | | | * | | | | | | Merge remote-tracking branch 'remotes/jackhumbert/master'IBNobody2016-06-11728-90650/+141429
| | | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ Merge remote-tracking branch 'remotes/jackhumbert/master'IBNobody2016-05-2432-792/+626
| | | | | |\ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'remotes/jackhumbert/master'IBNobody2016-05-24124-4257/+11726
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-05-02142-10819/+28668
| | | | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | fixed color detection routine in makefileIBNobody2016-08-191-194/+356
| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | fixed color detection routine in makefileIBNobody2016-08-191-194/+356
| | | |/ / / / / / / / / / / /