summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |/ / / / / / / / / / /
| * | | | | | | | | | | | fixed color detection routine in makefileIBNobody2016-08-201-194/+195
| | | | | | | | | | | | |
| * | | | | | | | | | | | fixed color detection routine in makefileIBNobody2016-08-201-0/+161
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #682 from jeebak/jd45-jeebakJack Humbert2016-08-253-0/+568
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Port jeebak's Planck keymap to JD45
| * | | | | | | | | | | | Make the "extra" key in the top row another backspaceJeeBak Kim2016-08-251-10/+10
| | | | | | | | | | | | |
| * | | | | | | | | | | | [jd45] Port jeebak's planck keymap to jd45JeeBak Kim2016-08-243-9/+560
| | | | | | | | | | | | |
| * | | | | | | | | | | | [jd45] Add "jeebak" keymap folder as a copy of the "default" folderJeeBak Kim2016-08-241-0/+17
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #680 from replicaJunction/layout-atreus-replicaJunctionJack Humbert2016-08-258-0/+258
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | Added replicaJunction keymap
| * | | | | | | | | | | Added replicaJunction keymapJoshua T2016-08-248-0/+258
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #679 from algernon/h/ucis/subproject-fixJack Humbert2016-08-242-2/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | quantum: Move qk_ucis_state to process_unicode.c
| * | | | | | | | | | | quantum: Move qk_ucis_state to process_unicode.cGergely Nagy2016-08-242-2/+6
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to not declare the same variable in multiple objects (which happens when building UCIS-enabled keymap for both the ErgoDox EZ and the ErgoDox Infinity), move the declaration to the .c file, and keep only an extern reference in the header. Many thanks to @fredizzimo for spotting the error in Travis, and suggesting the fix. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
* | | | | | | | | | | Merge pull request #646 from nclundsten/masterJack Humbert2016-08-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | fix ergodox ez link
| * | | | | | | | | | trailing slashNigel Lundsten2016-08-171-1/+1
| | | | | | | | | | |
| * | | | | | | | | | fix ergodox link (again?) Nigel Lundsten2016-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /ergodox/ez is a broken link, seems like the ez stuff is at /ergodox
* | | | | | | | | | | Merge pull request #677 from SmackleFunky/masterJack Humbert2016-08-239-4/+695
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | Virtual Serial Port - and a Layout that uses that virtual serial port for Plover
| * | | | | | | | | | move to ergodox-ez onlyJason Green2016-08-234-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Remove unneeded includeJason Green2016-08-231-1/+0
| | | | | | | | | | |
| * | | | | | | | | | add missing #includeJason Green2016-08-231-0/+1
| | | | | | | | | | |
| * | | | | | | | | |