summaryrefslogtreecommitdiffstats
path: root/keyboards
diff options
context:
space:
mode:
authorNathan Sharfi <me@ngalt.com>2016-07-31 14:02:25 -0700
committerNathan Sharfi <me@ngalt.com>2016-07-31 14:02:25 -0700
commitd889648d5373b7ff77dc7bc4b369c628e8336b45 (patch)
tree35c6eb194417242958baf54b36f0ff3a56e378f1 /keyboards
parent6428069eb70f5cc47ac1f3f9acf3daea14fb9097 (diff)
parentb25dbc484d639210c53d8e13f79cf5a77f2faaaa (diff)
Merge branch 'master' of github.com:jackhumbert/qmk_firmware
# Conflicts: # keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c # keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/alps64/Makefile70
-rw-r--r--keyboards/alps64/alps64.c30
-rw-r--r--keyboards/alps64/alps64.h40
-rw-r--r--keyboards/alps64/config.h75
-rw-r--r--keyboards/alps64/keymaps/default/keymap.c12
-rw-r--r--keyboards/alps64/led.c34
-rw-r--r--keyboards/alps64/matrix.c199
-rw-r--r--keyboards/alps64/readme.md4
-rw-r--r--keyboards/arrow_pad/Makefile74
-rw-r--r--keyboards/arrow_pad/arrow_pad.c1
-rw-r--r--keyboards/arrow_pad/arrow_pad.h13
-rw-r--r--keyboards/arrow_pad/config.h160
-rw-r--r--keyboards/arrow_pad/keymaps/default/keymap.c163
-rw-r--r--keyboards/arrow_pad/keymaps/pad_21/Makefile17
-rw-r--r--keyboards/arrow_pad/keymaps/pad_21/config.h158
-rw-r--r--keyboards/arrow_pad/keymaps/pad_21/keymap.c160
-rw-r--r--keyboards/arrow_pad/keymaps/pad_24/Makefile17
-rw-r--r--keyboards/arrow_pad/keymaps/pad_24/config.h160
-rw-r--r--keyboards/arrow_pad/keymaps/pad_24/keymap.c163
-rw-r--r--keyboards/arrow_pad/readme.md24
-rw-r--r--keyboards/atomic/Makefile73
-rw-r--r--keyboards/atomic/atomic.c15
-rw-r--r--keyboards/atomic/atomic.h27
-rw-r--r--keyboards/atomic/config.h160
-rw-r--r--keyboards/atomic/keymaps/abienz.c36
-rw-r--r--keyboards/atomic/keymaps/default/keymap.c234
-rw-r--r--keyboards/atomic/keymaps/michelle.c183
-rw-r--r--keyboards/atomic/keymaps/pvc/Makefile15
-rw-r--r--keyboards/atomic/keymaps/pvc/config.h169
-rw-r--r--keyboards/atomic/keymaps/pvc/keymap.c578
-rw-r--r--keyboards/atomic/readme.md25
-rw-r--r--keyboards/atreus/Makefile88
-rw-r--r--keyboards/atreus/atreus.c1
-rw-r--r--keyboards/atreus/atreus.h25
-rw-r--r--keyboards/atreus/config.h88
-rw-r--r--keyboards/atreus/keymaps/default/keymap.c51
-rw-r--r--keyboards/atreus/keymaps/gerb/keymap.c66
-rw-r--r--keyboards/atreus/readme.md186
-rw-r--r--keyboards/bantam44/Makefile72
-rw-r--r--keyboards/bantam44/bantam44.c1
-rw-r--r--keyboards/bantam44/bantam44.h23
-rw-r--r--keyboards/bantam44/config.h82
-rw-r--r--keyboards/bantam44/keymaps/default/keymap.c30
-rw-r--r--keyboards/bantam44/readme.md24
-rw-r--r--keyboards/chibios_test/Makefile14
-rw-r--r--keyboards/chibios_test/boards/GENERIC_STM32_F103/board.c49
-rw-r--r--keyboards/chibios_test/boards/GENERIC_STM32_F103/board.h166
-rw-r--r--keyboards/chibios_test/boards/GENERIC_STM32_F103/board.mk5
-rw-r--r--keyboards/chibios_test/boards/GENERIC_STM32_F103/mini_stm32_mapping.pngbin0 -> 162908 bytes
-rw-r--r--keyboards/chibios_test/boards/maple_mini_mapping.pngbin0 -> 237977 bytes
-rw-r--r--keyboards/chibios_test/chibios_test.c1
-rw-r--r--keyboards/chibios_test/chibios_test.h6
-rw-r--r--keyboards/chibios_test/config.h74
-rw-r--r--keyboards/chibios_test/keymaps/default/keymap.c25
-rw-r--r--keyboards/chibios_test/ld/MKL26Z64.ld105
-rw-r--r--keyboards/chibios_test/ld/STM32F103x8_stm32duino_bootloader.ld88
-rw-r--r--keyboards/chibios_test/stm32_f072_onekey/Makefile41
-rw-r--r--keyboards/chibios_test/stm32_f072_onekey/bootloader_defs.h7
-rw-r--r--keyboards/chibios_test/stm32_f072_onekey/chconf.h524
-rw-r--r--keyboards/chibios_test/stm32_f072_onekey/config.h7
-rw-r--r--keyboards/chibios_test/stm32_f072_onekey/halconf.h353
-rw-r--r--keyboards/chibios_test/stm32_f072_onekey/led.c34
-rw-r--r--keyboards/chibios_test/stm32_f072_onekey/matrix.c163
-rw-r--r--keyboards/chibios_test/stm32_f072_onekey/mcuconf.h171
-rw-r--r--keyboards/chibios_test/stm32_f072_onekey/stm32_f072_onekey.c1
-rw-r--r--keyboards/chibios_test/stm32_f072_onekey/stm32_f072_onekey.h5
-rw-r--r--keyboards/chibios_test/stm32_f103_onekey/Makefile52
-rw-r--r--keyboards/chibios_test/stm32_f103_onekey/bootloader_defs.h10
-rw-r--r--keyboards/chibios_test/stm32_f103_onekey/chconf.h524
-rw-r--r--keyboards/chibios_test/stm32_f103_onekey/config.h6
-rwxr-xr-xkeyboards/chibios_test/stm32_f103_onekey/flash.sh2
-rw-r--r--keyboards/chibios_test/stm32_f103_onekey/halconf.h353
-rw-r--r--keyboards/chibios_test/stm32_f103_onekey/led.c43
-rw-r--r--keyboards/chibios_test/stm32_f103_onekey/matrix.c177
-rw-r--r--keyboards/chibios_test/stm32_f103_onekey/mcuconf.h209
-rw-r--r--keyboards/chibios_test/stm32_f103_onekey/stm32_f103_onekey.c1
-rw-r--r--keyboards/chibios_test/stm32_f103_onekey/stm32_f103_onekey.h4
-rw-r--r--keyboards/chibios_test/teensy_lc_onekey/Makefile49
-rw-r--r--keyboards/chibios_test/teensy_lc_onekey/Makefile.3.077
-rw-r--r--keyboards/chibios_test/teensy_lc_onekey/Makefile.3.277
-rw-r--r--keyboards/chibios_test/teensy_lc_onekey/chconf.h524
-rw-r--r--keyboards/chibios_test/teensy_lc_onekey/config.h6
-rw-r--r--keyboards/chibios_test/teensy_lc_onekey/halconf.h187
-rw-r--r--keyboards/chibios_test/teensy_lc_onekey/instructions.md82
-rw-r--r--keyboards/chibios_test/teensy_lc_onekey/led.c32
-rw-r--r--keyboards/chibios_test/teensy_lc_onekey/matrix.c163
-rw-r--r--keyboards/chibios_test/teensy_lc_onekey/mcuconf.h55
-rw-r--r--keyboards/chibios_test/teensy_lc_onekey/teensy_lc_onekey.c1
-rw-r--r--keyboards/chibios_test/teensy_lc_onekey/teensy_lc_onekey.h4
-rw-r--r--keyboards/clueboard/Makefile109
-rw-r--r--keyboards/clueboard/clueboard.c1
-rw-r--r--keyboards/clueboard/clueboard.h13
-rw-r--r--keyboards/clueboard/config.h74
-rw-r--r--keyboards/clueboard/keymaps/default/keymap.c116
-rw-r--r--keyboards/clueboard/keymaps/max/Makefile49
-rw-r--r--keyboards/clueboard/keymaps/max/keymap.c85
-rw-r--r--keyboards/clueboard/keymaps/skully/keymap.c108
-rw-r--r--keyboards/clueboard/readme.md4
-rw-r--r--keyboards/clueboard/rev1/Makefile5
-rw-r--r--keyboards/clueboard/rev1/config.h36
-rw-r--r--keyboards/clueboard/rev1/rev1.c17
-rw-r--r--keyboards/clueboard/rev1/rev1.h47
-rw-r--r--keyboards/clueboard/rev2/Makefile5
-rw-r--r--keyboards/clueboard/rev2/config.h39
-rw-r--r--keyboards/clueboard/rev2/rev2.c63
-rw-r--r--keyboards/clueboard/rev2/rev2.h52
-rw-r--r--keyboards/clueboard2/Makefile71
-rw-r--r--keyboards/clueboard2/clueboard2.c63
-rw-r--r--keyboards/cluepad/Makefile70
-rw-r--r--keyboards/cluepad/cluepad.c60
-rw-r--r--keyboards/cluepad/cluepad.h36
-rw-r--r--keyboards/cluepad/config.h100
-rw-r--r--keyboards/cluepad/keymaps/default/keymap.c65
-rw-r--r--keyboards/cluepad/readme.md4
-rw-r--r--keyboards/ergodox/Makefile34
-rw-r--r--keyboards/ergodox/config.h36
-rw-r--r--keyboards/ergodox/ergodox.c0
-rw-r--r--keyboards/ergodox/ergodox.h10
-rwxr-xr-xkeyboards/ergodox/ez/190hotfix.sh19
-rw-r--r--keyboards/ergodox/ez/Makefile76
-rw-r--r--keyboards/ergodox/ez/config.h65
-rw-r--r--keyboards/ergodox/ez/ez.c85
-rw-r--r--keyboards/ergodox/ez/ez.h122
-rw-r--r--keyboards/ergodox/ez/i2cmaster.h178
-rw-r--r--keyboards/ergodox/ez/matrix.c382
-rw-r--r--keyboards/ergodox/ez/twimaster.c208
-rw-r--r--keyboards/ergodox/ez/util/compile_keymap.py710
-rw-r--r--keyboards/ergodox/ez/util/readme.md3
-rw-r--r--keyboards/ergodox/infinity/MEMO.txt385
-rw-r--r--keyboards/ergodox/infinity/Makefile77
-rw-r--r--keyboards/ergodox/infinity/bootloader_defs.h1
-rw-r--r--keyboards/ergodox/infinity/chconf.h524
-rw-r--r--keyboards/ergodox/infinity/config.h75
-rw-r--r--keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/board_IS31FL3731C.h113
-rw-r--r--keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/driver.mk2
-rw-r--r--