summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-08-27Fix the keyboard template with new make syntaxFred Sundvik1-5/+5
Also add proper link to the parent
2016-08-27Merge pull request #691 from fredizzimo/fix_line_endingsJack Humbert40-6251/+6252
Fix line endings
2016-08-27Merge branch 'master' into fix_line_endingsFred Sundvik115-3306/+3664
2016-08-27Merge pull request #666 from fredizzimo/makefile_overhaulJack Humbert115-3308/+3666
Makefile overhaul
2016-08-27Fix travis_compiled_pushFred Sundvik1-2/+2
2016-08-27Normalize line endingsFred Sundvik39-6322/+6322
2016-08-27Set eep files to binary modeFred Sundvik1-0/+1
2016-08-26Merge remote-tracking branch 'upstream/master' into makefile_overhaulFred Sundvik2-25/+144
2016-08-26Merge pull request #664 from linsomniac/infinity_readmeErez Zukerman1-23/+144
Adding nicer Infinity build instructions.
2016-08-26Merge pull request #685 from fredizzimo/windows10_instructions_typoErez Zukerman1-2/+2
Fix minor typo in the readme
2016-08-25Fix bad mergeFred Sundvik2-4/+2
Led should have been added to KC60, not GH60
2016-08-25Fix minor typo in the readmeFred Sundvik1-2/+2
2016-08-25Remove google test submoduleFred Sundvik1-0/+0
It had been added for some strange reason, allthough it's supposed to be there only in another branch.
2016-08-25Split vision_division into Makefile/rules.mkFred Sundvik2-75/+72
2016-08-25Merge branch 'master' into makefile_overhaulFred Sundvik55-336/+2855
2016-08-25Merge pull request #659 from Dbroqua/masterJack Humbert15-161/+319
- Updated dbroqua layout for planck keyboard
2016-08-25- Added capslock led for KC60 keyboard (based on gitbug.com/jpec/kc60 works)dbroqua2-1/+33
2016-08-25Merge pull request #683 from ickerwx/masterJack Humbert9-53/+322
LEDs work now, fixed Kitten Paw default keymap, added my own keymap as a better example
2016-08-25Merge pull request #681 from IBNobody/vision_division_devJack Humbert15-51/+1313
Added Port A Pin Mapping / Added Vision Division (WIP)
2016-08-25Merge pull request #682 from jeebak/jd45-jeebakJack Humbert3-0/+568
Port jeebak's Planck keymap to JD45
2016-08-25Merge pull request #680 from replicaJunction/layout-atreus-replicaJunctionJack Humbert8-0/+258
Added replicaJunction keymap
2016-08-25Fixed naming of Analog pins to differentiate them from DIO pins used by ↵IBNobody1-32/+32
Quantum Matrix
2016-08-25Merge remote-tracking branch 'upstream/master' into kitten_pawRené Werner12-7/+702
2016-08-25fixed defaulf keymap, added my own keymapRené Werner7-105/+123
now the LEDs are working like they should
2016-08-25Make the "extra" key in the top row another backspaceJeeBak Kim1-10/+10
2016-08-25Merge pull request #1 from jackhumbert/masterDamien3-3/+7
Merge from jackhumbert
2016-08-25- Updated kc60/readmedbroqua2-0/+76
- Added layout examples for kc60
2016-08-25[jd45] Port jeebak's planck keymap to jd45JeeBak Kim3-9/+560
2016-08-25[jd45] Add "jeebak" keymap folder as a copy of the "default" folderJeeBak Kim1-0/+17
2016-08-25Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into ↵IBNobody3-3/+7
vision_division_dev
2016-08-25Added pin support for A0-A7IBNobody4-13/+13
Vision Division - It works!
2016-08-25Added replicaJunction keymapJoshua T8-0/+258
2016-08-24- Fixed layout for kc60dbroqua6-18/+18
2016-08-24- Updated kc60.h for 2x 1u backspace (K49)dbroqua3-3/+119
- Added dbroqua layout
2016-08-24Making the existing firmware link betterSean Reifschneider1-1/+2
2016-08-24Changes based on @fredizzimo review, flashing Infinity detailsSean Reifschneider1-0/+34
2016-08-24Merge pull request #679 from algernon/h/ucis/subproject-fixJack Humbert2-2/+6
quantum: Move qk_ucis_state to process_unicode.c
2016-08-24Merge pull request #646 from nclundsten/masterJack Humbert1-1/+1
fix ergodox ez link
2016-08-24quantum: Move qk_ucis_state to process_unicode.cGergely Nagy2-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>
2016-08-24- Updated readme by adding link on kle for each layerdbroqua1-0/+3
2016-08-24Merge remote-tracking branch 'upstream/master' into makefile_overhaulFred Sundvik9-4/+695
2016-08-24Fix slight inconsistencyFred Sundvik1-13/+15
When running make from either a keyboard folder or a subproject it runs all keymaps for all subprojects and the selected subproject respectively. Without this fix, the same doesn't happen if your run make clean for example. As it would just provide you with an error message. Now this will work as expected.
2016-08-24NightlyIBNobody5-55/+652
Prep for Vision build
2016-08-24Merge remote-tracking branch 'refs/remotes/origin/master' into ↵IBNobody76-2666/+4492
vision_division_dev
2016-08-24Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody30-10/+1519
2016-08-24Fixed line endingIBNobody1-1/+1
2016-08-24Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody46-2656/+2973
2016-08-23Merge remote-tracking branch 'upstream/master'dbroqua9-4/+695
2016-08-23Merge pull request #677 from SmackleFunky/masterJack Humbert9-4/+695
Virtual Serial Port - and a Layout that uses that virtual serial port for Plover
2016-08-23Merge remote-tracking branch 'upstream/master'dbroqua86-2749/+4770
# Conflicts: # keyboards/planck/keymaps/dbroqua/keymap.c