summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-08-27Fix the keyboard template with new make syntaxFred Sundvik
Also add proper link to the parent
2016-08-27Merge pull request #691 from fredizzimo/fix_line_endingsJack Humbert
Fix line endings
2016-08-27Merge branch 'master' into fix_line_endingsFred Sundvik
2016-08-27Merge pull request #666 from fredizzimo/makefile_overhaulJack Humbert
Makefile overhaul
2016-08-27Fix travis_compiled_pushFred Sundvik
2016-08-27Normalize line endingsFred Sundvik
2016-08-27Set eep files to binary modeFred Sundvik
2016-08-26Merge remote-tracking branch 'upstream/master' into makefile_overhaulFred Sundvik
2016-08-26Merge pull request #664 from linsomniac/infinity_readmeErez Zukerman
Adding nicer Infinity build instructions.
2016-08-26Merge pull request #685 from fredizzimo/windows10_instructions_typoErez Zukerman
Fix minor typo in the readme
2016-08-26Fix bad mergeFred Sundvik
Led should have been added to KC60, not GH60
2016-08-25Fix minor typo in the readmeFred Sundvik
2016-08-25Remove google test submoduleFred Sundvik
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 Sundvik
2016-08-25Merge branch 'master' into makefile_overhaulFred Sundvik
2016-08-25Merge pull request #659 from Dbroqua/masterJack Humbert
- Updated dbroqua layout for planck keyboard
2016-08-25- Added capslock led for KC60 keyboard (based on gitbug.com/jpec/kc60 works)dbroqua
2016-08-25Merge pull request #683 from ickerwx/masterJack Humbert
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 Humbert
Added Port A Pin Mapping / Added Vision Division (WIP)
2016-08-25Merge pull request #682 from jeebak/jd45-jeebakJack Humbert
Port jeebak's Planck keymap to JD45
2016-08-25Merge pull request #680 from replicaJunction/layout-atreus-replicaJunctionJack Humbert
Added replicaJunction keymap
2016-08-25Fixed naming of Analog pins to differentiate them from DIO pins used by ↵IBNobody
Quantum Matrix
2016-08-25Merge remote-tracking branch 'upstream/master' into kitten_pawRené Werner
2016-08-25fixed defaulf keymap, added my own keymapRené Werner
now the LEDs are working like they should
2016-08-25Make the "extra" key in the top row another backspaceJeeBak Kim
2016-08-25Merge pull request #1 from jackhumbert/masterDamien
Merge from jackhumbert
2016-08-25- Updated kc60/readmedbroqua
- Added layout examples for kc60
2016-08-24[jd45] Port jeebak's planck keymap to jd45JeeBak Kim
2016-08-24[jd45] Add "jeebak" keymap folder as a copy of the "default" folderJeeBak Kim
2016-08-25Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into ↵IBNobody
vision_division_dev
2016-08-25Added pin support for A0-A7IBNobody
Vision Division - It works!
2016-08-24Added replicaJunction keymapJoshua T
2016-08-24- Fixed layout for kc60dbroqua
2016-08-24- Updated kc60.h for 2x 1u backspace (K49)dbroqua
- Added dbroqua layout
2016-08-24Making the existing firmware link betterSean Reifschneider
2016-08-24Changes based on @fredizzimo review, flashing Infinity detailsSean Reifschneider
2016-08-24Merge pull request #679 from algernon/h/ucis/subproject-fixJack Humbert
quantum: Move qk_ucis_state to process_unicode.c
2016-08-24Merge pull request #646 from nclundsten/masterJack Humbert
fix ergodox ez link
2016-08-24quantum: Move qk_ucis_state to process_unicode.cGergely Nagy
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 layerdbroqua
2016-08-24Merge remote-tracking branch 'upstream/master' into makefile_overhaulFred Sundvik
2016-08-24Fix slight inconsistencyFred Sundvik
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-23NightlyIBNobody
Prep for Vision build
2016-08-23Merge remote-tracking branch 'refs/remotes/origin/master' into ↵IBNobody
vision_division_dev
2016-08-23Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody
2016-08-23Fixed line endingIBNobody
2016-08-23Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody
2016-08-23Merge remote-tracking branch 'upstream/master'dbroqua
2016-08-23Merge pull request #677 from SmackleFunky/masterJack Humbert
Virtual Serial Port - and a Layout that uses that virtual serial port for Plover
2016-08-23Merge remote-tracking branch 'upstream/master'dbroqua
# Conflicts: # keyboards/planck/keymaps/dbroqua/keymap.c