Fix broken link

Creates a layouts/ folder for keymaps shared between keyboards (#1609 )
* include variables and .h files as pp directives * start layout compilation * split ergodoxes up * don't compile all layouts for everything * might seg fault * reset layouts variable * actually reset layouts * include rules.mk instead * remove includes from rules.mk * update variable setting * load visualizer from path * adds some more examples * adds more layouts * more boards added * more boards added * adds documentation for layouts * use lowercase names for LAYOUT_ * add layout.json files for each layout * add community folder, default keymaps for layouts * touch-up default layouts * touch-up layouts, some keyboard rules.mk * update documentation for layouts * fix up serial/i2c switches
2017-08-24 07:59:22 -04:00 · 2017-08-23 22:29:07 -04:00 · 2017-08-23 15:46:02 -04:00 · 2017-08-23 15:44:25 -04:00 · 2017-08-22 23:53:41 -04:00 · 2017-08-22 23:53:41 -04:00
597 changed files with 5081 additions and 2374 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -44,4 +44,8 @@ util/Win_Check_Output.txt
 *.gif

 # Do not ignore MiniDox left/right hand eeprom files
-!keyboards/minidox/*.eep 
+!keyboards/minidox/*.eep 
+
+# things travis sees
+secrets.tar
+id_rsa_*
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,6 +29,7 @@ addons:
    - binutils-arm-none-eabi
    - libnewlib-arm-none-eabi
    - diffutils
+    - dos2unix
 after_success: 
  bash util/travis_compiled_push.sh
 notifications:
--- a/2
+++ b/2
@@ -25,4 +25,4 @@ ENV keymap=default

 VOLUME /qmk
 WORKDIR /qmk
-CMD make clean; make;
+CMD make clean ; make keyboard=${keyboard} subproject=${subproject} keymap=${keymap}
--- a/10
+++ b/10
@@ -314,11 +314,21 @@ define PARSE_SUBPROJECT
    ifneq ($$(CURRENT_SP),allsp)
        # get a list of all keymaps
        KEYMAPS := $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/keymaps/*/.)))
+        LAYOUTS :=
+        $$(eval -include $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/rules.mk)
+        KEYBOARD_LAYOUTS := $$(LAYOUTS)
        ifneq ($$(CURRENT_SP),)
            # if the subproject is defined, then also look for keymaps inside the subproject folder
            SP_KEYMAPS := $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/$$(CURRENT_SP)/keymaps/*/.)))
            KEYMAPS := $$(sort $$(KEYMAPS) $$(SP_KEYMAPS))
+	        # $$(eval -include $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/$$(CURRENT_SP)/rules.mk)
+        	# KEYBOARD_LAYOUTS := $$(sort $$(KEYBOARD_LAYOUTS) $$(LAYOUTS))
        endif
+
+        LAYOUT_KEYMAPS :=
+        $$(foreach LAYOUT,$$(KEYBOARD_LAYOUTS),$$(eval LAYOUT_KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/layouts/*/$$(LAYOUT)/*/.)))))
+        
+        KEYMAPS := $$(sort $$(KEYMAPS) $$(LAYOUT_KEYMAPS))
        # if the rule after removing the start of it is empty (we haven't specified a kemap or target)
        # compile all the keymaps
        ifeq ($$(RULE),)
--- a/book.json
+++ b/book.json
@@ -8,7 +8,8 @@
      "hints",
      "page-toc",
      "terminal",
-      "toolbar"
+      "toolbar",
+      "bulk-redirect"
    ],
    "pluginsConfig": {
      "edit-link": {
@@ -35,6 +36,10 @@
            "url": "https://github.com/qmk/qmk_firmware"
          }
        ]
+      }, 
+      "bulk-redirect": {
+          "basepath": "/",
+          "redirectsFile": "docs/redirects.json"
      }
    },
    "root": "./docs/"
--- a/build_keyboard.mk
+++ b/build_keyboard.mk
@@ -39,6 +39,7 @@ ifneq ("$(wildcard $(KEYBOARD_C))","")
 else
    $(error "$(KEYBOARD_C)" does not exist)
 endif
+OPT_DEFS += -DKEYBOARD_$(KEYBOARD)

 ifneq ($(SUBPROJECT),)
    SUBPROJECT_PATH := keyboards/$(KEYBOARD)/$(SUBPROJECT)
@@ -97,11 +98,13 @@ else ifneq ("$(wildcard $(MAIN_KEYMAP_C))","")
    -include $(MAIN_KEYMAP_PATH)/Makefile
    KEYMAP_C := $(MAIN_KEYMAP_C)
    KEYMAP_PATH := $(MAIN_KEYMAP_PATH)
+else ifneq ($(LAYOUTS),)
+    include build_layout.mk
 else
-    $(error "$(MAIN_KEYMAP_C)/keymap.c" does not exist)
+    $(error Could not find keymap)
+    # this state should never be reached
 endif

-
 # Object files directory
 #     To put object files in current directory, use a dot (.), do NOT make
 #     this an empty or blank macro!
@@ -157,7 +160,10 @@ endif

 OUTPUTS := $(KEYMAP_OUTPUT) $(KEYBOARD_OUTPUT)
 $(KEYMAP_OUTPUT)_SRC := $(SRC)
-$(KEYMAP_OUTPUT)_DEFS := $(OPT_DEFS) $(GFXDEFS) -DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYMAP=\"$(KEYMAP)\"
+$(KEYMAP_OUTPUT)_DEFS := $(OPT_DEFS) $(GFXDEFS) \
+-DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYBOARD_H=\"$(KEYBOARD).h\" -DQMK_KEYBOARD_CONFIG_H=\"$(KEYBOARD_PATH)/config.h\" \
+-DQMK_KEYMAP=\"$(KEYMAP)\" -DQMK_KEYMAP_H=\"$(KEYMAP).h\" -DQMK_KEYMAP_CONFIG_H=\"$(KEYMAP_PATH)/config.h\" \
+-DQMK_SUBPROJECT=\"$(SUBPROJECT)\" -DQMK_SUBPROJECT_H=\"$(SUBPROJECT).h\" -DQMK_SUBPROJECT_CONFIG_H=\"$(SUBPROJECT_PATH)/config.h\"
 $(KEYMAP_OUTPUT)_INC :=  $(VPATH) $(EXTRAINCDIRS)
 $(KEYMAP_OUTPUT)_CONFIG := $(CONFIG_H)
 $(KEYBOARD_OUTPUT)_SRC := $(CHIBISRC) $(GFXSRC)
--- a/build_layout.mk
+++ b/build_layout.mk
@@ -0,0 +1,18 @@
+LAYOUTS_PATH := layouts
+LAYOUTS_REPOS := $(patsubst %/,%,$(sort $(dir $(wildcard $(LAYOUTS_PATH)/*/))))
+
+define SEARCH_LAYOUTS_REPO
+    LAYOUT_KEYMAP_PATH := $$(LAYOUTS_REPO)/$$(LAYOUT)/$$(KEYMAP)
+    LAYOUT_KEYMAP_C := $$(LAYOUT_KEYMAP_PATH)/keymap.c
+    ifneq ("$$(wildcard $$(LAYOUT_KEYMAP_C))","")
+        -include $$(LAYOUT_KEYMAP_PATH)/rules.mk
+        KEYMAP_C := $$(LAYOUT_KEYMAP_C)
+        KEYMAP_PATH := $$(LAYOUT_KEYMAP_PATH)
+    endif
+endef
+
+define SEARCH_LAYOUTS
+    $$(foreach LAYOUTS_REPO,$$(LAYOUTS_REPOS),$$(eval $$(call SEARCH_LAYOUTS_REPO)))
+endef
+
+$(foreach LAYOUT,$(LAYOUTS),$(eval $(call SEARCH_LAYOUTS)))
--- a/docs/README.md
+++ b/docs/README.md
@@ -12,7 +12,7 @@ Otherwise, you can either download it directly ([zip](https://github.com/qmk/qmk

 ## How to compile {#how-to-compile}

-Before you are able to compile, you'll need to [install an environment](build_environment_setup.md) for AVR or/and ARM development. Once that is complete, you'll use the `make` command to build a keyboard and keymap with the following notation:
+Before you are able to compile, you'll need to [install an environment](getting_started_build_tools.md) for AVR or/and ARM development. Once that is complete, you'll use the `make` command to build a keyboard and keymap with the following notation:

    make planck-rev4-default

--- a/docs/_summary.md
+++ b/docs/_summary.md
@@ -12,6 +12,7 @@
  * [Keymap](faq_keymap.md)

 * [Features](features.md)
+  * [Layouts](feature_layouts.md)
  * [Common Shortcuts](feature_common_shortcuts.md)
  * [Backlight](feature_backlight.md)
  * [Bootmagic](feature_bootmagic.md)
@@ -23,6 +24,7 @@
  * [PS2 Mouse](feature_ps2_mouse.md)
  * [Space Cadet](space_cadet_shift.md)
  * [Tap Dance](tap_dance.md)
+  * [Audio](feature_audio.md)
  * [Thermal Printer](feature_thermal_printer.md)
  * [Stenography](stenography.md)
  * [Unicode](unicode.md)
--- a/docs/faq_build.md
+++ b/docs/faq_build.md
@@ -1,6 +1,6 @@
 # Frequently Asked Build Questions

-This page covers questions about building QMK. If you have not yet you should read the [Build Environment Setup](build_environment_setup.md) and [Make Instructions](make_instructions.md) guides.
+This page covers questions about building QMK. If you have not yet you should read the [Build Environment Setup](getting_started_build_tools.md) and [Make Instructions](make_instructions.md) guides.

 ## Can't program on Linux
 You will need proper permission to operate a device. For Linux users see udev rules below. Easy way is to use `sudo` command, if you are not familiar with this command check its manual with `man sudo` or this page on line.
--- a/docs/feature_layouts.md
+++ b/docs/feature_layouts.md
@@ -0,0 +1,77 @@
+# Layouts: Using a keymap with multiple keyboards
+
+The `layouts/` folder contains different physical key layouts that can apply to different keyboards. 
+
+```
+layouts/
+ default/
+| + 60_ansi/
+| | + readme.md
+| | + layout.json
+| | + a_good_keymap/
+| | | + keymap.c
+| | | + readme.md
+| | | + config.h
+| | | + rules.mk
+| | + <keymap folder>/
+| | + ...
+| + <layout folder>/
+ community/
+| + <layout folder>/
+| + ...
+```
+
+The `layouts/default/` and `layouts/community/` are two examples of layout "repositories" - currently `default` will contain all of the information concerning the layout, and one default keymap named `default_<layout>`, for users to use as a reference. `community` contains all of the community keymaps, with the eventual goal of being split-off into a separate repo for users to clone into `layouts/`. QMK searches through all folders in `layouts/`, so it's possible to have multiple reposistories here. 
+
+Each layout folder is named (`[a-z0-9_]`) after the physical aspects of the layout, in the most generic way possible, and contains a `readme.md` with the layout to be defined by the keyboard:
+
+```md
+# 60_ansi
+
+   LAYOUT_60_ansi
+```
+
+New names should try to stick to the standards set by existing layouts, and can be discussed in the PR/Issue.
+
+## Supporting a layout
+
+For a keyboard to support a layout, the variable (`[a-z0-9_]`) must be defined in it's `<keyboard>.h`, and match the number of arguments/keys (and preferrably the physical layout):
+
+    #define LAYOUT_60_ansi KEYMAP_ANSI
+
+The folder name must be added to the keyboard's `rules.mk`:
+
+    LAYOUTS = 60_ansi
+
+`LAYOUTS` can be appended in the subproject's `rules.mk`:
+
+    LAYOUTS += 60_iso
+
+but the `LAYOUT_<layout>` variable must be defined in `<subproject>.h` as well.
+
+## Tips for making layouts keyboard-agnostic
+
+Instead of using `#include "planck.h"`, you can use this line to include whatever `<keyboard>.h` (`<subproject>.h` should not be included here) file that is being compiled:
+
+    #include QMK_KEYBOARD_H
+
+In your config.h, you can also use this variable to include the keyboard's `config.h`:
+
+    #include QMK_KEYBOARD_CONFIG_H
+
+If you want to keep some keyboard-specific code, you can use these variables to escape it with an `#ifdef` statement:
+
+* `KEYBOARD_<keyboard>`
+* `SUBPROJECT_<subproject>`
+
+For example:
+
+```c
+#ifdef KEYBOARD_planck
+    #ifdef SUBPROJECT_rev4
+        planck_rev4_function();
+    #endif
+#endif
+```
+
+Note that the names are lowercase and match the folder/file names for the keyboard/subproject exactly.
--- a/docs/how_keyboards_work.md
+++ b/docs/how_keyboards_work.md
@@ -51,7 +51,7 @@ layout is set to QWERTY, a sample of the matching table is as follow:

 ## Back to the firmware

-As the layout is generally fixed (unless you create your own), the firmware can actually call a keycode by its layout name directly to ease things for you. This is exactly what is done here with `KC_A` actually representing `0x04` in QWERTY. The full list can be found in `keycode.txt`.
+As the layout is generally fixed (unless you create your own), the firmware can actually call a keycode by its layout name directly to ease things for you. This is exactly what is done here with `KC_A` actually representing `0x04` in QWERTY. The full list can be found in [keycodes](keycodes.md).

 ## List of Characters You Can Send

--- a/docs/redirects.json
+++ b/docs/redirects.json
@@ -0,0 +1,12 @@
+{
+    "redirects": [
+            {
+                "from": "build_environment_setup.html",
+                "to": "getting_started_build_tools.html"
+            },
+            {
+                "from": "make_instructions.html",
+                "to": "getting_started_make_guide.html"
+            }
+        ]
+}
--- a/docs/stenography.md
+++ b/docs/stenography.md
@@ -12,11 +12,11 @@ To use Plover with QMK just enable NKRO and optionally adjust your layout if you

 ## Plover with Steno Protocol

-Plover also understands the language of several steno machines. QMK can speak a couple of these languages, TX Bolt and GeminiRP. An example layout can be found in `planck/keymaps/steno`.
+Plover also understands the language of several steno machines. QMK can speak a couple of these languages, TX Bolt and GeminiPR. An example layout can be found in `planck/keymaps/steno`.

 When QMK speaks to Plover over a steno protocol Plover will not use the keyboard as input. This means that you can switch back and forth between a standard keyboard and your steno keyboard, or even switch layers from Plover to standard and back without needing to activate/deactive Plover.

-In this mode Plover expects to speak with a steno machine over a serial port so QMK will present itself to the operating system as a virtual serial port in addition to a keyboard. By default QMK will speak the TX Bolt protocol but can be switched to GeminiRP; the last protocol used is stored in non-volatile memory so QMK will use the same protocol on restart.
+In this mode Plover expects to speak with a steno machine over a serial port so QMK will present itself to the operating system as a virtual serial port in addition to a keyboard. By default QMK will speak the TX Bolt protocol but can be switched to GeminiPR; the last protocol used is stored in non-volatile memory so QMK will use the same protocol on restart.

 > Note: Due to hardware limitations you may not be able to run both a virtual serial port and mouse emulation at the same time.

@@ -24,13 +24,13 @@ In this mode Plover expects to speak with a steno machine over a serial port so

 TX Bolt communicates the status of 24 keys over a very simple protocol in variable-sized (1-5 byte) packets.

-### GeminiRP
+### GeminiPR

-GeminiRP encodes 42 keys into a 6-byte packet. While TX Bolt contains everything that is necessary for standard stenography, GeminiRP opens up many more options, including supporting non-English theories.
+GeminiPR encodes 42 keys into a 6-byte packet. While TX Bolt contains everything that is necessary for standard stenography, GeminiPR opens up many more options, including supporting non-English theories.

 ## Configuring QMK for Steno

-Firstly, enable steno in your keymap's Makefile. You should also diable mousekeys to prevent conflicts.
+Firstly, enable steno in your keymap's Makefile. You may also need disable mousekeys, extra keys, or another USB endpoint to prevent conflicts. The builtin USB stack for some processors only supports a certain number of USB endpoints and the virtual serial port needed for steno fills 3 of them.

 ```Makefile
 STENO_ENABLE = yes
@@ -60,9 +60,9 @@ On the display tab click 'Open stroke display'. With Plover disabled you should

 As defined in `keymap_steno.h`.

-> Note: TX Bolt does not support the full set of keys. The TX Bolt implementation in QMK will map the GeminiRP keys to the nearest TX Bolt key so that one key map will work for both.
+> Note: TX Bolt does not support the full set of keys. The TX Bolt implementation in QMK will map the GeminiPR keys to the nearest TX Bolt key so that one key map will work for both.

-|GeminiRP|TX Bolt|Steno Key|
+|GeminiPR|TX Bolt|Steno Key|
 |--------|-------|-----------|
 |`STN_N1`|`STN_NUM`|Number bar #1|
 |`STN_N2`|`STN_NUM`|Number bar #2|
@@ -102,7 +102,7 @@ As defined in `keymap_steno.h`.
 |`STN_SR`|`STN_SR`| `-S`|
 |`STN_DR`|`STN_DR`| `-D`|
 |`STN_ZR`|`STN_ZR`| `-Z`|
-|`STN_FN`|| (GeminiRP only)|
-|`STN_RES1`||(GeminiRP only)|
-|`STN_RES2`||(GeminiRP only)|
-|`STN_PWR`||(GeminiRP only)|
+|`STN_FN`|| (GeminiPR only)|
+|`STN_RES1`||(GeminiPR only)|
+|`STN_RES2`||(GeminiPR only)|
+|`STN_PWR`||(GeminiPR only)|
--- a/keyboards/9key/9key.c
+++ b/keyboards/9key/9key.c
@@ -0,0 +1,5 @@
+#include "9key.h"
+
+void matrix_init_kb(void) {
+	matrix_init_user();
+}
--- a/keyboards/9key/9key.h
+++ b/keyboards/9key/9key.h
@@ -0,0 +1,17 @@
+#ifndef NINEKEY_H
+#define NINEKEY_H
+
+#include "quantum.h"
+
+#define KEYMAP( \
+      k00, k01, k02, \
+      k10, k11, k12, \
+      k20, k21, k22  \
+) \
+{ \
+    { k00, k01, k02 }, \
+    { k10, k11, k12 }, \
+    { k20, k21, k22 } \
+} 
+
+#endif
--- a/keyboards/ergodox/Makefile
+++ b/keyboards/ergodox/Makefile
@@ -1,5 +1,3 @@
-SUBPROJECT_DEFAULT = ez
-
 ifndef MAKEFILE_INCLUDED
 	include ../../Makefile
 endif
--- a/keyboards/9key/config.h
+++ b/keyboards/9key/config.h
@@ -0,0 +1,52 @@
+/*
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0x0007
+#define DEVICE_VER 		0x0001
+#define MANUFACTURER    Bishop Keyboards
+#define PRODUCT         9Key
+#define DESCRIPTION     Bishop Keyboards 9Key // Charleston, SC Meetup Handout
+
+/* key matrix size */
+#define MATRIX_ROWS 3
+#define MATRIX_COLS 3
+
+/* 9Key PCB default pin-out */
+#define MATRIX_ROW_PINS { D1, D0, D4 }
+#define MATRIX_COL_PINS { F4, F5, F6 }
+#define UNUSED_PINS
+
+/* ws2812 RGB LED */
+#define RGB_DI_PIN F7
+#define RGBLIGHT_TIMER
+#define RGBLED_NUM 1    // Number of LEDs
+#define ws2812_PORTREG  PORTD
+#define ws2812_DDRREG   DDRD
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+#define TAPPING_TERM 150
+
+#endif
--- a/keyboards/9key/keymaps/default/Makefile
+++ b/keyboards/9key/keymaps/default/Makefile
--- a/keyboards/9key/keymaps/default/keymap.c
+++ b/keyboards/9key/keymaps/default/keymap.c
@@ -0,0 +1,47 @@
+#include "9key.h"
+
+// Tap Dance Declarations
+enum {
+  ENT_5 = 0
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* LAYER 0
+ * ,-----------------.
+ * |  1  |  2  |  3  |
+ * |-----+-----+-----|
+ * |  4  |5/ENT|  6  | Dbl Tap 5 for Enter
+ * |-----+-----+-----|
+ * |  7  |  8  | FN  | 
+ * `-----------------'
+ */
+[0] = KEYMAP( \
+  KC_1, KC_2, KC_3, \
+  KC_4, TD(ENT_5), KC_6, \
+  KC_7, KC_8, MO(1) \
+),
+
+/* LAYER 1
+ * ,-----------------.
+ * |  9  |  0  |  -  |
+ * |-----+-----+-----|
+ * |  +  |  *  |  /  |
+ * |-----+-----+-----|
+ * | F1  | F2  |     |
+ * `-----------------'
+ */
+[1] = KEYMAP( \
+  KC_9,    KC_0,    KC_MINS, \
+  KC_PLUS, KC_ASTR, KC_SLSH, \
+  KC_F1,   KC_F2,   KC_TRNS  \
+)
+
+};
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+  [ENT_5] = ACTION_TAP_DANCE_DOUBLE(KC_5, KC_ENT)
+};
+
+void matrix_init_user(void) {
+}
--- a/keyboards/9key/readme.md
+++ b/keyboards/9key/readme.md
@@ -0,0 +1,17 @@
+9key
+===
+
+![9key](http://i.imgur.com/a3wWc7h.jpg)
+![9KeyBehind](http://i.imgur.com/2PWf5wu.jpg)
+
+A compact minipad (3x3) keyboard made and sold by Bishop Keyboards.
+
+Keyboard Maintainer: QMK Community  
+Hardware Supported: 9key PCB, Pro Micro ATmega32U4  
+Hardware Availability: [BishopKeyboards.com](https://www.reddit.com/user/se7en9057) (BishopKeyboards.com under renovation)  
+
+Make example for this keyboard (after setting up your build environment):
+
+    make 9key-default
+
+See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
--- a/keyboards/9key/rules.mk
+++ b/keyboards/9key/rules.mk
@@ -0,0 +1,69 @@
+# MCU name
+#MCU = at90usb1287
+MCU = atmega32u4
+
+# Processor frequency.
+#     This will define a symbol, F_CPU, in all source code files equal to the
+#     processor frequency in Hz. You can then use this symbol in your source code to
+#     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
+#     automatically to create a 32-bit value in your source code.
+#
+#     This will be an integer division of F_USB below, as it is sourced by
+#     F_USB after it has run through any CPU prescalers. Note that this value
+#     does not *change* the processor frequency - it should merely be updated to
+#     reflect the processor speed set externally so that the code can use accurate
+#     software delays.
+F_CPU = 16000000
+
+#
+# LUFA specific
+#
+# Target architecture (see library "Board Types" documentation).
+ARCH = AVR8
+
+# Input clock frequency.
+#     This will define a symbol, F_USB, in all source code files equal to the
+#     input clock frequency (before any prescaling is performed) in Hz. This value may
+#     differ from F_CPU if prescaling is used on the latter, and is required as the
+#     raw input clock is fed directly to the PLL sections of the AVR for high speed
+#     clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
+#     at the end, this will be done automatically to create a 32-bit value in your
+#     source code.
+#
+#     If no clock division is performed on the input clock inside the AVR (via the
+#     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
+F_USB = $(F_CPU)
+
+# Interrupt driven control endpoint task(+60)
+OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
+
+
+# Boot Section Size in *bytes*
+#   Teensy halfKay   512
+#   Teensy++ halfKay 1024
+#   Atmel DFU loader 4096
+#   LUFA bootloader  4096
+#   USBaspLoader     2048
+OPT_DEFS += -DBOOTLOADER_SIZE=4096
+
+# Build Options
+#   change to "no" to disable the options, or define them in the Makefile in 
+#   the appropriate keymap folder that will get included automatically
+#
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
+CONSOLE_ENABLE = no         # Console for debug(+400)
+COMMAND_ENABLE = no        # Commands for debug and configuration
+NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
+MIDI_ENABLE = no            # MIDI controls
+AUDIO_ENABLE = no           # Audio output on port C6
+UNICODE_ENABLE = yes         # Unicode
+BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
+API_SYSEX_ENABLE = yes
+TAP_DANCE_ENABLE = yes
+
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
--- a/keyboards/alps64/alps64.h
+++ b/keyboards/alps64/alps64.h
@@ -20,12 +20,30 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "quantum.h"

 /* Alps64 keymap definition macro */
+
 #define KEYMAP( \
    K36, K37, K46, K47, K56, K57, K66, K67, K76, K77, K06, K07, K17, K26, K27, \
    K34, K35, K44, K45, K54, K55, K64, K65, K75, K05, K15, K16, K25, K24, \
    K32, K33, K43, K52, K53, K63, K73, K74, K03, K04, K13, K14, K23, \
    K31, K41, K42, K51, K61, K62, K71, K72, K01, K02, K11, K12, K21, K22, \
    K30, K40, K50,           K60,                     K70, K00, K10, K20  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07 }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17 }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27 }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37 }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47 }, \
+    { K50, K51, K52, K53, K54, K55, K56, K57 }, \
+    { K60, K61, K62, K63, K64, K65, K66, K67 }, \
+    { K70, K71, K72, K73, K74, K75, K76, K77 } \
+}
+
+#define KC_KEYMAP( \
+    K36, K37, K46, K47, K56, K57, K66, K67, K76, K77, K06, K07, K17, K26, K27, \
+    K34, K35, K44, K45, K54, K55, K64, K65, K75, K05, K15, K16, K25, K24, \
+    K32, K33, K43, K52, K53, K63, K73, K74, K03, K04, K13, K14, K23, \
+    K31, K41, K42, K51, K61, K62, K71, K72, K01, K02, K11, K12, K21, K22, \
+    K30, K40, K50,           K60,                     K70, K00, K10, K20  \
 ) { \
    { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07 }, \
    { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17 }, \
--- a/keyboards/alps64/keymaps/default/keymap.c
+++ b/keyboards/alps64/keymaps/default/keymap.c
@@ -2,7 +2,7 @@

 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    /* 0: qwerty */
-    KEYMAP( \
+    KC_KEYMAP( \
        GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, NUHS, BSPC, \
        TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   LBRC,RBRC,BSLS, \
        CAPS,A,   S,   D,   F,   G,   H,   J,   K,   L,   SCLN,QUOT,ENT,  \
--- a/keyboards/amj40/keymaps/fabian/keymap.c
+++ b/keyboards/amj40/keymaps/fabian/keymap.c
@@ -179,7 +179,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
    case QWERTY:
      if (record->event.pressed) {
        #ifdef AUDIO_ENABLE
-          PLAY_NOTE_ARRAY(tone_qwerty, false, 0);
+          PLAY_SONG(tone_qwerty);
        #endif
        persistent_default_layer_set(1UL<<_QWERTY);
      }
@@ -188,7 +188,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
    case COLEMAK:
      if (record->event.pressed) {
        #ifdef AUDIO_ENABLE
-          PLAY_NOTE_ARRAY(tone_colemak, false, 0);
+          PLAY_SONG(tone_colemak);
        #endif
        persistent_default_layer_set(1UL<<_COLEMAK);
      }
@@ -197,7 +197,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
    case DVORAK:
      if (record->event.pressed) {
        #ifdef AUDIO_ENABLE
-          PLAY_NOTE_ARRAY(tone_dvorak, false, 0);
+          PLAY_SONG(tone_dvorak);
        #endif
        persistent_default_layer_set(1UL<<_DVORAK);
      }
--- a/keyboards/amj60/amj60.h
+++ b/keyboards/amj60/amj60.h
@@ -63,6 +63,8 @@
    {k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d}  \
 }

+#define LAYOUT_60_ansi KEYMAP_ANSI
+
 /* AMJ60 HHKB matrix layout
   * ,------------------------------------------------------------.
   * | 00 |01| 02| 03| 04| 05| 06| 07| 08| 09| 0a| 0b| 0c| 0d| 49 |
@@ -119,6 +121,7 @@
    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX}, \
    {k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d}  \
 }
+
 /* ISO w/ split right shift key matrix layout
   * ,-----------------------------------------------------------.
   * | 00 |01| 02| 03| 04| 05| 06| 07| 08| 09| 0a| 0b| 0c| 0d    |
--- a/keyboards/amj60/readme.md
+++ b/keyboards/amj60/readme.md
@@ -3,9 +3,9 @@ AMJ60

 A 60% keyboard.

-Keyboard Maintainer: QMK Community
-Hardware Supported: AMJ60
-Hardware Availability: https://geekhack.org/index.php?topic=77636.0
+Keyboard Maintainer: QMK Community  
+Hardware Supported: AMJ60  
+Hardware Availability: https://geekhack.org/index.php?topic=77636.0  

 Make example for this keyboard (after setting up your build environment):

--- a/keyboards/amj60/rules.mk
+++ b/keyboards/amj60/rules.mk
@@ -64,3 +64,5 @@ MIDI_ENABLE      = no  # MIDI controls
 AUDIO_ENABLE     = no
 UNICODE_ENABLE   = no  # Unicode
 BLUETOOTH_ENABLE = no  # Enable Bluetooth with the Adafruit EZ-Key HID
+
+LAYOUTS = 60_ansi
--- a/keyboards/amjpad/readme.md
+++ b/keyboards/amjpad/readme.md
@@ -3,9 +3,9 @@ AMJ Pad

 A DIY Keypad Kit

-Keyboard Maintainer: QMK Community
-Hardware Supported: AMJ Pad
-Hardware Availability: https://geekhack.org/index.php?topic=83546.0
+Keyboard Maintainer: QMK Community  
+Hardware Supported: AMJ Pad  
+Hardware Availability: https://geekhack.org/index.php?topic=83546.0  

 Make example for this keyboard (after setting up your build environment):

--- a/keyboards/atomic/atomic.h
+++ b/keyboards/atomic/atomic.h
@@ -24,4 +24,20 @@
    { K40, K41, KC_NO, K43, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B,   K4C,   K4D,   K4E }  \
 }

+#define KEYMAP_GRID( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,\
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,\
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E,\
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,\
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }  \
+}
+
+#define LAYOUT_ortho_5x15 KEYMAP_GRID
+
 #endif
--- a/keyboards/atomic/keymaps/pvc/keymap.c
+++ b/keyboards/atomic/keymaps/pvc/keymap.c
@@ -471,7 +471,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
                    else
                    {
                        audio_on();
-                        PLAY_NOTE_ARRAY(tone_audio_on, false, STACCATO);
+                        PLAY_SONG(tone_audio_on);
                    }
            }
            break;
@@ -486,7 +486,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
                    }
                    else
                    {
-                    PLAY_NOTE_ARRAY(tone_music_on, false, STACCATO);
+                    PLAY_SONG(tone_music_on);
                    layer_on(LAYER_MUSIC);
                    }
            }
@@ -496,7 +496,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
            {
                #ifdef AUDIO_ENABLE
                    voice_iterate();
-                    PLAY_NOTE_ARRAY(music_scale, false, STACCATO);
+                    PLAY_SONG(music_scale);
                #endif
            }
            break;
@@ -506,7 +506,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
            {
                #ifdef AUDIO_ENABLE
                    voice_deiterate();
-                    PLAY_NOTE_ARRAY(music_scale, false, STACCATO);
+                    PLAY_SONG(music_scale);
                #endif
            }
            break;
@@ -550,32 +550,32 @@ void led_set_user(uint8_t usb_led)
        if ((usb_led & (1<<USB_LED_CAPS_LOCK)) && !(old_usb_led & (1<<USB_LED_CAPS_LOCK)))
        {
                // If CAPS LK LED is turning on...
-                PLAY_NOTE_ARRAY(tone_caps_on,  false, LEGATO);
+                PLAY_SONG(tone_caps_on);
        }
        else if (!(usb_led & (1<<USB_LED_CAPS_LOCK)) && (old_usb_led & (1<<USB_LED_CAPS_LOCK)))
        {
                // If CAPS LK LED is turning off...
-                PLAY_NOTE_ARRAY(tone_caps_off, false, LEGATO);
+                PLAY_SONG(tone_caps_off);
        }
        else if ((usb_led & (1<<USB_LED_NUM_LOCK)) && !(old_usb_led & (1<<USB_LED_NUM_LOCK)))
        {
                // If NUM LK LED is turning on...
-                PLAY_NOTE_ARRAY(tone_numlk_on,  false, LEGATO);
+                PLAY_SONG(tone_numlk_on);
        }
        else if (!(usb_led & (1<<USB_LED_NUM_LOCK)) && (old_usb_led & (1<<USB_LED_NUM_LOCK)))
        {
                // If NUM LED is turning off...
-                PLAY_NOTE_ARRAY(tone_numlk_off, false, LEGATO);
+                PLAY_SONG(tone_numlk_off);
        }
        else if ((usb_led & (1<<USB_LED_SCROLL_LOCK)) && !(old_usb_led & (1<<USB_LED_SCROLL_LOCK)))
        {
                // If SCROLL LK LED is turning on...
-                PLAY_NOTE_ARRAY(tone_scroll_on,  false, LEGATO);
+                PLAY_SONG(tone_scroll_on);
        }
        else if (!(usb_led & (1<<USB_LED_SCROLL_LOCK)) && (old_usb_led & (1<<USB_LED_SCROLL_LOCK)))
        {
                // If SCROLL LED is turning off...
-                PLAY_NOTE_ARRAY(tone_scroll_off, false, LEGATO);
+                PLAY_SONG(tone_scroll_off);
        }
    }

@@ -586,29 +586,29 @@ void led_set_user(uint8_t usb_led)
 void startup_user()
 {
    _delay_ms(10); // gets rid of tick
-    PLAY_NOTE_ARRAY(tone_my_startup, false, STACCATO);
+    PLAY_SONG(tone_my_startup);
 }

 void shutdown_user()
 {
-    PLAY_NOTE_ARRAY(tone_my_goodbye, false, STACCATO);
+    PLAY_SONG(tone_my_goodbye);
    _delay_ms(2000);
    stop_all_notes();
 }

 void audio_on_user(void)
 {
-	PLAY_NOTE_ARRAY(tone_audio_on, false, STACCATO);
+	PLAY_SONG(tone_audio_on);
 }

 void music_on_user(void)
 {
-	PLAY_NOTE_ARRAY(tone_music_on, false, STACCATO);
+	PLAY_SONG(tone_music_on);
 }

 void music_scale_user(void)
 {
-	PLAY_NOTE_ARRAY(music_scale, false, STACCATO);
+	PLAY_SONG(music_scale);
 }

 #endif /* AUDIO_ENABLE */
--- a/keyboards/atomic/rules.mk
+++ b/keyboards/atomic/rules.mk
@@ -66,4 +66,6 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.

 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
+SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
+
+LAYOUTS = ortho_5x15
--- a/keyboards/atreus/rules.mk
+++ b/keyboards/atreus/rules.mk
@@ -78,5 +78,5 @@ UNICODE_ENABLE = YES 		# Unicode

 USB = /dev/cu.usbmodem1411

-upload: build
-	$(ATREUS_UPLOAD_COMMAND)
+# upload: build
+# 	$(ATREUS_UPLOAD_COMMAND)
--- a/keyboards/chibios_test/stm32_f072_onekey/rules.mk
+++ b/keyboards/chibios_test/stm32_f072_onekey/rules.mk
@@ -35,7 +35,4 @@ ARMV = 6

 # Build Options
 #   comment out to disable the options.
-#
-ifndef QUANTUM_DIR
-	include ../../../Makefile
-endif
+#
--- a/keyboards/chibios_test/stm32_f103_onekey/rules.mk
+++ b/keyboards/chibios_test/stm32_f103_onekey/rules.mk
@@ -44,9 +44,4 @@ ARMV = 7
 # http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
 # This also requires a patch to chibios:
 #   <tmk_dir>/tmk_core/tool/chibios/ch-bootloader-jump.patch
-#STM32_BOOTLOADER_ADDRESS = 0x1FFFC800
-
-
-ifndef QUANTUM_DIR
-	include ../../../Makefile
-endif
+#STM32_BOOTLOADER_ADDRESS = 0x1FFFC800
--- a/keyboards/chibios_test/teensy_lc_onekey/rules.mk
+++ b/keyboards/chibios_test/teensy_lc_onekey/rules.mk
@@ -42,8 +42,4 @@ MCU  = cortex-m0plus

 # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
 # I.e. 6 for Teensy LC; 7 for Teensy 3.x
-ARMV = 6
-
-ifndef QUANTUM_DIR
-	include ../../../Makefile
-endif
+ARMV = 6
--- a/keyboards/clueboard/rev1/rules.mk
+++ b/keyboards/clueboard/rev1/rules.mk
@@ -1,5 +1 @@
-BACKLIGHT_ENABLE = no
-
-ifndef QUANTUM_DIR
-	include ../../../Makefile
-endif
+BACKLIGHT_ENABLE = no
--- a/keyboards/clueboard/rev2/rules.mk
+++ b/keyboards/clueboard/rev2/rules.mk
@@ -1,5 +1 @@
-BACKLIGHT_ENABLE = yes
-
-ifndef QUANTUM_DIR
-	include ../../../Makefile
-endif
+BACKLIGHT_ENABLE = yes
--- a/keyboards/cluecard/keymaps/default/keymap.c
+++ b/keyboards/cluecard/keymaps/default/keymap.c
@@ -36,13 +36,13 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {
 	if (record->event.pressed) {
 		switch (id) {
 			case 0:
-				PLAY_NOTE_ARRAY(tone_startup, false, 0);
+				PLAY_SONG(tone_startup);
 				break;
 			case 1:
-				PLAY_NOTE_ARRAY(music_scale, false, 0);
+				PLAY_SONG(music_scale);
 				break;
 			case 2:
-				PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
+				PLAY_SONG(tone_goodbye);
 				break;
 		}
 	}
--- a/keyboards/converter/usb_usb/README.md
+++ b/keyboards/converter/usb_usb/README.md
@@ -1,80 +1,70 @@
 USB to USB keyboard protocol converter
 ======================================
-Original code from Hasu's TMK firmware. Ported to QMK by Coloneljesus.
+A small device to connect between your USB keyboard and your PC that makes (almost) every keyboard fully programmable.
+Original code from the [TMK firmware](https://github.com/tmk/tmk_keyboard/tree/master/converter/usb_usb). Ported to QMK by [Balz Guenat](https://github.com/BalzGuenat).

-This port has been tested only on the Pro Micro variant described in the next section.
+Keyboard Maintainer: [Balz Guenat](https://github.com/BalzGuenat)
+Hardware Supported: [Hasu's USB-USB converter](https://geekhack.org/index.php?topic=69169.0), [Pro Micro + USB Host Shield](https://geekhack.org/index.php?topic=80421.0), maybe more
+Hardware Availability: [GH thread](https://geekhack.org/index.php?topic=72052.0), self-built

-See for detail and discussion.
+Make example for this keyboard (after setting up your build environment):
+
+    make converter-usb_usb-default
+
+See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
+
+Troubleshooting & Known Issues
+------------------------------
+The Pro Micro variant runs at 8MHz, hence the following line in `usb_usb/rules.mk`:
+`F_CPU ?= 8000000`
+If the firmware doesn't work, try changing that line to
+`F_CPU ?= 16000000`
+or override the `F_CPU` variable in the `rules.mk` of your keymap.
+
+Getting the Hardware
+--------------------
+There are two options to get a converter: You can buy one from Hasu or build one yourself.
+
+### Buy a Converter
+You can buy a fully assembled converter from me here:
 https://geekhack.org/index.php?topic=69169.0

-
-Hardware requirement
--------------------
-There are two options.
-
-### TMK USB-USB Converter
-You can buy a fully assembled converter from me here.
-
-    https://geekhack.org/index.php?topic=69169.0
-
-### Arduino Leonardo + Circuit@Home USB Host Shield 2.0
+### Build one yourself using Arduino Leonardo + Circuit@Home USB Host Shield 2.0
 Buying Arduino Leonardo and USB Host Shield 2.0(from Circuit@home) will be better, you won't need even soldering iron.
-
-    http://arduino.cc/en/Main/ArduinoBoardLeonardo 
-    https://www.circuitsathome.com/products-page/arduino-shields/usb-host-shield-2-0-for-arduino-assembled/
+http://arduino.cc/en/Main/ArduinoBoardLeonardo
+https://www.circuitsathome.com/arduino_usb_host_shield_projects/

 Other compatible boards like Arduino's Shield will also work well but I think Sparkfun's needs to be modified.
-
-    http://arduino.cc/en/Main/ArduinoUSBHostShield
-    https://www.sparkfun.com/products/9947
+http://arduino.cc/en/Main/ArduinoUSBHostShield
+https://www.sparkfun.com/products/9947

 Also Pro Micro 3.3V(not Mini) or Teensy with mini host shield will work with some fixes on signal/power routing.
+[Build guide](https://geekhack.org/index.php?topic=80421.0)
+https://www.circuitsathome.com/arduino_usb_host_shield_projects/
+https://www.sparkfun.com/products/12587
+https://www.pjrc.com/teensy/td_libs_USBHostShield.html

-    https://www.circuitsathome.com/products-page/arduino-shields/usb-host-shield-for-arduino-pro-mini
-    https://www.sparkfun.com/products/12587
-    https://www.pjrc.com/teensy/td_libs_USBHostShield.html
-
-
-
-Build firmware
--------------
-Follow normal QMK build instructions to get a binary file. Flashing depends on you hardware.
-
-Limitation
+Limitations
 ----------
 Only supports 'HID Boot protocol'.
-
 Note that the converter can host only USB "boot protocol" keyboard(6KRO), not NKRO, it is possible to support NKRO keyboard but you will need to write HID report parser for that. Every NKRO keyboard can have different HID report and it is difficult to support all kind of NKRO keyboards in the market.

-
-
-Keymap editor
-------------
-You can editor keymap and download firmware with web brwoser.
-
- http://www.tmk-kbd.com/tmk_keyboard/editor/unimap/?usb_usb
-
-
-
-Update
------
-2014/12/11  Added Hub support(confirmed with HHKB pro2)
-2016/09/10  Unimap editor support
-2016/10/18  Fix LED state at startup
-2017/08/16  Port to QMK
-
-
-Resource
+Resources
 --------
-USB Host Sheild 2.0
-    https://www.circuitsathome.com/products-page/arduino-shields/usb-host-shield-2-0-for-arduino
-    https://www.circuitsathome.com/products-page/arduino-shields/usb-host-shield-for-arduino-pro-mini
-USB Host Sheild 2.0 source
+Hasu's main thread for the converter
+    https://geekhack.org/index.php?topic=69169.0
+Build guide for the Pro Micro variant
+    https://geekhack.org/index.php?topic=80421.0
+Original TMK version of the converter
+    https://github.com/tmk/tmk_keyboard/tree/master/converter/usb_usb
+USB Host Shield 2.0
+    https://www.circuitsathome.com/arduino_usb_host_shield_projects/
+USB Host Shield 2.0 source
    https://github.com/felis/USB_Host_Shield_2.0
-Arduino USB Host Shield(with bootst converter)
+Arduino USB Host Shield (with bootst converter)
    http://arduino.cc/en/Main/ArduinoUSBHostShield
 Arduino source
-    https://github.com/arduino/Arduino/hardware/arduino/{cores,variants}
+    https://github.com/arduino/Arduino
 Initial release of TMK USB-USB converter
    https://geekhack.org/index.php?topic=33057.msg653549#msg653549
    http://deskthority.net/workshop-f7/is-remapping-a-usb-keyboard-using-teensy-possible-t2841-30.html#p74854
--- a/keyboards/eco/keymaps/default/Makefile
+++ b/keyboards/eco/keymaps/default/Makefile
@@ -0,0 +1,25 @@
+
+
+# Build Options
+#   change to "no" to disable the options, or define them in the Makefile in 
+#   the appropriate keymap folder that will get included automatically
+#
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
+CONSOLE_ENABLE = no         # Console for debug(+400)
+COMMAND_ENABLE = no        # Commands for debug and configuration
+NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
+MIDI_ENABLE = no            # MIDI controls
+AUDIO_ENABLE = no          # Audio output on port C6
+UNICODE_ENABLE = no         # Unicode
+BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
+
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
+
+ifndef QUANTUM_DIR
+	include ../../../../Makefile
+endif
--- a/keyboards/eco/keymaps/default/keymap.c
+++ b/keyboards/eco/keymaps/default/keymap.c
@@ -0,0 +1,107 @@
+// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
+// this is the style you want to emulate.
+
+// Default ECO Layout
+// KLE here : http://www.keyboard-layout-editor.com/#/gists/0733eca6b4cb88ff9d7de746803f4039
+
+#include "eco.h"
+#include "action_layer.h"
+#include "eeconfig.h"
+
+extern keymap_config_t keymap_config;
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+#define _QWERTY 0
+#define _FN1 2
+#define _FN2 3
+
+enum eco_keycodes {
+  QWERTY = SAFE_RANGE
+};
+
+// Fillers to make layering more clear
+#define _______ KC_TRNS
+#define XXXXXXX KC_NO
+
+// Defines for task manager and such
+#define CALTDEL LCTL(LALT(KC_DEL))
+#define TSKMGR LCTL(LSFT(KC_ESC))
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Qwerty
+ * ,-------------------------------------------------------------------------------------------------.
+ * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |   [  |   ]  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |   '  | Enter|  \   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  | Shift|  Up  | Del  |
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Ctrl |  GUI | Alt  | Del  | FN1  | FN1  | Space| Space| FN2  | FN2  | Ctrl | Left | Down | Right|
+ * `-------------------------------------------------------------------------------------------------'
+ */
+[_QWERTY] = KEYMAP(
+  KC_ESC,  KC_Q,   KC_W,    KC_E,   KC_R,     KC_T,     KC_Y,   KC_U,   KC_I,     KC_O,     KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
+  KC_TAB,  KC_A,   KC_S,    KC_D,   KC_F,     KC_G,     KC_H,   KC_J,   KC_K,     KC_L,     KC_SCLN, KC_QUOT, KC_ENT,  KC_BSLS,
+  KC_LSFT, KC_Z,   KC_X,    KC_C,   KC_V,     KC_B,     KC_N,   KC_M,   KC_COMM,  KC_DOT,   KC_SLSH, KC_RSFT, KC_UP,   KC_DEL,
+  KC_LCTL, KC_LGUI,KC_LALT, KC_DEL, MO(_FN1), MO(_FN1), KC_SPC, KC_SPC, MO(_FN2), MO(_FN2), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+),
+
+/* FN1
+ * ,-------------------------------------------------------------------------------------------------.
+ * |      |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |   _  |   +  |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * |caltde|  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  | F11  | F12  |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |      | RESET|
+ * `-------------------------------------------------------------------------------------------------'
+ */
+[_FN1] = KEYMAP(
+  _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, _______,
+  CALTDEL, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET
+),
+
+/* Raise
+ * ,-------------------------------------------------------------------------------------------------.
+ * |      |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   -  |   =  |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * |Taskmg|  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  | F11  | F12  |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
+ * `-------------------------------------------------------------------------------------------------'
+ */
+[_FN2] = KEYMAP(
+  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  _______,
+  TSKMGR,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+)
+
+};
+
+void persistant_default_layer_set(uint16_t default_layer) {
+  eeconfig_update_default_layer(default_layer);
+  default_layer_set(default_layer);
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case QWERTY:
+      if (record->event.pressed) {
+        persistant_default_layer_set(1UL<<_QWERTY);
+      }
+      return false;
+      break;
+  }
+  return true;
+}
+
--- a/keyboards/eco/keymaps/default/readme.md
+++ b/keyboards/eco/keymaps/default/readme.md
@@ -0,0 +1,3 @@
+# ECO Default Layout by u/That-Canadian
+
+KLE here : http://www.keyboard-layout-editor.com/#/gists/0733eca6b4cb88ff9d7de746803f4039
--- a/keyboards/eco/keymaps/that_canadian/keymap.c
+++ b/keyboards/eco/keymaps/that_canadian/keymap.c
@@ -153,7 +153,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
    case QWERTY:
      if (record->event.pressed) {
        #ifdef AUDIO_ENABLE
-          PLAY_NOTE_ARRAY(tone_qwerty, false, 0);
+          PLAY_SONG(tone_qwerty);
        #endif
        persistant_default_layer_set(1UL<<_QWERTY);
      }
@@ -194,12 +194,12 @@ void matrix_init_user(void) {
 void startup_user()
 {
    _delay_ms(20); // gets rid of tick
-    PLAY_NOTE_ARRAY(tone_startup, false, 0);
+    PLAY_SONG(tone_startup);
 }

 void shutdown_user()
 {
-    PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
+    PLAY_SONG(tone_goodbye);
    _delay_ms(150);
    stop_all_notes();
 }
@@ -211,7 +211,7 @@ void music_on_user(void)

 void music_scale_user(void)
 {
-    PLAY_NOTE_ARRAY(music_scale, false, 0);
+    PLAY_SONG(music_scale);
 }

 #endif
--- a/keyboards/eco/rev1/rules.mk
+++ b/keyboards/eco/rev1/rules.mk
@@ -1,5 +1 @@
-BACKLIGHT_ENABLE = no
-
-ifndef QUANTUM_DIR
-	include ../../../Makefile
-endif
+BACKLIGHT_ENABLE = no
--- a/keyboards/eco/rev2/rules.mk
+++ b/keyboards/eco/rev2/rules.mk
@@ -1,5 +1 @@
-BACKLIGHT_ENABLE = no
-
-ifndef QUANTUM_DIR
-	include ../../../Makefile
-endif
+BACKLIGHT_ENABLE = no
--- a/keyboards/ergodox/ergodone/Makefile
+++ b/keyboards/ergodox/ergodone/Makefile
--- a/keyboards/ergodox/ergodone/config.h
+++ b/keyboards/ergodox/ergodone/config.h
@@ -1,8 +1,6 @@
 #ifndef ERGODOX_ERGODONE_CONFIG_H
 #define ERGODOX_ERGODONE_CONFIG_H

-#include "../config.h"
-
 #include "config_common.h"

 /* USB Device descriptor parameter */
@@ -17,6 +15,31 @@
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 14

+#define MOUSEKEY_INTERVAL       20
+#define MOUSEKEY_DELAY          0
+#define MOUSEKEY_TIME_TO_MAX    60
+#define MOUSEKEY_MAX_SPEED      7
+#define MOUSEKEY_WHEEL_DELAY 0
+
+#define TAPPING_TOGGLE  1
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+#define TAPPING_TERM    200
+#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* key combination for command */
+#define IS_COMMAND() ( \
+    keyboard_report->mods == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
+    keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
+)
+
 /* number of backlight levels */
 #define BACKLIGHT_LEVELS 3

--- a/keyboards/ergodox/ergodone/ergodone.c
+++ b/keyboards/ergodox/ergodone/ergodone.c
--- a/keyboards/ergodox/ergodone/ergodone.h
+++ b/keyboards/ergodox/ergodone/ergodone.h
@@ -60,4 +60,6 @@ inline void ergodox_led_all_set(uint8_t n)              {}
    { KC_NO, k51, k52, k53, k54, k55,   k56,      k57,   k58,   k59, k5A, k5B, k5C, KC_NO  } \
   }

+#define LAYOUT_ergodox KEYMAP
+
 #endif
--- a/keyboards/ergodox/ergodone/expander.c
+++ b/keyboards/ergodox/ergodone/expander.c
--- a/keyboards/ergodox/ergodone/expander.h
+++ b/keyboards/ergodox/ergodone/expander.h
--- a/keyboards/ergodox/ergodone/i2cmaster.h
+++ b/keyboards/ergodox/ergodone/i2cmaster.h
--- a/keyboards/ergodone/keymaps/default/keymap.c
+++ b/keyboards/ergodone/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "version.h"
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
        // left hand
        KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_LEFT,
        KC_DELT,        KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TG(SYMB),
@@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 *                                 `--------------------'       `--------------------'
 */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
       // left hand
       VRSN,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
       KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
@@ -122,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 *                                 `--------------------'       `--------------------'
 */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
--- a/keyboards/ergodone/keymaps/default/readme.md
+++ b/keyboards/ergodone/keymaps/default/readme.md
--- a/keyboards/ergodox/ergodone/matrix.c
+++ b/keyboards/ergodox/ergodone/matrix.c
--- a/keyboards/ergodox/ergodone/readme.md
+++ b/keyboards/ergodox/ergodone/readme.md
--- a/keyboards/ergodox/ergodone/rules.mk
+++ b/keyboards/ergodox/ergodone/rules.mk
@@ -70,6 +70,8 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
 # Build Options
 #   comment out to disable the options.
 #
+CUSTOM_MATRIX           = yes # Custom matrix file for the ErgoDone
+UNICODE_ENABLE          = yes # Unicode
 BOOTMAGIC_ENABLE        = yes	# Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE         = yes	# Mouse keys(+4700)
 EXTRAKEY_ENABLE         = yes	# Audio control and System control(+450)
@@ -89,3 +91,5 @@ LEDMAP_IN_EEPROM_ENABLE = no  # Read LED mapping from eeprom
 ONEHAND_ENABLE          = no  # Disable Onehand
 RGBLIGHT_ENABLE         = no
 MIDI_ENABLE             = no
+
+LAYOUTS = ergodox ergodox_80
--- a/keyboards/ergodox/ergodone/twimaster.c
+++ b/keyboards/ergodox/ergodone/twimaster.c
--- a/keyboards/ergodox/config.h
+++ b/keyboards/ergodox/config.h
@@ -1,40 +0,0 @@
-#ifndef KEYBOARDS_ERGODOX_CONFIG_H_
-#define KEYBOARDS_ERGODOX_CONFIG_H_
-
-#define MOUSEKEY_INTERVAL       20
-#define MOUSEKEY_DELAY          0
-#define MOUSEKEY_TIME_TO_MAX    60
-#define MOUSEKEY_MAX_SPEED      7
-#define MOUSEKEY_WHEEL_DELAY 0
-
-#define TAPPING_TOGGLE  1
-
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
-#define TAPPING_TERM    200
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/* key combination for command */
-#define IS_COMMAND() ( \
-    keyboard_report->mods == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
-    keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
-)
-
-#ifdef SUBPROJECT_ez
-    #include "ez/config.h"
-#endif
-#ifdef SUBPROJECT_infinity
-    #include "infinity/config.h"
-#endif
-#ifdef SUBPROJECT_ergodone
-    #include "ergodone/config.h"
-#endif
-
-
-#endif /* KEYBOARDS_ERGODOX_CONFIG_H_ */
--- a/keyboards/ergodox/ergodox.c
+++ b/keyboards/ergodox/ergodox.c
@@ -1,4 +0,0 @@
-#include "ergodox.h"
-#include "debug.h"
-#include "action_layer.h"
-
--- a/keyboards/ergodox/ergodox.h
+++ b/keyboards/ergodox/ergodox.h
@@ -1,13 +0,0 @@
-#ifndef KEYBOARDS_ERGODOX_ERGODOX_H_
-#define KEYBOARDS_ERGODOX_ERGODOX_H_
-#ifdef SUBPROJECT_ez
-    #include "ez.h"
-#endif
-#ifdef SUBPROJECT_infinity
-    #include "infinity.h"
-#endif
-#ifdef SUBPROJECT_ergodone
-    #include "ergodone.h"
-#endif
-
-#endif /* KEYBOARDS_ERGODOX_ERGODOX_H_ */
--- a/keyboards/ergodox/keymaps/belak/Makefile
+++ b/keyboards/ergodox/keymaps/belak/Makefile
@@ -1,6 +0,0 @@
-TAP_DANCE_ENABLE=yes
-UNICODE_ENABLE=yes
-
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/ergodox/keymaps/common-nighthawk/Makefile
+++ b/keyboards/ergodox/keymaps/common-nighthawk/Makefile
@@ -1,6 +0,0 @@
-SUBPROJECT_DEFAULT = ez
-TAP_DANCE_ENABLE = yes
-
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/ergodox/keymaps/default/visualizer.c
+++ b/keyboards/ergodox/keymaps/default/visualizer.c
@@ -1,42 +0,0 @@
-/*
-Copyright 2017 Fred Sundvik
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "simple_visualizer.h"
-
-// This function should be implemented by the keymap visualizer
-// Don't change anything else than state->target_lcd_color and state->layer_text as that's the only thing
-// that the simple_visualizer assumes that you are updating
-// Also make sure that the buffer passed to state->layer_text remains valid until the previous animation is
-// stopped. This can be done by either double buffering it or by using constant strings
-static void get_visualizer_layer_and_color(visualizer_state_t* state) {
-    uint8_t saturation = 60;
-    if (state->status.leds & (1u << USB_LED_CAPS_LOCK)) {
-        saturation = 255;
-    }
-    if (state->status.layer & 0x4) {
-        state->target_lcd_color = LCD_COLOR(0, saturation, 0xFF);
-        state->layer_text = "Media & Mouse";
-    }
-    else if (state->status.layer & 0x2) {
-        state->target_lcd_color = LCD_COLOR(168, saturation, 0xFF);
-        state->layer_text = "Symbol";
-    }
-    else {
-        state->target_lcd_color = LCD_COLOR(84, saturation, 0xFF);
-        state->layer_text = "Default";
-    }
-}
--- a/keyboards/ergodox/keymaps/kristian/keymap.c
+++ b/keyboards/ergodox/keymaps/kristian/keymap.c
@@ -1,79 +0,0 @@
-#include "ergodox.h"
-#include "debug.h"
-#include "action_layer.h"
-#include "version.h"
-#include "keymap_fr_ch.h"
-#include "keymap_french.h"
-#include "keymap_german.h"
-#include "keymap_german_ch.h"
-#include "keymap_nordic.h"
-#include "keymap_norwegian.h"
-#include "keymap_spanish.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-
-[0] = KEYMAP(NO_LESS,KC_1,KC_2,KC_3,KC_4,KC_5,KC_BSPACE,KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,TG(1),KC_BSPACE,KC_A,KC_S,KC_D,KC_F,KC_G,SFT_T(NO_APOS),CTL_T(KC_Z),KC_X,KC_C,KC_V,KC_B,SFT_T(KC_EQUAL),MO(1),CTL_T(KC_GRAVE),KC_LGUI,KC_LEFT,KC_RIGHT,KC_ESCAPE,KC_CAPSLOCK,KC_HOME,KC_SPACE,KC_LGUI,KC_LALT,KC_DELETE,KC_6,KC_7,KC_8,KC_9,KC_0,NO_PLUS,TG(1),KC_Y,KC_U,KC_I,KC_O,KC_P,NO_AM,KC_H,KC_J,KC_K,KC_L,LT(2,NO_OSLH),NO_AE,SFT_T(KC_RBRC),KC_N,KC_M,KC_COMMA,KC_DOT,CTL_T(KC_SLASH),SFT_T(NO_APOS),KC_DOWN,KC_UP,NO_LPRN,NO_RPRN,MO(1),NO_QUOT,CTL_T(KC_ESCAPE),NO_APOS,KC_LALT,KC_LGUI,KC_ENTER),
-
-[1] = KEYMAP(M(0),KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_BSPACE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_BSPACE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_LSHIFT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_LCTL,KC_LGUI,KC_LEFT,KC_RIGHT,KC_ESCAPE,KC_TRANSPARENT,KC_HOME,KC_SPACE,KC_LGUI,KC_LALT,KC_DELETE,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_TRANSPARENT,KC_7,KC_8,KC_9,KC_TRANSPARENT,KC_TRANSPARENT,KC_F12,KC_4,KC_5,KC_6,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_0,KC_1,KC_2,KC_3,NO_LBRC,NO_RBRC,KC_LSHIFT,KC_COMMA,KC_DOT,LSFT(NO_LBRC),LSFT(NO_RBRC),KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_LALT,KC_LGUI,KC_ENTER),
-
-[2] = KEYMAP(KC_ESCAPE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MS_UP,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MS_LEFT,KC_MS_DOWN,KC_MS_RIGHT,KC_TRANSPARENT,KC_LSHIFT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_LCTL,KC_LALT,KC_LGUI,KC_MS_BTN1,KC_MS_BTN2,KC_ESCAPE,KC_TRANSPARENT,KC_TRANSPARENT,KC_SPACE,KC_LGUI,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MEDIA_PREV_TRACK,KC_MEDIA_PLAY_PAUSE,KC_MEDIA_NEXT_TRACK,KC_TRANSPARENT,KC_TRANSPARENT,KC_AUDIO_VOL_UP,KC_AUDIO_VOL_DOWN,KC_AUDIO_MUTE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_ESCAPE,KC_MS_WH_UP,KC_MS_WH_DOWN,KC_MS_ACCEL0,KC_MS_ACCEL1),
-
-};
-
-const uint16_t PROGMEM fn_actions[] = {
-  [1] = ACTION_LAYER_TAP_TOGGLE(1)
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-      switch(id) {
-        case 0:
-        if (record->event.pressed) {
-          SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-        }
-        break;
-      }
-    return MACRO_NONE;
-};
-
-void matrix_scan_user(void) {
-
-    uint8_t layer = biton32(layer_state);
-
-    ergodox_board_led_off();
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-    switch (layer) {
-        case 1:
-            ergodox_right_led_1_on();
-            break;
-        case 2:
-            ergodox_right_led_2_on();
-            break;
-        case 3:
-            ergodox_right_led_3_on();
-            break;
-        case 4:
-            ergodox_right_led_1_on();
-            ergodox_right_led_2_on();
-            break;
-        case 5:
-            ergodox_right_led_1_on();
-            ergodox_right_led_3_on();
-            break;
-        case 6:
-            ergodox_right_led_2_on();
-            ergodox_right_led_3_on();
-            break;
-        case 7:
-            ergodox_right_led_1_on();
-            ergodox_right_led_2_on();
-            ergodox_right_led_3_on();
-            break;
-        default:
-            break;
-    }
-
-};
--- a/keyboards/ergodox/keymaps/yoruian/Makefile
+++ b/keyboards/ergodox/keymaps/yoruian/Makefile
@@ -1,13 +0,0 @@
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
-
-install-xorg-configuration:
-	install -m 0664 90-$(KEYBOARD)-$(KEYMAP).conf \
-	    /etc/X11/xorg.conf.d/90-$(KEYBOARD)-$(KEYMAP).conf
-	install -m 0644 $(KEYBOARD)_$(KEYMAP) \
-	    /usr/share/X11/xkb/symbols/$(KEYBOARD)_$(KEYMAP)
-
-uninstall-xorg-configuration:
-	-rm -f /etc/X11/xorg.conf.d/90-$(KEYBOARD)-$(KEYMAP).conf
-	-rm -f /usr/share/X11/xkb/symbols/$(KEYBOARD)_$(KEYMAP)
--- a/keyboards/ergodox/readme.md
+++ b/keyboards/ergodox/readme.md
@@ -1,111 +0,0 @@
-ErgoDox
-==
-
-The ErgoDox is a split ergonomic keyboard originally developed by Dominic "Dox" Beauchamp.
-
-* The **ErgoDox EZ** is a Teensy-based split mechanical keyboard, sold assembled and with warranty at [ErgoDox-EZ.com](https://ergodox-ez.com).
-* The **ErgoDox Infinity** is an ARM-based split mechanical keyboard, sold from time to time in kit form at [MassDrop.com](https://www.massdrop.com/buy/infinity-ergodox)
-
-The ErgoDox EZ code is maintained by Erez Zukerman and is officially supported by the EZ -- the keyboard ships running QMK from the factory.
-
-The ErgoDox Infinity code is maintained by Fredizzimo, as a community contribution.
-
-## Standard Build Instructions
-
-To build QMK for the ErgoDox, see the official [build guide](/docs/build_guide.md).
-
-## Additional resources
-
-A graphical configurator for the ErgoDox EZ is available at [configure.ergodox-ez.com](http://configure.ergodox-ez.com). It outputs QMK-compiled binaries, as well as source code for your layout, which you can use as a jumping-off point to further customize in QMK.
-
-# Flashing Firmware
-
-## ErgoDox EZ
-
-The Ez uses the [Teensy Loader](https://www.pjrc.com/teensy/loader.html).
-
-Linux users need to modify udev rules as described on the [Teensy
-Linux page].  Some distributions provide a binary, maybe called
-`teensy-loader-cli`.
-
-[Teensy Linux page]: https://www.pjrc.com/teensy/loader_linux.html
-
-To flash the firmware:
-
-  - Build the firmware with `make keymapname`, for example `make default`
-  - This will result in a hex file called `ergodox_ez_keymapname.hex`, e.g.
-    `ergodox_ez_default.hex`
-
-  - Start the teensy loader.
-
-  - Load the .hex file into it.
-
-  - Press the Reset button by inserting a paperclip gently into the reset hole
-    in the top right corder.
-
-  - Click the button in the Teensy app to download the firmware.
-
-To flash with ´teensy-loader-cli´:
-
-  - Build the firmware with `make keymapname`, for example `make default`
-
-  - Run ´<path/to/>teensy_loader_cli -mmcu=atmega32u4 -w ergodox_ez_<keymap>.hex´
-
-  - Press the Reset button by inserting a paperclip gently into the reset hole
-    in the top right corder.
-
-## ErgoDox Infinity
-
-The Infinity is two completely independent keyboards, and needs to be flashed
-for the left and right halves seperately.  To flash them:
-
-  - Build the firmware with `make infinity-keymapname`
-
-  - Plug in the left hand keyboard only.
-
-  - Press the program button (back of keyboard, above thumb pad).
-
-  - Install the firmware with `sudo make infinity-keymapname-dfu-util`
-
-  - Build right hand firmware with `make infinity-keymapname MASTER=right`
-
-  - Plug in the right hand keyboard only.
-
-  - Press the program button (back of keyboard, above thumb pad).
-
-  - Install the firmware with `sudo make infinity-keymapname-dfu-util MASTER=right`
-
-More information on the Infinity firmware is available in the [TMK/chibios for
-Input Club Infinity Ergodox](https://github.com/fredizzimo/infinity_ergodox/blob/master/README.md)
-
-### Infinity Master/Two Halves
-
-The Infinity is two completely independent keyboards, that can connect together.
-You have a few options in how you flash the firmware:
-
- Flash the left half, rebuild the firmware with "MASTER=right" and then flash
-  the right half.  This allows you to plug in either half directly to the
-  computer and is what the above instructions do.
-
- Flash the left half, then flash the same firmware on the right.  This only
-  works when the left half is plugged directly to the computer and the keymap
-  is mirrored.  It saves the small extra step of rebuilding with
-  "MASTER=right".
-
- The same as the previous one but with "MASTER=right" when you build the
-  firmware, then flash the same firmware to both halves.  You just have to
-  directly connect the right half to the computer.
-
- For minor changes such as changing only the keymap without having updated
-  any part of the firmware code itself, you can program only the MASTER half.
-  It is safest to program both halves though.
-
-## ErgoDone
-
-The ErgoDone uses its own HID bootloader and needs to be flashed using the [TKG Toolkit](https://github.com/kairyu/tkg-toolkit).
-
-  - Build the firmware with `make ergodone-keymapname`
-
-  - While plugging in the USB cable, hold the two right-most keys on the left half of the ErgoDone to enter FLASH mode.
-
-  - Use the utility from [TKG Toolkit](https://github.com/kairyu/tkg-toolkit) to flash the keyboard: `hid_bootloader_cli -mmcu=atmega32u4 ergodox_ergodone_keymapname.hex`
--- a/keyboards/ergodox/rules.mk
+++ b/keyboards/ergodox/rules.mk
@@ -1,28 +0,0 @@
-#----------------------------------------------------------------------------
-# On command line:
-#
-# make = Make software.
-#
-# make clean = Clean out built project files.
-#
-# That's pretty much all you need. To compile, always go make clean, 
-# followed by make.
-#
-# For advanced users only:
-# make teensy = Download the hex file to the device, using teensy_loader_cli.
-#               (must have teensy_loader_cli installed).
-#
-#----------------------------------------------------------------------------
-# Build Options
-#   comment out to disable the options.
-#
-BOOTMAGIC_ENABLE = no  # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE  = yes # Mouse keys(+4700)
-EXTRAKEY_ENABLE  = yes # Audio control and System control(+450)
-CONSOLE_ENABLE   = no  # Console for debug(+400)
-COMMAND_ENABLE   = yes # Commands for debug and configuration
-CUSTOM_MATRIX    = yes # Custom matrix file for the ErgoDox EZ
-SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
-NKRO_ENABLE      = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-UNICODE_ENABLE   = yes # Unicode
-ONEHAND_ENABLE   = yes # Allow swapping hands of keyboard
--- a/keyboards/ergodox_ez/190hotfix.sh
+++ b/keyboards/ergodox_ez/190hotfix.sh
--- a/keyboards/ergodox_ez/Makefile
+++ b/keyboards/ergodox_ez/Makefile
@@ -4,5 +4,5 @@ RGBLIGHT_ENABLE = yes
 MIDI_ENABLE = no

 ifndef MAKEFILE_INCLUDED
-	include ../../../Makefile
+	include ../../Makefile
 endif
--- a/keyboards/ergodox_ez/config.h
+++ b/keyboards/ergodox_ez/config.h
@@ -19,8 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef ERGODOX_EZ_CONFIG_H
 #define ERGODOX_EZ_CONFIG_H

-#include "../config.h"
-
 #include "config_common.h"

 /* USB Device descriptor parameter */
@@ -35,6 +33,31 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 14
 #define MATRIX_COLS 6

+#define MOUSEKEY_INTERVAL       20
+#define MOUSEKEY_DELAY          0
+#define MOUSEKEY_TIME_TO_MAX    60
+#define MOUSEKEY_MAX_SPEED      7
+#define MOUSEKEY_WHEEL_DELAY 0
+
+#define TAPPING_TOGGLE  1
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+#define TAPPING_TERM    200
+#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* key combination for command */
+#define IS_COMMAND() ( \
+    keyboard_report->mods == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
+    keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
+)
+
 /* number of backlight levels */
 #define BACKLIGHT_LEVELS 3

--- a/keyboards/ergodox_ez/ergodox_ez.c
+++ b/keyboards/ergodox_ez/ergodox_ez.c
@@ -1,4 +1,4 @@
-#include "ez.h"
+#include QMK_KEYBOARD_H
 #include "i2cmaster.h"


--- a/keyboards/ergodox_ez/ergodox_ez.h
+++ b/keyboards/ergodox_ez/ergodox_ez.h
@@ -160,4 +160,6 @@ inline void ergodox_led_all_set(uint8_t n)
    { k0D, k1D, k2D, k3D, k4D, KC_NO }    \
   }

+#define LAYOUT_ergodox KEYMAP
+
 #endif
--- a/keyboards/ergodox_ez/i2cmaster.h
+++ b/keyboards/ergodox_ez/i2cmaster.h
--- a/keyboards/ergodox_ez/keymaps/blakedietz/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/blakedietz/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"

--- a/keyboards/ergodox_ez/keymaps/default/default.png.md
+++ b/keyboards/ergodox_ez/keymaps/default/default.png.md
--- a/keyboards/ergodox_ez/keymaps/default/default_highres.png.md
+++ b/keyboards/ergodox_ez/keymaps/default/default_highres.png.md
--- a/keyboards/ergodox_ez/keymaps/default/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/default/keymap.c
@@ -0,0 +1,223 @@
+#include QMK_KEYBOARD_H
+#include "debug.h"
+#include "action_layer.h"
+#include "version.h"
+
+#define BASE 0 // default layer
+#define SYMB 1 // symbols
+#define MDIA 2 // media keys
+
+enum custom_keycodes {
+  PLACEHOLDER = SAFE_RANGE, // can always be here
+  EPRM,
+  VRSN,
+  RGB_SLD
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Keymap 0: Basic layer
+ *
+ * ,--------------------------------------------------.           ,--------------------------------------------------.
+ * |   =    |   1  |   2  |   3  |   4  |   5  | LEFT |           | RIGHT|   6  |   7  |   8  |   9  |   0  |   -    |
+ * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+ * | Del    |   Q  |   W  |   E  |   R  |   T  |  L1  |           |  L1  |   Y  |   U  |   I  |   O  |   P  |   \    |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * | BkSp   |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |; / L2|' / Cmd |
+ * |--------+------+------+------+------+------| Hyper|           | Meh  |------+------+------+------+------+--------|
+ * | LShift |Z/Ctrl|   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |//Ctrl| RShift |
+ * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+ *   |Grv/L1|  '"  |AltShf| Left | Right|                                       |  Up  | Down |   [  |   ]  | ~L1  |
+ *   `----------------------------------'                                       `----------------------------------'
+ *                                        ,-------------.       ,-------------.
+ *                                        | App  | LGui |       | Alt  |Ctrl/Esc|
+ *                                 ,------|------|------|       |------+--------+------.
+ *                                 |      |      | Home |       | PgUp |        |      |
+ *                                 | Space|Backsp|------|       |------|  Tab   |Enter |
+ *                                 |      |ace   | End  |       | PgDn |        |      |
+ *                                 `--------------------'       `----------------------'
+ */
+// If it accepts an argument (i.e, is a function), it doesn't need KC_.
+// Otherwise, it needs KC_*
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
+        // left hand
+        KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_LEFT,
+        KC_DELT,        KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TG(SYMB),
+        KC_BSPC,        KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
+        KC_LSFT,        CTL_T(KC_Z),  KC_X,   KC_C,   KC_V,   KC_B,   ALL_T(KC_NO),
+        LT(SYMB,KC_GRV),KC_QUOT,      LALT(KC_LSFT),  KC_LEFT,KC_RGHT,
+                                              ALT_T(KC_APP),  KC_LGUI,
+                                                              KC_HOME,
+                                               KC_SPC,KC_BSPC,KC_END,
+        // right hand
+             KC_RGHT,     KC_6,   KC_7,  KC_8,   KC_9,   KC_0,             KC_MINS,
+             TG(SYMB),    KC_Y,   KC_U,  KC_I,   KC_O,   KC_P,             KC_BSLS,
+                          KC_H,   KC_J,  KC_K,   KC_L,   LT(MDIA, KC_SCLN),GUI_T(KC_QUOT),
+             MEH_T(KC_NO),KC_N,   KC_M,  KC_COMM,KC_DOT, CTL_T(KC_SLSH),   KC_RSFT,
+                                  KC_UP, KC_DOWN,KC_LBRC,KC_RBRC,          KC_FN1,
+             KC_LALT,        CTL_T(KC_ESC),
+             KC_PGUP,
+             KC_PGDN,KC_TAB, KC_ENT
+    ),
+/* Keymap 1: Symbol Layer
+ *
+ * ,---------------------------------------------------.           ,--------------------------------------------------.
+ * |Version  |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
+ * |---------+------+------+------+------+------+------|           |------+------+------+------+------+------+--------|
+ * |         |   !  |   @  |   {  |   }  |   |  |      |           |      |   Up |   7  |   8  |   9  |   *  |   F12  |
+ * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * |         |   #  |   $  |   (  |   )  |   `  |------|           |------| Down |   4  |   5  |   6  |   +  |        |
+ * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * |         |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   1  |   2  |   3  |   \  |        |
+ * `---------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+ *   | EPRM  |      |      |      |      |                                       |      |    . |   0  |   =  |      |
+ *   `-----------------------------------'                                       `----------------------------------'
+ *                                        ,-------------.       ,-------------.
+ *                                        |Animat|      |       |Toggle|Solid |
+ *                                 ,------|------|------|       |------+------+------.
+ *                                 |Bright|Bright|      |       |      |Hue-  |Hue+  |
+ *                                 |ness- |ness+ |------|       |------|      |      |
+ *                                 |      |      |      |       |      |      |      |
+ *                                 `--------------------'       `--------------------'
+ */
+// SYMBOLS
+[SYMB] = LAYOUT_ergodox(
+       // left hand
+       VRSN,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
+       KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
+       KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
+       KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS,
+          EPRM,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+                                       RGB_MOD,KC_TRNS,
+                                               KC_TRNS,
+                               RGB_VAD,RGB_VAI,KC_TRNS,
+       // right hand
+       KC_TRNS, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
+       KC_TRNS, KC_UP,   KC_7,   KC_8,    KC_9,    KC_ASTR, KC_F12,
+                KC_DOWN, KC_4,   KC_5,    KC_6,    KC_PLUS, KC_TRNS,
+       KC_TRNS, KC_AMPR, KC_1,   KC_2,    KC_3,    KC_BSLS, KC_TRNS,
+                         KC_TRNS,KC_DOT,  KC_0,    KC_EQL,  KC_TRNS,
+       RGB_TOG, RGB_SLD,
+       KC_TRNS,
+       KC_TRNS, RGB_HUD, RGB_HUI
+),
+/* Keymap 2: Media and mouse keys
+ *
+ * ,--------------------------------------------------.           ,--------------------------------------------------.
+ * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
+ * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+ * |        |      |      | MsUp |      |      |      |           |      |      |      |      |      |      |        |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * |        |      |MsLeft|MsDown|MsRght|      |------|           |------|      |      |      |      |      |  Play  |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * |        |      |      |      |      |      |      |           |      |      |      | Prev | Next |      |        |
+ * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+ *   |      |      |      | Lclk | Rclk |                                       |VolUp |VolDn | Mute |      |      |
+ *   `----------------------------------'                                       `----------------------------------'
+ *                                        ,-------------.       ,-------------.
+ *                                        |      |      |       |      |      |
+ *                                 ,------|------|------|       |------+------+------.
+ *                                 |      |      |      |       |      |      |Brwser|
+ *                                 |      |      |------|       |------|      |Back  |
+ *                                 |      |      |      |       |      |      |      |
+ *                                 `--------------------'       `--------------------'
+ */
+// MEDIA AND MOUSE
+[MDIA] = LAYOUT_ergodox(
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
+                                           KC_TRNS, KC_TRNS,
+                                                    KC_TRNS,
+                                  KC_TRNS, KC_TRNS, KC_TRNS,
+    // right hand
+       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
+       KC_TRNS,  KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
+                          KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS,
+       KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_WBAK
+),
+};
+
+const uint16_t PROGMEM fn_actions[] = {
+    [1] = ACTION_LAYER_TAP_TOGGLE(SYMB)                // FN1 - Momentary Layer 1 (Symbols)
+};
+
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
+{
+  // MACRODOWN only works in this function
+      switch(id) {
+        case 0:
+        if (record->event.pressed) {
+          SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
+        }
+        break;
+        case 1:
+        if (record->event.pressed) { // For resetting EEPROM
+          eeconfig_init();
+        }
+        break;
+      }
+    return MACRO_NONE;
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    // dynamically generate these.
+    case EPRM:
+      if (record->event.pressed) {
+        eeconfig_init();
+      }
+      return false;
+      break;
+    case VRSN:
+      if (record->event.pressed) {
+        SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
+      }
+      return false;
+      break;
+    case RGB_SLD:
+      if (record->event.pressed) {
+        #ifdef RGBLIGHT_ENABLE
+          rgblight_mode(1);
+        #endif
+      }
+      return false;
+      break;
+  }
+  return true;
+}
+
+// Runs just one time when the keyboard initializes.
+void matrix_init_user(void) {
+
+};
+
+
+// Runs constantly in the background, in a loop.
+void matrix_scan_user(void) {
+
+    uint8_t layer = biton32(layer_state);
+
+    ergodox_board_led_off();
+    ergodox_right_led_1_off();
+    ergodox_right_led_2_off();
+    ergodox_right_led_3_off();
+    switch (layer) {
+      // TODO: Make this relevant to the ErgoDox EZ.
+        case 1:
+            ergodox_right_led_1_on();
+            break;
+        case 2:
+            ergodox_right_led_2_on();
+            break;
+        default:
+            // none
+            break;
+    }
+
+};
--- a/keyboards/ergodox_ez/keymaps/default/readme.md
+++ b/keyboards/ergodox_ez/keymaps/default/readme.md
@@ -0,0 +1,15 @@
+# ErgoDox EZ Default Configuration
+
+## Changelog
+
+* Dec 2016:
+  * Added LED keys
+  * Refreshed layout graphic, comes from http://configure.ergodox-ez.com now.
+* Sep 22, 2016:
+  * Created a new key in layer 1 (bottom-corner key) that resets the EEPROM.
+* Feb 2, 2016 (V1.1): 
+  * Made the right-hand quote key double as Cmd/Win on hold. So you get ' when you tap it, " when you tap it with Shift, and Cmd or Win when you hold it. You can then use it as a modifier, or just press and hold it for a moment (and then let go) to send a single Cmd or Win keystroke (handy for opening the Start menu on Windows).
+
+This is what we ship with out of the factory. :) The image says it all:
+
+![Default](https://i.imgur.com/Be53jH7.png)
--- a/keyboards/ergodox_ez/keymaps/default_osx/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/default_osx/keymap.c
@@ -1,7 +1,7 @@
 // Netable differences vs. the default firmware for the ErgoDox EZ:
 // 1. The Cmd key is now on the right side, making Cmd+Space easier.
 // 2. The media keys work on OSX (But not on Windows).
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"

@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
+[BASE] = LAYOUT_ergodox(  // layer 0 : default
        // left hand
        KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_LEFT,
        KC_DELT,        KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   TG(SYMB),
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 *                                 `--------------------'       `--------------------'
 */
 // SYMBOLS
-[SYMB] = KEYMAP(
+[SYMB] = LAYOUT_ergodox(
       // left hand
       KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
       KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
@@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 *                                 `--------------------'       `--------------------'
 */
 // MEDIA AND MOUSE
-[MDIA] = KEYMAP(
+[MDIA] = LAYOUT_ergodox(
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
--- a/keyboards/ergodox_ez/keymaps/default_osx/readme.md
+++ b/keyboards/ergodox_ez/keymaps/default_osx/readme.md
--- a/keyboards/ergodox_ez/keymaps/drashna-custom/Makefile
+++ b/keyboards/ergodox_ez/keymaps/drashna-custom/Makefile
@@ -1,10 +1,10 @@
-TAP_DANCE_ENABLE = yes
-LAYER_UNDERGLOW_LIGHTING = yes
-SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
-COMMAND_ENABLE   = no  # Commands for debug and configuration
-RGBLIGHT_ENABLE = yes
-MIDI_ENABLE = no
-
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
+TAP_DANCE_ENABLE = yes
+LAYER_UNDERGLOW_LIGHTING = yes
+SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
+COMMAND_ENABLE   = no  # Commands for debug and configuration
+RGBLIGHT_ENABLE = yes
+MIDI_ENABLE = no
+
+ifndef QUANTUM_DIR
+	include ../../../../Makefile
+endif
--- a/keyboards/ergodox_ez/keymaps/drashna-custom/config.h
+++ b/keyboards/ergodox_ez/keymaps/drashna-custom/config.h
--- a/keyboards/ergodox_ez/keymaps/drashna-custom/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/drashna-custom/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "version.h"
--- a/keyboards/ergodox_ez/keymaps/drashna/Makefile
+++ b/keyboards/ergodox_ez/keymaps/drashna/Makefile
@@ -1,6 +1,6 @@
-RGBLIGHT_ENABLE = yes
-RGBLIGHT_ANIMATION = no
-
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
+RGBLIGHT_ENABLE = yes
+RGBLIGHT_ANIMATION = no
+
+ifndef QUANTUM_DIR
+	include ../../../../Makefile
+endif
--- a/keyboards/ergodox_ez/keymaps/drashna/config.h
+++ b/keyboards/ergodox_ez/keymaps/drashna/config.h
--- a/keyboards/ergodox_ez/keymaps/drashna/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/drashna/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "version.h"
--- a/keyboards/ergodox_ez/keymaps/drashna/readme.md
+++ b/keyboards/ergodox_ez/keymaps/drashna/readme.md
--- a/keyboards/ergodox_ez/keymaps/profet_80/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/profet_80/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "version.h"
--- a/keyboards/ergodox_ez/keymaps/profet_80/readme.md
+++ b/keyboards/ergodox_ez/keymaps/profet_80/readme.md
--- a/keyboards/ergodox_ez/keymaps/steno/Makefile
+++ b/keyboards/ergodox_ez/keymaps/steno/Makefile
--- a/keyboards/ergodox_ez/keymaps/steno/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/steno/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
 #include "sendchar.h"
--- a/keyboards/ergodox_ez/keymaps/steno/readme.md
+++ b/keyboards/ergodox_ez/keymaps/steno/readme.md
--- a/keyboards/ergodox_ez/matrix.c
+++ b/keyboards/ergodox_ez/matrix.c
@@ -33,7 +33,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "debug.h"
 #include "util.h"
 #include "matrix.h"
-#include "ez.h"
+#include QMK_KEYBOARD_H
 #include "i2cmaster.h"
 #ifdef DEBUG_MATRIX_SCAN_RATE
 #include  "timer.h"
--- a/keyboards/ergodox_ez/readme.md
+++ b/keyboards/ergodox_ez/readme.md
@@ -0,0 +1,33 @@
+# ErgoDox EZ
+
+The Ez uses the [Teensy Loader](https://www.pjrc.com/teensy/loader.html).
+
+Linux users need to modify udev rules as described on the [Teensy
+Linux page].  Some distributions provide a binary, maybe called
+`teensy-loader-cli`.
+
+[Teensy Linux page]: https://www.pjrc.com/teensy/loader_linux.html
+
+To flash the firmware:
+
+  - Build the firmware with `make keymapname`, for example `make default`
+  - This will result in a hex file called `ergodox_ez_keymapname.hex`, e.g.
+    `ergodox_ez_default.hex`
+
+  - Start the teensy loader.
+
+  - Load the .hex file into it.
+
+  - Press the Reset button by inserting a paperclip gently into the reset hole
+    in the top right corder.
+
+  - Click the button in the Teensy app to download the firmware.
+
+To flash with ´teensy-loader-cli´:
+
+  - Build the firmware with `make keymapname`, for example `make default`
+
+  - Run ´<path/to/>teensy_loader_cli -mmcu=atmega32u4 -w ergodox_ez_<keymap>.hex´
+
+  - Press the Reset button by inserting a paperclip gently into the reset hole
+    in the top right corder.
--- a/keyboards/ergodox_ez/rules.mk
+++ b/keyboards/ergodox_ez/rules.mk
@@ -70,7 +70,17 @@ OPT_DEFS += -DBOOTLOADER_SIZE=512
 # Build Options
 #   comment out to disable the options.
 #
-
+BOOTMAGIC_ENABLE = no  # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE  = yes # Mouse keys(+4700)
+EXTRAKEY_ENABLE  = yes # Audio control and System control(+450)
+CONSOLE_ENABLE   = no  # Console for debug(+400)
+COMMAND_ENABLE   = yes # Commands for debug and configuration
+CUSTOM_MATRIX    = yes # Custom matrix file for the ErgoDox EZ
+NKRO_ENABLE      = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+UNICODE_ENABLE   = yes # Unicode
+ONEHAND_ENABLE   = yes # Allow swapping hands of keyboard
 SLEEP_LED_ENABLE = no
 API_SYSEX_ENABLE = no
 RGBLIGHT_ENABLE = yes
+
+LAYOUTS = ergodox
--- a/keyboards/ergodox_ez/twimaster.c
+++ b/keyboards/ergodox_ez/twimaster.c
--- a/keyboards/ergodox_ez/util/compile_keymap.py
+++ b/keyboards/ergodox_ez/util/compile_keymap.py
--- a/keyboards/ergodox_ez/util/readme.md
+++ b/keyboards/ergodox_ez/util/readme.md
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Markus Kohler	718fddf44c	Fix broken link	2017-08-24 07:59:22 -04:00
Jack Humbert	d2ff66a985	Creates a layouts/ folder for keymaps shared between keyboards (#1609 ) * include variables and .h files as pp directives * start layout compilation * split ergodoxes up * don't compile all layouts for everything * might seg fault * reset layouts variable * actually reset layouts * include rules.mk instead * remove includes from rules.mk * update variable setting * load visualizer from path * adds some more examples * adds more layouts * more boards added * more boards added * adds documentation for layouts * use lowercase names for LAYOUT_ * add layout.json files for each layout * add community folder, default keymaps for layouts * touch-up default layouts * touch-up layouts, some keyboard rules.mk * update documentation for layouts * fix up serial/i2c switches	2017-08-23 22:29:07 -04:00
Jack Humbert	7260fc3eef	update 9key readme	2017-08-23 15:46:02 -04:00
Jack Humbert	437c86c9c1	update build script	2017-08-23 15:44:25 -04:00
Steve Holt	d54360b1d8	Update keymap.c	2017-08-22 23:53:41 -04:00
Steve Holt	fe4549839e	Update config.h	2017-08-22 23:53:41 -04:00
Steve Holt	1d930ebe45	Update Makefile	2017-08-22 23:53:41 -04:00
Jonathan Boyett	fcb60b1601	fix link brackets	2017-08-22 23:33:38 -04:00
Cory Shaw	3aa7fbcd79	fix(9key): Fix layout of 9key readme	2017-08-22 23:09:12 -04:00
Cory Shaw	82f434a4d4	update(9key): Add readme with updated format	2017-08-22 23:09:12 -04:00
Cory Shaw	d8fd33dd5e	Add support for 9key by Bishop Keyboards	2017-08-22 23:09:12 -04:00
Jonathan Boyett	bd484f18bd	JD40 MiniVan port	2017-08-22 23:07:52 -04:00
Ryan MacLean	9f6362e4df	Adding Makefile Required for JIS layouts	2017-08-22 17:59:38 -04:00
Ryan MacLean	57c93c13cc	Creating Mac Version of JIS Keymap Swapping command and alt, restoring fn+left for delete, subbing in grave for hhkb key.	2017-08-22 17:59:38 -04:00
Jack Humbert	e719f5b0b5	Merge branch 'master' of https://github.com/qmk/qmk_firmware	2017-08-22 10:08:44 -04:00
Jack Humbert	9da308a0cd	move to compiled [skip ci]	2017-08-22 10:07:32 -04:00
keisuke333	47cd5b5622	Fix avoid certificate errors that occur during '2-setup-environment-win.bat'	2017-08-22 09:09:51 -04:00
Jack Humbert	0e39f1faf4	Merge branch 'master' of https://github.com/qmk/qmk_firmware	2017-08-22 08:57:13 -04:00
Jack Humbert	dd8cedc361	update travis script	2017-08-22 08:56:39 -04:00
Jack Humbert	51a2ce6145	convert to unix line-endings [skip ci]	2017-08-22 08:56:22 -04:00
Jack Humbert	11d27cec1e	attempt to fix line-ending travis stuff	2017-08-21 23:39:06 -04:00
jpetermans	7a445d9167	Add back original copyrights	2017-08-21 23:22:36 -04:00
jpetermans	ff32643641	Readme correction #2	2017-08-21 23:22:36 -04:00
jpetermans	dbd4ce19e9	Correct jpetermans keymap readme and update copyright info	2017-08-21 23:22:36 -04:00
Jack Humbert	9ff064ae50	triggering travis	2017-08-21 23:11:08 -04:00
Jack Humbert	c3c07eff51	update building for .hex, secrets moving	2017-08-21 21:57:46 -04:00
Daniel Shields	69c4cfb238	Fix gherkin README to use correct build command.	2017-08-21 17:04:31 -04:00
Mark Spanbroek	36709d6a30	Use cmd-left and cmd-right instead of ctrl-a and ctrl-e for home and end The ctrl commands only seem to work well in terminal, not in other apps.	2017-08-21 17:01:27 -04:00
Mark Spanbroek	1ab9e5d1c9	Remove COMPACT_KEYMAP, use full KC_ keycodes instead.	2017-08-21 17:01:27 -04:00
Mark Spanbroek	f4b3b576a0	Revert "Add COMPACT_KEYMAP macro to Satan GH60" 9a1826598a1a06d87459c5bbef9db9be277bdae9	2017-08-21 17:01:27 -04:00
Mark Spanbroek	dc1d24a4fe	Add screen lock key	2017-08-21 17:01:27 -04:00
Mark Spanbroek	0be483c762	Fix power; use keyboard shortcut for Mac	2017-08-21 17:01:27 -04:00
Mark Spanbroek	cb719757c2	Reverse the split shift/fn Turns out that 3c and 3d are not reversed when splitting the right shift in the way that the Mark I layout does. Reversing it here, rather than in the generic satan.h to avoid breaking the other layouts.	2017-08-21 17:01:27 -04:00
Mark Spanbroek	d172d6bec6	Add Mark I layout	2017-08-21 17:01:27 -04:00
Mark Spanbroek	90b07a5be4	Add COMPACT_KEYMAP macro to Satan GH60	2017-08-21 17:01:27 -04:00
Mark Spanbroek	af21fa63e5	Fix: add missing keys to Satan GH60 KEYMAP macro	2017-08-21 17:01:27 -04:00
Stephen Tudor	dde035b963	Add smt keymap for Sentraq S65-X	2017-08-21 16:59:52 -04:00
Jack Humbert	e7b3991b97	fix readmes	2017-08-21 16:51:16 -04:00
Jack Humbert	1ce3971c90	adds sweet16 and four banger keyboards	2017-08-21 16:51:16 -04:00
Ben James	48e79cbe29	Create readme.md	2017-08-20 20:57:22 -04:00
Ben James	68dafc8382	Create Makefile	2017-08-20 20:57:22 -04:00
Ben James	e0d9cc945f	Create config.h	2017-08-20 20:57:22 -04:00
Ben James	7aa839915e	Create keymap.c	2017-08-20 20:57:22 -04:00
Jack Humbert	78dc7bacfa	travis files in gitignore for good measure	2017-08-20 15:20:32 -04:00
Jack Humbert	fa6bcfd10c	make travis convert line-endings and push a skippable commit	2017-08-20 14:22:18 -04:00
Jack Humbert	1254e76e29	stop compiling ez after build, rework ssh ids	2017-08-20 14:04:35 -04:00
Jack Humbert	166706a32c	adds subatomic files (non-working)	2017-08-20 13:52:28 -04:00
Joe Wasson	948d6efcfb	Fix stray keystroke in readme file.	2017-08-20 13:28:39 -04:00
Joe Wasson	fe60cbd928	Remove PLAY_NOTE_ARRAY usages to get rid of warning.	2017-08-20 12:32:20 -04:00
Jack Humbert	f94963e6b7	Merge pull request #1608 from hot-leaf-juice/master keymap update	2017-08-20 11:52:57 -04:00
Joe Wasson	4b74c9056b	Fix Planck Steno layout with new error message (remove MIDI).	2017-08-20 11:51:57 -04:00
Joe Wasson	e74a95bf26	Keymap tweaks.	2017-08-20 11:51:57 -04:00
Joe Wasson	bae1144a9f	Fix compilation error when NO_ACTION_LAYER is defined.	2017-08-20 11:51:57 -04:00
Joe Wasson	eb5748e8bf	Gherkin keymaps for Steno and Talljoe	2017-08-20 11:51:57 -04:00
Joe Wasson	bdc0880ca5	Add compile error if too many endpoints are defined for the ATmega32U4.	2017-08-20 11:51:57 -04:00
Joe Wasson	fc70c9ac9e	Allow steno to build when NKRO is not defined. Was missing eeprom.h, MAX(), and memset.	2017-08-20 11:51:57 -04:00
That-Canadian	937b86d030	Added default ECO keymap	2017-08-20 11:47:46 -04:00
That-Canadian	cc9b0eb109	Line ending stuff again	2017-08-20 11:47:46 -04:00
Daniel Khodabakhsh	046595f521	Update s60_x/default/rule.mk for original Sentraq S60-X Fix and issue with the original Sentraq S60-X not being compatible with 'default'. If 'default' shouldn't be changed, perhaps I can create an 'original' revision.	2017-08-20 11:45:18 -04:00
ThreeFx	8341068299	Correct if-statement	2017-08-20 11:17:19 -04:00
ThreeFx	a553dcba5a	Added gentoo support for dependency script	2017-08-20 11:17:19 -04:00
Jack Humbert	5cab5e4a4e	validates json	2017-08-19 08:35:14 -04:00
Jack Humbert	d8145c8464	adds redirects for docs	2017-08-19 08:31:54 -04:00
Jack Humbert	81d7e7d4c8	Merge pull request #1601 from dlaroe/master My keymaps only	2017-08-19 08:19:50 -04:00
Balz Guenat	30ac7d403e	remove dead links, add troubleshooting section	2017-08-19 08:19:16 -04:00
Balz Guenat	6ea408da10	Update USB-USB converter README according to #1588	2017-08-19 08:19:16 -04:00
Ryan MacLean	1132646b2f	Update readme.md	2017-08-19 08:18:27 -04:00
Ryan MacLean	9eb71e9719	Update readme.md	2017-08-19 08:18:27 -04:00
Ryan MacLean	9ea56f03a1	Fixing readme clobber	2017-08-19 08:18:27 -04:00
Ryan MacLean	07be7b8d69	Reverting CMD Changes Adding the CMD from @edasque in once more as it allows specifying more than one board via host ENV vars. Currently, the Dockerfile is hard-coded.	2017-08-19 08:17:58 -04:00
Wilba6582	baae936b47	Required overridden function for keymaps in EEPROM	2017-08-19 08:16:58 -04:00
Callum Oakley	a6845036e2	Merge branch 'master' of https://github.com/qmk/qmk_firmware	2017-08-19 10:34:45 +01:00
	4c4a174dbe	Added Preonic Makefile and readme.md	2017-08-18 17:45:32 -04:00
	8b62a0af74	Updated keymaps with second LOWER for the right hand	2017-08-18 17:29:19 -04:00
Danny Nguyen	7277f09bba	Update Nyquist readme file to new format	2017-08-18 15:44:02 -04:00
Joe Wasson	94ca84d271	Fix incorrect name for GeminiPR in docs.	2017-08-18 14:43:24 -04:00
Jack Humbert	52f2f6d8ea	adds audio docs to summary	2017-08-18 13:57:57 -04:00
Benny Powers	9fed4f7948	Add link to keycodes doc in how_keyboards_work	2017-08-18 12:49:55 -04:00
Roy Wellington Ⅳ	c0a6935fb3	Fix these links, as they appear to be broken (#1595 ) It looks like build_environment_setup.md got renamed to getting_started_build_tools.md in this commit: commit `e6c638bed1` Author: skullY <skullydazed@gmail.com> Date: Sat Aug 5 20:54:34 2017 -0700 Overhaul the Getting Started section and add a FAQ section docs/{build_environment_setup.md => getting_started_build_tools.md} \| 132 ++++++++++++++++++++++++++++++++++++------------------------------------- This commit adjusts the links to match the new name.	2017-08-18 00:18:04 -07:00
	07dcbd23fd	First Update	2017-07-24 15:19:31 -04:00
Callum Oakley	84a8aabe5b	MORE layer	2017-07-04 18:16:45 +01:00