summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge pull request #3229 from qmk/hf/shinydoxErez Zukerman2018-07-0311-170/+408
|\
| * remove comment codeJack Humbert2018-06-231-1/+0
| * adds immediate i2c return, fixes ez matrix codeJack Humbert2018-06-235-31/+35
| * refactor, non-workingJack Humbert2018-06-229-146/+178
| * start updating i2c for timeoutsJack Humbert2018-06-202-71/+46
| * adds timeout to avr i2cJack Humbert2018-06-128-84/+167
| * revert some attempts, update i2cJack Humbert2018-06-124-15/+14
| * Merge branch 'master' of github.com:qmk/qmk_firmware into hf/shinydoxJack Humbert2018-06-12771-5089/+35710
| |\
| * | a failed attempt at hot-pluggingErez Zukerman2018-05-242-7/+12
| * | i2c fixJack Humbert2018-05-156-29/+33
| * | Merge branch 'master' of github.com:qmk/qmk_firmware into hf/shinydoxJack Humbert2018-05-152-1/+48
| |\ \
| * \ \ Merge branch 'master' into hf/shinydoxErez Zukerman2018-05-15277-1427/+8885
| |\ \ \
| * | | | turn it onJack Humbert2018-05-091-1/+1
| * | | | disables RGB Matrix for nowErez Zukerman2018-05-092-1/+3
| * | | | a quick attemptErez Zukerman2018-05-093-1/+136
* | | | | Addition of hard brigtness limit for RGB_Matrix (#3299)yiancar2018-07-033-3/+9
* | | | | Phantom refactor and Configurator update (#3285)noroadsleft2018-07-019-81/+205
* | | | | Fixed pin for RGB on lets_split/sockets keyboard (#3284)Mikkel Jeppesen2018-07-011-1/+1
* | | | | qwerty_code_friendly: update for renamed macro (#3283)Campbell Barton2018-07-011-3/+3
* | | | | defaulted to 5 rows when HELIX_ROWS is not defined (#3282)MakotoKurauchi2018-07-011-3/+1
* | | | | Omnikey Blackheart refactor (#3280)noroadsleft2018-07-014-54/+68
* | | | | OK60 Refactor and Configurator support (#3279)noroadsleft2018-07-015-21/+42
* | | | | Nyquist Configurator support and keymap refactor (#3278)noroadsleft2018-07-019-45/+40
* | | | | Novelpad refactor and Configurator support (#3276)noroadsleft2018-07-015-16/+35
* | | | | Nano refactor and Configurator update (#3275)noroadsleft2018-07-013-14/+24
* | | | | Helix five rows jis (#3274)marksard2018-07-015-0/+1111
* | | | | Miuni32 refactor and Configurator support (#3273)noroadsleft2018-07-017-199/+240
* | | | | Mitosis refactor and Configurator support (#3271)noroadsleft2018-06-308-363/+372
* | | | | Helix fix configrator problem (#3270)MakotoKurauchi2018-06-304-20/+17
* | | | | ErgoDash Hardware Update (#3269)omkbd2018-06-3014-5/+439
* | | | | Helix shrink config (#3268)MakotoKurauchi2018-06-307-371/+207
* | | | | readme update to wanleg layout (#3266)wanleg2018-06-301-2/+4
* | | | | Maxr1998's contra layout (#3267)Max Rumpf2018-06-304-0/+168
* | | | | Add XD75 keymap (#3263)Markus Weimar2018-06-294-0/+292
* | | | | add QMK DFU make option to gherkin, and bootloader replacement instructions (...wanleg2018-06-294-148/+85
* | | | | Fix Mbsurfer deltasplit75 keymap (#3262)Cory Shaw2018-06-291-10/+41
* | | | | Support KBD75 rev 2 (#3261)MechMerlin2018-06-2812-170/+313
* | | | | Levinson Configurator support (#3260)noroadsleft2018-06-283-4/+15
* | | | | Let's Split refactor and Configurator support (#3259)noroadsleft2018-06-283-23/+30
* | | | | update to mechmerlin keymaps (#3258)MechMerlin2018-06-284-11/+10
* | | | | Diagonal micro move fixEvgeniy Petukhov2018-06-281-0/+2
* | | | | removed unused boxes (qmk won't compile with them anyway), updated welcome me...adamws2018-06-281-29/+8
* | | | | Make sure that both RGBLIGHT_ENABLE is defined, for RGBLIGHT_SLEEPDrashna Jaelre2018-06-281-3/+3
* | | | | Kitten Paw refactor and Configurator update (#3248)noroadsleft2018-06-287-15/+62
* | | | | Laplace Refactor (#3252)noroadsleft2018-06-283-55/+31
* | | | | Helix serial bugfix (#3255)MakotoKurauchi2018-06-281-47/+102
* | | | | Knops Configurator update (#3249)noroadsleft2018-06-281-1/+1
* | | | | added a description how to flash jj40 in windows (#3247)sgugler2018-06-281-0/+7
* | | | | Clean up SEND_STRING keycodes and add media keys (#3214)fauxpark2018-06-283-162/+203
* | | | | Disable JTAG in keyboard initDrashna Jaelre2018-06-282-7/+6