Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | 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 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Nightly | IBNobody | 2016-08-21 | 7 | -161/+321 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only major change to qmk was the addition of A0-A7 pins for the AT90USB | |||||
| * | | | | | | | | | | In Progress Merge | IBNobody | 2016-08-20 | 4 | -18/+137 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Initial Commmit | IBNobody | 2016-08-20 | 10 | -1/+387 | |
| |/ / / / / / / / / | ||||||
| * | | | | | | | | | Merge | IBNobody | 2016-08-20 | 1 | -356/+194 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge | IBNobody | 2016-08-20 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ | Merge | IBNobody | 2016-08-20 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ | Merge https://github.com/IBNobody/qmk_firmware | IBNobody | 2016-08-19 | 1 | -22/+22 | |
| | | |\ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | fixed color detection routine in makefile | IBNobody | 2016-06-11 | 1 | -30/+28 | |
| | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | Merge remote-tracking branch 'remotes/jackhumbert/master' | IBNobody | 2016-06-11 | 728 | -90650/+141429 | |
| | | | |\ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'remotes/jackhumbert/master' | IBNobody | 2016-05-24 | 32 | -792/+626 | |
| | | | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'remotes/jackhumbert/master' | IBNobody | 2016-05-24 | 124 | -4257/+11726 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' | IBNobody | 2016-05-02 | 142 | -10819/+28668 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | fixed color detection routine in makefile | IBNobody | 2016-08-19 | 1 | -194/+356 | |
| | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | ||||||
| | * / | | | | | | | | | | | | | fixed color detection routine in makefile | IBNobody | 2016-08-19 | 1 | -194/+356 | |
| | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | fixed color detection routine in makefile | IBNobody | 2016-08-20 | 1 | -194/+195 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | fixed color detection routine in makefile | IBNobody | 2016-08-20 | 1 | -0/+161 | |
| |/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge pull request #682 from jeebak/jd45-jeebak | Jack Humbert | 2016-08-25 | 3 | -0/+568 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port jeebak's Planck keymap to JD45 | |||||
| * | | | | | | | | | | | | | | Make the "extra" key in the top row another backspace | JeeBak Kim | 2016-08-25 | 1 | -10/+10 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | [jd45] Port jeebak's planck keymap to jd45 | JeeBak Kim | 2016-08-24 | 3 | -9/+560 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | [jd45] Add "jeebak" keymap folder as a copy of the "default" folder | JeeBak Kim | 2016-08-24 | 1 | -0/+17 | |
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge pull request #680 from replicaJunction/layout-atreus-replicaJunction | Jack Humbert | 2016-08-25 | 8 | -0/+258 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | Added replicaJunction keymap | |||||
| * | | | | | | | | | | | | | Added replicaJunction keymap | Joshua T | 2016-08-24 | 8 | -0/+258 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge pull request #679 from algernon/h/ucis/subproject-fix | Jack Humbert | 2016-08-24 | 2 | -2/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | quantum: Move qk_ucis_state to process_unicode.c | |||||
| * | | | | | | | | | | | | | quantum: Move qk_ucis_state to process_unicode.c | Gergely Nagy | 2016-08-24 | 2 | -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/master | Jack Humbert | 2016-08-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | fix ergodox ez link | |||||
| * | | | | | | | | | | | | trailing slash | Nigel Lundsten | 2016-08-17 | 1 | -1/+1 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | fix ergodox link (again?) | Nigel Lundsten | 2016-08-17 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /ergodox/ez is a broken link, seems like the ez stuff is at /ergodox | |||||
* | | | | | | | | | | | | | Merge pull request #677 from SmackleFunky/master | Jack Humbert | 2016-08-23 | 9 | -4/+695 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | Virtual Serial Port - and a Layout that uses that virtual serial port for Plover | |||||
| * | | | | | | | | | | | | move to ergodox-ez only | Jason Green | 2016-08-23 | 4 | -1/+1 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Remove unneeded include | Jason Green | 2016-08-23 | 1 | -1/+0 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | add missing #include | Jason Green |