summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Ong <the.onga@gmail.com>2019-01-04 19:39:14 +1100
committerAlex Ong <the.onga@gmail.com>2019-01-04 19:39:14 +1100
commit47c91fc7f75ae0a477e55b687aa0fc30da0a283c (patch)
tree65ad39452748ff2e6d4a83ce54ede6ca22c9ada9
parentac9b88e8ccbbf38762871504cd827ff0d941c426 (diff)
parent563ce3f225d981ce460c12ca5130dfe47af41df0 (diff)
Merge branch 'master' of https://github.com/qmk/qmk_firmware
-rw-r--r--.github/ISSUE_TEMPLATE/blank.md5
-rw-r--r--.github/ISSUE_TEMPLATE/bug_report.md31
-rw-r--r--.github/ISSUE_TEMPLATE/feature_request.md19
-rw-r--r--.github/ISSUE_TEMPLATE/other_issues.md9
-rw-r--r--.github/PULL_REQUEST_TEMPLATE.md32
-rw-r--r--.travis.yml3
-rw-r--r--Dockerfile37
-rw-r--r--Makefile2
-rw-r--r--Vagrantfile2
-rw-r--r--build_keyboard.mk117
-rw-r--r--common.mk1
-rw-r--r--common_features.mk80
-rw-r--r--docs/LANGS.md4
-rw-r--r--docs/_sidebar.md78
-rw-r--r--docs/_summary.md78
-rw-r--r--docs/arm_debugging.md87
-rw-r--r--docs/becoming_a_qmk_collaborator.md10
-rw-r--r--docs/config_options.md109
-rw-r--r--docs/contributing.md24
-rw-r--r--docs/custom_quantum_functions.md182
-rw-r--r--docs/documentation_templates.md2
-rw-r--r--docs/faq_build.md14
-rw-r--r--docs/faq_keymap.md30
-rw-r--r--docs/feature_advanced_keycodes.md260
-rw-r--r--docs/feature_audio.md33
-rw-r--r--docs/feature_backlight.md22
-rw-r--r--docs/feature_bluetooth.md32
-rw-r--r--docs/feature_bootmagic.md53
-rw-r--r--docs/feature_combo.md89
-rw-r--r--docs/feature_encoders.md48
-rw-r--r--docs/feature_layouts.md6
-rw-r--r--docs/feature_leader_key.md111
-rw-r--r--docs/feature_macros.md164
-rw-r--r--docs/feature_ps2_mouse.md18
-rw-r--r--docs/feature_rgb_matrix.md83
-rw-r--r--docs/feature_rgblight.md64
-rw-r--r--docs/feature_tap_dance.md38
-rw-r--r--docs/feature_unicode.md177
-rw-r--r--docs/feature_userspace.md178
-rw-r--r--docs/features.md6
-rw-r--r--docs/flashing.md39
-rw-r--r--docs/getting_started_build_tools.md35
-rw-r--r--docs/getting_started_github.md2
-rw-r--r--docs/hardware_avr.md44
-rw-r--r--docs/hardware_drivers.md8
-rw-r--r--docs/how_keyboards_work.md14
-rw-r--r--docs/i2c_driver.md82
-rw-r--r--docs/index.html3
-rw-r--r--docs/internals_gpio_control.md23
-rw-r--r--docs/keycode.txt261
-rw-r--r--docs/keycodes.md81
-rw-r--r--docs/keycodes_basic.md10
-rw-r--r--docs/keycodes_us_ansi_shifted.md4
-rw-r--r--docs/keymap.md12
-rw-r--r--docs/newbs.md6
-rw-r--r--docs/newbs_best_practices.md163
-rw-r--r--docs/newbs_building_firmware.md16
-rw-r--r--docs/newbs_getting_started.md78
-rw-r--r--docs/newbs_learn_more_resources.md16
-rw-r--r--docs/newbs_testing_debugging.md2
-rw-r--r--docs/quantum_keycodes.md25
-rw-r--r--docs/ref_functions.md119
-rw-r--r--docs/reference_configurator_support.md195
-rw-r--r--docs/reference_glossary.md2
-rw-r--r--docs/support.md43
-rw-r--r--docs/understanding_qmk.md51
-rw-r--r--docs/zh/README.md32
-rw-r--r--docs/zh/_sidebar.md99
-rw-r--r--drivers/arm/i2c_master.c109
-rw-r--r--drivers/arm/i2c_master.h40
-rwxr-xr-xdrivers/avr/i2c_master.c2
-rw-r--r--drivers/avr/is31fl3731.c262
-rw-r--r--drivers/avr/is31fl3731.h214
-rw-r--r--drivers/avr/ws2812.h3
-rw-r--r--drivers/haptic/DRV2605L.c129
-rw-r--r--drivers/haptic/DRV2605L.h394
-rw-r--r--drivers/issi/is31fl3218.c102
-rw-r--r--drivers/issi/is31fl3218.h24
-rw-r--r--drivers/issi/is31fl3731.c270
-rw-r--r--drivers/issi/is31fl3731.h214
-rw-r--r--drivers/issi/is31fl3733.c252
-rw-r--r--drivers/issi/is31fl3733.h255
-rw-r--r--drivers/issi/is31fl3736.c306
-rw-r--r--drivers/issi/is31fl3736.h172
-rw-r--r--drivers/qwiic/micro_oled.c691
-rw-r--r--drivers/qwiic/micro_oled.h134
-rw-r--r--drivers/qwiic/qwiic.c31
-rw-r--r--drivers/qwiic/qwiic.h28
-rw-r--r--drivers/qwiic/qwiic.mk18
-rw-r--r--drivers/qwiic/util/font5x7.h288
-rw-r--r--drivers/qwiic/util/font8x16.h127
-rw-r--r--keyboards/1up60rgb/config.h58
-rw-r--r--keyboards/1up60rgb/readme.md13
-rw-r--r--keyboards/1upkeyboards/1up60hse/1up60hse.c43
-rw-r--r--keyboards/1upkeyboards/1up60hse/1up60hse.h39
-rw-r--r--keyboards/1upkeyboards/1up60hse/config.h224
-rw-r--r--keyboards/1upkeyboards/1up60hse/info.json12
-rw-r--r--keyboards/1upkeyboards/1up60hse/keymaps/default/config.h20
-rw-r--r--keyboards/1upkeyboards/1up60hse/keymaps/default/keymap.c43
-rw-r--r--keyboards/1upkeyboards/1up60hse/keymaps/default/readme.md4
-rw-r--r--keyboards/1upkeyboards/1up60hse/readme.md15
-rw-r--r--keyboards/1upkeyboards/1up60hse/rules.mk72
-rw-r--r--keyboards/1upkeyboards/1up60rgb/1up60rgb.c (renamed from keyboards/1up60rgb/1up60rgb.c)0
-rw-r--r--keyboards/1upkeyboards/1up60rgb/1up60rgb.h (renamed from keyboards/1up60rgb/1up60rgb.h)0
-rw-r--r--keyboards/1upkeyboards/1up60rgb/config.h55
-rw-r--r--keyboards/1upkeyboards/1up60rgb/info.json (renamed from keyboards/1up60rgb/info.json)0
-rw-r--r--keyboards/1upkeyboards/1up60rgb/keymaps/default/keymap.c (renamed from keyboards/1up60rgb/keymaps/default/keymap.c)0
-rw-r--r--keyboards/1upkeyboards/1up60rgb/keymaps/iso/keymap.c (renamed from keyboards/1up60rgb/keymaps/iso/keymap.c)0
-rw-r--r--keyboards/1upkeyboards/1up60rgb/keymaps/raffle/keymap.c130
-rw-r--r--keyboards/1upkeyboards/1up60rgb/keymaps/raffle/readme.md43
-rw-r--r--keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c (renamed from keyboards/1up60rgb/keymaps/tsangan/keymap.c)0
-rw-r--r--keyboards/1upkeyboards/1up60rgb/readme.md13
-rw-r--r--keyboards/1upkeyboards/1up60rgb/rules.mk (renamed from keyboards/1up60rgb/rules.mk)0
-rw-r--r--keyboards/1upkeyboards/readme.md5
-rw-r--r--keyboards/1upkeyboards/sweet16/config.h55
-rw-r--r--keyboards/1upkeyboards/sweet16/info.json (renamed from keyboards/sweet16/info.json)0
-rw-r--r--keyboards/1upkeyboards/sweet16/keymaps/default/keymap.c (renamed from keyboards/sweet16/keymaps/default/keymap.c)0
-rw-r--r--keyboards/1upkeyboards/sweet16/keymaps/dlaroe/keymap.c (renamed from keyboards/sweet16/keymaps/dlaroe/keymap.c)0
-rw-r--r--keyboards/1upkeyboards/sweet16/keymaps/dlaroe/readme.md (renamed from keyboards/sweet16/keymaps/dlaroe/readme.md)0
-rw-r--r--keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/config.h15
-rw-r--r--keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/keymap.c215
-rw-r--r--keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/readme.md10
-rw-r--r--keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/rules.mk5
-rw-r--r--keyboards/1upkeyboards/sweet16/readme.md14
-rw-r--r--keyboards/1upkeyboards/sweet16/rules.mk (renamed from keyboards/sweet16/rules.mk)0
-rw-r--r--keyboards/1upkeyboards/sweet16/sweet16.c (renamed from keyboards/sweet16/sweet16.c)0
-rw-r--r--keyboards/1upkeyboards/sweet16/sweet16.h (renamed from keyboards/sweet16/sweet16.h)0
-rw-r--r--keyboards/30wer/30wer.c1
-rw-r--r--keyboards/30wer/30wer.h14
-rw-r--r--keyboards/30wer/config.h31
-rw-r--r--keyboards/30wer/info.json51
-rw-r--r--keyboards/30wer/keymaps/default/keymap.c17
-rw-r--r--keyboards/30wer/readme.md16
-rw-r--r--keyboards/30wer/rules.mk60
-rw-r--r--keyboards/40percentclub/25/25.c60
-rw-r--r--keyboards/40percentclub/25/25.h85