~ruther/qmk_firmware

5272218ac9cff7ce5af8cfda9129dc03b7aafa49 — Erez Zukerman 7 years ago 0592d23 + e41147d
Merge branch 'master' into hf/shinydox
277 files changed, 8885 insertions(+), 1427 deletions(-)

M .vscode/settings.json
M common_features.mk
M docs/feature_rgb_matrix.md
M docs/feature_tap_dance.md
M docs/getting_started_make_guide.md
M docs/index.html
A docs/sidebar.css
D drivers/avr/TWIlib.c
D drivers/avr/TWIlib.h
A drivers/avr/i2c_master.c
A drivers/avr/i2c_master.h
M drivers/avr/is31fl3731.c
M keyboards/1up60rgb/1up60rgb.h
M keyboards/1up60rgb/info.json
M keyboards/1up60rgb/rules.mk
A keyboards/bananasplit/keymaps/talljoe/config.h
A keyboards/bananasplit/keymaps/talljoe/keymap.c
M keyboards/ca66/ca66.c
R keyboards/{ => ckeys}/nakey/config.h
R keyboards/{ => ckeys}/nakey/info.json
R keyboards/{ => ckeys}/nakey/keymaps/default/keymap.c
R keyboards/{ => ckeys}/nakey/keymaps/default/readme.md
R keyboards/{ => ckeys}/nakey/nakey.c
R keyboards/{ => ckeys}/nakey/nakey.h
R keyboards/{ => ckeys}/nakey/readme.md
R keyboards/{ => ckeys}/nakey/rules.mk
R keyboards/{ => ckeys}/obelus/config.h
R keyboards/{ => ckeys}/obelus/keymaps/default/config.h
R keyboards/{ => ckeys}/obelus/keymaps/default/keymap.c
R keyboards/{ => ckeys}/obelus/keymaps/default/readme.md
R keyboards/{ => ckeys}/obelus/obelus.c
R keyboards/{ => ckeys}/obelus/obelus.h
R keyboards/{ => ckeys}/obelus/readme.md
R keyboards/{ => ckeys}/obelus/rules.mk
A keyboards/ckeys/readme.md
M keyboards/dz60/dz60.h
M keyboards/dz60/info.json
A keyboards/dz60/keymaps/xtonhasvim/config.h
A keyboards/dz60/keymaps/xtonhasvim/keymap.c
A keyboards/dz60/keymaps/xtonhasvim/readme.md
M keyboards/dz60/rules.mk
M keyboards/ergo42/keymaps/hdbx/config.h
M keyboards/ergo42/keymaps/hdbx/keymap.c
M keyboards/ergo42/keymaps/hdbx/readme.md
A keyboards/facew/config.h
A keyboards/facew/facew.c
A keyboards/facew/facew.h
A keyboards/facew/i2c.c
A keyboards/facew/i2c.h
A keyboards/facew/info.json
A keyboards/facew/keymaps/default/keymap.c
A keyboards/facew/keymaps/mechmerlin/keymap.c
A keyboards/facew/keymaps/mechmerlin/readme.md
A keyboards/facew/matrix.c
A keyboards/facew/readme.md
A keyboards/facew/rules.mk
A keyboards/facew/usbconfig.h
M keyboards/frosty_flake/frosty_flake.h
M keyboards/frosty_flake/rules.mk
M keyboards/iris/info.json
M keyboards/iris/keymaps/drashna/rules.mk
M keyboards/iris/keymaps/hag/keymap.c
M keyboards/iris/keymaps/swedish/keymap.c
M keyboards/iris/keymaps/transmogrified/keymap.c
M keyboards/iris/rev1/rev1.c
M keyboards/iris/rev1_led/rev1_led.c
M keyboards/iris/rev2/rev2.c
M keyboards/jj40/jj40.h
D keyboards/jj40/keymaps/ajp10304/jj40.h
M keyboards/jj40/keymaps/ajp10304/keymap.c
M keyboards/jj40/keymaps/cockpit/keymap.c
M keyboards/jj40/keymaps/default/keymap.c
D keyboards/jj40/keymaps/fun40/jj40.h
M keyboards/jj40/keymaps/fun40/keymap.c
M keyboards/jj40/keymaps/krusli/keymap.c
M keyboards/jj40/keymaps/oscillope/keymap.c
D keyboards/jj40/keymaps/suzuken/jj40.h
M keyboards/jj40/keymaps/suzuken/keymap.c
D keyboards/jj40/keymaps/waples/jj40.h
M keyboards/jj40/keymaps/waples/keymap.c
M keyboards/jj40/rules.mk
M keyboards/jj50/README.md
A keyboards/jj50/backlight.c
A keyboards/jj50/backlight_custom.h
A keyboards/jj50/breathing_custom.h
M keyboards/jj50/config.h
M keyboards/jj50/jj50.c
M keyboards/jj50/jj50.h
M keyboards/jj50/keymaps/default/keymap.c
M keyboards/jj50/matrix.c
M keyboards/jj50/rules.mk
M keyboards/jj50/usbconfig.h
M keyboards/lets_split/keymaps/DE_simple/keymap.c
M keyboards/lets_split/keymaps/OLED_sample/keymap.c
M keyboards/lets_split/keymaps/adam/keymap.c
M keyboards/lets_split/keymaps/cpeters1982/keymap.c
M keyboards/lets_split/keymaps/default/keymap.c
M keyboards/lets_split/keymaps/dlaroe/keymap.c
M keyboards/lets_split/keymaps/fabian/keymap.c
M keyboards/lets_split/keymaps/heartrobotninja/keymap.c
M keyboards/lets_split/keymaps/henxing/keymap.c
M keyboards/lets_split/keymaps/khord/keymap.c
M keyboards/lets_split/keymaps/kris/keymap.c
M keyboards/lets_split/keymaps/krusli/keymap.c
M keyboards/lets_split/keymaps/mbsurfer/keymap.c
M keyboards/lets_split/keymaps/mjt/keymap.c
M keyboards/lets_split/keymaps/normacos/keymap.c
M keyboards/lets_split/keymaps/piemod/keymap.c
M keyboards/lets_split/keymaps/pitty/keymap.c
M keyboards/lets_split/keymaps/poker/keymap.c
M keyboards/lets_split/keymaps/smt/keymap.c
M keyboards/lets_split/keymaps/waples/keymap.c
M keyboards/lets_split/keymaps/xk/keymap.c
M keyboards/lets_split/keymaps/xyverz/keymap.c
M keyboards/lets_split/lets_split.h
M keyboards/levinson/keymaps/default/keymap.c
M keyboards/levinson/keymaps/treadwell/keymap.c
M keyboards/levinson/keymaps/valgrahf/keymap.c
M keyboards/levinson/levinson.h
M keyboards/mt40/config.h
A keyboards/mt40/keymaps/default/config.h
M keyboards/mt40/keymaps/default/keymap.c
M keyboards/mt40/matrix.c
M keyboards/mt40/mt40.c
M keyboards/mt40/mt40.h
M keyboards/mt40/rules.mk
M keyboards/niu_mini/keymaps/default/keymap.c
M keyboards/niu_mini/keymaps/mason/keymap.c
M keyboards/niu_mini/keymaps/planck/keymap.c
M keyboards/niu_mini/keymaps/readme.md
A keyboards/niu_mini/keymaps/xtonhasvim/config.h
A keyboards/niu_mini/keymaps/xtonhasvim/keymap.c
A keyboards/niu_mini/keymaps/xtonhasvim/readme.md
A keyboards/niu_mini/keymaps/xtonhasvim/rules.mk
M keyboards/niu_mini/niu_mini.h
M keyboards/niu_mini/rules.mk
M keyboards/orthodox/keymaps/default/config.h
M keyboards/orthodox/keymaps/default/keymap.c
M keyboards/orthodox/keymaps/drashna/keymap.c
M keyboards/orthodox/keymaps/oscillope/keymap.c
M keyboards/orthodox/orthodox.h
M keyboards/orthodox/rev1/info.json
M keyboards/orthodox/rev1/rev1.c
M keyboards/orthodox/rev1/rev1.h
M keyboards/orthodox/rev3/info.json
M keyboards/orthodox/rev3/rev3.c
M keyboards/orthodox/rev3/rev3.h
M keyboards/orthodox/rev3_teensy/info.json
M keyboards/orthodox/rev3_teensy/rev3_teensy.c
M keyboards/orthodox/rev3_teensy/rev3_teensy.h
A keyboards/paladin64/info.json
M keyboards/paladin64/keymaps/default/keymap.c
M keyboards/paladin64/paladin64.h
M keyboards/paladin64/rules.mk
A keyboards/pk60/config.h
A keyboards/pk60/info.json
A keyboards/pk60/keymaps/default/keymap.c
A keyboards/pk60/keymaps/default/readme.md
A keyboards/pk60/pk60.c
A keyboards/pk60/pk60.h
A keyboards/pk60/readme.md
A keyboards/pk60/rules.mk
M keyboards/planck/keymaps/sascha/keymap.c
M keyboards/planck/keymaps/sascha/rules.mk
M keyboards/redox/keymaps/default/config.h
M keyboards/redox/keymaps/default/keymap.c
M keyboards/redox/keymaps/default/readme.md
A keyboards/redox/keymaps/italian/config.h
A keyboards/redox/keymaps/italian/keymap.c
A keyboards/redox/keymaps/italian/readme.md
A keyboards/redox/keymaps/italian/rules.mk
A keyboards/vitamins_included/config.h
A keyboards/vitamins_included/i2c.c
A keyboards/vitamins_included/i2c.h
A keyboards/vitamins_included/keymaps/default/config.h
A keyboards/vitamins_included/keymaps/default/keymap.c
A keyboards/vitamins_included/keymaps/default/rules.mk
A keyboards/vitamins_included/matrix.c
A keyboards/vitamins_included/readme.md
A keyboards/vitamins_included/rev1/config.h
A keyboards/vitamins_included/rev1/rev1.c
A keyboards/vitamins_included/rev1/rev1.h
A keyboards/vitamins_included/rev1/rules.mk
A keyboards/vitamins_included/rules.mk
A keyboards/vitamins_included/serial.c
A keyboards/vitamins_included/serial.h
A keyboards/vitamins_included/split_util.c
A keyboards/vitamins_included/split_util.h
A keyboards/vitamins_included/vitamins_included.c
A keyboards/vitamins_included/vitamins_included.h
M keyboards/xd60/info.json
M keyboards/xd60/keymaps/Jos/keymap.c
M keyboards/xd60/keymaps/birkir/keymap.c
M keyboards/xd60/keymaps/cheese/keymap.c
M keyboards/xd60/keymaps/default/keymap.c
M keyboards/xd60/keymaps/edulpn/keymap.c
M keyboards/xd60/keymaps/iso/keymap.c
M keyboards/xd60/keymaps/kmontag42/keymap.c
M keyboards/xd60/keymaps/krusli/keymap.c
M keyboards/xd60/keymaps/petesmom/keymap.c
M keyboards/xd60/keymaps/rooski/keymap.c
M keyboards/xd60/keymaps/split_bksp_arrows/keymap.c
M keyboards/xd60/keymaps/stanleylai/keymap.c
M keyboards/xd60/keymaps/supercoffee/keymap.c
M keyboards/xd60/keymaps/yuuki/keymap.c
M keyboards/xd60/rules.mk
M keyboards/xd60/xd60.h
M keyboards/xd75/keymaps/default/keymap.c
M keyboards/xd75/keymaps/default/readme.md
A keyboards/ymd75/README.md
A keyboards/ymd75/backlight.c
A keyboards/ymd75/backlight_custom.h
A keyboards/ymd75/breathing_custom.h
A keyboards/ymd75/config.h
A keyboards/ymd75/i2c.c
A keyboards/ymd75/i2c.h
A keyboards/ymd75/info.json
A keyboards/ymd75/keymaps/default/keymap.c
A keyboards/ymd75/matrix.c
A keyboards/ymd75/program
A keyboards/ymd75/rules.mk
A keyboards/ymd75/usbconfig.h
A keyboards/ymd75/ymd75.c
A keyboards/ymd75/ymd75.h
M keyboards/ymd96/keymaps/JJ50/keymap.c
M keyboards/ymd96/ymd96.h
M layouts/community/60_ansi/mechmerlin-ansi/readme.md
M layouts/community/60_ansi/readme.md
M layouts/community/60_ansi/talljoe-ansi/config.h
M layouts/community/60_ansi_split_bs_rshift/talljoe/config.h
A layouts/community/60_hhkb/talljoe-hhkb/config.h
A layouts/community/60_hhkb/talljoe-hhkb/keymap.c
A layouts/community/60_hhkb/talljoe-hhkb/rules.mk
M layouts/community/ortho_4x12/talljoe/config.h
A layouts/community/tkl_ansi/talljoe-tkl/config.h
A layouts/community/tkl_ansi/talljoe-tkl/keymap.c
A layouts/community/tkl_ansi/talljoe-tkl/rules.mk
A layouts/default/60_hhkb/default_60_hhkb/keymap.c
A layouts/default/60_hhkb/layout.json
A layouts/default/60_hhkb/readme.md
A layouts/default/tkl_ansi/default_tkl_ansi/keymap.c
A layouts/default/tkl_ansi/layout.json
A layouts/default/tkl_ansi/readme.md
M lib/lufa/LUFA/Drivers/USB/Class/Common/HIDParser.c
M lib/lufa/LUFA/Drivers/USB/Core/Events.h
M quantum/rgb_matrix.c
M quantum/rgb_matrix.h
M quantum/rgblight_list.h
R quantum/template/{ => avr}/config.h
R quantum/template/{ => avr}/rules.mk
R quantum/template/{ => avr}/template.c
R quantum/template/{ => avr}/template.h
A quantum/template/base/info.json
R quantum/template/{ => base}/keymaps/default/config.h
R quantum/template/{ => base}/keymaps/default/keymap.c
R quantum/template/{ => base}/keymaps/default/readme.md
R quantum/template/{ => base}/readme.md
A quantum/template/ps2avrgb/config.h
A quantum/template/ps2avrgb/i2c.c
A quantum/template/ps2avrgb/i2c.h
A quantum/template/ps2avrgb/matrix.c
A quantum/template/ps2avrgb/rules.mk
A quantum/template/ps2avrgb/template.c
A quantum/template/ps2avrgb/template.h
A quantum/template/ps2avrgb/usbconfig.h
M tmk_core/common/action.c
M users/talljoe/rules.mk
M users/talljoe/talljoe.c
M users/talljoe/talljoe.h
A users/talljoe/tapdance.c
A users/xtonhasvim/readme.md
A users/xtonhasvim/rules.mk
A users/xtonhasvim/xtonhasvim.c
A users/xtonhasvim/xtonhasvim.h
M util/activate_msys2.sh
M util/msys2_install.sh
M util/new_project.sh
This diff is too large to display. Try viewing the raw diff instead.