diff options
| author | Joshua T <joshua@sonofone.net> | 2016-07-30 08:41:22 -0500 |
|---|---|---|
| committer | Joshua T <joshua@sonofone.net> | 2016-07-30 08:41:22 -0500 |
| commit | e9a501d4477981da878294a630431ed76716c57e (patch) | |
| tree | 5c6c6a381e21f3d8f2bba223438d7528da717962 | |
| parent | 5607b716ba0ec7002f29244f24aa8999b9511061 (diff) | |
| parent | 7775f3e4b3309f3102bf9d887a79514a67d18da6 (diff) | |
Merge remote-tracking branch 'upstream/master'
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | Vagrantfile | 2 | ||||
| -rw-r--r-- | doc/TMK_README.md | 2 | ||||
| -rw-r--r-- | doc/VAGRANT_GUIDE.md | 4 | ||||
| -rw-r--r-- | keyboards/ergodox/Makefile | 34 | ||||
| -rw-r--r-- | keyboards/ergodox/config.h | 36 | ||||
| -rw-r--r-- | keyboards/ergodox/ergodox.c | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/ergodox.h | 10 | ||||
| -rwxr-xr-x | keyboards/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/config.h) | 33 | ||||
| -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) | 2 | ||||
| -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.txt (renamed from keyboards/infinity_ergodox/MEMO.txt) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/infinity/Makefile (renamed from keyboards/infinity_ergodox/Makefile) | 24 | ||||
| -rw-r--r-- | keyboards/ergodox/infinity/bootloader_defs.h (renamed from keyboards/infinity_ergodox/bootloader_defs.h) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/infinity/chconf.h (renamed from keyboards/infinity_ergodox/chconf.h) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/infinity/config.h (renamed from keyboards/infinity_ergodox/config.h) | 25 | ||||
| -rw-r--r-- | keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/board_IS31FL3731C.h (renamed from keyboards/infinity_ergodox/drivers/gdisp/IS31FL3731C/board_IS31FL3731C.h) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/driver.mk (renamed from keyboards/infinity_ergodox/drivers/gdisp/IS31FL3731C/driver.mk) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c (renamed from keyboards/infinity_ergodox/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_lld_config.h (renamed from keyboards/infinity_ergodox/drivers/gdisp/IS31FL3731C/gdisp_lld_config.h) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/infinity/drivers/gdisp/emulator_lcd/driver.mk (renamed from keyboards/infinity_ergodox/drivers/gdisp/emulator_lcd/driver.mk) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/infinity/drivers/gdisp/emulator_lcd/emulator_lcd.c (renamed from keyboards/infinity_ergodox/drivers/gdisp/emulator_lcd/emulator_lcd.c) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/infinity/drivers/gdisp/emulator_led/driver.mk (renamed from keyboards/infinity_ergodox/drivers/gdisp/emulator_led/driver.mk) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/infinity/drivers/gdisp/emulator_led/emulator_led.c (renamed from keyboards/infinity_ergodox/drivers/gdisp/emulator_led/emulator_led.c) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h (renamed from keyboards/infinity_ergodox/drivers/gdisp/st7565ergodox/board_ST7565.h) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/driver.mk (renamed from keyboards/infinity_ergodox/drivers/gdisp/st7565ergodox/driver.mk) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c (renamed from keyboards/infinity_ergodox/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_config.h (renamed from keyboards/infinity_ergodox/drivers/gdisp/st7565ergodox/gdisp_lld_config.h) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/st7565.h (renamed from keyboards/infinity_ergodox/drivers/gdisp/st7565ergodox/st7565.h) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/infinity/gfxconf.h (renamed from keyboards/infinity_ergodox/gfxconf.h) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/infinity/halconf.h (renamed from keyboards/infinity_ergodox/halconf.h) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/infinity/infinity.c (renamed from keyboards/infinity_ergodox/infinity_ergodox.c) | 60 | ||||
| -rw-r--r-- | keyboards/ergodox/infinity/infinity.h | 110 | ||||
| -rw-r--r-- | keyboards/ergodox/infinity/led.c (renamed from keyboards/infinity_ergodox/led.c) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/infinity/matrix.c (renamed from keyboards/infinity_ergodox/matrix.c) | 3 | ||||
| -rw-r--r-- | keyboards/ergodox/infinity/mcuconf.h (renamed from keyboards/infinity_ergodox/mcuconf.h) | 0 | ||||
| -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) | bin | 80776 -> 80776 bytes | |||
| -rw-r--r-- | keyboards/ergodox/keymaps/ab/keymap.c (renamed from keyboards/ergodox_ez/keymaps/ab/keymap.c) | 2 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/ab/readme.md (renamed from keyboards/ergodox_ez/keymaps/ab/readme.md) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/adnw_k_o_y/keymap.c (renamed from keyboards/ergodox_ez/keymaps/adnw_k_o_y/keymap.c) | 2 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/adnw_k_o_y/readme.md (renamed from keyboards/ergodox_ez/keymaps/adnw_k_o_y/readme.md) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/alexjj/keymap.c (renamed from keyboards/ergodox_ez/keymaps/alexjj/keymap.c) | 2 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/alexjj/readme.md (renamed from keyboards/ergodox_ez/keymaps/alexjj/readme.md) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/alexjj/rl-layout.jpg (renamed from keyboards/ergodox_ez/keymaps/alexjj/rl-layout.jpg) | bin | 833107 -> 833107 bytes | |||
| -rw-r--r-- | keyboards/ergodox/keymaps/algernon/COPYING (renamed from keyboards/ergodox_ez/keymaps/algernon/COPYING) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/algernon/Makefile (renamed from keyboards/ergodox_ez/keymaps/algernon/Makefile) | 8 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/algernon/config.h (renamed from keyboards/ergodox_ez/keymaps/algernon/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/algernon/images/adore-layer.png (renamed from keyboards/ergodox_ez/keymaps/algernon/images/adore-layer.png) | bin | 95615 -> 95615 bytes | |||
| -rw-r--r-- | keyboards/ergodox/keymaps/algernon/images/base-layer.png (renamed from keyboards/ergodox_ez/keymaps/algernon/images/base-layer.png) | bin | 95654 -> 95654 bytes | |||
| -rw-r--r-- | keyboards/ergodox/keymaps/algernon/images/heatmap.png (renamed from keyboards/ergodox_ez/keymaps/algernon/images/heatmap.png) | bin | 137912 -> 137912 bytes | |||
| -rw-r--r-- | keyboards/ergodox/keymaps/algernon/images/hun-layer.png (renamed from keyboards/ergodox_ez/keymaps/algernon/images/hun-layer.png) | bin | 67924 -> 67924 bytes | |||
| -rw-r--r-- | keyboards/ergodox/keymaps/algernon/images/nav-n-media-layer.png (renamed from keyboards/ergodox_ez/keymaps/algernon/images/nav-n-media-layer.png) | bin | 94837 -> 94837 bytes | |||
| -rw-r--r-- | keyboards/ergodox/keymaps/algernon/images/one-handed-layer.png (renamed from keyboards/ergodox_ez/keymaps/algernon/images/one-handed-layer.png) | bin | 91140 -> 91140 bytes | |||
| -rw-r--r-- | keyboards/ergodox/keymaps/algernon/images/steno-layer.png (renamed from keyboards/ergodox_ez/keymaps/algernon/images/steno-layer.png) | bin | 69557 -> 69557 bytes | |||
| -rw-r--r-- | keyboards/ergodox/keymaps/algernon/keymap.c (renamed from keyboards/ergodox_ez/keymaps/algernon/keymap.c) | 2322 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/algernon/readme.md (renamed from keyboards/ergodox_ez/keymaps/algernon/readme.md) | 9 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/algernon/tools/heatmap-adore-layout.json | 533 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/algernon/tools/heatmap-base-layout.json (renamed from keyboards/ergodox_ez/keymaps/algernon/tools/heatmap-base-layout.json) | 0 | ||||
| -rwxr-xr-x | keyboards/ergodox/keymaps/algernon/tools/log-to-heatmap.py (renamed from keyboards/ergodox_ez/keymaps/algernon/tools/log-to-heatmap.py) | 0 | ||||
| -rwxr-xr-x | keyboards/ergodox/keymaps/algernon/tools/max-focused (renamed from keyboards/ergodox_ez/keymaps/algernon/tools/max-focused) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/andrew_osx/keymap.c (renamed from keyboards/ergodox_ez/keymaps/andrew_osx/keymap.c) | 2 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/bepo/bepo.png (renamed from keyboards/ergodox_ez/keymaps/bepo/bepo.png) | bin | 79747 -> 79747 bytes | |||
| -rw-r--r-- | keyboards/ergodox/keymaps/bepo/keymap.c (renamed from keyboards/ergodox_ez/keymaps/bepo/keymap.c) | 2 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/bepo/readme.md (renamed from keyboards/ergodox_ez/keymaps/bepo/readme.md) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/coderkun_neo2/Makefile | 2 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/coderkun_neo2/keymap.c (renamed from keyboards/ergodox_ez/keymaps/coderkun_neo2/keymap.c) | 21 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/coderkun_neo2/readme.md (renamed from keyboards/ergodox_ez/keymaps/coderkun_neo2/readme.md) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/colemak/keymap.c (renamed from keyboards/ergodox_ez/keymaps/colemak/keymap.c) | 2 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/colemak/readme.md (renamed from keyboards/ergodox_ez/keymaps/colemak/readme.md) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/colemak_osx_pc_no/keyboard-layout.png (renamed from keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/keyboard-layout.png) | bin | 103158 -> 103158 bytes | |||
| -rw-r--r-- | keyboards/ergodox/keymaps/colemak_osx_pc_no/keymap.c (renamed from keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/keymap.c) | 4 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/colemak_osx_pc_no/readme.md (renamed from keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/readme.md) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/csharp_dev/csharp_dev.png (renamed from keyboards/ergodox_ez/keymaps/csharp_dev/csharp_dev.png) | bin | 97642 -> 97642 bytes | |||
| -rw-r--r-- | keyboards/ergodox/keymaps/csharp_dev/csharp_dev_legend.png (renamed from keyboards/ergodox_ez/keymaps/csharp_dev/csharp_dev_legend.png) | bin | 387797 -> 387797 bytes | |||
| -rw-r--r-- | keyboards/ergodox/keymaps/csharp_dev/keymap.c (renamed from keyboards/ergodox_ez/keymaps/csharp_dev/keymap.c) | 2 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/csharp_dev/readme.md (renamed from keyboards/ergodox_ez/keymaps/csharp_dev/readme.md) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/dave/keymap.c (renamed from keyboards/ergodox_ez/keymaps/dave/keymap.c) | 2 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/dave/readme.md (renamed from keyboards/ergodox_ez/keymaps/dave/readme.md) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/default/default.png (renamed from keyboards/ergodox_ez/keymaps/default/default.png) | bin | 193672 -> 193672 bytes | |||
| -rw-r--r-- | keyboards/ergodox/keymaps/default/default_highres.png (renamed from keyboards/ergodox_ez/keymaps/default/default_highres.png) | bin | 1459389 -> 1459389 bytes | |||
| -rw-r--r-- | keyboards/ergodox/keymaps/default/keymap.c (renamed from keyboards/ergodox_ez/keymaps/default/keymap.c) | 2 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/default/readme.md (renamed from keyboards/ergodox_ez/keymaps/default/readme.md) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/default_osx/default_osx_highres.png (renamed from keyboards/ergodox_ez/keymaps/default_osx/default_osx_highres.png) | bin | 772418 -> 772418 bytes | |||
| -rw-r--r-- | keyboards/ergodox/keymaps/default_osx/keymap.c (renamed from keyboards/ergodox_ez/keymaps/default_osx/keymap.c) | 2 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/default_osx/readme.md (renamed from keyboards/ergodox_ez/keymaps/default_osx/readme.md) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/dragon788/keymap.c (renamed from keyboards/ergodox_ez/keymaps/dragon788/keymap.c) | 2 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/dvorak/dvorak.png (renamed from keyboards/ergodox_ez/keymaps/dvorak/dvorak.png) | bin | 87314 -> 87314 bytes | |||
| -rw-r--r-- | keyboards/ergodox/keymaps/dvorak/keymap.c (renamed from keyboards/ergodox_ez/keymaps/dvorak/keymap.c) | 2 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/dvorak_intl_squisher/keyboard-layout0.png (renamed from keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout0.png) | bin | 73585 -> 73585 bytes | |||
| -rw-r--r-- | keyboards/ergodox/keymaps/dvorak_intl_squisher/keyboard-layout1.png (renamed from keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout1.png) | bin | 59122 -> 59122 bytes | |||
| -rw-r--r-- | keyboards/ergodox/keymaps/dvorak_intl_squisher/keyboard-layout2.png (renamed from keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout2.png) | bin | 53319 -> 53319 bytes | |||
| -rw-r--r-- | keyboards/ergodox/keymaps/dvorak_intl_squisher/keymap.c (renamed from keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/keymap.c) | 2 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/dvorak_intl_squisher/readme.md (renamed from keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/readme.md) | 0 | ||||
| -rwxr-xr-x | keyboards/ergodox/keymaps/dvorak_spanish/keymap.c (renamed from keyboards/ergodox_ez/keymaps/dvorak_spanish/keymap.c) | 2 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/dvorak_spanish/readme.md (renamed from keyboards/ergodox_ez/keymaps/dvorak_spanish/readme.md) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/emacs_osx_dk/default_highres.png (renamed from keyboards/ergodox_ez/keymaps/emacs_osx_dk/default_highres.png) | bin | 142146 -> 142146 bytes | |||
| -rw-r--r-- | keyboards/ergodox/keymaps/emacs_osx_dk/keymap.c (renamed from keyboards/ergodox_ez/keymaps/emacs_osx_dk/keymap.c) | 2 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/emacs_osx_dk/readme.md (renamed from keyboards/ergodox_ez/keymaps/emacs_osx_dk/readme.md) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/erez_experimental/Makefile (renamed from keyboards/ergodox_ez/keymaps/erez_experimental/Makefile) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/erez_experimental/config.h (renamed from keyboards/ergodox_ez/keymaps/erez_experimental/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/erez_experimental/keymap.c (renamed from keyboards/ergodox_ez/keymaps/erez_experimental/keymap.c) | 2 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/erez_experimental/readme.md (renamed from keyboards/ergodox_ez/keymaps/erez_experimental/readme.md) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/german-kinergo/keymap.c (renamed from keyboards/ergodox_ez/keymaps/german-kinergo/keymap.c) | 2 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/german-kinergo/layout-code.png (renamed from keyboards/ergodox_ez/keymaps/german-kinergo/layout-code.png) | bin | 55386 -> 55386 bytes | |||
| -rw-r--r-- | keyboards/ergodox/keymaps/german-kinergo/layout-media.png (renamed from keyboards/ergodox_ez/keymaps/german-kinergo/layout-media.png) | bin | 67634 -> 67634 bytes | |||
| -rw-r--r-- | keyboards/ergodox/keymaps/german-kinergo/layout.png (renamed from keyboards/ergodox_ez/keymaps/german-kinergo/layout.png) | bin | 71175 -> 71175 bytes | |||
| -rw-r--r-- | keyboards/ergodox/keymaps/german-kinergo/readme.md (renamed from keyboards/ergodox_ez/keymaps/german-kinergo/readme.md) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/german-manuneo/compile_keymap.py (renamed from keyboards/ergodox_ez/util/compile_keymap.py) | 0 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/german-manuneo/keymap.c (renamed from keyboards/ergodox_ez/keymaps/german-manuneo/keymap.c) | 2 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/german-manuneo/keymap.md (renamed from keyboards/ergodox_ez/keymaps/german-manuneo/keymap.md) | 2 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/german/keymap.c (renamed from keyboards/ergodox_ez/keymaps/german/keymap.c) | 2 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/j3rn/keymap.c (renamed from keyboards/ergodox_ez/keymaps/j3rn/keymap.c) | 2 |
