summaryrefslogtreecommitdiffstats
path: root/keyboards
diff options
context:
space:
mode:
authorOlivier <olivier@gid0.org>2016-08-20 18:07:02 +0200
committerOlivier <olivier@gid0.org>2016-08-20 18:07:02 +0200
commit009ab77d3e26bd348e45a9a8102b2737c9367979 (patch)
treeb01491320736c818584098c4b7a6dce8de53f405 /keyboards
parent4cfb262faab653247f4d66d44bf5f3339d82bd36 (diff)
parenta3f726174c0f8f358f7970767a1bf743fd9ad761 (diff)
Merge https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/alps64/readme.md4
-rw-r--r--keyboards/amj60/Makefile (renamed from keyboards/clueboard2/Makefile)25
-rw-r--r--keyboards/amj60/amj60.c30
-rw-r--r--keyboards/amj60/amj60.h153
-rw-r--r--keyboards/amj60/config.h (renamed from keyboards/teensy_lc_onekey/config.h)43
-rw-r--r--keyboards/amj60/keymaps/iso_split_rshift/Makefile23
-rwxr-xr-xkeyboards/amj60/keymaps/iso_split_rshift/build.sh42
-rw-r--r--keyboards/amj60/keymaps/iso_split_rshift/keymap.c147
-rw-r--r--keyboards/amj60/keymaps/iso_split_rshift/readme.md30
-rwxr-xr-xkeyboards/amj60/keymaps/iso_split_rshift/updatemerge.sh4
-rw-r--r--keyboards/amj60/readme.md57
-rw-r--r--keyboards/atreus/Makefile9
-rw-r--r--keyboards/atreus/atreus.h10
-rw-r--r--keyboards/atreus/keymaps/xyverz/keymap.c89
-rw-r--r--keyboards/chibios_test/Makefile14
-rw-r--r--keyboards/chibios_test/boards/GENERIC_STM32_F103/board.c (renamed from keyboards/stm32_f103_onekey/boards/GENERIC_STM32_F103/board.c)0
-rw-r--r--keyboards/chibios_test/boards/GENERIC_STM32_F103/board.h (renamed from keyboards/stm32_f103_onekey/boards/GENERIC_STM32_F103/board.h)0
-rw-r--r--keyboards/chibios_test/boards/GENERIC_STM32_F103/board.mk (renamed from keyboards/stm32_f103_onekey/boards/GENERIC_STM32_F103/board.mk)0
-rw-r--r--keyboards/chibios_test/boards/GENERIC_STM32_F103/mini_stm32_mapping.png (renamed from keyboards/stm32_f103_onekey/boards/GENERIC_STM32_F103/mini_stm32_mapping.png)bin162908 -> 162908 bytes
-rw-r--r--keyboards/chibios_test/boards/maple_mini_mapping.png (renamed from keyboards/stm32_f103_onekey/boards/maple_mini_mapping.png)bin237977 -> 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.h (renamed from keyboards/stm32_f103_onekey/config.h)9
-rw-r--r--keyboards/chibios_test/keymaps/default/keymap.c (renamed from keyboards/stm32_f072_onekey/keymaps/default/keymap.c)4
-rw-r--r--keyboards/chibios_test/ld/MKL26Z64.ld (renamed from keyboards/teensy_lc_onekey/ld/MKL26Z64.ld)0
-rw-r--r--keyboards/chibios_test/ld/STM32F103x8_stm32duino_bootloader.ld (renamed from keyboards/stm32_f103_onekey/ld/STM32F103x8_stm32duino_bootloader.ld)0
-rw-r--r--keyboards/chibios_test/stm32_f072_onekey/Makefile (renamed from keyboards/stm32_f072_onekey/Makefile)11
-rw-r--r--keyboards/chibios_test/stm32_f072_onekey/bootloader_defs.h (renamed from keyboards/stm32_f072_onekey/bootloader_defs.h)0
-rw-r--r--keyboards/chibios_test/stm32_f072_onekey/chconf.h (renamed from keyboards/stm32_f072_onekey/chconf.h)0
-rw-r--r--keyboards/chibios_test/stm32_f072_onekey/config.h7
-rw-r--r--keyboards/chibios_test/stm32_f072_onekey/halconf.h (renamed from keyboards/stm32_f072_onekey/halconf.h)0
-rw-r--r--keyboards/chibios_test/stm32_f072_onekey/led.c (renamed from keyboards/stm32_f072_onekey/led.c)0
-rw-r--r--keyboards/chibios_test/stm32_f072_onekey/matrix.c (renamed from keyboards/stm32_f072_onekey/matrix.c)0
-rw-r--r--keyboards/chibios_test/stm32_f072_onekey/mcuconf.h (renamed from keyboards/stm32_f072_onekey/mcuconf.h)0
-rw-r--r--keyboards/chibios_test/stm32_f072_onekey/stm32_f072_onekey.c (renamed from keyboards/stm32_f072_onekey/stm32_f072_onekey.c)0
-rw-r--r--keyboards/chibios_test/stm32_f072_onekey/stm32_f072_onekey.h (renamed from keyboards/stm32_f072_onekey/stm32_f072_onekey.h)2
-rw-r--r--keyboards/chibios_test/stm32_f103_onekey/Makefile (renamed from keyboards/stm32_f103_onekey/Makefile)14
-rw-r--r--keyboards/chibios_test/stm32_f103_onekey/bootloader_defs.h (renamed from keyboards/stm32_f103_onekey/bootloader_defs.h)0
-rw-r--r--keyboards/chibios_test/stm32_f103_onekey/chconf.h (renamed from keyboards/stm32_f103_onekey/chconf.h)0
-rw-r--r--keyboards/chibios_test/stm32_f103_onekey/config.h6
-rwxr-xr-xkeyboards/chibios_test/stm32_f103_onekey/flash.sh (renamed from keyboards/stm32_f103_onekey/flash.sh)0
-rw-r--r--keyboards/chibios_test/stm32_f103_onekey/halconf.h (renamed from keyboards/stm32_f103_onekey/halconf.h)0
-rw-r--r--keyboards/chibios_test/stm32_f103_onekey/led.c (renamed from keyboards/stm32_f103_onekey/led.c)0
-rw-r--r--keyboards/chibios_test/stm32_f103_onekey/matrix.c (renamed from keyboards/stm32_f103_onekey/matrix.c)0
-rw-r--r--keyboards/chibios_test/stm32_f103_onekey/mcuconf.h (renamed from keyboards/stm32_f103_onekey/mcuconf.h)0
-rw-r--r--keyboards/chibios_test/stm32_f103_onekey/stm32_f103_onekey.c (renamed from keyboards/stm32_f103_onekey/stm32_f103_onekey.c)0
-rw-r--r--keyboards/chibios_test/stm32_f103_onekey/stm32_f103_onekey.h (renamed from keyboards/stm32_f103_onekey/stm32_f103_onekey.h)2
-rw-r--r--keyboards/chibios_test/teensy_lc_onekey/Makefile (renamed from keyboards/teensy_lc_onekey/Makefile)17
-rw-r--r--keyboards/chibios_test/teensy_lc_onekey/Makefile.3.0 (renamed from keyboards/teensy_lc_onekey/Makefile.3.0)0
-rw-r--r--keyboards/chibios_test/teensy_lc_onekey/Makefile.3.2 (renamed from keyboards/teensy_lc_onekey/Makefile.3.2)0
-rw-r--r--keyboards/chibios_test/teensy_lc_onekey/chconf.h (renamed from keyboards/teensy_lc_onekey/chconf.h)0
-rw-r--r--keyboards/chibios_test/teensy_lc_onekey/config.h6
-rw-r--r--keyboards/chibios_test/teensy_lc_onekey/halconf.h (renamed from keyboards/teensy_lc_onekey/halconf.h)0
-rw-r--r--keyboards/chibios_test/teensy_lc_onekey/instructions.md (renamed from keyboards/teensy_lc_onekey/instructions.md)0
-rw-r--r--keyboards/chibios_test/teensy_lc_onekey/led.c (renamed from keyboards/teensy_lc_onekey/led.c)0
-rw-r--r--keyboards/chibios_test/teensy_lc_onekey/matrix.c (renamed from keyboards/teensy_lc_onekey/matrix.c)0
-rw-r--r--keyboards/chibios_test/teensy_lc_onekey/mcuconf.h (renamed from keyboards/teensy_lc_onekey/mcuconf.h)0
-rw-r--r--keyboards/chibios_test/teensy_lc_onekey/teensy_lc_onekey.c (renamed from keyboards/teensy_lc_onekey/teensy_lc_onekey.c)0
-rw-r--r--keyboards/chibios_test/teensy_lc_onekey/teensy_lc_onekey.h (renamed from keyboards/teensy_lc_onekey/teensy_lc_onekey.h)2
-rw-r--r--keyboards/clueboard/Makefile2
-rw-r--r--keyboards/clueboard/clueboard.c16
-rw-r--r--keyboards/clueboard/config.h3
-rw-r--r--keyboards/clueboard/keymaps/default/keymap.c80
-rw-r--r--keyboards/clueboard/keymaps/max/keymap.c70
-rw-r--r--keyboards/clueboard/keymaps/skully/readme.md5
-rw-r--r--keyboards/clueboard/readme.md97
-rw-r--r--keyboards/clueboard/rev1/config.h5
-rw-r--r--keyboards/clueboard/rev1/rev1.c16
-rw-r--r--keyboards/clueboard/rev2/config.h7
-rw-r--r--keyboards/clueboard/rev2/rev2.c16
-rw-r--r--keyboards/clueboard/rev2/rev2.h2
-rw-r--r--keyboards/clueboard2/clueboard2.c63
-rw-r--r--keyboards/cluecard/Makefile76
-rw-r--r--keyboards/cluecard/cluecard.c98
-rw-r--r--keyboards/cluecard/cluecard.h22
-rw-r--r--keyboards/cluecard/config.h167
-rw-r--r--keyboards/cluecard/keymaps/default/Makefile21
-rw-r--r--keyboards/cluecard/keymaps/default/config.h8
-rw-r--r--keyboards/cluecard/keymaps/default/keymap.c63
-rw-r--r--keyboards/cluecard/keymaps/default/readme.md1
-rw-r--r--keyboards/cluecard/readme.md28
-rw-r--r--keyboards/cluepad/config.h13
-rw-r--r--keyboards/cluepad/keymaps/default/keymap.c71
-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.sh (renamed from keyboards/ergodox_ez/190hotfix.sh)0
-rw-r--r--keyboards/ergodox/ez/Makefile (renamed from keyboards/ergodox_ez/Makefile)12
-rw-r--r--keyboards/ergodox/ez/config.h (renamed from keyboards/ergodox_ez/keymaps/townk_osx/config.h)43
-rw-r--r--keyboards/ergodox/ez/ez.c (renamed from keyboards/ergodox_ez/ergodox_ez.c)2
-rw-r--r--keyboards/ergodox/ez/ez.h (renamed from keyboards/ergodox_ez/ergodox_ez.h)0
-rw-r--r--keyboards/ergodox/ez/i2cmaster.h (renamed from keyboards/ergodox_ez/i2cmaster.h)0
-rw-r--r--keyboards/ergodox/ez/matrix.c (renamed from keyboards/ergodox_ez/matrix.c)20
-rw-r--r--keyboards/ergodox/ez/twimaster.c (renamed from keyboards/ergodox_ez/twimaster.c)0
-rw-r--r--keyboards/ergodox/ez/util/compile_keymap.py (renamed from keyboards/ergodox_ez/keymaps/german-manuneo/compile_keymap.py)0
-rw-r--r--keyboards/ergodox/ez/util/readme.md (renamed from keyboards/ergodox_ez/util/readme.md)0
-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--keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c333
-rw-r--r--keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_lld_config.h36
-rw-r--r--keyboards/ergodox/infinity/drivers/gdisp/emulator_lcd/driver.mk2
-rw-r--r--keyboards/ergodox/infinity/drivers/gdisp/emulator_lcd/emulator_lcd.c10
-rw-r--r--keyboards/ergodox/infinity/drivers/gdisp/emulator_led/driver.mk2
-rw-r--r--keyboards/ergodox/infinity/drivers/gdisp/emulator_led/emulator_led.c10
-rw-r--r--keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h127
-rw-r--r--keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/driver.mk2
-rw-r--r--keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c292
-rw-r--r--keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_config.h26
-rw-r--r--keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/st7565.h37
-rw-r--r--keyboards/ergodox/infinity/gfxconf.h331
-rw-r--r--keyboards/ergodox/infinity/halconf.h353
-rw-r--r--keyboards/ergodox/infinity/infinity.c132
-rw-r--r--keyboards/ergodox/infinity/infinity.h110
-rw-r--r--keyboards/ergodox/infinity/led.c49
-rw-r--r--keyboards/ergodox/infinity/matrix.c172
-rw-r--r--keyboards/ergodox/infinity/mcuconf.h74
-rw-r--r--keyboards/ergodox/keymaps/ab/Makefile (renamed from keyboards/ergodox_ez/keymaps/ab/Makefile)0
-rw-r--r--keyboards/ergodox/keymaps/ab/keyboard-layout.json (renamed from keyboards/ergodox_ez/keymaps/ab/keyboard-layout.json)0
-rw-r--r--keyboards/ergodox/keymaps/ab/keyboard-layout.png (renamed from keyboards/ergodox_ez/keymaps/ab/keyboard-layout.png)bin80776 -> 80776 bytes
-rw-r--r--ke