summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Stick2017-06-234-61/+106
|\
| * Doc updatesFredric Silberberg2017-06-232-18/+22
| * Copy/paste additions.Fredric Silberberg2017-06-232-15/+17
| * Added backlight control keysFredric Silberberg2017-06-232-5/+4
| * Added a few more VS macros and another ctrlFredric Silberberg2017-06-231-11/+30
| * Small keymap layout updatesFredric Silberberg2017-06-233-18/+39
* | added media keys; many bug fixesStick2017-06-232-27/+26
* | added tapdance lockingStick2017-06-222-44/+66
* | Merge remote-tracking branch 'upstream/master'Stick2017-06-22139-2383/+707
|\|
| * Merge pull request #1331 from ariasuni/masterErez Zukerman2017-06-221-1/+25
| |\
| | * Fix undefined reference errors with avr-gcc 7.1ariasuni2017-05-271-1/+25
| * | Merge pull request #1408 from fredizzimo/fix_build_improve_travisJack Humbert2017-06-181-0/+1
| |\ \
| | * | Add missing include to Ergodox Belak keymapFred Sundvik2017-06-181-0/+1
| * | | Merge pull request #1361 from fredizzimo/ergodox_infinity_backlightJack Humbert2017-06-184-27/+75
| |\ \ \ | | |/ / | |/| |
| | * | Make sure backlight is in the range 0-100Fred Sundvik2017-06-161-1/+1
| | * | Fix typo in BACKLIGHT_ENABLEFred Sundvik2017-06-151-2/+2
| | * | Add backlight support to the default Ergodox Infinity animationsFred Sundvik2017-06-031-11/+58
| | * | Add backlight control to the IS31FL3731 driverFred Sundvik2017-06-031-4/+10
| | * | Turn off LED matrix by defaultFred Sundvik2017-06-031-2/+2
| | * | Let BACKLIGHT_ENABLE control the Infinity LEDsFred Sundvik2017-06-033-10/+5
| * | | ergodox: initial addition of belak themeKaleb Elwert2017-06-165-0/+522
| * | | remove .hex, .PNG, .jpgJack Humbert2017-06-117-4/+4
| * | | remove the rest of the .pngsJack Humbert2017-06-1136-24/+29
| * | | remove most .pngsJack Humbert2017-06-1187-2327/+51
* | | | Revert "ugly workaround for ErgoDoxEZ LED bugs: turn 'em all off"Stick2017-06-083-23/+24
* | | | trying to fix LEDsStick2017-06-081-21/+21
* | | | Merge remote-tracking branch 'upstream/master'Stick2017-06-084-1/+183
|\| | |
| * | | Ergodox Adam keymapAdam Bell2017-06-034-1/+183
| |/ /
* | | ugly workaround for ErgoDoxEZ LED bugs: turn 'em all offStick2017-06-023-45/+44
* | | moved alt out from under spaceStick2017-06-021-7/+7
* | | Merge remote-tracking branch 'upstream/master'Stick2017-06-0218-71/+1273
|\| |
| * | Update licensing on visualizer.cFredric Silberberg2017-05-311-14/+1
| * | Updated readmeFredric Silberberg2017-05-312-7/+13
| * | Added several new macrosFredric Silberberg2017-05-311-19/+63
| * | Fixed numpad 0 layoutFredric Silberberg2017-05-312-3/+3
| * | Use code blocks for keyboard layoutsFredric Silberberg2017-05-301-3/+13
| * | Completed iteration 1 of my layoutFredric Silberberg2017-05-304-98/+306
| * | Added initial keymap filesFredric Silberberg2017-05-303-0/+273
| * | Adds prevent stuck modifiers to EZ defaultErez Zukerman2017-05-282-1/+3
| |/
| * tweaks default mouse speed constantsErez Zukerman2017-05-241-2/+2
| * Created a dvorak keymap for Swedish developers using Visual StudioChristian Westerlund2017-05-162-0/+359
| * Fix spelling of "persistent"Nikolaus Wittenstein2017-05-111-4/+4
| * Merge pull request #1279 from awpr/masterErez Zukerman2017-05-072-26/+38
| |\
| | * Change to per-key eager debouncing for ErgoDox EZ.Andrew Pritchard2017-04-262-26/+38
| * | Update README for keymap “coderkun_neo2”coderkun2017-05-061-9/+2
| * | Merge tag '0.5.43' into coderkun_neo2coderkun2017-05-0634-371/+1582
| |\|
| | * Fix LCD SS pin configurationFred Sundvik2017-04-191-1/+1
| | * Merge pull request #1235 from siroken3/siroken3Jack Humbert2017-04-185-0/+202
| | |\
| | | * fix backspace key position.Kenichi Sasaki2017-03-051-2/+2
| | | * fix againKenichi Sasaki2017-03-041-98/+55