summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Chang <william@factual.com>2019-07-13 10:18:33 -0700
committerWilliam Chang <william@factual.com>2019-07-13 10:18:33 -0700
commit71493b2f9bbd5f3d18373c518fa14ccafcbf48fc (patch)
tree3bb3e5e496621535611e087720aa5c4d7a533e5e
parent86ad4988fe7ff64916127509d84f44c56fa097aa (diff)
parentda1f05fbc19477c05c0c01bb07fabfaf1ece9d54 (diff)
Merge branch 'master' of https://github.com/qmk/qmk_firmware
-rw-r--r--.clang-format2
-rw-r--r--.editorconfig2
-rw-r--r--.travis.yml24
-rw-r--r--Dockerfile8
-rw-r--r--Vagrantfile4
-rw-r--r--common_features.mk10
-rw-r--r--docs/_summary.md7
-rw-r--r--docs/config_options.md12
-rw-r--r--docs/custom_quantum_functions.md2
-rw-r--r--docs/faq_build.md4
-rw-r--r--docs/feature_advanced_keycodes.md16
-rw-r--r--docs/feature_audio.md3
-rw-r--r--docs/feature_backlight.md25
-rw-r--r--docs/feature_bootmagic.md2
-rw-r--r--docs/feature_combo.md3
-rw-r--r--docs/feature_encoders.md2
-rw-r--r--docs/feature_oled_driver.md49
-rw-r--r--docs/feature_rgb_matrix.md50
-rw-r--r--docs/feature_rgblight.md134
-rw-r--r--docs/feature_space_cadet.md11
-rw-r--r--docs/feature_unicode.md68
-rw-r--r--docs/feature_userspace.md2
-rw-r--r--docs/features.md7
-rw-r--r--docs/getting_started_build_tools.md6
-rw-r--r--docs/getting_started_introduction.md8
-rw-r--r--docs/how_keyboards_work.md4
-rw-r--r--docs/i2c_driver.md29
-rw-r--r--docs/index.html8
-rw-r--r--docs/keycodes.md42
-rw-r--r--docs/newbs_flashing.md4
-rw-r--r--docs/quantum_keycodes.md7
-rw-r--r--docs/reference_configurator_support.md2
-rw-r--r--docs/zh-cn/_summary.md66
-rw-r--r--docs/zh-cn/contributing.md205
-rw-r--r--docs/zh-cn/custom_quantum_functions.md490
-rw-r--r--docs/zh-cn/faq.md6
-rw-r--r--docs/zh-cn/faq_build.md150
-rw-r--r--docs/zh-cn/faq_debug.md233
-rw-r--r--docs/zh-cn/faq_general.md19
-rw-r--r--docs/zh-cn/faq_keymap.md212
-rw-r--r--docs/zh-cn/getting_started_getting_help.md15
-rw-r--r--docs/zh-cn/getting_started_github.md59
-rw-r--r--docs/zh-cn/newbs.md23
-rw-r--r--docs/zh-cn/reference_glossary.md170
-rw-r--r--drivers/arm/i2c_master.c16
-rw-r--r--drivers/arm/i2c_master.h40
-rwxr-xr-xdrivers/avr/apa102.h2
-rw-r--r--drivers/avr/ws2812.h2
-rw-r--r--drivers/issi/is31fl3733.c38
-rw-r--r--drivers/issi/is31fl3733.h6
-rw-r--r--drivers/oled/oled_driver.c37
-rw-r--r--drivers/oled/oled_driver.h61
-rw-r--r--drivers/qwiic/qwiic.mk4
-rw-r--r--keyboards/1upkeyboards/1up60hse/config.h3
-rw-r--r--keyboards/1upkeyboards/1up60hte/config.h4
-rw-r--r--keyboards/1upkeyboards/1up60rgb/config.h2
-rw-r--r--keyboards/1upkeyboards/1up60rgb/keymaps/raffle/keymap.c6
-rw-r--r--keyboards/1upkeyboards/super16/config.h2
-rw-r--r--keyboards/1upkeyboards/sweet16/config.h3
-rw-r--r--keyboards/40percentclub/25/config.h2
-rw-r--r--keyboards/40percentclub/4x4/config.h2
-rw-r--r--keyboards/40percentclub/5x5/config.h2
-rw-r--r--keyboards/40percentclub/6lit/config.h2
-rw-r--r--keyboards/40percentclub/foobar/config.h2
-rw-r--r--keyboards/40percentclub/gherkin/config.h2
-rw-r--r--keyboards/40percentclub/gherkin/keymaps/michel/config.h13
-rw-r--r--keyboards/40percentclub/gherkin/keymaps/michel/keymap.c8
-rw-r--r--keyboards/40percentclub/gherkin/keymaps/michel/rules.mk3
-rw-r--r--keyboards/40percentclub/gherkin/keymaps/midi/config.h24
-rw-r--r--keyboards/40percentclub/gherkin/keymaps/midi/keymap.c115
-rw-r--r--keyboards/40percentclub/gherkin/keymaps/midi/readme.md14
-rw-r--r--keyboards/40percentclub/gherkin/keymaps/midi/rules.mk8
-rw-r--r--keyboards/40percentclub/half_n_half/config.h2
-rw-r--r--keyboards/40percentclub/i75/config.h2
-rw-r--r--keyboards/40percentclub/luddite/config.h2
-rw-r--r--keyboards/40percentclub/mf68/config.h2
-rw-r--r--keyboards/40percentclub/nein/config.h239
-rw-r--r--keyboards/40percentclub/nein/info.json22
-rw-r--r--keyboards/40percentclub/nein/keymaps/default/keymap.c29
-rw-r--r--keyboards/40percentclub/nein/nein.c16
-rw-r--r--keyboards/40percentclub/nein/nein.h37
-rw-r--r--keyboards/40percentclub/nein/readme.md18
-rw-r--r--keyboards/40percentclub/nein/rules.mk80
-rw-r--r--keyboards/40percentclub/nori/config.h2
-rw-r--r--keyboards/40percentclub/tomato/config.h2
-rw-r--r--keyboards/40percentclub/ut47/config.h2
-rw-r--r--keyboards/8pack/8pack.c1
-rw-r--r--keyboards/8pack/8pack.h11
-rw-r--r--keyboards/8pack/config.h39
-rw-r--r--keyboards/8pack/info.json21
-rw-r--r--keyboards/8pack/keymaps/default/keymap.c12
-rw-r--r--keyboards/8pack/readme.md13
-rw-r--r--keyboards/8pack/rev11/config.h3
-rw-r--r--keyboards/8pack/rev11/rev11.c1
-rw-r--r--keyboards/8pack/rev11/rev11.h11
-rw-r--r--keyboards/8pack/rev11/rules.mk (renamed from keyboards/9key/keymaps/default/rules.mk)0
-rw-r--r--keyboards/8pack/rev12/config.h3
-rw-r--r--keyboards/8pack/rev12/rev12.c1
-rw-r--r--keyboards/8pack/rev12/rev12.h11
-rw-r--r--keyboards/8pack/rev12/rules.mk (renamed from keyboards/sol/rev1/rules.mk)0
-rw-r--r--keyboards/8pack/rules.mk63
-rw-r--r--keyboards/9key/keymaps/default/keymap.c38
-rw-r--r--keyboards/9key/keymaps/tap_dance/keymap.c69
-rw-r--r--keyboards/9key/keymaps/tap_dance/rules.mk1
-rw-r--r--keyboards/9key/rules.mk4
-rw-r--r--keyboards/abstract/ellipse/info.json12
-rw-r--r--keyboards/abstract/ellipse/keymaps/abstractkb/config.h23
-rw-r--r--keyboards/abstract/ellipse/keymaps/abstractkb/keymap.c66
-rw-r--r--keyboards/abstract/ellipse/keymaps/abstractkb/readme.md3
-rw-r--r--keyboards/abstract/ellipse/keymaps/abstractkb/rules.mk1
-rw-r--r--keyboards/abstract/ellipse/keymaps/default/config.h19
-rw-r--r--keyboards/abstract/ellipse/keymaps/default/keymap.c66
-rw-r--r--keyboards/abstract/ellipse/keymaps/default/readme.md6
-rw-r--r--keyboards/abstract/ellipse/keymaps/default/rules.mk0
-rw-r--r--keyboards/abstract/ellipse/readme.md19
-rw-r--r--keyboards/abstract/ellipse/rev1/config.h245
-rw-r--r--keyboards/abstract/ellipse/rev1/rev1.c43
-rw-r--r--keyboards/abstract/ellipse/rev1/rev1.h36
-rw-r--r--keyboards/abstract/ellipse/rev1/rules.mk81
-rw-r--r--keyboards/acr60/config.h2
-rw-r--r--keyboards/adkb96/rev1/config.h5
-rw-r--r--keyboards/aeboards/aegis/config.h7
-rw-r--r--keyboards/aeboards/ext65/config.h71
-rw-r--r--keyboards/aeboards/ext65/ext65.c18
-rw-r--r--keyboards/aeboards/ext65/ext65.h40
-rw-r--r--keyboards/aeboards/ext65/keymaps/default/keymap.c104
-rw-r--r--keyboards/aeboards/ext65/keymaps/default/readme.md2
-rw-r--r--keyboards/aeboards/ext65/keymaps/via/keymap.c103
-rw-r--r--keyboards/aeboards/ext65/keymaps/via/readme.md2
-rw-r--r--keyboards/aeboards/ext65/keymaps/via/rules.mk68
-rw-r--r--keyboards/aeboards/ext65/readme.md14
-rw-r--r--keyboards/aeboards/ext65/rules.mk65
-rw-r--r--keyboards/ai03/lunar/config.h4
-rw-r--r--keyboards/ai03/lunar/info.json73
-rw-r--r--keyboards/ai03/orbit/config.h2
-rw-r--r--keyboards/ai03/orbit/info.json88
-rw-r--r--keyboards/ai03/quasar/config.h251
-rw-r--r--keyboards/ai03/quasar/info.json97
-rw-r--r--keyboards/ai03/quasar/keymaps/ai03/keymap.c61
-rw-r--r--keyboards/ai03/quasar/keymaps/ai0