summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-07-07Add Infinity Ergodox display driversFred Sundvik13-0/+992
2016-07-07Merge branch 'master' of https://github.com/Skrymir/qmk_firmwareJosh Colbeck2-0/+213
2016-07-07Merge pull request #484 from jackhumbert/lets-split-supportJack Humbert22-18/+1807
Add Let's Split support
2016-07-07default keymap, reset sorted out for now, added serial to makefileJack Humbert8-59/+241
2016-07-07Merge pull request #1 from Skrymir/patch-1Joshua Colbeck12-244/+495
add ergodox layout
2016-07-07Changed layer switching to momentaryJosh Colbeck1-6/+6
corrected macro
2016-07-07Merge branch 'master' into lets-split-supportJack Humbert42-18/+4186
2016-07-06Makefile changes and files to compile VisualizerFred Sundvik8-23/+604
2016-07-06Add ugfx submoduleFred Sundvik2-0/+3
2016-07-06Merge pull request #488 from fredizzimo/add_visualizerJack Humbert13-0/+1717
Add visualizer library
2016-07-06Merge commit '73d890a2c9c34b905cd5e74e7146fdd4578dcb96' into add_visualizerFred Sundvik5-25/+342
2016-07-06Delete .gitmodules from visualizerFred Sundvik2-3/+0
2016-07-06Add 'quantum/visualizer/' from commit 'bde869aa7ec8601459bc63b9636081d21108d1be'Fred Sundvik13-0/+1403
git-subtree-dir: quantum/visualizer git-subtree-mainline: 19f480992c015aec0a15dca43e740bad8b7834e6 git-subtree-split: bde869aa7ec8601459bc63b9636081d21108d1be
2016-07-06Merge pull request #487 from fredizzimo/serial_link_ergodoxJack Humbert6-6/+81
Integrate serial link support for ChibiOS and Infinity Ergodox
2016-07-06Add setting of the master side to the makefileFred Sundvik2-0/+23
2016-07-06Enable serial_link support for ChibiOSFred Sundvik3-6/+37
2016-07-06Add serial_link compilation to Infinity ErgodoxFred Sundvik3-1/+22
2016-07-06adds eep, removes usbconfig.hJack Humbert3-377/+4
2016-07-06Merge pull request #482 from fredizzimo/serial_linkJack Humbert21-0/+2374
Add serial link library
2016-07-06Remove extra serial_link subdirectoryFred Sundvik22-62/+1
2016-07-06Remove CGreen make filesFred Sundvik3-71/+0
2016-07-06Remove serial_link .gitignore and .gitmodulesFred Sundvik2-4/+0
2016-07-06fix/annotate wait_us linesJack Humbert2-12/+14
2016-07-06remove uno_slave for now, even though it's freakin coolJack Humbert5-448/+0
2016-07-06add options to config.hJack Humbert1-2/+5
2016-07-06Merge branch 'master' into lets-split-supportJack Humbert15-1/+1875
2016-07-06images, docks, clean-up [skip ci]Jack Humbert13-2/+367
2016-07-06i2c workingJack Humbert20-21/+1827
2016-07-06one half workingJack Humbert6-0/+254
2016-07-05Add 'quantum/serial_link/' from commit ↵Fred Sundvik28-0/+2510
'a20d513e3cdacbf6e0e70a80402497ad10166434' git-subtree-dir: quantum/serial_link git-subtree-mainline: 7d28d6a7bc81578bb5a83f1d55810ee3d1458e96 git-subtree-split: a20d513e3cdacbf6e0e70a80402497ad10166434
2016-07-05Merge pull request #480 from fredizzimo/add_infinity_ergodoxJack Humbert15-1/+1875
Add infinity ergodox
2016-07-05Add dfu-util command for programmingFred Sundvik3-1/+12
Also add .bin generation, which is needed for dfu-util.
2016-07-05Merge pull request #471 from Chipairon/patch-1Jack Humbert1-2/+2
Fix for '~' in spanish layout
2016-07-05Merge pull request #478 from fredizzimo/chibios_subprojectsJack Humbert49-255/+52
Suprojects for ChibiOS testing
2016-07-05Infinity Ergodox - Add matrix.c and led.cFred Sundvik2-1/+4
2016-07-05First version of Infinity ErgodoxFred Sundvik12-0/+1860
Mostly just adding the files from the fredizzimo repository. Still needs some fixing until it works
2016-07-05Fix typo in teensy_lc_onkey.hFred Sundvik1-1/+1
2016-07-05Don't include common_config.h for ChibiOS testFred Sundvik1-2/+0
2016-07-05Move ChibiOS test board and ldFred Sundvik7-0/+0
Move the ChibiOS test subproject board and ld files to the kebyoard folder, so that the build system can find them
2016-07-05Suprojects for ChibiOS testingFred Sundvik49-253/+52
2016-07-05Merge remote-tracking branch 'jackhumbert/master' into patch-1Josh Colbeck2-14/+14
2016-07-05fixed indentation.Smilliam1-8/+8
2016-07-05Allow Space Cadet state to be canceled by alternate Shift keySmilliam1-0/+8
Allows you to press RSHIFT to cancel the insertion of a "(" when holding down LSHIFT. Alternatively, allows you to press LSHIFT to cancel the insertion of a ")" when holding down RSHIFT. This change enables you to renege from outputting a character should you press a shift key erroneously.
2016-07-05correct break/return order for planck and preonic defaultsJack Humbert2-14/+14
2016-07-04Merge remote-tracking branch 'jackhumbert/master' into patch-1Josh Colbeck8-230/+268
2016-07-04Added macro and readmeJosh Colbeck2-18/+40
macros to for often used eclipse shortcuts
2016-07-04Added new keymapJosh Colbeck1-0/+191
2016-07-04Fixes typos in keycode.txtJack Humbert1-2/+2
2016-07-04Adds wait to i2c (debounce)Jack Humbert1-3/+3
2016-07-04Improves debounceJack Humbert2-9/+3