summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Ong <the.onga@gmail.com>2019-01-26 12:13:19 +1100
committerAlex Ong <the.onga@gmail.com>2019-01-26 12:13:19 +1100
commitc9ba618654417ec115809a031d315f8327c79ad4 (patch)
treecd5b907af5bebde7062897ff847e473232ed1214
parent2bb2977c133646c4e056960e72029270d77cc1eb (diff)
parentd977daa8dc9136746425f9e1414e1f93cb161877 (diff)
DO NOT USE Merge branch 'master' into debounce_refactor
Merged, however now there are two debounce.h and debounce.c to mess around with and coalesce. # Conflicts: # quantum/matrix.c
<
-rw-r--r--Vagrantfile31
-rw-r--r--build_keyboard.mk87
-rw-r--r--common_features.mk21
-rw-r--r--docs/_sidebar.md100
-rw-r--r--docs/_summary.md2
-rw-r--r--docs/config_options.md15
-rw-r--r--docs/custom_quantum_functions.md45
-rw-r--r--docs/feature_advanced_keycodes.md66
-rw-r--r--docs/feature_encoders.md20
-rw-r--r--docs/feature_unicode.md47
-rw-r--r--docs/features.md1
-rw-r--r--docs/getting_started_build_tools.md6
-rw-r--r--docs/getting_started_make_guide.md28
-rw-r--r--docs/index.html2
-rw-r--r--docs/internals_gpio_control.md6
-rw-r--r--docs/isp_flashing_guide.md2
-rw-r--r--docs/keycodes.md480
-rw-r--r--docs/keycodes_basic.md100
-rw-r--r--docs/proton_c_conversion.md21
-rw-r--r--docs/understanding_qmk.md58
-rw-r--r--docs/zh/_summary.md (renamed from docs/zh/_sidebar.md)0
-rwxr-xr-xdrivers/avr/i2c_master.c5
-rwxr-xr-xdrivers/avr/i2c_slave.c25
-rwxr-xr-xdrivers/avr/i2c_slave.h13
-rw-r--r--drivers/boards/GENERIC_STM32_F303XC/board.c (renamed from keyboards/clueboard/60/boards/GENERIC_STM32_F303XC/board.c)0
-rw-r--r--drivers/boards/GENERIC_STM32_F303XC/board.h (renamed from keyboards/planck/rev6/boards/GENERIC_STM32_F303XC/board.h)4
-rw-r--r--drivers/boards/GENERIC_STM32_F303XC/board.mk (renamed from keyboards/clueboard/60/boards/GENERIC_STM32_F303XC/board.mk)0
-rw-r--r--drivers/boards/GENERIC_STM32_F303XC/bootloader_defs.h (renamed from keyboards/clueboard/60/bootloader_defs.h)0
-rw-r--r--drivers/issi/is31fl3733.c2
-rw-r--r--keyboards/1upkeyboards/sweet16/keymaps/default/keymap.c8
-rw-r--r--keyboards/1upkeyboards/sweet16/keymaps/switchtester/keymap.c31
-rw-r--r--keyboards/1upkeyboards/sweet16/keymaps/switchtester/readme.md5
-rw-r--r--keyboards/1upkeyboards/sweet16/keymaps/switchtester/rules.mk12
-rw-r--r--keyboards/1upkeyboards/sweet16/keymaps/switchtester/switches.c99
-rw-r--r--keyboards/1upkeyboards/sweet16/keymaps/switchtester/switches.h189
-rw-r--r--keyboards/40percentclub/luddite/info.json80
-rw-r--r--keyboards/40percentclub/ut47/readme.md2
-rw-r--r--keyboards/412_64/keymaps/default/keymap.c6
-rw-r--r--keyboards/6ball/keymaps/default/rules.mk3
-rw-r--r--keyboards/6ball/readme.md2
-rw-r--r--keyboards/9key/keymaps/default/rules.mk3
-rw-r--r--keyboards/9key/readme.md2
-rw-r--r--keyboards/acr60/readme.md2
-rw-r--r--keyboards/al1/keymaps/splitbs/keymap.c4
-rw-r--r--keyboards/al1/readme.md2
-rw-r--r--keyboards/alf/dc60/dc60.h14
-rw-r--r--keyboards/alf/dc60/info.json5
-rw-r--r--keyboards/alf/dc60/keymaps/default/keymap.c14
-rw-r--r--keyboards/alice/alice.c55
-rw-r--r--keyboards/alice/alice.h38
-rw-r--r--keyboards/alice/config.h42
-rw-r--r--keyboards/alice/info.json12
-rw-r--r--keyboards/alice/keymaps/default/keymap.c37
-rw-r--r--keyboards/alice/keymaps/mrkeebs/keymap.c37
-rwxr-xr-xkeyboards/alice/program106
-rw-r--r--keyboards/alice/readme.md60
-rw-r--r--keyboards/alice/rules.mk48
-rw-r--r--keyboards/alice/usbconfig.h396
-rw-r--r--keyboards/alpha/keymaps/vderm/README.md35
-rw-r--r--keyboards/alpha/keymaps/vderm/alpha_vderm.hex1422
-rw-r--r--keyboards/alpha/keymaps/vderm/keymap.c34
-rw-r--r--keyboards/alps64/keymaps/crd/keymap.c2
-rw-r--r--keyboards/alps64/keymaps/default/keymap.c1
-rw-r--r--keyboards/alps64/keymaps/mechmerlin/keymap.c26
-rw-r--r--keyboards/alps64/keymaps/mechmerlin/readme.md10
-rw-r--r--keyboards/alps64/readme.md9
-rwxr-xr-xkeyboards/alu84/keymaps/default/keymap.c35
-rw-r--r--keyboards/alu84/keymaps/turbomech/rules.mk3
-rw-r--r--keyboards/alu84/readme.md2
-rw-r--r--keyboards/amj40/keymaps/default/rules.mk4
-rwxr-xr-xkeyboards/amj40/readme.md2
-rw-r--r--keyboards/amj60/keymaps/iso_split_rshift/rules.mk3
-rw-r--r--keyboards/amj60/readme.md2
-rw-r--r--keyboards/amj96/keymaps/default/keymap.c4
-rw-r--r--keyboards/amj96/readme.md2
-rw-r--r--keyboards/amjpad/keymaps/default/keymap.c37
-rw-r--r--keyboards/amjpad/readme.md2
-rw-r--r--keyboards/atom47/readme.md2
-rw-r--r--keyboards/atom47/rev2/readme.md2
-rw-r--r--keyboards/atomic/keymaps/default/keymap.c4
-rw-r--r--keyboards/atomic/keymaps/michelle.c3
-rw-r--r--keyboards/atomic/readme.md2
-rw-r--r--keyboards/atreus/keymaps/alphadox/keymap.c4
-rw-r--r--keyboards/atreus/keymaps/classic/keymap.c4
-rw-r--r--keyboards/atreus/keymaps/default/keymap.c4
-rw-r--r--keyboards/atreus/keymaps/dvorak_42_key/keymap.c4
-rw-r--r--keyboards/atreus/keymaps/gerb/keymap.c4
-rw-r--r--keyboards/atreus/keymaps/jeremy/keymap.c4
-rw-r--r--keyboards/atreus/keymaps/nojjan/keymap.c4
-rw-r--r--keyboards/atreus/keymaps/xk/rules.mk3
-rw-r--r--keyboards/atreus/keymaps/xyverz/keymap.c4
-rw-r--r--keyboards/atreus/readme.md2
-rw-r--r--keyboards/atreus62/keymaps/default/keymap.c6
-rw-r--r--keyboards/atreus62/keymaps/mfluid/keymap.c6
-rw-r--r--keyboards/atreus62/keymaps/mneme/keymap.c3
-rw-r--r--keyboards/atreus62/keymaps/pcewing/keymap.c4
-rw-r--r--keyboards/atreus62/keymaps/xyverz/keymap.c3
-rw-r--r--keyboards/atreus62/readme.md2
-rw-r--r--keyboards/bantam44/keymaps/default/keymap.c3
-rw-r--r--keyboards/bantam44/readme.md2
-rw-r--r--keyboards/bdn9/bdn9.c1
-rw-r--r--keyboards/bdn9/bdn9.h (renamed from quantum/template/avr/template.h)15
-rw-r--r--keyboards/bdn9/config.h74
-rw-r--r--keyboards/bdn9/info.json0
-rw-r--r--keyboards/bdn9/keymaps/default/keymap.c41
-rw-r--r--keyboards/bdn9/readme.md15
-rw-r--r--keyboards/bdn9/rules.mk50
-rw-r--r--keyboards/bface/README.md2
-rw-r--r--keyboards/bface/keymaps/default/keymap.c4
-rw-r--r--keyboards/bfake/readme.md2
-rw-r--r--keyboards/bfo9000/readme.md2
-rw-r--r--keyboards/blockey/readme.md2
-rw-r--r--keyboards/bmini/readme.md2
-rw-r--r--keyboards/bpiphany/kitten_paw/keymaps/default/keymap.c6
-rw-r--r--keyboards/bpiphany/kitten_paw/keymaps/ickerwx/keymap.c7
-rw-r--r--keyboards/bpiphany/pegasushoof/keymaps/citadel/keymap.c10
-rw-r--r--keyboards/bpiphany/tiger_lily/keymaps/default/rules.mk3
-rw-r--r--keyboards/bpiphany/tiger_lily/keymaps/default_ansi/rules.mk3
-rw-r--r--keyboards/bpiphany/unloved_bastard/keymaps/default/keymap.c5
-rw-r--r--keyboards/bpiphany/unloved_bastard/keymaps/default_ansi/keymap.c5
-rw-r--r--keyboards/bthlabs/geekpad/config.h227
-rw-r--r--keyboards/bthlabs/geekpad/geekpad.c43
-rw-r--r--keyboards/bthlabs/geekpad/geekpad.h40
-rw-r--r--keyboards/bthlabs/geekpad/info.json22
-rw-r--r--keyboards/bthlabs/geekpad/keymaps/default/config.h19
-rw-r--r--keyboards/bthlabs/geekpad/keymaps/default/keymap.c24
-rw-r--r--keyboards/bthlabs/geekpad/readme.md15
-rw-r--r--keyboards/bthlabs/geekpad/rules.mk81
-rw-r--r--keyboards/candybar/boards/ST_STM32F072B_DISCOVERY/board.c (renamed from keyboards/proton_c/boards/GENERIC_STM32_F303XC/board.c)25
-rw-r--r--keyboards/candybar/boards/ST_STM32F072B_DISCOVERY/board.h923
-rw-r--r--keyboards/candybar/boards/ST_STM32F072B_DISCOVERY/board.mk5
-rw-r--r--keyboards/candybar/bootloader_defs.h (renamed from keyboards/planck/rev6/bootloader_defs.h)2
-rw-r--r--keyboards/candybar/candybar.c21
-rw-r--r--keyboards/candybar/candybar.h30
-rw-r--r--keyboards/candybar/chconf.h524
-rw-r--r--keyboards/candybar/config.h121
-rw-r--r--keyboards/candybar/halconf.h353
-rw-r--r--