summaryrefslogtreecommitdiffstats
path: root/keyboards
diff options
context:
space:
mode:
authorCallum Oakley <callum@pusher.com>2017-08-19 10:34:45 +0100
committerCallum Oakley <callum@pusher.com>2017-08-19 10:34:45 +0100
commita6845036e25c4f4d936dcd12cd0ddedd2894b30e (patch)
treeb23b4e8d9d757aa3c0d42be561572533ae0d126c /keyboards
parent84a8aabe5bf8807595f98de44d18f6a31b892edf (diff)
parent7277f09bbadcce120f819132dec8ff7172caacc4 (diff)
Merge branch 'master' of https://github.com/qmk/qmk_firmware
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/alps64/readme.md16
-rwxr-xr-xkeyboards/amj40/Makefile3
-rwxr-xr-xkeyboards/amj40/amj40.c30
-rwxr-xr-xkeyboards/amj40/amj40.h38
-rwxr-xr-xkeyboards/amj40/config.h94
-rwxr-xr-xkeyboards/amj40/keymaps/default/Makefile27
-rwxr-xr-xkeyboards/amj40/keymaps/default/build.sh42
-rwxr-xr-xkeyboards/amj40/keymaps/default/keymap.c173
-rwxr-xr-xkeyboards/amj40/keymaps/default/readme.md11
-rwxr-xr-xkeyboards/amj40/keymaps/default/updatemerge.sh4
-rwxr-xr-xkeyboards/amj40/keymaps/fabian/Makefile27
-rwxr-xr-xkeyboards/amj40/keymaps/fabian/keymap.c236
-rwxr-xr-xkeyboards/amj40/readme.md35
-rwxr-xr-xkeyboards/amj40/rules.mk66
-rw-r--r--keyboards/amj60/readme.md61
-rw-r--r--keyboards/amjpad/readme.md14
-rw-r--r--keyboards/atreus/readme.md187
-rw-r--r--keyboards/atreus62/readme.md18
-rw-r--r--keyboards/bananasplit/Makefile3
-rw-r--r--keyboards/bananasplit/README.md29
-rw-r--r--keyboards/bananasplit/bananasplit.c28
-rw-r--r--keyboards/bananasplit/bananasplit.h142
-rw-r--r--keyboards/bananasplit/config.h84
-rw-r--r--keyboards/bananasplit/keymaps/0010/Makefile37
-rw-r--r--keyboards/bananasplit/keymaps/0010/config.h (renamed from keyboards/whitefox/animations.h)18
-rw-r--r--keyboards/bananasplit/keymaps/0010/keymap.c73
-rw-r--r--keyboards/bananasplit/keymaps/coloneljesus/Makefile37
-rw-r--r--keyboards/bananasplit/keymaps/coloneljesus/config.h (renamed from keyboards/ergodox/infinity/animations.h)19
-rw-r--r--keyboards/bananasplit/keymaps/coloneljesus/keymap.c96
-rw-r--r--keyboards/bananasplit/keymaps/coloneljesus/readme.md33
-rw-r--r--keyboards/bananasplit/keymaps/default/Makefile37
-rw-r--r--keyboards/bananasplit/keymaps/default/config.h24
-rw-r--r--keyboards/bananasplit/keymaps/default/keymap.c25
-rw-r--r--keyboards/bananasplit/keymaps/default/readme.md1
-rw-r--r--keyboards/bananasplit/keymaps/hhkbanana/keymap.c25
-rw-r--r--keyboards/bananasplit/keymaps/nic/keymap.c45
-rw-r--r--keyboards/bananasplit/rules.mk65
-rw-r--r--keyboards/bantam44/readme.md29
-rw-r--r--keyboards/clueboard/keymaps/bloodlvst/Makefile2
-rw-r--r--keyboards/clueboard/keymaps/bloodlvst/config.h8
-rw-r--r--keyboards/clueboard/keymaps/bloodlvst/keymap.c41
-rw-r--r--keyboards/clueboard/keymaps/bloodlvst/readme.md17
-rw-r--r--keyboards/clueboard/keymaps/caps_fn/keymap.c47
-rw-r--r--keyboards/clueboard/keymaps/colemak/keymap.c59
-rw-r--r--keyboards/clueboard/keymaps/default/keymap.c75
-rw-r--r--keyboards/clueboard/keymaps/jokrik/keymap.c45
-rw-r--r--keyboards/clueboard/keymaps/mac_optimized/keymap.c68
-rw-r--r--keyboards/clueboard/keymaps/magicmonty/keymap.c41
-rw-r--r--keyboards/clueboard/keymaps/maximised/keymap.c6
-rw-r--r--keyboards/clueboard/keymaps/mouse_keys/keymap.c47
-rw-r--r--keyboards/clueboard/keymaps/serubin/keymap.c51
-rw-r--r--keyboards/clueboard/keymaps/shift_fn/keymap.c47
-rw-r--r--keyboards/clueboard/keymaps/skully/keymap.c47
-rw-r--r--keyboards/clueboard/keymaps/smt/keymap.c53
-rw-r--r--keyboards/clueboard/keymaps/unix_optimized/keymap.c47
-rw-r--r--keyboards/clueboard/keymaps/win_optimized/keymap.c47
-rw-r--r--keyboards/clueboard/keymaps/xyverz/keymap.c35
-rw-r--r--keyboards/clueboard/readme.md102
-rw-r--r--keyboards/clueboard/rules.mk2
-rw-r--r--keyboards/cluecard/readme.md31
-rw-r--r--keyboards/cluepad/readme.md17
-rw-r--r--keyboards/converter/usb_usb/Makefile3
-rw-r--r--keyboards/converter/usb_usb/README.md84
-rw-r--r--keyboards/converter/usb_usb/config.h63
-rw-r--r--keyboards/converter/usb_usb/custom_matrix.cpp238
-rw-r--r--keyboards/converter/usb_usb/keymap.c288
-rw-r--r--keyboards/converter/usb_usb/keymaps/coloneljesus/Makefile3
-rw-r--r--keyboards/converter/usb_usb/keymaps/coloneljesus/config.h6
-rw-r--r--keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c307
-rw-r--r--keyboards/converter/usb_usb/keymaps/default/Makefile3
-rw-r--r--keyboards/converter/usb_usb/keymaps/default/config.h6
-rw-r--r--keyboards/converter/usb_usb/keymaps/default/keymap.c85
-rw-r--r--keyboards/converter/usb_usb/main.c102
-rw-r--r--keyboards/converter/usb_usb/matrix.c1
-rw-r--r--keyboards/converter/usb_usb/rules.mk66
-rw-r--r--keyboards/converter/usb_usb/usb_usb.c1
-rw-r--r--keyboards/converter/usb_usb/usb_usb.h203
-rw-r--r--keyboards/deltasplit75/Makefile5
-rw-r--r--keyboards/deltasplit75/config.h29
-rw-r--r--keyboards/deltasplit75/deltasplit75.c1
-rw-r--r--keyboards/deltasplit75/deltasplit75.h13
-rw-r--r--keyboards/deltasplit75/eeprom-lefthand.eep2
-rw-r--r--keyboards/deltasplit75/eeprom-righthand.eep2
-rw-r--r--keyboards/deltasplit75/i2c.c162
-rw-r--r--keyboards/deltasplit75/i2c.h31
-rw-r--r--keyboards/deltasplit75/keymaps/default/config.h31
-rw-r--r--keyboards/deltasplit75/keymaps/default/keymap.c31
-rw-r--r--keyboards/deltasplit75/keymaps/itsaferbie/Makefile7
-rw-r--r--keyboards/deltasplit75/keymaps/itsaferbie/config.h31
-rw-r--r--keyboards/deltasplit75/keymaps/itsaferbie/keymap.c46
-rw-r--r--keyboards/deltasplit75/keymaps/protosplit/config.h31
-rw-r--r--keyboards/deltasplit75/keymaps/protosplit/keymap.c32
-rw-r--r--keyboards/deltasplit75/matrix.c318
-rw-r--r--keyboards/deltasplit75/readme.md137
-rw-r--r--keyboards/deltasplit75/rules.mk75
-rw-r--r--keyboards/deltasplit75/serial.c228
-rw-r--r--keyboards/deltasplit75/serial.h26
-rw-r--r--keyboards/deltasplit75/split_util.c81
-rw-r--r--keyboards/deltasplit75/split_util.h22
-rw-r--r--keyboards/deltasplit75/v2/Makefile3
-rw-r--r--keyboards/deltasplit75/v2/config.h90
-rw-r--r--keyboards/deltasplit75/v2/rules.mk5
-rw-r--r--keyboards/deltasplit75/v2/v2.c14
-rw-r--r--keyboards/deltasplit75/v2/v2.h62
-rw-r--r--keyboards/dk60/config.h2
-rw-r--r--keyboards/dk60/readme.md17
-rw-r--r--keyboards/eco/Makefile5
-rw-r--r--keyboards/eco/config.h80
-rw-r--r--keyboards/eco/eco.c1
-rw-r--r--keyboards/eco/eco.h14
-rw-r--r--keyboards/eco/keymaps/that_canadian/Makefile25
-rw-r--r--keyboards/eco/keymaps/that_canadian/keymap.c217
-rw-r--r--keyboards/eco/keymaps/that_canadian/readme.md1
-rw-r--r--keyboards/eco/readme.md15
-rw-r--r--keyboards/eco/rev1/Makefile3
-rw-r--r--keyboards/eco/rev1/config.h30
-rw-r--r--keyboards/eco/rev1/rev1.c1
-rw-r--r--keyboards/eco/rev1/rev1.h24
-rw-r--r--keyboards/eco/rev1/rules.mk5
-rw-r--r--keyboards/eco/rev2/Makefile3
-rw-r--r--keyboards/eco/rev2/config.h30
-rw-r--r--keyboards/eco/rev2/rev2.c1
-rw-r--r--keyboards/eco/rev2/rev2.h24
-rw-r--r--keyboards/eco/rev2/rules.mk5
-rw-r--r--keyboards/eco/rules.mk68
-rw-r--r--keyboards/ergodox/config.h3
-rw-r--r--keyboards/ergodox/ergodone/Makefile3
-rw-r--r--keyboards/ergodox/ergodone/config.h55
-rw-r--r--keyboards/ergodox/ergodone/ergodone.c5
-rw-r--r--keyboards/ergodox/ergodone/ergodone.h63
-rw-r--r--keyboards/ergodox/ergodone/expander.c120
-rw-r--r--keyboards/ergodox/ergodone/expander.h48
-rw-r--r--keyboards/ergodox/ergodone/i2cmaster.h178
-rw-r--r--keyboards/ergodox/ergodone/matrix.c295
-rw-r--r--keyboards/ergodox/ergodone/readme.md26
-rw-r--r--keyboards/ergodox/ergodone/rules.mk91