~ruther/qmk_firmware

8655677584483e46d9b45873aa50ec6e860486dd — coderkun 9 years ago a10e100 + 35e6870
Merge branch 'master' into coderkun_neo2
346 files changed, 20511 insertions(+), 12401 deletions(-)

M .gitattributes
M .gitignore
M .gitmodules
M .travis.yml
M Makefile
A build_keyboard.mk
A build_test.mk
A common.mk
M doc/VAGRANT_GUIDE.md
M keyboards/alps64/Makefile
A keyboards/alps64/rules.mk
M keyboards/amj60/Makefile
A keyboards/amj60/rules.mk
M keyboards/arrow_pad/Makefile
M keyboards/arrow_pad/readme.md
A keyboards/arrow_pad/rules.mk
M keyboards/atomic/Makefile
M keyboards/atomic/keymaps/pvc/Makefile
M keyboards/atomic/keymaps/pvc/config.h
M keyboards/atomic/keymaps/pvc/keymap.c
M keyboards/atomic/readme.md
A keyboards/atomic/rules.mk
M keyboards/atreus/Makefile
M keyboards/atreus/config.h
A keyboards/atreus/keymaps/classic/keymap.c
M keyboards/atreus/keymaps/default/keymap.c
A keyboards/atreus/keymaps/erlandsona/config.h
A keyboards/atreus/keymaps/erlandsona/keymap.c
A keyboards/atreus/keymaps/jeremy/keymap.c
A keyboards/atreus/keymaps/jeremy/readme.md
M keyboards/atreus/readme.md
A keyboards/atreus/rules.mk
M keyboards/bantam44/Makefile
M keyboards/bantam44/readme.md
A keyboards/bantam44/rules.mk
M keyboards/chibios_test/Makefile
M keyboards/chibios_test/boards/GENERIC_STM32_F103/board.c
M keyboards/chibios_test/boards/GENERIC_STM32_F103/board.h
M keyboards/chibios_test/boards/GENERIC_STM32_F103/board.mk
M keyboards/chibios_test/ld/MKL26Z64.ld
M keyboards/chibios_test/ld/STM32F103x8_stm32duino_bootloader.ld
A keyboards/chibios_test/rules.mk
M keyboards/chibios_test/stm32_f072_onekey/Makefile
M keyboards/chibios_test/stm32_f072_onekey/mcuconf.h
A keyboards/chibios_test/stm32_f072_onekey/rules.mk
M keyboards/chibios_test/stm32_f103_onekey/Makefile
M keyboards/chibios_test/stm32_f103_onekey/mcuconf.h
A keyboards/chibios_test/stm32_f103_onekey/rules.mk
M keyboards/chibios_test/teensy_lc_onekey/Makefile
M keyboards/chibios_test/teensy_lc_onekey/chconf.h
M keyboards/chibios_test/teensy_lc_onekey/halconf.h
M keyboards/chibios_test/teensy_lc_onekey/mcuconf.h
A keyboards/chibios_test/teensy_lc_onekey/rules.mk
M keyboards/clueboard/Makefile
M keyboards/clueboard/readme.md
M keyboards/clueboard/rev1/Makefile
A keyboards/clueboard/rev1/rules.mk
M keyboards/clueboard/rev2/Makefile
A keyboards/clueboard/rev2/rules.mk
A keyboards/clueboard/rules.mk
M keyboards/cluecard/Makefile
M keyboards/cluecard/readme.md
A keyboards/cluecard/rules.mk
M keyboards/cluepad/Makefile
A keyboards/cluepad/rules.mk
M keyboards/ergodox/Makefile
M keyboards/ergodox/ergodox.c
M keyboards/ergodox/ez/Makefile
M keyboards/ergodox/ez/ez.h
A keyboards/ergodox/ez/keymaps/profet_80/ergodox80.png
A keyboards/ergodox/ez/keymaps/profet_80/keymap.c
A keyboards/ergodox/ez/keymaps/profet_80/readme.md
A keyboards/ergodox/ez/rules.mk
M keyboards/ergodox/infinity/Makefile
A keyboards/ergodox/infinity/rules.mk
A keyboards/ergodox/keymaps/absenth/absenth_highres.png
A keyboards/ergodox/keymaps/absenth/keymap.c
A keyboards/ergodox/keymaps/absenth/readme.md
M keyboards/ergodox/keymaps/algernon/Makefile
M keyboards/ergodox/keymaps/algernon/images/adore-layer.png
M keyboards/ergodox/keymaps/algernon/images/base-layer.png
M keyboards/ergodox/keymaps/algernon/images/heatmap.png
M keyboards/ergodox/keymaps/algernon/keymap.c
M keyboards/ergodox/keymaps/algernon/readme.md
R keyboards/ergodox/keymaps/algernon/tools/{heatmap-adore-layout => heatmap-layout.ADORE}.json
R keyboards/ergodox/keymaps/algernon/tools/{heatmap-base-layout => heatmap-layout.Dvorak}.json
A keyboards/ergodox/keymaps/algernon/tools/hid-commands
A keyboards/ergodox/keymaps/algernon/tools/layer-notify
M keyboards/ergodox/keymaps/algernon/tools/log-to-heatmap.py
D keyboards/ergodox/keymaps/algernon/tools/max-focused
A keyboards/ergodox/keymaps/algernon/tools/text-to-log.py
A keyboards/ergodox/keymaps/bepo_csa/keymap.c
A keyboards/ergodox/keymaps/bepo_csa/readme.md
M keyboards/ergodox/keymaps/default/keymap.c
M keyboards/ergodox/keymaps/default/readme.md
M keyboards/ergodox/keymaps/kastyle/keymap.c
A keyboards/ergodox/keymaps/kastyle/readme.md
A keyboards/ergodox/keymaps/mclennon_osx/README.md
A keyboards/ergodox/keymaps/mclennon_osx/keymap.c
A keyboards/ergodox/keymaps/norwegian_programmer_osx_pc/keyboard-layout.png
A keyboards/ergodox/keymaps/norwegian_programmer_osx_pc/keymap.c
A keyboards/ergodox/keymaps/norwegian_programmer_osx_pc/readme.md
A keyboards/ergodox/keymaps/norwegian_programmer_osx_pc_colemak/keyboard-layout.png
A keyboards/ergodox/keymaps/norwegian_programmer_osx_pc_colemak/keymap.c
A keyboards/ergodox/keymaps/norwegian_programmer_osx_pc_colemak/readme.md
M keyboards/ergodox/keymaps/romanzolotarev-norman-osx/keymap.c
M keyboards/ergodox/keymaps/romanzolotarev-norman-osx/readme.md
A keyboards/ergodox/keymaps/yoruian/90-ergodox-yoruian.conf
A keyboards/ergodox/keymaps/yoruian/Makefile
A keyboards/ergodox/keymaps/yoruian/README
A keyboards/ergodox/keymaps/yoruian/ergodox_yoruian
A keyboards/ergodox/keymaps/yoruian/keymap.c
A keyboards/ergodox/keymaps/yoruian/yoruian.h
R keyboards/ergodox/keymaps/zweihander-osx/{makefile.mk => Makefile}
M keyboards/ergodox/keymaps/zweihander-osx/keymap.c
M keyboards/ergodox/keymaps/zweihander-osx/readme.markdown
M keyboards/ergodox/readme.md
A keyboards/ergodox/rules.mk
M keyboards/gh60/Makefile
M keyboards/gh60/config.h
M keyboards/gh60/gh60.c
M keyboards/gh60/gh60.h
M keyboards/gh60/keymaps/robotmaxtron/Makefile
M keyboards/gh60/keymaps/robotmaxtron/config.h
M keyboards/gh60/pinout.txt
M keyboards/gh60/readme.md
A keyboards/gh60/rules.mk
M keyboards/handwired/CMD60/Makefile
A keyboards/handwired/CMD60/rules.mk
M keyboards/handwired/Makefile
M keyboards/handwired/fivethirteen/Makefile
A keyboards/handwired/fivethirteen/rules.mk
M keyboards/handwired/minorca/Makefile
A keyboards/handwired/minorca/rules.mk
M keyboards/handwired/onekey/Makefile
A keyboards/handwired/onekey/rules.mk
A keyboards/handwired/retro_refit/Makefile
R keyboards/{ => handwired}/retro_refit/config.h
R keyboards/{ => handwired}/retro_refit/keymaps/default/keymap.c
A keyboards/handwired/retro_refit/readme.md
R keyboards/{ => handwired}/retro_refit/retro_refit.c
R keyboards/{ => handwired}/retro_refit/retro_refit.h
R keyboards/{retro_refit/Makefile => handwired/retro_refit/rules.mk}
A keyboards/handwired/rules.mk
M keyboards/handwired/traveller/Makefile
A keyboards/handwired/traveller/rules.mk
M keyboards/hhkb/Makefile
A keyboards/hhkb/keymaps/dbroqua/keymap.c
A keyboards/hhkb/keymaps/dbroqua/readme.md
M keyboards/hhkb/keymaps/jp/Makefile
M keyboards/hhkb/keymaps/rdg_jp/Makefile
M keyboards/hhkb/readme.md
A keyboards/hhkb/rules.mk
R keyboards/{infinity_chibios => infinity60}/MEMO.txt
A keyboards/infinity60/Makefile
R keyboards/{infinity_chibios => infinity60}/bootloader_defs.h
R keyboards/{infinity_chibios => infinity60}/chconf.h
R keyboards/{infinity_chibios => infinity60}/config.h
R keyboards/{infinity_chibios => infinity60}/halconf.h
R keyboards/{infinity_chibios/infinity_chibios => infinity60/infinity60}.c
R keyboards/{infinity_chibios/infinity_chibios => infinity60/infinity60}.h
R keyboards/{infinity_chibios => infinity60}/keymaps/default/keymap.c
R keyboards/{infinity_chibios => infinity60}/keymaps/depariel/keymap.c
R keyboards/{infinity_chibios => infinity60}/keymaps/hasu/keymap.c
R keyboards/{infinity_chibios => infinity60}/led.c
R keyboards/{infinity_chibios => infinity60}/matrix.c
R keyboards/{infinity_chibios => infinity60}/mcuconf.h
A keyboards/infinity60/readme.md
R keyboards/{infinity_chibios/Makefile => infinity60/rules.mk}
A keyboards/jd40/Makefile
A keyboards/jd40/config.h
A keyboards/jd40/jd40.c
A keyboards/jd40/jd40.h
A keyboards/jd40/keymaps/default/keymap.c
A keyboards/jd40/readme.md
A keyboards/jd40/rules.mk
M keyboards/jd45/Makefile
A keyboards/jd45/rules.mk
M keyboards/kc60/Makefile
M keyboards/kc60/config.h
M keyboards/kc60/keymaps/dbroqua/keymap.c
M keyboards/kc60/keymaps/workman-dead/keymap.c
R keyboards/kc60/keymaps/workman-dead/{README => readme}.md
M keyboards/kc60/readme.md
A keyboards/kc60/rules.mk
M keyboards/kinesis/Makefile
M keyboards/kinesis/readme.md
A keyboards/kinesis/rules.mk
M keyboards/kitten_paw/Makefile
A keyboards/kitten_paw/rules.mk
M keyboards/lets_split/Makefile
M keyboards/lets_split/config.h
M keyboards/lets_split/i2c.c
A keyboards/lets_split/keymaps/i2c/config.h
A keyboards/lets_split/keymaps/i2c/keymap.c
A keyboards/lets_split/keymaps/serial/config.h
A keyboards/lets_split/keymaps/serial/keymap.c
M keyboards/lets_split/lets_split.c
M keyboards/lets_split/matrix.c
A keyboards/lets_split/rules.mk
M keyboards/lets_split/serial.c
M keyboards/lets_split/split_util.c
M keyboards/phantom/Makefile
A keyboards/phantom/rules.mk
M keyboards/planck/Makefile
A keyboards/planck/keymaps/bone2planck/config.h
M keyboards/planck/keymaps/bone2planck/keymap.c
A keyboards/planck/keymaps/bone2planck/readme.md
M keyboards/planck/keymaps/callum/keymap.c
M keyboards/planck/keymaps/callum/readme.md
M keyboards/planck/keymaps/cbbrowne/config.h
M keyboards/planck/keymaps/cbbrowne/keymap.c
M keyboards/planck/keymaps/cbbrowne/readme.md
A keyboards/planck/keymaps/impossible/Makefile
A keyboards/planck/keymaps/impossible/keymap.c
A keyboards/planck/keymaps/impossible/readme.md
A keyboards/planck/keymaps/jhenahan/Makefile
A keyboards/planck/keymaps/jhenahan/config.h
A keyboards/planck/keymaps/jhenahan/keymap.c
A keyboards/planck/keymaps/jhenahan/readme.md
M keyboards/planck/keymaps/pvc/Makefile
M keyboards/planck/keymaps/pvc/config.h
M keyboards/planck/keymaps/pvc/keymap.c
A keyboards/planck/keymaps/sgoodwin/Makefile
A keyboards/planck/keymaps/sgoodwin/keymap.c
A keyboards/planck/keymaps/sgoodwin/readme.md
A keyboards/planck/keymaps/tong92/Makefile
A keyboards/planck/keymaps/tong92/keymap.c
A keyboards/planck/keymaps/tong92/readme.md
M keyboards/planck/readme.md
M keyboards/planck/rev3/Makefile
A keyboards/planck/rev3/rules.mk
M keyboards/planck/rev4/Makefile
A keyboards/planck/rev4/rules.mk
A keyboards/planck/rules.mk
M keyboards/preonic/Makefile
M keyboards/preonic/readme.md
A keyboards/preonic/rules.mk
M keyboards/readme.md
D keyboards/retro_refit/readme.md
M keyboards/s60-x/Makefile
M keyboards/s60-x/readme.md
A keyboards/s60-x/rules.mk
M keyboards/satan/Makefile
A keyboards/satan/rules.mk
M keyboards/sixkeyboard/Makefile
A keyboards/sixkeyboard/rules.mk
A keyboards/tada68/Makefile
A keyboards/tada68/config.h
A keyboards/tada68/keymaps/default/Makefile
A keyboards/tada68/keymaps/default/keymap.c
A keyboards/tada68/keymaps/default/readme.md
A keyboards/tada68/readme.md
A keyboards/tada68/rules.mk
A keyboards/tada68/tada68.c
A keyboards/tada68/tada68.h
M keyboards/tv44/Makefile
A keyboards/tv44/keymaps/jeebak/Makefile
A keyboards/tv44/keymaps/jeebak/config.h
A keyboards/tv44/keymaps/jeebak/keymap.c
A keyboards/tv44/keymaps/jeebak/readme.md
M keyboards/tv44/readme.md
A keyboards/tv44/rules.mk
M keyboards/vision_division/Makefile
M keyboards/vision_division/config.h
M keyboards/vision_division/keymaps/default/Makefile
M keyboards/vision_division/keymaps/default/config.h
M keyboards/vision_division/keymaps/default/keymap.c
M keyboards/vision_division/matrix_types.h
M keyboards/vision_division/readme.md
A keyboards/vision_division/rules.mk
M keyboards/vision_division/vision_division.c
A lib/googletest
A message.mk
M quantum/keycode_config.h
M quantum/keymap.h
A quantum/keymap_extras/keymap_canadian_multilingual.h
M quantum/keymap_extras/keymap_dvorak.h
M quantum/process_keycode/process_midi.c
M quantum/process_keycode/process_tap_dance.c
M quantum/process_keycode/process_tap_dance.h
M quantum/process_keycode/process_unicode.c
M quantum/process_keycode/process_unicode.h
M quantum/quantum.c
M quantum/serial_link/protocol/byte_stuffer.c
M quantum/serial_link/protocol/byte_stuffer.h
M quantum/serial_link/protocol/transport.c
M quantum/serial_link/protocol/transport.h
R quantum/serial_link/tests/{byte_stuffer_tests.c => byte_stuffer_tests.cpp}
D quantum/serial_link/tests/frame_router_tests.c
A quantum/serial_link/tests/frame_router_tests.cpp
R quantum/serial_link/tests/{frame_validator_tests.c => frame_validator_tests.cpp}
A quantum/serial_link/tests/rules.mk
A quantum/serial_link/tests/testlist.mk
D quantum/serial_link/tests/transport_tests.c
A quantum/serial_link/tests/transport_tests.cpp
R quantum/serial_link/tests/{triple_buffered_object_tests.c => triple_buffered_object_tests.cpp}
M quantum/template/Makefile
M quantum/template/readme.md
A quantum/template/rules.mk
M readme.md
A testlist.mk
M tmk_core/chibios.mk
M tmk_core/common.mk
M tmk_core/common/action.c
M tmk_core/common/action_util.c
M tmk_core/common/avr/bootloader.c
M tmk_core/common/avr/xprintf.S
M tmk_core/common/avr/xprintf.h
M tmk_core/common/bootmagic.c
M tmk_core/common/command.c
M tmk_core/common/host.c
M tmk_core/common/host.h
M tmk_core/common/keyboard.c
M tmk_core/common/magic.c
M tmk_core/common/mbed/xprintf.cpp
M tmk_core/common/mbed/xprintf.h
M tmk_core/common/print.h
A tmk_core/native.mk
M tmk_core/protocol/chibios/usb_main.c
M tmk_core/protocol/iwrap/suart.S
M tmk_core/protocol/iwrap/suart.h
M tmk_core/protocol/iwrap/wd.h
M tmk_core/protocol/lufa/LUFA-git/Bootloaders/CDC/asf.xml
M tmk_core/protocol/lufa/LUFA-git/Bootloaders/DFU/asf.xml
M tmk_core/protocol/lufa/LUFA-git/Bootloaders/HID/asf.xml
M tmk_core/protocol/lufa/LUFA-git/Bootloaders/MassStorage/BootloaderAPITable.S
M tmk_core/protocol/lufa/LUFA-git/Bootloaders/MassStorage/asf.xml
M tmk_core/protocol/lufa/LUFA-git/Bootloaders/MassStorage/makefile
M tmk_core/protocol/lufa/LUFA-git/Bootloaders/Printer/BootloaderAPITable.S
M tmk_core/protocol/lufa/LUFA-git/Bootloaders/Printer/asf.xml
M tmk_core/protocol/lufa/LUFA-git/Bootloaders/Printer/makefile
M tmk_core/protocol/lufa/LUFA-git/LUFA/Build/HID_EEPROM_Loader/makefile
M tmk_core/protocol/lufa/LUFA-git/LUFA/CodeTemplates/DeviceTemplate/asf.xml
M tmk_core/protocol/lufa/LUFA-git/LUFA/CodeTemplates/HostTemplate/asf.xml
M tmk_core/protocol/lufa/LUFA-git/LUFA/DoxygenPages/BuildSystem.txt
M tmk_core/protocol/lufa/descriptor.h
M tmk_core/protocol/lufa/lufa.c
M tmk_core/protocol/pjrc/usb.c
M tmk_core/protocol/pjrc/usb_keyboard.c
M tmk_core/readme.md
M tmk_core/rules.mk
A util/Win_Check.bat
M util/install_dependencies.sh -rw-r--r-- => -rwxr-xr-x
M util/new_project.sh
M util/travis_compiled_push.sh
This diff is too large to display. Try viewing the raw diff instead.