Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
254 files changed, 39878 insertions(+), 7081 deletions(-) M .gitignore M 1-setup-path-win.bat M 2-setup-environment-win.bat M BUILD_GUIDE.md M README.md M keyboard/alps64/Makefile R keyboard/alps64/{keymap_plain => keymaps/default}.c R keyboard/alps64/{keymap_hasu => keymaps/hasu}.c M keyboard/atomic/Makefile M keyboard/atomic/README.md M keyboard/atomic/atomic.c M keyboard/atomic/atomic.h M keyboard/atomic/config.h R keyboard/atomic/keymaps/{keymap_abienz => abienz}.c A keyboard/atomic/keymaps/default.c D keyboard/atomic/keymaps/keymap_default.c R keyboard/atomic/keymaps/{keymap_michelle => michelle}.c A keyboard/atomic/keymaps/pvc/config.h A keyboard/atomic/keymaps/pvc/keymap.c A keyboard/atomic/keymaps/pvc/makefile.mk M keyboard/atreus/Makefile M keyboard/atreus/README.md R keyboard/atreus/keymaps/{keymap_default => default}.c R keyboard/atreus/keymaps/{keymap_gerb => gerb}.c R keyboard/{preonic/Makefile.pjrc => clueboard1/Makefile} A keyboard/clueboard1/clueboard1.c A keyboard/clueboard1/clueboard1.h A keyboard/clueboard1/config.h A keyboard/clueboard1/keymaps/keymap_default.c R keyboard/{preonic => clueboard1}/led.c A keyboard/clueboard2/Makefile A keyboard/clueboard2/backlight.c A keyboard/clueboard2/clueboard2.c A keyboard/clueboard2/clueboard2.h A keyboard/clueboard2/config.h A keyboard/clueboard2/keymaps/keymap_default.c A keyboard/clueboard2/keymaps/keymap_max.c A keyboard/clueboard2/keymaps/keymap_skully.c A keyboard/clueboard2/led.c A keyboard/cluepad/Makefile A keyboard/cluepad/backlight.c A keyboard/cluepad/cluepad.c A keyboard/cluepad/cluepad.h A keyboard/cluepad/config.h A keyboard/cluepad/keymaps/keymap_default.c A keyboard/ergodox_ez/keymaps/ab/ab.hex A keyboard/ergodox_ez/keymaps/ab/keyboard-layout.json A keyboard/ergodox_ez/keymaps/ab/keyboard-layout.png A keyboard/ergodox_ez/keymaps/ab/keymap.c A keyboard/ergodox_ez/keymaps/ab/readme.md A keyboard/ergodox_ez/keymaps/alexjj/keymap.c A keyboard/ergodox_ez/keymaps/alexjj/keymap.hex A keyboard/ergodox_ez/keymaps/alexjj/readme.md A keyboard/ergodox_ez/keymaps/alexjj/rl-layout.jpg A keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/README.md A keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/dvorak_intl_squisher.hex A keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout0.png A keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout1.png A keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout2.png A keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/keymap.c M keyboard/ergodox_ez/keymaps/erez_experimental/erez_experimental.hex M keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c M keyboard/ergodox_ez/keymaps/erez_experimental/readme.md A keyboard/ergodox_ez/keymaps/german-manuneo/compile_keymap.py A keyboard/ergodox_ez/keymaps/german-manuneo/german-manuneo.hex A keyboard/ergodox_ez/keymaps/german-manuneo/keymap.c A keyboard/ergodox_ez/keymaps/german-manuneo/keymap.md M keyboard/ergodox_ez/keymaps/j3rn/keymap.c M keyboard/ergodox_ez/keymaps/j3rn/readme.md A keyboard/ergodox_ez/keymaps/msc/img/code_layer.png A keyboard/ergodox_ez/keymaps/msc/img/main_layer.png A keyboard/ergodox_ez/keymaps/msc/img/media_layer.png A keyboard/ergodox_ez/keymaps/msc/keymap.c A keyboard/ergodox_ez/keymaps/msc/msc.hex A keyboard/ergodox_ez/keymaps/msc/readme.md M keyboard/ergodox_ez/keymaps/osx_de/keymap.c M keyboard/ergodox_ez/keymaps/osx_de/osx_de.hex M keyboard/ergodox_ez/keymaps/osx_de/osx_de_highres.png M keyboard/ergodox_ez/keymaps/osx_de/readme.md M keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/keymap.c M keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/osx_de_adnw_koy.hex A keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/osx_de_adnw_koy_highres.png A keyboard/ergodox_ez/keymaps/osx_de_experimental/keymap.c A keyboard/ergodox_ez/keymaps/osx_de_experimental/osx_de_experimental_highres.png A keyboard/ergodox_ez/keymaps/plums/keymap.c A keyboard/ergodox_ez/keymaps/plums/plums.hex A keyboard/ergodox_ez/keymaps/plums/plums.png A keyboard/ergodox_ez/keymaps/plums/readme.md A keyboard/ergodox_ez/keymaps/romanzolotarev-norman-osx/keymap.c A keyboard/ergodox_ez/keymaps/romanzolotarev-norman-osx/readme.md A keyboard/ergodox_ez/keymaps/romanzolotarev-norman-osx/romanzolotarev-norman-osx.hex A keyboard/ergodox_ez/keymaps/romanzolotarev-norman-osx/romanzolotarev-norman-osx.png A keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/keymap.c A keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/readme.md A keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/romanzolotarev-norman-plover-osx-hjkl.hex A keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/romanzolotarev-norman-plover-osx-hjkl.png M keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/readme.md A keyboard/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/keymap.c A keyboard/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/readme.md A keyboard/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/romanzolotarev-norman-qwerty-osx.hex A keyboard/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/romanzolotarev-norman-qwerty-osx.png A keyboard/ergodox_ez/keymaps/sneako/README.md A keyboard/ergodox_ez/keymaps/sneako/keymap.c A keyboard/ergodox_ez/keymaps/sneako/sneako.hex A keyboard/ergodox_ez/keymaps/techtomas/keymap.c A keyboard/ergodox_ez/keymaps/techtomas/readme.md A keyboard/ergodox_ez/keymaps/techtomas/techtomas.hex A keyboard/ergodox_ez/keymaps/twey/keymap.c A keyboard/ergodox_ez/keymaps/twey/readme.md A keyboard/ergodox_ez/keymaps/twey/twey.hex A keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c A keyboard/ergodox_ez/keymaps/zweihander-osx/readme.markdown A keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex M keyboard/ergodox_ez/readme.md M keyboard/gh60/Makefile M keyboard/gh60/Makefile.pjrc M keyboard/gh60/README.md R keyboard/gh60/{keymap_hasu => keymaps/hasu}.c R keyboard/gh60/{keymap_hhkb => keymaps/hhkb}.c R keyboard/gh60/{keymap_plain => keymaps/plain}.c R keyboard/gh60/{keymap_poker => keymaps/poker}.c R keyboard/gh60/{keymap_poker_bit => keymaps/poker_bit}.c R keyboard/gh60/{keymap_poker_set => keymaps/poker_set}.c R keyboard/gh60/{keymap_spacefn => keymaps/spacefn}.c A keyboard/gh60_rev_c/Makefile A keyboard/gh60_rev_c/README.md A keyboard/gh60_rev_c/config.h A keyboard/gh60_rev_c/gh60.c A keyboard/gh60_rev_c/gh60.h A keyboard/gh60_rev_c/gh60revc.jpg A keyboard/gh60_rev_c/keymaps/default.c A keyboard/gh60_rev_c/pinout.txt M keyboard/hhkb/Makefile M keyboard/hhkb/Makefile.pjrc M keyboard/hhkb/Makefile.rn42 M keyboard/hhkb/README.md R keyboard/hhkb/{keymap_hasu => keymaps/hasu}.c R keyboard/hhkb/{keymap_hhkb => keymaps/hhkb}.c R keyboard/hhkb/{keymap_jp => keymaps/jp}.c R keyboard/hhkb/{keymap_spacefn => keymaps/spacefn}.c M keyboard/hhkb/rn42/rn42_task.c M keyboard/hhkb_qmk/Makefile M keyboard/hhkb_qmk/README.md R keyboard/hhkb_qmk/keymaps/{keymap_default => default}.c R keyboard/hhkb_qmk/keymaps/{keymap_lxol => lxol}.c M keyboard/jd45/Makefile R keyboard/jd45/keymaps/{keymap_default => default}.c R keyboard/jd45/keymaps/{keymap_justin => justin}.c M keyboard/planck/Makefile M keyboard/planck/README.md D keyboard/planck/backlight.c M keyboard/planck/config.h A keyboard/planck/keymaps/bone2planck.c M keyboard/planck/keymaps/default/README.md M keyboard/planck/keymaps/default/keymap.c A keyboard/planck/keymaps/default/makefile.mk A keyboard/planck/keymaps/nico.c A keyboard/planck/keymaps/pvc/config.h A keyboard/planck/keymaps/pvc/keymap.c A keyboard/planck/keymaps/pvc/makefile.mk A keyboard/planck/keymaps/tak3over.c R keyboard/planck/{ => old_keymap_files}/common_keymaps/keymap_mitch.c M keyboard/planck/planck.c M keyboard/planck/planck.h R keyboard/planck/{planck_pcb => planck_pcb_r3}.hex R keyboard/planck/{planck_with_bootloader => planck_pcb_r3_w_bootloader}.hex A keyboard/planck/planck_pcb_r4.hex A keyboard/planck/planck_pcb_r4_w_bootloader.hex M keyboard/preonic/Makefile D keyboard/preonic/PCB_GUIDE.md M keyboard/preonic/README.md D keyboard/preonic/__avr_gdbinit D keyboard/preonic/analog.c D keyboard/preonic/analog.h D keyboard/preonic/backlight.c D keyboard/preonic/beeps.c D keyboard/preonic/beeps.h M keyboard/preonic/config.h D keyboard/preonic/config_definitions.h D keyboard/preonic/extended_keymap_common.c D keyboard/preonic/extended_keymap_common.h D keyboard/preonic/extended_keymaps/extended_keymap_default.c D keyboard/preonic/extended_keymaps/extended_keymap_lock.c A keyboard/preonic/flash-pcb.sh D keyboard/preonic/keymap_midi.c D keyboard/preonic/keymap_midi.h A keyboard/preonic/keymaps/default/README.md A keyboard/preonic/keymaps/default/keymap.c A keyboard/preonic/keymaps/default/makefile.mk A keyboard/preonic/keymaps/lock/README.md A keyboard/preonic/keymaps/lock/keymap.c A keyboard/preonic/keymaps/nerdgasm/README.md A keyboard/preonic/keymaps/nerdgasm/keymap.c D keyboard/preonic/matrix.c R keyboard/{atomic/backlight => preonic/preonic}.c A keyboard/preonic/preonic.h A keyboard/preonic/preonic_pcb_r1.hex A keyboard/preonic/preonic_pcb_r1_w_bootloader.hex M keyboard/retro_refit/Makefile M keyboard/retro_refit/config.h M keyboard/retro_refit/retro_refit.c M new_project.sh D quantum/audio.c D quantum/audio.h A quantum/audio/audio.c A quantum/audio/audio.h A quantum/audio/frequency_lut.h A quantum/audio/musical_notes.h A quantum/audio/song_list.h A quantum/audio/vibrato_lut.h A quantum/audio/voices.c A quantum/audio/voices.h R quantum/{ => audio}/wave.h M quantum/keymap_common.c M quantum/keymap_common.h M quantum/keymap_extras/keymap_german_osx.h A quantum/keymap_extras/keymap_plover.h M quantum/keymap_midi.c M quantum/keymap_midi.h M quantum/led.c M quantum/quantum.mk M quantum/rgblight.c M quantum/rgblight.h M quantum/template/Makefile M quantum/template/README.md M quantum/template/config.h M quantum/template/template.c M quantum/template/template.h A quantum/tools/README.md A quantum/tools/eeprom_reset.hex M tmk_core/common.mk M tmk_core/common/action.c M tmk_core/common/action.h M tmk_core/common/action_code.h M tmk_core/common/action_layer.c M tmk_core/common/action_layer.h M tmk_core/common/action_tapping.c M tmk_core/common/avr/eeconfig.c M tmk_core/common/avr/suspend.c M tmk_core/common/backlight.c M tmk_core/common/bootmagic.c M tmk_core/common/command.c M tmk_core/common/command.h M tmk_core/common/eeconfig.h M tmk_core/common/keyboard.c M tmk_core/common/keymap.c M tmk_core/common/keymap.h A tmk_core/common/magic.c A tmk_core/common/magic.h M tmk_core/common/print.h M tmk_core/protocol/lufa.mk M tmk_core/protocol/lufa/LUFA-git/Bootloaders/CDC/BootloaderCDC.c M tmk_core/protocol/lufa/LUFA-git/Bootloaders/DFU/BootloaderDFU.c M tmk_core/protocol/lufa/lufa.c