Fix Spacing issue in makefile that breaks Terminal config

* Add mapdev layout to espectro

* Add mapdev layout to espectro

* - Update MO

Co-Authored-By: tcatkins99 <[email protected]>

Vagrantfile

@@ -59,7 +59,7 @@ Vagrant.configure(2) do |config|
   # add a # before ,args: and run 'vagrant up' to get a working
   # non-updated box and then attempt to troubleshoot or open a Github issue
 
-  config.vm.provision "shell", run: "always", path: "./util/install_dependencies.sh", args: "-update"
+  config.vm.provision "shell", run: "always", path: "./util/qmk_install.sh", args: "-update"
 
   config.vm.post_up_message = <<-EOT
 

common_features.mk

@@ -213,12 +213,18 @@ endif
 ifeq ($(strip $(TERMINAL_ENABLE)), yes)
     SRC += $(QUANTUM_DIR)/process_keycode/process_terminal.c
     OPT_DEFS += -DTERMINAL_ENABLE
+    OPT_DEFS += -DUSER_PRINT
 endif
 
 ifeq ($(strip $(USB_HID_ENABLE)), yes)
     include $(TMK_DIR)/protocol/usb_hid.mk
 endif
 
+ifeq ($(strip $(ENCODER_ENABLE)), yes)
+    SRC += $(QUANTUM_DIR)/encoder.c
+    OPT_DEFS += -DENCODER_ENABLE
+endif
+
 ifeq ($(strip $(HD44780_ENABLE)), yes)
     SRC += drivers/avr/hd44780.c
     OPT_DEFS += -DHD44780_ENABLE
@@ -239,7 +245,7 @@ QUANTUM_SRC:= \
     $(QUANTUM_DIR)/keymap_common.c \
     $(QUANTUM_DIR)/keycode_config.c
 
-ifndef CUSTOM_MATRIX
+ifneq ($(strip $(CUSTOM_MATRIX)), yes)
     ifeq ($(strip $(SPLIT_KEYBOARD)), yes)
         QUANTUM_SRC += $(QUANTUM_DIR)/split_common/matrix.c
     else

docs/_sidebar.md

@@ -52,6 +52,7 @@
   * [Combos](feature_combo)
   * [Command](feature_command.md)
   * [Dynamic Macros](feature_dynamic_macros.md)
+  * [Encoders](feature_encoders.md)
   * [Grave Escape](feature_grave_esc.md)
   * [Key Lock](feature_key_lock.md)
   * [Layouts](feature_layouts.md)

docs/_summary.md

@@ -52,6 +52,7 @@
   * [Combos](feature_combo)
   * [Command](feature_command.md)
   * [Dynamic Macros](feature_dynamic_macros.md)
+  * [Encoders](feature_encoders.md)
   * [Grave Escape](feature_grave_esc.md)
   * [Key Lock](feature_key_lock.md)
   * [Layouts](feature_layouts.md)

docs/config_options.md

@@ -132,14 +132,15 @@ If you define these options you will enable the associated feature, which may in
 * `#define TAPPING_TOGGLE 2`
   * how many taps before triggering the toggle
 * `#define PERMISSIVE_HOLD`
-  * makes tap and hold keys work better for fast typers who don't want tapping term set above 500
+  * makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the `TAPPING_TERM`
   * See [Permissive Hold](feature_advanced_keycodes.md#permissive-hold) for details
 * `#define IGNORE_MOD_TAP_INTERRUPT`
-  * makes it possible to do rolling combos (zx) with keys that convert to other keys on hold
+  * makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the `TAPPING_TERM` for both keys.
-  * See [Mod tap interrupt](feature_advanced_keycodes.md#mod-tap-interrupt) for details
+  * See [Mod tap interrupt](feature_advanced_keycodes.md#ignore-mod-tap-interrupt) for details
 * `#define TAPPING_FORCE_HOLD`
   * makes it possible to use a dual role key as modifier shortly after having been tapped
-  * See [Hold after tap](feature_advanced_keycodes.md#hold-after-tap)
+  * See [Hold after tap](feature_advanced_keycodes.md#tapping-force-hold)
+  * Breaks any Tap Toggle functionality (`TT` or the One Shot Tap Toggle)
 * `#define LEADER_TIMEOUT 300`
   * how long before the leader key times out
 * `#define ONESHOT_TIMEOUT 300`

docs/faq_build.md

@@ -105,10 +105,12 @@ The solution is to remove and reinstall all affected modules.
 ```
 brew rm avr-gcc
 brew rm dfu-programmer
+brew rm dfu-util
 brew rm gcc-arm-none-eabi
 brew rm avrdude
 brew install avr-gcc
 brew install dfu-programmer
+brew install dfu-util
 brew install gcc-arm-none-eabi
 brew install avrdude
 ```

docs/feature_advanced_keycodes.md

@@ -2,7 +2,7 @@
 
 Your keymap can include keycodes that are more advanced than normal, for example keys that switch layers or send modifiers when held, but send regular keycodes when tapped. This page documents the functions that are available to you.
 
-### Assigning Custom Names
+## Assigning Custom Names
 
 People often define custom names using `#define`. For example:
 
@@ -13,7 +13,7 @@ People often define custom names using `#define`. For example:
 
 This will allow you to use `FN_CAPS` and `ALT_TAB` in your `KEYMAP()`, keeping it more readable.
 
-### Caveats
+## Caveats
 
 Currently, `LT()` and `MT()` are limited to the [Basic Keycode set](keycodes_basic.md), meaning you can't use keycodes like `LCTL()`, `KC_TILD`, or anything greater than `0xFF`. Modifiers specified as part of a Layer Tap or Mod Tap's keycode will be ignored.
 
@@ -36,7 +36,7 @@ These functions allow you to activate layers in various ways. Note that layers a
 
 Care must be taken when switching layers, it's possible to lock yourself into a layer with no way to deactivate that layer (without unplugging your keyboard.) We've created some guidelines to help users avoid the most common problems.
 
-### Beginners
+## Beginners
 
 If you are just getting started with QMK you will want to keep everything simple. Follow these guidelines when setting up your layers:
 
@@ -44,11 +44,11 @@ If you are just getting started with QMK you will want to keep everything simple
 * Arrange your layers in a "tree" layout, with layer 0 as the root. Do not try to enter the same layer from more than one other layer.
 * In a layer's keymap, only reference higher-numbered layers. Because layers are processed from the highest-numbered (topmost) active layer down, modifying the state of lower layers can be tricky and error-prone.
 
-### Intermediate Users
+## Intermediate Users
 
 Sometimes you need more than one base layer. For example, if you want to switch between QWERTY and Dvorak, switch between layouts for different countries, or switch your layout for different videogames. Your base layers should always be the lowest numbered layers. When you have multiple base layers you should always treat them as mutually exclusive. When one base layer is on the others are off.
 
-### Advanced Users
+## Advanced Users
 
 Once you have a good feel for how layers work and what you can do, you can get more creative. The rules listed in the beginner section will help you be successful by avoiding some of the tricker details but they can be constraining, especially for ultra-compact keyboard users. Understanding how layers work will allow you to use them in more advanced ways.
 
@@ -73,7 +73,6 @@ These allow you to combine a modifier with a keycode. When pressed, the keydown
 |`HYPR(kc)`|                      |Hold Left Control, Shift, Alt and GUI and press `kc`|
 |`MEH(kc)` |                      |Hold Left Control, Shift and Alt and press `kc`     |
 |`LCAG(kc)`|                      |Hold Left Control, Alt and GUI and press `kc`       |
-|`ALTG(kc)`|                      |Hold Right Control and Alt and press `kc`           |
 |`SGUI(kc)`|`SCMD(kc)`, `SWIN(kc)`|Hold Left Shift and GUI and press `kc`              |
 |`LCA(kc)` |                      |Hold Left Control and Alt and press `kc`            |
 
@@ -126,6 +125,14 @@ For convenience, QMK includes some Mod-Tap shortcuts to make common combinations
 |`SGUI_T(kc)`|`SCMD_T(kc)`, `SWIN_T(kc)`             |Left Shift and GUI when held, `kc` when tapped         |
 |`LCA_T(kc)` |                                       |Left Control and Alt when held, `kc` when tapped       |
 
+## Caveats
+
+Unfortunately, these keycodes cannot be used in Mod-Taps or Layer-Taps, since any modifiers specified in the keycode are ignored.
+
+Additionally, you may run into issues when using Remote Desktop Connection on Windows. Because these codes send shift very fast, Remote Desktop may miss the codes.
+
+To fix this, open Remote Desktop Connection, click on "Show Options", open the the "Local Resources" tab. In the keyboard section, change the drop down to "On this Computer". This will fix the issue, and allow the characters to work correctly.
+
 # One Shot Keys
 
 One shot keys are keys that remain active until the next key is pressed, and then are released. This allows you to type keyboard combinations without pressing more than one key at a time. These keys are usually called "Sticky keys" or "Dead keys".
@@ -134,6 +141,8 @@ For example, if you define a key as `OSM(MOD_LSFT)`, you can type a capital A ch
 
 One shot keys also work as normal modifiers. If you hold down a one shot key and type other keys, your one shot will be released immediately after you let go of the key.
 
+Additionally, hitting keys five times in a short period will lock that key. This applies for both One Shot Modifiers and One Shot Layers, and is controlled by the `ONESHOT_TAP_TOGGLE` define.
+
 You can control the behavior of one shot keys by defining these in `config.h`:
 
 ```c
@@ -144,42 +153,73 @@ You can control the behavior of one shot keys by defining these in `config.h`:
 * `OSM(mod)` - Momentarily hold down *mod*. You must use the `MOD_*` keycodes as shown in [Mod Tap](#mod-tap), not the `KC_*` codes.
 * `OSL(layer)` - momentary switch to *layer*.
 
-Sometimes, you want to activate a one-shot layer as part of a macro or tap dance routine. To do this, you need to call `set_oneshot_layer(LAYER, ONESHOT_START)` on key down, and `set_oneshot_layer(ONESHOT_PRESSED)` on key up. If you want to cancel the oneshot, call `reset_oneshot_layer()`. For more complicated actions, take a look at the oneshot implementation in [`process_record`](https://github.com/qmk/qmk_firmware/blob/master/tmk_core/common/action.c#L429).
+Sometimes, you want to activate a one-shot key as part of a macro or tap dance routine.  
+
+For one shot layers, you need to call `set_oneshot_layer(LAYER, ONESHOT_START)` on key down, and `set_oneshot_layer(ONESHOT_PRESSED)` on key up. If you want to cancel the oneshot, call `reset_oneshot_layer()`.
+
+For one shot mods, you need to call `set_oneshot_mods(MOD)` to set it, or `clear_oneshot_mods()` to cancel it.
+
+!> If you're having issues with OSM translating over Remote Desktop Connection, this can be fixed by opening the settings, going to the "Local Resources" tap, and in the keyboard section, change the drop down to "On this Computer".  This will fix the issue and allow OSM to function properly over Remote Desktop.
 
-If you're having issues with OSM translating over Remote Desktop Connection, this can be fixed by opening the settings, going to the "Local Resources" tap, and in the keyboard section, change the drop down to "On this Computer".  This will fix the issue and allow OSM to function properly over Remote Desktop.
 
 # Permissive Hold
 
 As of [PR#1359](https://github.com/qmk/qmk_firmware/pull/1359/), there is a new `config.h` option:
 
-```
+```c
 #define PERMISSIVE_HOLD
 ```
 
-This makes it easier for fast typists to use dual-function keys. Without this, if you let go of a held key inside the tapping term, it won't register.
+This makes tap and hold keys (like Mod Tap) work better for fast typist, or for high `TAPPING_TERM` settings. 
 
-Example: (Tapping Term = 200ms)
+If you press a Mod Tap key, tap another key (press and release) and then release the Mod Tap key, all within the tapping term, it will output the "tapping" function for both keys.
 
-- SHFT_T(KC_A) Down
+For Instance:
-- KC_X Down
-- KC_X Up
-- SHFT_T(KC_A) Up
 
-With defaults, if above is typed within tapping term, this will emit `ax`. With permissive hold, if above is typed within tapping term, this will emit `X` (so, Shift+X).
+- `SHFT_T(KC_A)` Down
+- `KC_X` Down
+- `KC_X` Up
+- `SHFT_T(KC_A)` Up
 
-# Mod tap interrupt
+Normally, if you do all this within the `TAPPING_TERM` (default: 200ms) this will be registered as `ax` by the firmware and host system. With permissive hold enabled, this modifies how this is handled by considering the Mod Tap keys as a Mod if another key is tapped, and would registered as `X` (`SHIFT`+`x`). 
 
-When a dual role key used for a modifier is quickly followed by another keys, it is interpreted as held even before the tapping term elapsed.  This is a problem if a key is used for example inside a rolling combo because the second key will be pressed before the first key is released.
+?> If you have `Ignore Mod Tap Interrupt` enabled, as well, this will modify how both work. The regular key has the modifier added if the first key is released first or if both keys are held longer than the `TAPPING_TERM`.
 
-For example, when trying to type the rolling combo "zx" and z being configured to send Ctrl when hold, z rapidly followed by x actually sends Ctrl-x. That's bad.
+# Ignore Mod Tap Interrupt
 
-You can disable this behavior by defining `IGNORE_MOD_TAP_INTERRUPT` in `config.h`.
+To enable this setting, add this to your `config.h`:
 
-Note that this only concerns modifiers and not layer switching keys.
+```c
+#define IGNORE_MOD_TAP_INTERRUPT
+```
 
-# Hold after tap
+Similar to Permissive Hold, this alters how the firmware processes input for fast typist. If you press a Mod Tap key, press another key, release the Mod Tap key, and then release the normal key, it would normally output the "tapping" function for both keys. This may not be desirable for rolling combo keys. 
 
-When the user holds a key after tap, this repeats the tapped key rather to hold a modifier key.  This allows to use auto repeat for the tapped key.  If you prefer to hold a modifier instead, define `TAPPING_FORCE_HOLD` in `config.h`.
+Setting `Ignore Mod Tap Interrupt` requires  holding both keys for the `TAPPING_TERM` to trigger the hold function (the mod).
+
+For Instance:
+
+- `SHFT_T(KC_A)` Down
+- `KC_X` Down
+- `SHFT_T(KC_A)` Up
+- `KC_X` Up
+
+Normally, this would send `X` (`SHIFT`+`x`). With `Ignore Mod Tap Interrupt` enabled, holding both keys are required for the `TAPPING_TERM` to register the hold action. A quick tap will output `ax` in this case, while a hold on both will still output `X`  (`SHIFT`+`x`).
+
+
+?> __Note__: This only concerns modifiers and not layer switching keys.
+
+?> If you have `Permissive Hold` enabled, as well, this will modify how both work. The regular key has the modifier added if the first key is released first or if both keys are held longer than the `TAPPING_TERM`.
+
+# Tapping Force Hold
+
+To enable `tapping force hold`, add the following to your `config.h`: 
+
+```c
+#define TAPPING_FORCE_HOLD
+```
+
+When the user holds a key after tap, this repeats the tapped key rather to hold a modifier key.  This allows to use auto repeat for the tapped key.  
 
 Example:
 
@@ -197,6 +237,12 @@ With `TAPPING_FORCE_HOLD`, the second press will be interpreted as a Shift, allo
 
 # Retro Tapping
 
-When you hold a dual function key, and haven't pressed anything when you release the key, normally nothing happens.  However, if you enable this, if you release the key without pressing another key, it will send the original key, even if it is outside of the tapping term. 
+To enable `retro tapping`, add the following to your `config.h`: 
 
-For instance, if you're using `LT(2, KC_SPACE)`, if you hold the key, don't hit anything else and then release it, normally, nothing happens. But with `RETRO_TAPPING` defined in your `config.h`, it will send `KC_SPACE`. 
+```c
+#define RETRO_TAPPING
+```
+
+Holding and releasing a dual function key without pressing another key will result in nothing happening. With retro tapping enabled, releasing the key without pressing another will send the original keycode even if it is outside the tapping term.
+
+For instance, holding and releasing `LT(2, KC_SPACE)` without hitting another key will result in nothing happening. With this enabled, it will send `KC_SPACE` instead.

docs/feature_backlight.md

@@ -61,7 +61,7 @@ In this handler, the value of an incrementing counter is mapped onto a precomput
 |`backlight_increase()` |Increase the backlight level                 |
 |`backlight_decrease()` |Decrease the backlight level                 |
 |`backlight_level(x)`   |Sets the backlight level to specified level  |
-|`get_backlight_level()`|Toggle backlight breathing                   |
+|`get_backlight_level()`|Return the current backlight level           |
 
 ### Backlight Breathing Functions
 

docs/feature_bootmagic.md

@@ -11,7 +11,15 @@ There are three separate but related features that allow you to change the behav
 On some keyboards Bootmagic is disabled by default. If this is the case, it must be explicitly enabled in your `rules.mk` with:
 
 ```make
-BOOTMAGIC_ENABLE = yes
+BOOTMAGIC_ENABLE = full
+```
+
+?> You may see `yes` being used in place of `full`, and this is okay. However, `yes` is deprecated, and ideally `full` (or `lite`) should be used instead.
+
+Additionally, you can use [Bootmagic Lite](#bootmagic-lite) (a scaled down, very basic version of Bootmagic) by adding the following to your `rules.mk` file:
+
+```make
+BOOTMAGIC_ENABLE = lite
 ```
 
 ## Hotkeys
@@ -99,3 +107,45 @@ If you would like to change the hotkey assignments for Bootmagic, `#define` thes
 |`BOOTMAGIC_KEY_DEFAULT_LAYER_5`         |`KC_5`       |Make layer 5 the default layer                     |
 |`BOOTMAGIC_KEY_DEFAULT_LAYER_6`         |`KC_6`       |Make layer 6 the default layer                     |
 |`BOOTMAGIC_KEY_DEFAULT_LAYER_7`         |`KC_7`       |Make layer 7 the default layer                     |
+
+# Bootmagic Lite
+
+In addition to the full blown Bootmagic feature, is the Bootmagic Lite feature that only handles jumping into the bootloader.  This is great for boards that don't have a physical reset button but you need a way to jump into the bootloader, and don't want to deal with the headache that Bootmagic can cause.
+
+To enable this version of Bootmagic, you need to enable it in your `rules.mk` with:
+
+```make
+BOOTMAGIC_ENABLE = lite
+```
+
+Additionally, you may want to specify which key to use.  This is especially useful for keyboards that have unusual matrices.  To do so, you need to specify the row and column of the key that you want to use. Add these entries to your `config.h` file:
+
+```c
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 1
+```
+
+By default, these are set to 0 and 0, which is usually the "ESC" key on a majority of keyboards.
+
+And to trigger the bootloader, you hold this key down when plugging the keyboard in. Just the single key. 
+
+## Advanced Bootmagic Lite
+
+The `bootmagic_lite` function is defined weakly, so that you can replace this in your code, if you need.  A great example of this is the Zeal60 boards that have some additional handling needed.
+
+To replace the function, all you need to do is add something like this to your code:
+
+```c
+void bootmagic_lite(void) {
+    matrix_scan();
+    wait_ms(DEBOUNCING_DELAY * 2);
+    matrix_scan();
+
+    if (matrix_get_row(BOOTMAGIC_LITE_ROW) & (1 << BOOTMAGIC_LITE_COLUMN)) {
+      // Jump to bootloader.
+      bootloader_jump();
+    }
+}
+```
+
+You can additional feature here. For instance, resetting the eeprom or requiring additional keys to be pressed to trigger bootmagic.  Keep in mind that `bootmagic_lite` is called before a majority of features are initialized in the firmware.

docs/feature_combo.md

@@ -19,6 +19,7 @@ combo_t key_combos[COMBO_COUNT] = {COMBO(test_combo, KC_ESC)};
 This will send "Escape" if you hit the A and B keys.
 
 !> This method only supports [basic keycodes](keycodes_basic.md). See the examples for more control.
+!> You cannot reuse (share) keys in combos. Each key should only belong to a single combo.  
 
 ## Examples
 
@@ -43,15 +44,15 @@ For a more complicated implementation, you can use the `process_combo_event` fun
 ```c
 enum combo_events {
   ZC_COPY,
-  ZV_PASTE
+  XV_PASTE
   };
 
 const uint16_t PROGMEM copy_combo[] = {KC_Z, KC_C, COMBO_END};
-const uint16_t PROGMEM paste_combo[] = {KC_Z, KC_V, COMBO_END};
+const uint16_t PROGMEM paste_combo[] = {KC_X, KC_V, COMBO_END};
 
 combo_t key_combos[COMBO_COUNT] = {
   [ZC_COPY] = COMBO_ACTION(copy_combo),
-  [ZV_PASTE] = COMBO_ACTION(paste_combo),
+  [XV_PASTE] = COMBO_ACTION(paste_combo),
 };
 
 void process_combo_event(uint8_t combo_index, bool pressed) {
@@ -65,7 +66,7 @@ void process_combo_event(uint8_t combo_index, bool pressed) {
       }
       break;
 
-    case ZV_PASTE:
+    case XV_PASTE:
       if (pressed) {
         register_code(KC_LCTL);
         register_code(KC_V);
@@ -77,7 +78,7 @@ void process_combo_event(uint8_t combo_index, bool pressed) {
 }
 ```
 
-This will send Ctrl+C if you hit Z and C, and Ctrl+V if you hit Z and V.  But you could change this to do stuff like change layers, play sounds, or change settings.
+This will send Ctrl+C if you hit Z and C, and Ctrl+V if you hit X and V.  But you could change this to do stuff like change layers, play sounds, or change settings.
 
 ## Additional Configuration
 

docs/feature_encoders.md

@@ -0,0 +1,48 @@
+# Encoders
+
+Basic encoders are supported by adding this to your `rules.mk`:
+
+    ENCODER_ENABLE = yes
+
+and this to your `config.h`:
+
+    #define NUMBER_OF_ENCODERS 1
+    #define ENCODERS_PAD_A { B12 }
+    #define ENCODERS_PAD_B { B13 }
+
+Each PAD_A/B variable defines an array so multiple encoders can be defined, e.g.:
+
+    #define ENCODERS_PAD_A { encoder1a, encoder2a }
+    #define ENCODERS_PAD_B { encoder1a, encoder2b }
+
+If your encoder's clockwise directions are incorrect, you can swap the A & B pad definitions.
+
+Additionally, the resolution can be specified in the same file (the default & suggested is 4):
+
+    #define ENCODER_RESOLUTION 4
+
+## Callbacks
+
+The callback functions can be inserted into your `<keyboard>.c`:
+
+    void encoder_update_kb(uint8_t index, bool clockwise) {
+        encoder_update_user(index, clockwise);
+    }
+
+or `keymap.c`:
+
+    void encoder_update_user(uint8_t index, bool clockwise) {
+        if (index == 0) {
+            if (clockwise) {
+                register_code(KC_PGDN);
+                unregister_code(KC_PGDN);
+            } else {
+                register_code(KC_PGUP);
+                unregister_code(KC_PGUP);
+            }
+        }
+    }
+
+## Hardware
+
+The A an B lines of the encoders should be wired directly to the MCU, and the C/common lines should be wired to ground.

docs/feature_tap_dance.md

@@ -26,6 +26,8 @@ This array specifies what actions shall be taken when a tap-dance key is in acti
 
 The first option is enough for a lot of cases, that just want dual roles. For example, `ACTION_TAP_DANCE_DOUBLE(KC_SPC, KC_ENT)` will result in `Space` being sent on single-tap, `Enter` otherwise.
 
+!> Keep in mind that only [basic keycodes](keycodes_basic.md) are supported here. Custom keycodes are not supported.
+
 And that's the bulk of it!
 
 And now, on to the explanation of how it works!

docs/features.md

@@ -8,13 +8,17 @@ QMK has a staggering number of features for building your keyboard. It can take
 * [Auto Shift](feature_auto_shift.md) - Tap for the normal key, hold slightly longer for its shifted state.
 * [Backlight](feature_backlight.md) - LED lighting support for your keyboard.
 * [Bootmagic](feature_bootmagic.md) - Adjust the behavior of your keyboard using hotkeys.
+* [Combos](feature_combos.md) - Custom actions for multiple key holds.
+* [Command](feature_command.md) - Runtime version of bootmagic (Formerly known as "Magic").
 * [Dynamic Macros](feature_dynamic_macros.md) - Record and playback macros from the keyboard itself.
+* [Grave Escape](feature_grave_esc.md) - Lets you use a single key for Esc and Grave. 
 * [HD44780 LCD Display](feature_hd44780.md) - Support for LCD character displays using the HD44780 standard.
 * [Key Lock](feature_key_lock.md) - Lock a key in the "down" state.
 * [Layouts](feature_layouts.md) - Use one keymap with any keyboard that supports your layout.
 * [Leader Key](feature_leader_key.md) - Tap the leader key followed by a sequence to trigger custom behavior.
 * [Macros](feature_macros.md) - Send multiple key presses when pressing only one physical key.
 * [Mouse keys](feature_mouse_keys.md) - Control your mouse pointer from your keyboard.
+* [One Shot Keys](feature_advanced_keycodes.md#one-shot-keys) - Sticky Keys, lets hit a key rather than holding it.
 * [Pointing Device](feature_pointing_device.md) - Framework for connecting your custom pointing device to your keyboard.
 * [PS2 Mouse](feature_ps2_mouse.md) - Driver for connecting a PS/2 mouse directly to your keyboard.
 * [RGB Light](feature_rgblight.md) - RGB lighting for your keyboard.

docs/flashing.md

@@ -71,8 +71,8 @@ Flashing sequence:
 
 1. Press the `RESET` keycode, or short RST to GND quickly (you only have 7 seconds to flash once it enters)
 2. Wait for the OS to detect the device
-4. Flash a .hex file
+3. Flash a .hex file
-5. Wait for the device to reset automatically
+4. Wait for the device to reset automatically
 
 or
 
@@ -106,5 +106,28 @@ Flashing sequence:
 
 1. Press the `RESET` keycode, or short RST to GND quickly (you only have 7 seconds to flash once it enters)
 2. Wait for the OS to detect the device
-4. Flash a .hex file
+3. Flash a .hex file
-5. Reset the device into application mode (may be done automatically)
+4. Reset the device into application mode (may be done automatically)
+
+## STM32
+
+All STM32 chips come preloaded with a factory bootloader that cannot be modified nor deleted. Some STM32 chips have bootloaders that do not come with USB programming (e.g. STM32F103) but the process is still the same.
+
+At the moment, no `BOOTLOADER` variable is needed on `rules.mk` for STM32.
+
+Compatible flashers:
+
+* [QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases) (recommended GUI)
+* [dfu-util](https://github.com/Stefan-Schmidt/dfu-util) / `:dfu-util` (recommended command line)
+
+Flashing sequence:
+
+1. Enter the bootloader using any of the following methods:
+    * Tap the `RESET` keycode (may not work on STM32F042 devices)
+    * If a reset circuit is present, tap the RESET button
+    * Otherwise, you need to bridge BOOT0 to VCC (via BOOT0 button or bridge), short RESET to GND (via RESET button or bridge), and then let go of the BOOT0 bridge
+2. Wait for the OS to detect the device
+3. Flash a .bin file
+    * You will receive a warning about the DFU signature; Just ignore it
+4. Reset the device into application mode (may be done automatically)
+    * If you are building from command line (e.g. `make planck/rev6:default:dfu-util`), make sure that `:leave` is passed to the `DFU_ARGS` variable inside your `rules.mk` (e.g. `DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave`) so that your device resets after flashing

docs/getting_started_build_tools.md

@@ -8,7 +8,7 @@ Note: If it is your first time here, Check out the "Complete Newbs guide" instea
 
 ## Linux
 
-To ensure you are always up to date, you can just run `sudo util/install_dependencies.sh`. That should always install all the dependencies needed. **This will run `apt-get upgrade`.**
+To ensure you are always up to date, you can just run `sudo util/qmk_install.sh`. That should always install all the dependencies needed. **This will run `apt-get upgrade`.**
 
 You can also install things manually, but this documentation might not be always up to date with all requirements.
 
@@ -58,10 +58,11 @@ If you're using [homebrew,](http://brew.sh/) you can use the following commands:
     brew update
     brew install avr-gcc@7
     brew install dfu-programmer
+    brew install dfu-util
     brew install gcc-arm-none-eabi
     brew install avrdude
 
-This is the recommended method. If you don't have homebrew, [install it!](http://brew.sh/) It's very much worth it for anyone who works in the command line. Note that the `make` and `make install` portion during the homebrew installation of avr-libc can take over 20 minutes and exhibit high CPU usage.
+This is the recommended method. If you don't have homebrew, [install it!](http://brew.sh/) It's very much worth it for anyone who works in the command line. Note that the `make` and `make install` portion during the homebrew installation of `avr-gcc@7` can take over 20 minutes and exhibit high CPU usage.
 
 ## Windows with msys2 (recommended)
 
@@ -69,9 +70,9 @@ The best environment to use, for Windows Vista through any later version (tested
 
 * Install msys2 by downloading it and following the instructions here: http://www.msys2.org
 * Open the ``MSYS2 MingGW 64-bit`` shortcut
-* Navigate to your qmk checkout. For example, if it's in the root of your c drive:
+* Navigate to your QMK repository. For example, if it's in the root of your c drive:
  * `$ cd /c/qmk_firmware`
-* Run `util/msys2_install.sh` and follow the prompts
+* Run `util/qmk_install.sh` and follow the prompts
 
 ## Windows 10 (deprecated)
 These are the old instructions for Windows 10. We recommend you use [MSYS2 as outlined above](#windows-with-msys2-recommended).

docs/hardware_avr.md

@@ -66,7 +66,7 @@ Do change the `MANUFACTURER`, `PRODUCT`, and `DESCRIPTION` lines to accurately r
 #define DESCRIPTION     A custom keyboard
 ```
 
-?> Note: On Windows and macOS the `MANUFACTURER`, `PRODUCT`, and `DESCRIPTION` fields will be displayed in the list of USB devices. On Linux these values will not be visible in `lsusb`, since Linux takes that information from the list published by the USB-IF.
+?> Note: On Windows and macOS the `MANUFACTURER`, `PRODUCT`, and `DESCRIPTION` fields will be displayed in the list of USB devices. ?> On Linux these values will not be visible in lsusb by default, since Linux takes the information from the list maintained by [USB ID Repository](http://www.linux-usb.org/usb-ids.html) by default. lsusb will show the information reported by the device when executed with -v option. It is also present in kernel logs after plugging in the device.
 
 ### Keyboard Matrix Configuration
 

docs/internals_gpio_control.md

@@ -12,7 +12,7 @@ The following functions can provide basic control of GPIOs and are found in `qua
 |`setPinInputHigh(pin)`|Set pin as input with build in pull-up                            |
 |`setPinInputLow(pin)` |Set pin as input with build in pull-down (Supported only on STM32)|
 |`setPinOutput(pin)`   |Set pin as output                                                 |
-|`writePinHige(pin)`   |Set pin level as high, assuming it is an output                   |
+|`writePinHigh(pin)`   |Set pin level as high, assuming it is an output                   |
 |`writePinLow(pin)`    |Set pin level as low, assuming it is an output                    |
 |`writePin(pin, level)`|Set pin level, assuming it is an output                           |
 |`readPin(pin)`        |Returns the level of the pin                                      |

docs/keycodes.md

@@ -333,7 +333,6 @@ This is a reference only. Each group of keys links to the page documenting their
 |`HYPR(kc)`|                      |Hold Left Control, Shift, Alt and GUI and press `kc`|
 |`MEH(kc)` |                      |Hold Left Control, Shift and Alt and press `kc`     |
 |`LCAG(kc)`|                      |Hold Left Control, Alt and GUI and press `kc`       |
-|`ALTG(kc)`|                      |Hold Right Control and Alt and press `kc`           |
 |`SGUI(kc)`|`SCMD(kc)`, `SWIN(kc)`|Hold Left Shift and GUI and press `kc`              |
 |`LCA(kc)` |                      |Hold Left Control and Alt and press `kc`            |
 

docs/keycodes_us_ansi_shifted.md

@@ -6,6 +6,10 @@ These keycodes correspond to characters that are "shifted" on a standard US ANSI
 
 Unfortunately, these keycodes cannot be used in Mod-Taps or Layer-Taps, since any modifiers specified in the keycode are ignored.
 
+Additionally, you may run into issues when using Remote Desktop Connection on Windows. Because these codes send shift very fast, Remote Desktop may miss the codes.
+
+To fix this, open Remote Desktop Connection, click on "Show Options", open the the "Local Resources" tab. In the keyboard section, change the drop down to "On this Computer". This will fix the issue, and allow the characters to work correctly.
+
 ## Keycodes
 
 |Key                     |Aliases            |Description        |

docs/newbs_building_firmware.md

@@ -16,7 +16,7 @@ Start by navigating to the `keymaps` folder for your keyboard.
 
 ?> Windows:
 
-    start keyboards/<keyboard_folder>/keymaps
+    start .\\keyboards\\<keyboard_folder>\\keymaps
 
 ## Create a Copy Of The `default` Keymap
 

docs/quantum_keycodes.md

@@ -8,15 +8,16 @@ On this page we have documented keycodes between `0x00FF` and `0xFFFF` which are
 
 ## QMK Keycodes
 
-|Key          |Aliases    |Description                                                          |
+|Key            |Aliases    |Description                                                          |
-|-------------|-----------|---------------------------------------------------------------------|
+|---------------|-----------|---------------------------------------------------------------------|
-|`RESET`      |           |Put the keyboard into DFU mode for flashing                          |
+|`RESET`        |           |Put the keyboard into DFU mode for flashing                          |
-|`DEBUG`      |           |Toggle debug mode                                                    |
+|`DEBUG`        |           |Toggle debug mode                                                    |
-|`KC_GESC`    |`GRAVE_ESC`|Escape when tapped, <code>&#96;</code> when pressed with Shift or GUI|
+|`EEPROM_RESET` |`EEP_RST`  |Resets EEPROM state by reinitializing it                             |
-|`KC_LSPO`    |           |Left Shift when held, `(` when tapped                                |
+|`KC_GESC`      |`GRAVE_ESC`|Escape when tapped, <code>&#96;</code> when pressed with Shift or GUI|
-|`KC_RSPC`    |           |Right Shift when held, `)` when tapped                               |
+|`KC_LSPO`      |           |Left Shift when held, `(` when tapped                                |
-|`KC_LEAD`    |           |The [Leader key](feature_leader_key.md)                              |
+|`KC_RSPC`      |           |Right Shift when held, `)` when tapped                               |
-|`KC_LOCK`    |           |The [Lock key](feature_key_lock.md)                                  |
+|`KC_LEAD`      |           |The [Leader key](feature_leader_key.md)                              |
-|`FUNC(n)`    |`F(n)`     |Call `fn_action(n)` (deprecated)                                     |
+|`KC_LOCK`      |           |The [Lock key](feature_key_lock.md)                                  |
-|`M(n)`       |           |Call macro `n`                                                       |
+|`FUNC(n)`      |`F(n)`     |Call `fn_action(n)` (deprecated)                                     |
-|`MACROTAP(n)`|           |Macro-tap `n` idk FIXME                                              |
+|`M(n)`         |           |Call macro `n`                                                       |
+|`MACROTAP(n)`  |           |Macro-tap `n` idk FIXME                                              |

drivers/avr/ws2812.h

@@ -69,7 +69,4 @@ void ws2812_sendarray_mask(uint8_t *array,uint16_t length, uint8_t pinmask);
 #define CONCAT_EXP(a, b)   CONCAT(a, b)
 #endif
 
-// #define ws2812_PORTREG  CONCAT_EXP(PORT,ws2812_port)
-// #define ws2812_DDRREG   CONCAT_EXP(DDR,ws2812_port)
-
 #endif /* LIGHT_WS2812_H_ */

keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/config.h

@@ -0,0 +1,15 @@
+#pragma once
+
+/* tap dance stuff*/
+#undef TAPPING_TERM
+#define TAPPING_TERM 500
+
+#define TAPPING_TOGGLE 2
+
+#define EXAMPLESTRING1 "tapdance_1"
+#define EXAMPLESTRING2 "tapdance_2"
+#define EXAMPLESTRING3 "tapdance_3"
+#define EXAMPLESTRING4 "tapdance_4"
+
+#undef RGBLED_NUM
+#define RGBLED_NUM 16

keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/keymap.c

@@ -0,0 +1,215 @@
+/*
+tap danc eis turned on in the rules now...
+*/
+#include QMK_KEYBOARD_H
+
+#define _EMOJI 0
+#define _TAPLAND 1
+#define _LEDCNTL 2
+
+enum custom_keycodes {
+    SHRUG,
+    DISFACE,
+    FU,
+    TFLIP,
+    TFLIP2,
+    SAD_EYES,
+    TPUT,
+    HAPPYFACE,
+    HEARTFACE,
+    CLOUD,
+    CHANFACE,
+    CMDCLEAR
+};
+//Tap Dance Declarations
+enum {
+  TD_EXAMPLE1 = 0,
+  TD_EXAMPLE2,
+  TD_EXAMPLE3,
+  TD_EXAMPLE4
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    /* EMOJI Pad
+    * ,-------------------------------.
+    * |TFLIP | TFlIP2|DISFACE|   FU   |
+    * |------+-------+-------+--------|
+    * | CLOUD|       |       | CLEAR  |
+    * |------+-------+-------+--------|
+    * |SHRUG |DISFACE| HRTFAC| HAPPYF |
+    * |------+-------+-------+--------|
+    * | ENTER|       |LEDCNTR| tapland| 
+    * `-------------------------------'
+    */
+      //purple
+    [_EMOJI] = LAYOUT_ortho_4x4(
+       TFLIP,   TFLIP2,   KC_NO,      FU , 
+       CLOUD,   KC_NO,  KC_NO,      CMDCLEAR, 
+       SHRUG,   DISFACE,  HEARTFACE,    HAPPYFACE, 
+       KC_ENT,  RGB_TOG,  MO(_LEDCNTL), MO(_TAPLAND)
+    ),
+ 
+    /* TapLand //
+    * ,-------------------------------.
+    * | str1 | str2  |  str3 |   str4 |
+    * |------+-------+-------+--------|
+    * |      |       |       |        |
+    * |------+-------+-------+--------|
+    * |      |       |       |        |
+    * |------+-------+-------+--------|
+    * |      |       |       |        | 
+    * `-------------------------------'
+    */
+    //blue
+    [_TAPLAND] = LAYOUT_ortho_4x4(
+       TD(TD_EXAMPLE1), TD(TD_EXAMPLE2),  TD(TD_EXAMPLE3), TD(TD_EXAMPLE4), 
+       KC_NO,         KC_NO,          KC_NO,         KC_NO, 
+       KC_NO,         KC_NO,          KC_NO,         KC_NO, 
+       KC_NO,         KC_NO,          KC_NO,         KC_NO
+    ),
+    /* LEDControl Pad
+    * ,-------------------------------.
+    * | snake|breathe|rainbow|gradient|
+    * |------+-------+-------+--------|
+    * | xmas |  Val+ | Sat+  |   HUE+ |
+    * |------+-------+-------+--------|
+    * |kngrdr|  Val- | Sat-  |   HUE- |
+    * |------+-------+-------+--------|
+    * | swirl| PLAIN |       | ON/OFF | 
+    * `-------------------------------'
+    */
+    //blue
+    [_LEDCNTL] = LAYOUT_ortho_4x4(
+        RGB_M_SN, RGB_M_B,    RGB_M_R,     RGB_M_G, 
+        RGB_M_X,  RGB_VAI,    RGB_SAI,     RGB_HUI, 
+        RGB_M_K,  RGB_VAD,    RGB_SAD,     RGB_HUD, 
+        RGB_M_SW, RGB_M_P,    KC_NO,     RGB_TOG
+     ),
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (record->event.pressed) {
+        switch(keycode) {
+            case CLOUD:       // (っ◕‿◕)っ
+                if(record->event.pressed){
+                    send_unicode_hex_string("0028 3063 25D5 203F 25D5 0029 3063");
+                }
+                return false;
+                break;
+            case FU:       // t(-_-t)
+                if(record->event.pressed){
+                    SEND_STRING("t(-_-t)");
+                }
+                return false;
+                break;  
+            case HAPPYFACE:       // ʘ‿ʘ 
+                if(record->event.pressed){
+                     send_unicode_hex_string("0298 203F 0298");
+                }
+                return false;
+                break; 
+            case CMDCLEAR:
+                if (record->event.pressed) {
+                    register_code(KC_LGUI);
+                    tap_code(KC_A);                 
+                    unregister_code(KC_LGUI);
+                    tap_code(KC_DEL);                 
+                }
+                return false;
+                break;  
+            case SHRUG: // ¯\_(ツ)_/¯
+                if (record->event.pressed) {
+                    send_unicode_hex_string("00AF 005C 005F 0028 30C4 0029 005F 002F 00AF");
+                }
+                return false; 
+                break;
+            case HEARTFACE:       // ♥‿♥
+                if(record->event.pressed){
+                    send_unicode_hex_string("2665 203F 2665");
+                }
+                return false;
+                break;  
+            case DISFACE:       // ಠ_ಠ 
+                if(record->event.pressed){
+                    send_unicode_hex_string("0CA0 005F 0CA0");
+                }
+                return false;
+                break;
+            case TFLIP:         // (╯°□°)╯ ︵ ┻━┻ 
+                if(record->event.pressed){
+                    send_unicode_hex_string("0028 256F 00B0 25A1 00B0 0029 256F 0020 FE35 0020 253B 2501 253B");
+                }
+                return false;
+                break;
+            case TFLIP2:         // ┻━┻︵ \(°□°)/ ︵ ┻━┻  
+                if(record->event.pressed){
+                    send_unicode_hex_string("253B 2501 253B FE35 0020 005C 0028 00B0 25A1 00B0 0029 002F 0020 FE35 0020 253B 2501 253B");
+                }
+                return false;
+                break;
+                } 
+    }
+    return true;
+}
+
+
+/* tap dance time */
+void tdexample1(qk_tap_dance_state_t *state, void *user_data) {
+  if (state->count >= 2) {
+    SEND_STRING(EXAMPLESTRING1);
+    reset_tap_dance (state);
+  }
+}
+void tdexample2(qk_tap_dance_state_t *state, void *user_data) {
+  if (state->count >= 2) {
+    SEND_STRING(EXAMPLESTRING2);
+    reset_tap_dance (state);
+  }
+}
+void tdexample3(qk_tap_dance_state_t *state, void *user_data) {
+  if (state->count >= 2) {
+    SEND_STRING(EXAMPLESTRING3);
+    reset_tap_dance (state);
+  }
+}
+void tdexample4(qk_tap_dance_state_t *state, void *user_data) {
+  if (state->count >= 2) {
+    SEND_STRING(EXAMPLESTRING4);
+    reset_tap_dance (state);
+  }
+}
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+    [TD_EXAMPLE1] = ACTION_TAP_DANCE_FN(tdexample1),
+    [TD_EXAMPLE2] = ACTION_TAP_DANCE_FN(tdexample2),
+    [TD_EXAMPLE3] = ACTION_TAP_DANCE_FN(tdexample3),
+    [TD_EXAMPLE4] = ACTION_TAP_DANCE_FN(tdexample4)
+};
+
+// Runs just one time when the keyboard initializes.
+void matrix_scan_user(void) {
+  static bool has_ran_yet;
+  if (!has_ran_yet) {
+    has_ran_yet = true;
+        rgblight_setrgb (16, 0, 16);
+  }
+}
+uint32_t layer_state_set_user(uint32_t state) {
+    switch (biton32(state)) {
+    case _TAPLAND:
+        rgblight_setrgb(0, 16, 0); //green
+        break;
+    case _LEDCNTL:
+        rgblight_setrgb(0, 0, 16); //blue
+        break;
+    case _EMOJI:
+        rgblight_setrgb (16, 0, 16); //purple
+        break;
+
+    default: //  for any other layers, or the default layer
+        rgblight_setrgb (16, 0, 16); //purple
+        break;
+    }
+  return state;
+}

keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/readme.md

@@ -0,0 +1,10 @@
+# Ridingtraffic's examples
+===
+This keymap has many features:
+3 layers
+Momentary layer switching
+16 pixel neopixel
+Unicode Enabled
+Tap dance enabled
+
+The rgb also updates depending on what layer you are on, and then flips back when done.

keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/rules.mk

@@ -0,0 +1,5 @@
+# turning on tap dance
+TAP_DANCE_ENABLE = yes
+RGBLIGHT_ENABLE = yes
+MOUSEKEY_ENABLE = no
+UNICODE_ENABLE = yes 

keyboards/6ball/config.h

@@ -39,11 +39,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN F7
-#define RGBLIGHT_TIMER
+
 #define RGBLIGHT_ANIMATIONS
 #define RGBLED_NUM 6    // Number of LEDs
-#define ws2812_PORTREG  PORTD
-#define ws2812_DDRREG   DDRD
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW

keyboards/6lit/6lit.c

@@ -0,0 +1,53 @@
+/* Copyright 2018
+ *
+ * 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 "6lit.h"
+
+void matrix_init_kb(void) {
+	// put your keyboard start-up code here
+	// runs once when the firmware starts up
+
+	matrix_init_user();
+}
+
+void matrix_scan_kb(void) {
+	// put your looping keyboard code here
+	// runs every cycle (a lot)
+
+	matrix_scan_user();
+}
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+	// put your per-action keyboard code here
+	// runs for every action, just before processing by the firmware
+
+	return process_record_user(keycode, record);
+}
+
+void led_set_kb(uint8_t usb_led) {
+	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
+
+	led_set_user(usb_led);
+}
+
+#ifdef SWAP_HANDS_ENABLE
+__attribute__ ((weak))
+const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
+	{{2, 2}, {1, 2}, {0, 2}},
+	{{2, 3}, {1, 3}, {0, 3}},
+	{{0, 0}, {1, 0}, {2, 0}},
+  {{0, 1}, {1, 1}, {2, 1}},
+};
+#endif

keyboards/6lit/6lit.h

@@ -0,0 +1,55 @@
+/* Copyright 2018
+ *
+ * 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/>.
+ */
+#pragma once
+
+#include "quantum.h"
+#define ________ KC_NO
+
+#ifndef FLIP_HALF
+#define LAYOUT_split( \
+	L00, L01, L02, R00, R01, R02, \
+	L10, L11, L12, R10, R11, R12  \
+) { \
+	{ L00, L01, L02 }, \
+	{ L10, L11, L12 }, \
+	{ R02, R01, R00 }, \
+	{ R12, R11, R10 }, \
+}
+#else
+#define LAYOUT_split( \
+	L00, L01, L02, R00, R01, R02, \
+	L10, L11, L12, R10, R11, R12  \
+) { \
+	{ L00, L01, L02 }, \
+	{ L10, L11, L12 }, \
+	{ R00, R01, R02 }, \
+	{ R10, R11, R12 }, \
+}
+#endif
+
+#define LAYOUT_macro( \
+	L00, L01, L02, \
+	L10, L11, L12  \
+) { \
+	{ L00, L01, L02 }, \
+	{ L10, L11, L12 }, \
+}
+
+#define LAYOUT LAYOUT_macro
+
+#ifdef USE_I2C
+  #error "I2C not Supported"
+#endif

keyboards/6lit/config.h

@@ -0,0 +1,230 @@
+/* Copyright 2018
+ *
+ * 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/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0x0A0C
+#define DEVICE_VER      0x0F61
+#define MANUFACTURER    di0ib
+#define PRODUCT         The 6lit Macropad
+#define DESCRIPTION     A split 12 key Macropad
+
+#define USE_SERIAL
+
+/* Select hand configuration */
+#define MASTER_LEFT
+//#define MASTER_RIGHT
+//#define EE_HANDS
+
+/* key matrix size */
+// Rows are doubled-up
+#define MATRIX_ROWS 2*2
+#define MATRIX_COLS 3
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+#define MATRIX_ROW_PINS { D7, E6 }
+#define MATRIX_COL_PINS { F6, F7, B1 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
+#define DIODE_DIRECTION COL2ROW
+
+// #define BACKLIGHT_PIN B7
+// #define BACKLIGHT_BREATHING
+// #define BACKLIGHT_LEVELS 3
+
+// #define RGB_DI_PIN E2
+// #ifdef RGB_DI_PIN
+// #define RGBLIGHT_ANIMATIONS
+// #define RGBLED_NUM 16
+// #define RGBLIGHT_HUE_STEP 8
+// #define RGBLIGHT_SAT_STEP 8
+// #define RGBLIGHT_VAL_STEP 8
+// #endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCING_DELAY 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* number of backlight levels */
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Magic Key Options
+ *
+ * Magic keys are hotkey commands that allow control over firmware functions of
+ * the keyboard. They are best used in combination with the HID Listen program,
+ * found here: https://www.pjrc.com/teensy/hid_listen.html
+ *
+ * The options below allow the magic key functionality to be changed. This is
+ * useful if your keyboard/keypad is missing keys and you want magic key support.
+ *
+ */
+
+/* key combination for magic key command */
+#define IS_COMMAND() ( \
+    keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
+)
+
+/* control how magic key switches layers */
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS  true
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS  true
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
+
+/* override magic key keymap */
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
+//#define MAGIC_KEY_HELP1          H
+//#define MAGIC_KEY_HELP2          SLASH
+//#define MAGIC_KEY_DEBUG          D
+//#define MAGIC_KEY_DEBUG_MATRIX   X
+//#define MAGIC_KEY_DEBUG_KBD      K
+//#define MAGIC_KEY_DEBUG_MOUSE    M
+//#define MAGIC_KEY_VERSION        V
+//#define MAGIC_KEY_STATUS         S
+//#define MAGIC_KEY_CONSOLE        C
+//#define MAGIC_KEY_LAYER0_ALT1    ESC
+//#define MAGIC_KEY_LAYER0_ALT2    GRAVE
+//#define MAGIC_KEY_LAYER0         0
+//#define MAGIC_KEY_LAYER1         1
+//#define MAGIC_KEY_LAYER2         2
+//#define MAGIC_KEY_LAYER3         3
+//#define MAGIC_KEY_LAYER4         4
+//#define MAGIC_KEY_LAYER5         5
+//#define MAGIC_KEY_LAYER6         6
+//#define MAGIC_KEY_LAYER7         7
+//#define MAGIC_KEY_LAYER8         8
+//#define MAGIC_KEY_LAYER9         9
+//#define MAGIC_KEY_BOOTLOADER     PAUSE
+//#define MAGIC_KEY_LOCK           CAPS
+//#define MAGIC_KEY_EEPROM         E
+//#define MAGIC_KEY_NKRO           N
+//#define MAGIC_KEY_SLEEP_LED      Z
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+/*
+ * MIDI options
+ */
+
+/* Prevent use of disabled MIDI features in the keymap */
+//#define MIDI_ENABLE_STRICT 1
+
+/* enable basic MIDI features:
+   - MIDI notes can be sent when in Music mode is on
+*/
+//#define MIDI_BASIC
+
+/* enable advanced MIDI features:
+   - MIDI notes can be added to the keymap
+   - Octave shift and transpose
+   - Virtual sustain, portamento, and modulation wheel
+   - etc.
+*/
+//#define MIDI_ADVANCED
+
+/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
+//#define MIDI_TONE_KEYCODE_OCTAVES 1
+
+/*
+ * HD44780 LCD Display Configuration
+ */
+/*
+#define LCD_LINES           2     //< number of visible lines of the display
+#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
+
+#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
+
+#if LCD_IO_MODE
+#define LCD_PORT         PORTB        //< port for the LCD lines
+#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
+#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
+#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
+#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
+#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
+#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
+#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
+#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
+#define LCD_RS_PORT      LCD_PORT     //< port for RS line
+#define LCD_RS_PIN       3            //< pin  for RS line
+#define LCD_RW_PORT      LCD_PORT     //< port for RW line
+#define LCD_RW_PIN       2            //< pin  for RW line
+#define LCD_E_PORT       LCD_PORT     //< port for Enable line
+#define LCD_E_PIN        1            //< pin  for Enable line
+#endif
+*/

keyboards/6lit/info.json

@@ -0,0 +1,23 @@
+{
+    "keyboard_name": "6lit",
+    "url": "",
+    "maintainer": "qmk",
+    "width": 6,
+    "height": 2,
+    "layouts": {
+        "LAYOUT_macro": {
+            "key_count": 6,
+            "layout": [
+              {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0},
+              {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}
+            ]
+        },
+        "LAYOUT_split": {
+            "key_count": 12,
+            "layout": [
+              {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0},
+              {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}
+            ]
+        }
+    }
+}

keyboards/6lit/keymaps/default/config.h

@@ -0,0 +1,19 @@
+/* Copyright 2018
+ *
+ * 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/>.
+ */
+
+#pragma once
+
+// place overrides here

keyboards/6lit/keymaps/default/keymap.c

@@ -0,0 +1,39 @@
+/* Copyright 2018
+ *
+ * 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 QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_split( /* Base */
+    KC_F13,   KC_F14,   KC_F15,   KC_F16,   KC_F17,   KC_F18, \
+    KC_F19,   KC_F20,   KC_F21,   KC_F22,   KC_F23,   KC_F24  \
+  ),
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  return true;
+}
+
+void matrix_init_user(void) {
+
+}
+
+void matrix_scan_user(void) {
+
+}
+
+void led_set_user(uint8_t usb_led) {
+
+}

keyboards/6lit/keymaps/default/readme.md

@@ -0,0 +1 @@
+# The default split keymap for 6lit

keyboards/6lit/keymaps/macro/config.h

@@ -0,0 +1,19 @@
+/* Copyright 2018
+ *
+ * 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/>.
+ */
+
+#pragma once
+
+// place overrides here

keyboards/6lit/keymaps/macro/keymap.c

@@ -0,0 +1,39 @@
+/* Copyright 2018
+ *
+ * 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 QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_macro( /* Base */
+    KC_F19,   KC_F20,   KC_F21, \
+    KC_F22,   KC_F23,   KC_F24  \
+  ),
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  return true;
+}
+
+void matrix_init_user(void) {
+
+}
+
+void matrix_scan_user(void) {
+
+}
+
+void led_set_user(uint8_t usb_led) {
+
+}

keyboards/6lit/keymaps/macro/readme.md

@@ -0,0 +1 @@
+# The default single board macro keymap for 6lit

keyboards/6lit/readme.md

@@ -0,0 +1,17 @@
+# 6lit
+
+![6lit](https://1.bp.blogspot.com/-Pa8RgYZ0hy8/Wbmr4bjuV0I/AAAAAAACDbI/WLKQMDlcDVAVf1lAIRMN51usR1XcCCVNgCLcBGAs/s1600/a.JPG)
+
+6 key macropad that fits within the 100mm x 100mm PCB size. Can be used singly as a regular 6 key macropad as well.
+
+* [The original TMK firmware](https://github.com/di0ib/tmk_keyboard/tree/master/keyboard/6lit)
+
+Keyboard Maintainer: QMK Community  
+Hardware Supported: 6lit PCB  
+Hardware Availability: [6lit project on 40% Keyboards](http://www.40percent.club/2017/09/6lit.html)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make 6lit:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

keyboards/6lit/rules.mk

@@ -0,0 +1,83 @@
+# MCU name
+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
+
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   atmega32a    bootloadHID
+BOOTLOADER = caterina
+
+
+# If you don't know the bootloader type, then you can specify the
+# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line
+#   Teensy halfKay      512
+#   Teensy++ halfKay    1024
+#   Atmel DFU loader    4096
+#   LUFA bootloader     4096
+#   USBaspLoader        2048
+# OPT_DEFS += -DBOOTLOADER_SIZE=4096
+
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # 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
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality on B7 by default
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+MIDI_ENABLE = no            # MIDI support (+2400 to 4200, depending on config)
+UNICODE_ENABLE = no         # Unicode
+BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
+AUDIO_ENABLE = no           # Audio output on port C6
+FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
+HD44780_ENABLE = no 		    # Enable support for HD44780 based LCDs (+400)
+
+# Enable generic behavior for split boards
+SPLIT_KEYBOARD = yes

keyboards/9key/config.h

@@ -39,10 +39,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* 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

keyboards/alps64/keymaps/crd/keymap.c

@@ -0,0 +1,31 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* 0: qwerty */
+  LAYOUT_all(
+    KC_GRV,        KC_1,    KC_2,    KC_3,   KC_4,     KC_5,    KC_6,    KC_7,    KC_8,    KC_9,     KC_0,    KC_MINS, KC_EQL,  _______, KC_BSPC,
+    KC_TAB,        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_BSLS,
+    CTL_T(KC_ESC), 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_LSFT,       KC_NUBS, KC_Z,    KC_X,   KC_C,     KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, RSFT_T(KC_UP), _______,
+    MO(1),         KC_LALT, KC_LGUI,                   KC_SPC,                                       _______, RGUI_T(KC_LEFT), RALT_T(KC_DOWN), LT(2, KC_RIGHT)
+  ),
+  /* 1: fn1 */
+  LAYOUT_all(
+    _______,       KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,
+    _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, KC_HOME, KC_PGUP, _______,
+    _______,       _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, KC_END,  KC_PGDOWN, _______,
+    _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______,
+    _______,       _______, _______,                   _______,                                      _______, _______, _______, _______
+  ),
+  /* 2: fn2 */
+  LAYOUT_all(
+    _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
+    _______,       _______, _______, _______, RESET,   _______, _______, _______, _______, _______,  KC_VOLD, KC_MUTE, KC_VOLU, _______,
+    _______,       _______, _______, DEBUG,   _______, _______, _______, _______, _______, _______,  KC_SCROLLLOCK,  KC_PAUSE, _______,
+    _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______,
+    _______,       _______, _______,                   _______,                                      _______, _______, _______, _______
+  ),
+}
+;
+
+const uint16_t PROGMEM fn_actions[] = {};

keyboards/amj40/keymaps/default/rules.mk

@@ -1,5 +1,5 @@
 # Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
+#   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)
@@ -13,14 +13,11 @@ 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  = yes  # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
+RGBLIGHT_ENABLE  = yes  # Enable WS2812 RGB underlight.
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 
-#define ws2812_PORTREG  PORTD
-#define ws2812_DDRREG   DDRD
-
 
 ifndef QUANTUM_DIR
 	include ../../../../Makefile

keyboards/amj40/keymaps/fabian/rules.mk

@@ -1,5 +1,5 @@
 # Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
+#   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)
@@ -13,15 +13,7 @@ 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  = yes  # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
+RGBLIGHT_ENABLE  = yes  # Enable WS2812 RGB underlight. 
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
-#define ws2812_PORTREG  PORTD
-#define ws2812_DDRREG   DDRD
-
-
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif

keyboards/amj40/keymaps/jetpacktuxedo/rules.mk

@@ -13,15 +13,7 @@ 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.
+RGBLIGHT_ENABLE  = no  # Enable WS2812 RGB underlight. 
 
 # Do not enable SLEEP_LED_ENABLE. It uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
-#define ws2812_PORTREG  PORTD
-#define ws2812_DDRREG   DDRD
-
-
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif

keyboards/amj40/keymaps/myee/rules.mk

@@ -1,5 +1,5 @@
 # Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
+#   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)
@@ -13,15 +13,7 @@ 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  = yes  # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
+RGBLIGHT_ENABLE  = yes  # Enable WS2812 RGB underlight. 
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
-#define ws2812_PORTREG  PORTD
-#define ws2812_DDRREG   DDRD
-
-
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif

keyboards/amj60/keymaps/iso_split_rshift/rules.mk

@@ -13,7 +13,7 @@ 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.
+RGBLIGHT_ENABLE  = no  # Enable WS2812 RGB underlight. 
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend

keyboards/atomic/keymaps/pvc/rules.mk

@@ -9,7 +9,7 @@ MIDI_ENABLE      = no  # MIDI controls
 AUDIO_ENABLE     = yes # 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.
+RGBLIGHT_ENABLE  = no  # Enable WS2812 RGB underlight. 
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend

keyboards/atomic/rules.mk

@@ -63,7 +63,7 @@ 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.
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend

keyboards/atreus/keymaps/xk/rules.mk

@@ -10,7 +10,7 @@ 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.  Do not enable this with audio at the same time.
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
 
 ifndef QUANTUM_DIR

keyboards/atreus62/keymaps/194h/keymap.c

@@ -39,6 +39,7 @@
 //Norwegian layout - dependant on previous definitions
 #define  NO_UNDS  LSFT(NO_MINS)  //  _
 #define  NO_QUES  LSFT(NO_PLUS)  //  ?
+#define  NO_ACUT  RALT(NO_BSLS)  //  Acute
 #define  NO_GRAV  LSFT(NO_BSLS)  //  `
 #define  NO_GT    LSFT(NO_LT)    //  >
 #define  NO_HALF  RALT(NO_LT)    //  ½
@@ -56,6 +57,9 @@
 #define OSM_RSFT OSM(MOD_RSFT)
 #define OSM_RGUI OSM(MOD_RGUI)
 
+//CTRL on hold, ESC on tap
+#define CTL_ESC CTL_T(KC_ESC)
+
 //Layers
 #define L1 0
 #define L2 1
@@ -63,23 +67,51 @@
 #define L4 3
 #define L5 4
 
+// Momentary switch to layer 
+#define MO_L2 MO(L2)
+#define MO_L4 MO(L4)
+#define MO_L5 MO(L5)
 // Momentary switch to layer - One Shot Layer
+#define OSL_L2 OSL(L2)
 #define OSL_L3 OSL(L3)
 #define OSL_L4 OSL(L4)
 
+//Tap Dance Declarations
+enum {
+  SCLN_OE = 0,
+  QUOT_AE,
+  DQT_AO
+};
+
+//Tap Dance Definitions
+qk_tap_dance_action_t tap_dance_actions[] = {
+  //Tap once for semicolon, twice for ø
+  [SCLN_OE] = ACTION_TAP_DANCE_DOUBLE(NO_SCLN, NO_OE),
+  //Tap once for single quote, twice for æ
+  [QUOT_AE] = ACTION_TAP_DANCE_DOUBLE(NO_QUOT, NO_AE),
+  //Tap once for double quote, twice for å
+  [DQT_AO] = ACTION_TAP_DANCE_DOUBLE(NO_DQT, NO_AO),
+// Other declarations would go here, separated by commas, if you have them
+};
+
+//Tap Dance keys
+#define TD_SCLN_OE TD(SCLN_OE)
+#define TD_QUOT_AE TD(QUOT_AE)
+#define TD_DQT_AO TD(DQT_AO)
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [L1] = LAYOUT(
 	KC_LGUI,       KC_1,         KC_2,         KC_3,         KC_4,         KC_5,                                     KC_6,         KC_7,         KC_8,         KC_9,         KC_0,         KC_RGUI,
-	KC_TAB,        KC_Q,         KC_W,         KC_E,         KC_R,         KC_T,                                     KC_Y,         KC_U,         KC_I,         KC_O,         KC_P,         NO_DQT,
+	KC_TAB,        KC_Q,         KC_W,         KC_E,         KC_R,         KC_T,                                     KC_Y,         KC_U,         KC_I,         KC_O,         KC_P,         TD_DQT_AO,
-	KC_BSPC,       KC_A,         KC_S,         KC_D,         KC_F,         KC_G,                                     KC_H,         KC_J,         KC_K,         KC_L,         NO_SCLN,      NO_QUOT,
+	KC_BSPC,       KC_A,         KC_S,         KC_D,         KC_F,         KC_G,                                     KC_H,         KC_J,         KC_K,         KC_L,         TD_SCLN_OE,   TD_QUOT_AE,
 	OSM_LSFT,      KC_Z,         KC_X,         KC_C,         KC_V,         KC_B,                                     KC_N,         KC_M,         KC_COMM,      KC_DOT,       NO_MINS,      OSM_RSFT,
-	CTL_T(KC_ESC), MO(L5),       KC_LEAD,      OSM_LALT,     MO(L4),       OSL_L3,       KC_SPC,       KC_ENT,       OSL_L3,       MO(L4),       OSM_RALT,     NO_EQL,       NO_PLUS,      KC_RCTL
+	CTL_ESC,       MO_L5,        KC_TAB,       OSM_LALT,     MO_L4,        OSL_L3,       KC_SPC,       KC_ENT,       OSL_L3,       MO_L4,        OSM_LALT,     NO_EQL,       NO_PLUS,      KC_RCTL
   ),
   [L2] = LAYOUT(
 	_______,       _______,      _______,      _______,      _______,      _______,                                  _______,      _______,      _______,      _______,      _______,      _______,
-	_______,       _______,      _______,      _______,      _______,      _______,                                  _______,      _______,      _______,      _______,      _______,      NO_AO,
+	_______,       _______,      _______,      _______,      _______,      _______,                                  _______,      _______,      _______,      _______,      _______,      NO_DQT,
-	_______,       _______,      _______,      _______,      _______,      _______,                                  _______,      _______,      _______,      _______,      NO_OE,        NO_AE,
+	_______,       _______,      _______,      _______,      _______,      _______,                                  _______,      _______,      _______,      _______,      NO_SCLN,      NO_QUOT,
 	_______,       _______,      _______,      _______,      _______,      _______,                                  _______,      _______,      _______,      _______,      _______,      _______,
 	_______,       _______,      _______,      _______,      _______,      _______,      _______,      _______,      _______,      _______,      _______,      _______,      _______,      _______       
   ),
@@ -95,66 +127,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	XXXXXXX,       KC_F6,        KC_F7,        KC_F8,        KC_F9,        KC_F10,                                   KC_HOME,      KC_PGDN,      KC_PGUP,      KC_END,       XXXXXXX,      XXXXXXX,
 	_______,       KC_F11,       KC_F12,       KC_F13,       KC_F14,       KC_F15,                                   KC_LEFT,      KC_DOWN,      KC_UP,        KC_RIGHT,     XXXXXXX,      KC_DEL,
 	XXXXXXX,       KC_F16,       KC_F17,       KC_F18,       KC_F19,       KC_F20,                                   XXXXXXX,      KC_APP,       XXXXXXX,      XXXXXXX,      KC_VOLD,      XXXXXXX,
-	OSM_LCTL,      _______,      XXXXXXX,      _______,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      KC_MUTE,      KC_VOLU,      OSM_RCTL
+	OSM_LCTL,      _______,      XXXXXXX,      _______,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      OSM_RALT,     KC_MUTE,      KC_VOLU,      OSM_RCTL
   ),
   [L5] = LAYOUT(
 	XXXXXXX,       TO(L1),       TO(L2),       TO(L3),       TO(L4),       XXXXXXX,                                  XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,
-	XXXXXXX,       XXXXXXX,      XXXXXXX,      XXXXXXX,      RESET,        XXXXXXX,                                  XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      NO_AO,  
+	XXXXXXX,       XXXXXXX,      XXXXXXX,      XXXXXXX,      RESET,        XXXXXXX,                                  XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,
-	XXXXXXX,       XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,                                  XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      NO_OE,        NO_AE,  
+	XXXXXXX,       XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,                                  XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,
 	XXXXXXX,       XXXXXXX,      XXXXXXX,      KC_CAPS,      XXXXXXX,      XXXXXXX,                                  XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,
 	XXXXXXX,       _______,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX,      XXXXXXX
   )
 };
 
-
+//TODO: Is there productivity gain in the use of unicode?
-// Unicode Linux
+//	- Won't work in xterm.
-void matrix_init_user(void) {
+//	Create a layer for macros and/or unicode?
-  set_unicode_input_mode(UC_LNX);
+//	Are macros useful?
-};
+//	- Found no gain in having sendstring for commands.
-
+//	- Find repeated tasks that cannot be done easily on the OS.
-
+//	- Most other keymaps have macros for game/fun stuff, hard to find "serious" onces.
-#define TAP_ONCE(code)  \
+//	Screw Norwegian layout, switch to US with unicode æøå or US/English International?
-  register_code (code); \
+//	- Will be different from laptop keyboard, requiring a switch on the OS side when only using the laptop.
-  unregister_code (code)
-
-
-LEADER_EXTERNS();
-
-// Runs constantly in the background, in a loop. Only supports basic keycodes.
-void matrix_scan_user(void) {
-  LEADER_DICTIONARY() {
-    leading = false;
-    leader_end();
-
-    //probably useless in practice, but cool
-    SEQ_ONE_KEY (KC_P) {
-      tap_random_base64();
-      tap_random_base64();
-      tap_random_base64();
-      tap_random_base64();
-      tap_random_base64();
-      tap_random_base64();
-      tap_random_base64();
-      tap_random_base64();
-    }
-
-    SEQ_ONE_KEY (KC_G) {
-      SEND_STRING("grep something !");
-      register_code(KC_RALT);
-      TAP_ONCE(KC_4);
-      unregister_code(KC_RALT);
-    }
-    SEQ_ONE_KEY (KC_T) {
-      SEND_STRING("tail "); 
-      TAP_ONCE(KC_SLSH);
-      SEND_STRING("f !");
-      register_code(KC_RALT);
-      TAP_ONCE(KC_4);
-      unregister_code(KC_RALT);
-    }
-    SEQ_ONE_KEY (KC_S) {
-      SEND_STRING("sudo !!");
-      TAP_ONCE(KC_ENT);
-    }
-  }
-}

keyboards/atreus62/keymaps/194h/rules.mk

@@ -1,8 +1,7 @@
-TAP_DANCE_ENABLE = no
+TAP_DANCE_ENABLE = yes
 NKRO_ENABLE = true
 MOUSEKEY_ENABLE = no
 EXTRAKEY_ENABLE = yes
 CONSOLE_ENABLE = no
 KEY_LOCK_ENABLE = no 
-AUTO_SHIFT_ENABLE = no
+LEADER_ENABLE = no
-LEADER_ENABLE = yes

keyboards/bfo9000/config.h

@@ -53,7 +53,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN B4
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 20    // Number of LEDs
 
 /*

keyboards/bfo9000/rules.mk

@@ -63,7 +63,7 @@ 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.
+RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight. 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 

keyboards/blockey/config.h

@@ -51,11 +51,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN B1
-#define RGBLIGHT_TIMER
-#define RGBLED_NUM 4
-#define ws2812_PORTREG  PORTB
-#define ws2812_DDRREG   DDRB
 
+#define RGBLED_NUM 4
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
 

keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/rules.mk

@@ -13,5 +13,5 @@ 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.
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend

keyboards/bpiphany/frosty_flake/keymaps/default/rules.mk

@@ -13,7 +13,7 @@ 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.
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 
 ifndef QUANTUM_DIR

keyboards/bpiphany/frosty_flake/keymaps/nikchi/rules.mk

@@ -14,7 +14,7 @@ AUDIO_ENABLE = no           # Audio output on port C6
 UNICODE_ENABLE = no         # Unicode
 UNICODEMAP_ENABLE = yes		# unicodemap
 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.
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 TAP_DANCE_ENABLE = yes
 LEADER_ENABLE = yes

keyboards/bpiphany/frosty_flake/keymaps/tkl/rules.mk

@@ -13,5 +13,5 @@ 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.
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend

keyboards/bpiphany/pegasushoof/keymaps/blowrak/rules.mk

@@ -14,7 +14,7 @@ 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.
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 
 
 ifndef QUANTUM_DIR

keyboards/bpiphany/pegasushoof/keymaps/citadel/rules.mk

@@ -13,7 +13,7 @@ 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.
+RGBLIGHT_ENABLE  = no   # Enable WS2812 RGB underlight. 
 TAP_DANCE_ENABLE = yes  # see https://docs.qmk.fm/#/feature_tap_dance (+1000)
 
 

keyboards/bpiphany/pegasushoof/keymaps/default/rules.mk

@@ -14,7 +14,7 @@ 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.
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 
 
 ifndef QUANTUM_DIR

keyboards/bpiphany/pegasushoof/rules.mk

@@ -60,7 +60,7 @@ 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.
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 
 
 CUSTOM_MATRIX = yes

keyboards/bpiphany/tiger_lily/keymaps/default/rules.mk

@@ -13,7 +13,7 @@ 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.
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 
 ifndef QUANTUM_DIR

keyboards/bpiphany/tiger_lily/keymaps/default_ansi/rules.mk

@@ -13,7 +13,7 @@ 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.
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 
 ifndef QUANTUM_DIR

keyboards/catch22/config.h

@@ -39,7 +39,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 
 /* Set 0 if debouncing isn't needed */
-#define DEBOUNCING_DELAY 50
+// #define DEBOUNCING_DELAY 0
 
 /* key combination for command */
 #define IS_COMMAND() ( \

keyboards/chimera_ls/chimera_ls.h

@@ -50,32 +50,30 @@
 // The first section contains all of the arguements
 // The second converts the arguments into a two-dimensional array
 
-#define KC_KEYMAP( \
+#define LAYOUT_ortho_4x12( \
-  k00, k01, k02, k03, k04, k05,           k06, k07, k08, k09, k10, k11, \
+    k00, k01, k02, k03, k04, k05,           k06, k07, k08, k09, k10, k11, \
-  k12, k13, k14, k15, k16, k17,           k18, k19, k20, k21, k22, k23, \
+    k12, k13, k14, k15, k16, k17,           k18, k19, k20, k21, k22, k23, \
-  k24, k25, k26, k27, k28, k29,           k30, k31, k32, k33, k34, k35, \
+    k24, k25, k26, k27, k28, k29,           k30, k31, k32, k33, k34, k35, \
-  k36, k37, k38, k39, k40, k41,           k42, k43, k44, k45, k46, k47  \
+    k36, k37, k38, k39, k40, k41,           k42, k43, k44, k45, k46, k47  \
-) \
+  ) { \
-{ \
+    { k43, k45, k34, k11, k23,   k40, k38, k25, k00, k12   }, \
-	{ KC_##k43, KC_##k45, KC_##k34, KC_##k11, KC_##k23, KC_##k40, KC_##k38, KC_##k25, KC_##k00, KC_##k12 }, \
+    { k31, k44, k46, k35, k22,   k28, k39, k37, k24, k13   }, \
-	{ KC_##k31, KC_##k44, KC_##k46, KC_##k35, KC_##k22, KC_##k28, KC_##k39, KC_##k37, KC_##k24, KC_##k13 }, \
+    { k30, k32, k33, k47, k09,   k29, k27, k26, k36, k02   }, \
-	{ KC_##k30, KC_##k32, KC_##k33, KC_##k47, KC_##k09, KC_##k29, KC_##k27, KC_##k26, KC_##k36, KC_##k02 }, \
+    { k19, k20, k21, k42, k18,   k16, k15, k14, k41, k17   }, \
-	{ KC_##k19, KC_##k20, KC_##k21, KC_##k42, KC_##k18, KC_##k16, KC_##k15, KC_##k14, KC_##k41, KC_##k17 },  \
+    { k06, k07, k08, k10, KC_NO, k05, k04, k03, k01, KC_NO }  \
-	{ KC_##k06, KC_##k07, KC_##k08, KC_##k10, KC_NO,    KC_##k05, KC_##k04, KC_##k03, KC_##k01, KC_NO    }, \
 }
 
-#define KEYMAP( \
+#define LAYOUT_kc_ortho_4x12( \
-  k00, k01, k02, k03, k04, k05,           k06, k07, k08, k09, k10, k11, \
+    k00, k01, k02, k03, k04, k05,           k06, k07, k08, k09, k10, k11, \
-  k12, k13, k14, k15, k16, k17,           k18, k19, k20, k21, k22, k23, \
+    k12, k13, k14, k15, k16, k17,           k18, k19, k20, k21, k22, k23, \
-  k24, k25, k26, k27, k28, k29,           k30, k31, k32, k33, k34, k35, \
+    k24, k25, k26, k27, k28, k29,           k30, k31, k32, k33, k34, k35, \
-  k36, k37, k38, k39, k40, k41,           k42, k43, k44, k45, k46, k47  \
+    k36, k37, k38, k39, k40, k41,           k42, k43, k44, k45, k46, k47  \
-) \
+  ) { \
-{ \
+    { KC_##k43, KC_##k45, KC_##k34, KC_##k11, KC_##k23, KC_##k40, KC_##k38, KC_##k25, KC_##k00, KC_##k12 }, \
-	{ k43, k45, k34, k11, k23, k40, k38, k25, k00, k12 }, \
+    { KC_##k31, KC_##k44, KC_##k46, KC_##k35, KC_##k22, KC_##k28, KC_##k39, KC_##k37, KC_##k24, KC_##k13 }, \
-	{ k31, k44, k46, k35, k22, k28, k39, k37, k24, k13 }, \
+    { KC_##k30, KC_##k32, KC_##k33, KC_##k47, KC_##k09, KC_##k29, KC_##k27, KC_##k26, KC_##k36, KC_##k02 }, \
-	{ k30, k32, k33, k47, k09, k29, k27, k26, k36, k02 }, \
+    { KC_##k19, KC_##k20, KC_##k21, KC_##k42, KC_##k18, KC_##k16, KC_##k15, KC_##k14, KC_##k41, KC_##k17 }, \
-	{ k19, k20, k21, k42, k18, k16, k15, k14, k41, k17 },  \
+    { KC_##k06, KC_##k07, KC_##k08, KC_##k10, KC_NO,    KC_##k05, KC_##k04, KC_##k03, KC_##k01, KC_NO    }  \
-	{ k06, k07, k08, k10, KC_NO,    k05, k04, k03, k01, KC_NO    }, \
 }
 
 

keyboards/chimera_ls/info.json

@@ -0,0 +1,13 @@
+{
+  "keyboard_name": "Chimera LS",
+  "url": "",
+  "maintainer": "qmk",
+  "width": 13,
+  "height": 4,
+  "layouts": {
+    "LAYOUT_ortho_4x12": {
+      "key_count": 48,
+      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}]
+    }
+  }
+}

keyboards/chimera_ls/keymaps/default/keymap.c

@@ -1,7 +1,7 @@
 // this is the style you want to emulate.
 // This is the canonical layout file for the Quantum project. If you want to add another keyboard,
 
-#include "chimera_ls.h"
+#include QMK_KEYBOARD_H
 
 // 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.
@@ -24,168 +24,163 @@ enum chimera_lets_split_layers
 #define KC_SCTR MT(MOD_LCTL, KC_RBRC)
 #define KC_SPLT MT(MOD_LALT, KC_MINS)
 #define KC_MESC LT(_MACROS, KC_ESC)
-#define KC_INCL M(0)
-#define KC_PULL M(1)
-#define KC_PUSH M(2)
-#define KC_SCAP M(3)
-#define KC_SCOF M(4)
 #define KC_CAD LALT(LCTL(KC_DEL))
 
+enum custom_keycodes {
+  KC_INCL = SAFE_RANGE,
+  KC_PULL,
+  KC_PUSH,
+  KC_SCAP,
+  KC_SCOF
+};
+
 #define LONGPRESS_DELAY 150
 //#define LAYER_TOGGLE_DELAY 300
 
-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-#define KC_ KC_TRNS 
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [_QWERTY] = KC_KEYMAP(
+  [_QWERTY] = LAYOUT_ortho_4x12(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
+  //,--------+--------+--------+--------+--------+--------.    ,--------+--------+--------+--------+--------+--------.
-     MESC, Q  , W  , E  , R  , T  ,      Y  , U  , I  , O  , P  ,BSPC,
+     KC_MESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,         KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
+  //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
-     TAB , A  , S  , D  , F  , G  ,      H  , J  , K  , L  ,SCLN, ENT,
+     KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,         KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
+  //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
-     LSPO, Z  , X  , C  , V  , B  ,      N  , M  ,COMM,DOT ,SLSH,RSPC,
+     KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,         KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
+  //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
-     SCTL,SPFN,SPLT,AMPR,NMPD,SPC ,     SPC ,SYMB,ASTR,EXLM,LBRC,SCTR
+     KC_SCTL, KC_SPFN, KC_SPLT, KC_AMPR, KC_NMPD, KC_SPC,       KC_SPC,  KC_SYMB, KC_ASTR, KC_EXLM, KC_LBRC, KC_SCTR
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
+  //`--------+--------+--------+--------+--------+--------'    `--------+--------+--------+--------+--------+--------'
   ),
 
-  [_CAPS] = KC_KEYMAP(
+  [_CAPS] = LAYOUT_ortho_4x12(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
+  //,--------+--------+--------+--------+--------+--------.    ,--------+--------+--------+--------+--------+--------.
-         ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,
+     _______, _______, _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
+  //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
-         ,    ,    ,    ,    ,    ,         ,    ,    ,    ,COLN,    ,
+     _______, _______, _______, _______, _______, _______,      _______, _______, _______, _______, KC_COLN, _______,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
+  //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
-         ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,
+     _______, _______, _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
+  //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
-         ,    ,UNDS,    ,    ,    ,         ,    ,    ,    ,    ,    
+     _______, _______, KC_UNDS, _______, _______, _______,      _______, _______, _______, _______, _______, _______
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
+  //`--------+--------+--------+--------+--------+--------'    `--------+--------+--------+--------+--------+--------'
   ),
 
 
-  [_NUMPAD] = KC_KEYMAP(
+  [_NUMPAD] = LAYOUT_ortho_4x12(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
+  //,--------+--------+--------+--------+--------+--------.    ,--------+--------+--------+--------+--------+--------.
-         ,    ,    ,    ,    ,    ,         ,  7 ,  8 ,  9 ,MINS,QUOT,
+     _______, _______, _______, _______, _______, _______,      _______, KC_7,    KC_8,    KC_9,    KC_MINS, KC_QUOT,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
+  //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
-         ,    ,    ,    ,    ,    ,         ,  4 ,  5 ,  6 ,PLUS, ENT,
+     _______, _______, _______, _______, _______, _______,      _______, KC_4,    KC_5,    KC_6,    KC_PLUS, KC_ENT,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
+  //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
-     LSFT,    ,    ,    ,    ,    ,         ,  1 ,  2 ,  3 ,ASTR, EQL,
+     KC_LSFT, _______, _______, _______, _______, _______,      _______, KC_1,    KC_2,    KC_3,    KC_ASTR, KC_EQL,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
+  //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
-         ,    ,    ,    ,    ,BSPC,     SPC ,  0 ,  0 , DOT,SLSH,    
+     _______, _______, _______, _______, _______, KC_BSPC,      KC_SPC,  KC_0,    KC_0,    KC_DOT,  KC_SLSH, _______
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
+  //`--------+--------+--------+--------+--------+--------'    `--------+--------+--------+--------+--------+--------'
   ),
 
-  [_SYMBOLS] = KC_KEYMAP(
+  [_SYMBOLS] = LAYOUT_ortho_4x12(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
+  //,--------+--------+--------+--------+--------+--------.    ,--------+--------+--------+--------+--------+--------.
-         ,EXLM, AT ,HASH,DLR ,PERC,     CIRC,AMPR,ASTR,LPRN,RPRN,QUOT,
+     _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_QUOT,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
+  //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
-      F1 , F2 , F3 , F4 , F5 , F6 ,     TILD,EQL ,UNDS,LCBR,RCBR,PIPE,
+     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,        KC_TILD, KC_EQL,  KC_UNDS, KC_LCBR, KC_RCBR, KC_PIPE,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
+  //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
-      F7 , F8 , F9 , F10, F11, F12,     GRV ,PLUS,MINS,LBRC,RBRC,BSLS,
+     KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,       KC_GRV,  KC_PLUS, KC_MINS, KC_LBRC, KC_RBRC, KC_BSLS,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
+  //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
-         ,    ,    ,    , NO ,BSPC,     SPC ,    ,    ,    ,    ,    
+     _______, _______, _______, _______, XXXXXXX, KC_BSPC,      KC_SPC,  _______, _______, _______, _______, _______
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
+  //`--------+--------+--------+--------+--------+--------'    `--------+--------+--------+--------+--------+--------'
   ),
 
-  [_NAV] = KC_KEYMAP(
+  [_NAV] = LAYOUT_ortho_4x12(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
+  //,--------+--------+--------+--------+--------+--------.    ,--------+--------+--------+--------+--------+--------.
-         ,    ,    ,    , DEL,BSPC,         ,HOME, UP , END, INS,PSCR,
+     _______, _______, _______, _______, KC_DEL,  KC_BSPC,      _______, KC_HOME, KC_UP,   KC_END,  KC_INS,  KC_PSCR,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
+  //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
-         ,    ,    ,LSFT,LCTL, ENT,         ,LEFT,DOWN,RGHT, DEL,   ,
+     _______, _______, _______, KC_LSFT, KC_LCTL, KC_ENT,       _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL,  _______,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
+  //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
-         ,    ,    ,    ,    ,    ,         ,PGUP,PGDN,    ,    ,    ,
+     _______, _______, _______, _______, _______, _______,      _______, KC_PGUP, KC_PGDN, _______, _______, _______,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
+  //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
-         ,    ,    ,    ,    ,DEL ,         ,    ,    ,    ,    ,   
+     _______, _______, _______, _______, _______, KC_DEL,       _______, _______, _______, _______, _______, _______
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
+  //`--------+--------+--------+--------+--------+--------'    `--------+--------+--------+--------+--------+--------'
   ),
 
-  [_MACROS] = KC_KEYMAP(
+  [_MACROS] = LAYOUT_ortho_4x12(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
+  //,--------+--------+--------+--------+--------+--------.    ,--------+--------+--------+--------+--------+--------.
-         ,    ,    ,    ,    ,    ,         ,    ,INCL,    ,    ,    ,
+     _______, _______, _______, _______, _______, _______,      _______, _______, KC_INCL, _______, _______, _______,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
+  //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
-         ,    ,    ,CAD ,    ,    ,         ,    ,    ,    ,    ,    ,
+     _______, _______, _______, KC_CAD,  _______, _______,      _______, _______, _______, _______, _______, _______,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
+  //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
-     SCAP,    ,    ,    ,    ,    ,         ,    ,PULL,PUSH,    ,SCAP,
+     KC_SCAP, _______, _______, _______, _______, _______,      _______, _______, KC_PULL, KC_PUSH, _______, KC_SCAP,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
+  //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
-         ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,   
+     _______, _______, _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
+  //`--------+--------+--------+--------+--------+--------'    `--------+--------+--------+--------+--------+--------'
   ),
 
 };
 
 
-const uint16_t PROGMEM fn_actions[] = {
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
+  switch(keycode) {
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  switch(id) {
     /* include some kind of library or header */
-    case 0:
+    case KC_INCL:
       if (record->event.pressed) {
-        SEND_STRING("#include <>");
+        SEND_STRING("#include <>" SS_TAP(X_LEFT) );
-        return MACRO( T(LEFT), END);
+        return false;
       }
       break;
-    case 1:
+    case KC_PULL:
       if (record->event.pressed) {
-        SEND_STRING("git pull");
+        SEND_STRING("git pull" SS_TAP(X_ENTER) );
-        return MACRO( T(ENT), END );
+        return false;
       }
       break;
-    case 2:
+    case KC_PUSH:
       if (record->event.pressed){
-        SEND_STRING("git push");
+        SEND_STRING("git push" SS_TAP(X_ENTER) );
-        return MACRO( T(ENT), END );
+        return false;
       }
       break;
-    case 3:
+    case KC_SCAP:
       if (record->event.pressed){
         layer_on(_CAPS);
         register_code(KC_CAPSLOCK);
         unregister_code(KC_CAPSLOCK);
+        return false;
       }
       break;
-    case 4:
+    case KC_SCOF:
       if (record->event.pressed){
         layer_off(_CAPS);
         register_code(KC_CAPSLOCK);
         unregister_code(KC_CAPSLOCK);
+        return false;
       }
       break;
   }
-  return MACRO_NONE;
+  return true;
 };
- 
+
 
 void matrix_scan_user(void) {
-    uint8_t layer = biton32(layer_state);
+  uint8_t layer = biton32(layer_state);
-    
+
-    switch (layer) {
+  switch (layer) {
-    	case _QWERTY:
+    case _QWERTY:
-    	    set_led_green;
+      set_led_green;
-    	    break;
+      break;
-        case _CAPS:
+    case _CAPS:
-	    set_led_white;
+      set_led_white;
-	    break;
+      break;
-        case _NUMPAD:
+    case _NUMPAD:
-            set_led_blue;
+      set_led_blue;
-            break;
+      break;
-        case _SYMBOLS:
+    case _SYMBOLS:
-            set_led_red;
+      set_led_red;
-            break;
+      break;
-        case _NAV:
+    case _NAV:
-	    set_led_magenta;
+      set_led_magenta;
-	    break;
+      break;
-        case _MACROS:
+    case _MACROS:
-	    set_led_cyan;
+      set_led_cyan;
-	    break;
+      break;
-       default:
+    default:
-            set_led_green;
+      set_led_green;
-            break;
+      break;
-    }
+  }
 };

keyboards/chimera_ls/readme.md

@@ -2,18 +2,14 @@
 
 ![Chimera LS](https://imgur.com/FOGlO4M.jpg)
 
-A wireless version of the let's split: a split 40% ortholinear keyboard 
+A wireless version of the Let's Split: a split 40% ortholinear keyboard.
 
 Keyboard Maintainer: [William Wilson](https://github.com/GlenPickle)  
-
+Hardware Supported: Chimera LS PCB, WaveShare core nRF51822  
-
-Hardware Supported: Chimera LS PCB, WaveShare core nRF51822
-
 Hardware Availability: [Gerbers](https://github.com/GlenPickle/Chimera/tree/master/ls/gerbers)
 
 Make example for this keyboard (after setting up your build environment):
 
     make chimera_ls: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.
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
-

keyboards/chimera_ls/rules.mk

@@ -46,7 +46,7 @@ F_USB = $(F_CPU)
 
 # Bootloader
 #     This definition is optional, and if your keyboard supports multiple bootloaders of
-#     different sizes, comment this out, and the correct address will be loaded 
+#     different sizes, comment this out, and the correct address will be loaded
 #     automatically (+60). See bootloader.mk for all options.
 BOOTLOADER = caterina
 
@@ -80,3 +80,5 @@ UNICODE_ENABLE = YES 		# Unicode
 # BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID
 
 USB = /dev/ttyACM0
+
+LAYOUTS = ortho_4x12

keyboards/chocopad/config.h

@@ -47,9 +47,7 @@
 #define RGBLIGHT_VAL_STEP 8
 #endif
 #define RGB_DI_PIN D3
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 4
-#define ws2812_PORTREG  PORTD
-#define ws2812_DDRREG   DDRD
 
 #endif

keyboards/clueboard/66/keymaps/xyverz/rules.mk

@@ -42,7 +42,7 @@
 #   change to "no" to disable the options, or define them in the makefile.mk in 
 #   the appropriate keymap folder that will get included automatically
 #
-RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
+RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight. 
 
 ifndef QUANTUM_DIR
 	include ../../../../Makefile

keyboards/comet46/keymaps/satt/rules.mk

@@ -15,7 +15,7 @@ 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.
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 ONEHAND_ENABLE = no        # Enable one-hand typing
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE

keyboards/contra/keymaps/bramver/README.md

@@ -0,0 +1,35 @@
+# Contra layout
+
+My current setup consists of a very simple base layer, numbers layer, mouse layer and emoji layer.
+Still many options, but time will tell if changes are needed.
+
+## Keymap
+
+```
+#define SP_MSE LT(_MOUSE, KC_SPC)
+
+
+BASE layer
+  { KC_GESC , KC_Q    , KC_W    , KC_E    , KC_R    , KC_T    , KC_Y    , KC_U    , KC_I    , KC_O    , KC_P    , 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_ENT  }, 
+  { KC_LSFT , KC_Z    , KC_X    , KC_C    , KC_V    , KC_B    , KC_N    , KC_M    , KC_COMM , KC_DOT  , KC_SLSH , KC_QUOT }, 
+  { KC_LCTL , KC_GRV  , KC_LALT , KC_LGUI , MO(1)   , SP_MSE  , SP_MSE  , KC_LEFT , KC_DOWN , KC_UP   , KC_RGHT , MO(2)   },
+
+LOWER layer
+  { _______ , KC_1    , KC_2    , KC_3    , KC_4    , KC_5    , KC_6    , KC_7    , KC_8    , KC_9    , KC_0    , KC_DEL  }, 
+  { _______ , KC_F1   , KC_F2   , KC_F3   , KC_LBRC , KC_MINS , KC_EQL  , KC_RBRC , KC_F7   , KC_F8   , KC_F9   , _______ }, 
+  { _______ , KC_F4   , KC_F5   , KC_F6   , KC_HOME , KC_BSLS , KC_MPLY , KC_END  , KC_F10  , KC_F11  , KC_F12  , _______ }, 
+  { _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ },
+
+EMOJI layer
+  { _______ , X(CLAP) , X(CUM)  , X(BNIS) , X(BUTT) , X(CAR)  , X(FIRE) , X(REDB) , X(MONY) , X(HNDR) , X(SOS)  , _______ },
+  { _______ , X(CELE) , X(PRAY) , X(NAIL) , X(OK)   , X(THNK) , X(UNAM) , X(HEYE) , X(COOL) , X(EYES) , X(SMIR) , _______ },
+  { _______ , X(TRIU) , X(SCRM) , X(VOMI) , X(DTIV) , X(EXPL) , X(HAIR) , X(DANC) , X(STRN) , X(LEFT) , X(RGHT) , _______ },
+  { _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ },
+
+MOUSE layer
+  { _______ , KC_WH_L , KC_BTN1 , KC_MS_U , KC_BTN2 , KC_WH_U , KC_WH_U , KC_BTN1 , KC_MS_U , KC_BTN2 , KC_WH_L , _______ },
+  { _______ , KC_WH_R , KC_MS_L , KC_MS_D , KC_MS_R , KC_WH_D , KC_WH_D , KC_MS_L , KC_MS_D , KC_MS_R , KC_WH_R , _______ },
+  { _______ , KC_VOLD , KC_VOLU , KC_MPRV , KC_MNXT , KC_MPLY , KC_MPLY , KC_MPRV , KC_MNXT , KC_VOLD , KC_VOLU , _______ },
+  { _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ },
+```

keyboards/contra/keymaps/bramver/config.h

@@ -0,0 +1,9 @@
+#pragma once
+                                
+#define MOUSEKEY_DELAY             0
+#define MOUSEKEY_INTERVAL          16
+#define MOUSEKEY_MAX_SPEED         7
+#define MOUSEKEY_TIME_TO_MAX       60
+#define MOUSEKEY_WHEEL_MAX_SPEED   8
+#define MOUSEKEY_WHEEL_TIME_TO_MAX 40
+#define MOUSEKEY_WHEEL_DELAY 0

keyboards/contra/keymaps/bramver/keymap.c

@@ -0,0 +1,126 @@
+/* Copyright 2018 darm
+ *
+ * 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 QMK_KEYBOARD_H
+
+enum emoji_map {
+  UNAM, // unamused 😒
+  HEYE, // smiling face with heart shaped eyes 😍
+  OK, // ok hand sign 👌
+  SMIR, // smirk 😏
+  PRAY, // pray 🙏
+  CELE, // celebration 🙌
+  COOL, // smile with sunglasses 😎
+  EYES, // eyes
+  THNK, // BIG THONK
+  NAIL, // Nailcare
+  SOS, // Vuile sos
+  REDB, // Red B
+  HNDR, // 100
+  MONY,
+  FIRE,
+  CAR,
+  BUTT,
+  BNIS,
+  CUM,
+  CLAP,
+  TRIU, // Fart from nose
+  SCRM,
+  VOMI,
+  DTIV, // Detective
+  EXPL, // Brainsplosion
+  HAIR, // Haircut
+  DANC, // Salsa dancer
+  STRN, // Stronk
+  LEFT, // Point Left
+  RGHT, // Point Right
+};
+
+const uint32_t PROGMEM unicode_map[] = {
+  [UNAM] = 0x1F612,
+  [HEYE] = 0x1f60d,
+  [OK]   = 0x1F44C,
+  [SMIR] = 0x1F60F,
+  [PRAY] = 0x1F64F,
+  [CELE] = 0x1F64C,
+  [COOL] = 0x1F60E,
+  [EYES] = 0x1F440,
+  [THNK] = 0x1F914,
+  [NAIL] = 0x1F485,
+  [SOS] = 0x1F198,
+  [REDB] = 0x1F171,
+  [HNDR] = 0x1F4AF,
+  [MONY] = 0x1F480,
+  [FIRE] = 0x1F525,
+  [CAR] = 0x1F697,
+  [BUTT] = 0x1F351,
+  [BNIS] = 0x1F346,
+  [CUM] = 0x1F4A6,
+  [CLAP] = 0x1F44F,
+  [TRIU] = 0x1F624,
+  [SCRM] = 0x1F631,
+  [VOMI] = 0x1F92E,
+  [DTIV] = 0x1F575,
+  [EXPL] = 0x1F92F,
+  [HAIR] = 0x2640,
+  [DANC] = 0x1F483,
+  [STRN] = 0x1F4AA,
+  [LEFT] = 0x1F448,
+  [RGHT] = 0x1F449,
+};
+
+// Layer shorthand
+#define _BASE     0
+#define _LOWER    1
+#define _EMOJI    2
+#define _MOUSE    3
+
+#define SP_MSE LT(_MOUSE, KC_SPC)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[_BASE] = LAYOUT_ortho_4x12(
+			KC_GESC	, KC_Q		, KC_W		, KC_E		, KC_R 		, KC_T 		, KC_Y 		, KC_U 		, KC_I 		, KC_O 		, KC_P 		, 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_ENT	, 
+			KC_LSFT	, KC_Z		, KC_X		, KC_C		, KC_V 		, KC_B 		, KC_N 		, KC_M 		, KC_COMM , KC_DOT 	, KC_SLSH , KC_QUOT	, 
+			KC_LCTL	, KC_GRV  , KC_LALT	, KC_LGUI , MO(1)		, SP_MSE 	, SP_MSE	, KC_LEFT , KC_DOWN , KC_UP 	, KC_RGHT , MO(2)   
+	),
+
+	[_LOWER] = LAYOUT_ortho_4x12(
+			_______ , KC_1 		, KC_2 		, KC_3		, KC_4		, KC_5		, KC_6		, KC_7 		, KC_8		, KC_9		, KC_0		, KC_DEL	, 
+			_______ , KC_F1		, KC_F2 	, KC_F3		, KC_LBRC , KC_MINS	, KC_EQL	, KC_RBRC , KC_F7		, KC_F8		, KC_F9		, _______	, 
+			_______ , KC_F4		, KC_F5 	, KC_F6 	, KC_HOME , KC_BSLS , KC_MPLY	, KC_END	, KC_F10	, KC_F11	, KC_F12	, _______	, 
+			_______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ 
+	),
+
+	[_EMOJI] = LAYOUT_ortho_4x12(
+			_______ , X(CLAP) , X(CUM)  , X(BNIS) , X(BUTT) , X(CAR)  , X(FIRE) , X(REDB) , X(MONY) , X(HNDR) , X(SOS)  , _______ ,
+			_______ , X(CELE) , X(PRAY) , X(NAIL) , X(OK)   , X(THNK) , X(UNAM) , X(HEYE) , X(COOL) , X(EYES) , X(SMIR) , _______ ,
+			_______ , X(TRIU) , X(SCRM) , X(VOMI) , X(DTIV) , X(EXPL) , X(HAIR) , X(DANC) , X(STRN) , X(LEFT) , X(RGHT) , _______ ,
+			_______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ 
+	),
+
+	[_MOUSE] = LAYOUT_ortho_4x12(
+			_______ , KC_WH_L , KC_BTN1 , KC_MS_U , KC_BTN2 , KC_WH_U , KC_WH_U , KC_BTN1 , KC_MS_U , KC_BTN2 , KC_WH_L , _______ ,
+			_______ , KC_WH_R , KC_MS_L , KC_MS_D , KC_MS_R , KC_WH_D , KC_WH_D , KC_MS_L , KC_MS_D , KC_MS_R , KC_WH_R , _______ ,
+			_______ , KC_VOLD , KC_VOLU , KC_MPRV , KC_MNXT , KC_MPLY , KC_MPLY , KC_MPRV , KC_MNXT , KC_VOLD , KC_VOLU , _______ ,
+			_______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ 
+	)
+
+};
+
+void matrix_init_user(void) {
+  set_unicode_input_mode(UC_LNX);
+}

keyboards/contra/keymaps/bramver/rules.mk

@@ -0,0 +1,6 @@
+MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
+NKRO_ENABLE = yes           # USB Nkey Rollover
+UNICODEMAP_ENABLE = yes         # Unicode
+BOOTLOADER = atmel-dfu
+

keyboards/contra/keymaps/losinggeneration/rules.mk

@@ -10,7 +10,7 @@ COMMAND_ENABLE   = no    # Commands for debug and configuration
 CONSOLE_ENABLE   = no    # Console for debug(+400)
 MIDI_ENABLE      = no    # MIDI controls
 NKRO_ENABLE      = no    # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-RGBLIGHT_ENABLE  = no    # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
+RGBLIGHT_ENABLE  = no    # Enable WS2812 RGB underlight. 
 
 ifndef QUANTUM_DIR
 	include ../../../../Makefile

keyboards/converter/adb_usb/README.md

@@ -0,0 +1,83 @@
+ADB-to USB Keyboard Converter
+=============================
+This firmware converts Apple Desktop Bus (ADB) keyboard protocol to USB so that you can use an ADB keyboard on a modern computer. It works on the PJRC Teensy 2.0 and other USB AVR MCUs (ATMega32U4, AT90USB64/128, etc) and needs at least 10KB of flash memory.
+
+
+This is a port of the TMK ADB-to-USB converter to QMK. For information on QMK, please consult the following:
+https://github.com/qmk/qmk_firmware  
+https://docs.qmk.fm
+
+
+Wiring
+------
+Connect the VCC, GND, and DATA lines of the ADB keyboard to the controller (Teensy 2.0 or similar). By default the DATA line uses port PD0. The Power SW line is unused by the converter.
+
+ADB female socket from the front:
+
+      ,--_--.
+     / o4 3o \      1: DATA
+    | o2   1o |     2: Power SW
+     -  ===  -      3: VCC
+      `-___-'       4: GND
+
+This converter uses AVR's internal pull-up, but it seems to be too weak, in particular when you want to use a long or coiled cable. Using an external pull-up resistor (1K-10K Ohm) between the DATA and VCC lines is strongly recommended.
+
+Pull-up resistor:
+
+    Keyboard       Converter
+                   ,------.
+    5V------+------|VCC   |
+            |      |      |
+           [R]     |      |
+            |      |      |
+    Signal--+------|PD0   |
+                   |      |
+    GND------------|GND   |
+                   `------'
+    R: 1K Ohm resistor
+
+
+Define following macros for ADB connection in config.h if you use other than port PD0.
+
+    ADB_PORT, ADB_PIN, ADB_DDR, ADB_DATA_BIT
+
+
+Building the Firmware
+------------------------------------------
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+
+Keymap
+------
+To build the default keymap run this command:
+
+    $ make converter/adb_usb:default
+
+You may add your own keymap to the converter/adb_usb/keymaps directory, as you would with any other QMK-powered keyboard.
+
+To build your custom keymap, change the build command to:
+
+    $ make converter/adb_usb:my_keymap
+
+Where 'my_keymap' is the name of your custom keymap directory.
+
+
+Locking Caps Lock
+----------------
+Many old ADB keyboards use a locking switch for the caps lock key. This converter supports the locking caps lock key by default.
+
+
+Notes
+-----
+Non-extended ADB keyboards make no distinction between the left and right modifiers,
+i.e. the keycode for the left modifier will be sent even if the right modifier
+
+The Apple Extended Keyboard and Apple Extended Keyboard II can differentiate between the left and right modifiers except for the GUI key (Windows/Command).
+
+Most ADB keyboards have no diodes in its matrix so they are not NKRO,
+though the ADB protocol itself supports it. See protocol/adb.c for more info.
+
+
+QMK Port Changelog
+---------
+- 2018/09/16 - Initial release.

keyboards/converter/adb_usb/adb_usb.c

@@ -0,0 +1,3 @@
+#include "adb_usb.h"
+#include <avr/io.h>
+#include "quantum.h"

keyboards/converter/adb_usb/adb_usb.h

@@ -0,0 +1,109 @@
+/*
+Copyright 2011,2012,2013 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/>.
+
+Ported to QMK by Peter Roe <pete@13bit.me>
+*/
+
+#ifndef ADB_USB_H
+#define ADB_USB_H
+
+#include "quantum.h"
+
+/* M0115/M3501 Apple Extended Keyboard ANSI
+ * ,---.   ,---------------. ,---------------. ,---------------. ,-----------.             ,---.
+ * |Esc|   |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau|             |Pwr|
+ * `---'   `---------------' `---------------' `---------------' `-----------'             `---'
+ * ,-----------------------------------------------------------. ,-----------. ,---------------.
+ * |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backspa| |Ins|Hom|PgU| |NmL|  =|  /|  *|
+ * |-----------------------------------------------------------| |-----------| |---------------|
+ * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \| |Del|End|PgD| |  7|  8|  9|  -|
+ * |-----------------------------------------------------------| `-----------' |---------------|
+ * |CapsLo|  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return  |               |  4|  5|  6|  +|
+ * |-----------------------------------------------------------|     ,---.     |---------------|
+ * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  ,|  /|Shift     |     |Up |     |  1|  2|  3|   |
+ * |-----------------------------------------------------------| ,-----------. |-----------|Ent|
+ * |Ctrl |Opt |Cmd |         Space           |     |Opt |Ctrl  | |Lef|Dow|Rig| |      0|  .|   |
+ * `-----------------------------------------------------------' `-----------' `---------------'
+ */
+#define LAYOUT_ext_ansi( \
+    K35,    K7A,K78,K63,K76,K60,K61,K62,K64,K65,K6D,K67,K6F, K69,K6B,K71,              K7F, \
+    K32,K12,K13,K14,K15,K17,K16,K1A,K1C,K19,K1D,K1B,K18,K33, K72,K73,K74,  K47,K51,K4B,K43, \
+    K30,K0C,K0D,K0E,K0F,K11,K10,K20,K22,K1F,K23,K21,K1E,K2A, K75,K77,K79,  K59,K5B,K5C,K4E, \
+    K39,K00,K01,K02,K03,K05,K04,K26,K28,K25,K29,K27,    K24,               K56,K57,K58,K45, \
+    K38,K06,K07,K08,K09,K0B,K2D,K2E,K2B,K2F,K2C,        K7B,     K3E,      K53,K54,K55,     \
+    K36,K3A,K37,        K31,                        K7C,K7D, K3B,K3D,K3C,  K52,    K41,K4C  \
+) { \
+    { K00,   K01,   K02,   K03, K04,   K05,   K06,   K07    }, \
+    { K08,   K09,   KC_NO, K0B, K0C,   K0D,   K0E,   K0F    }, \
+    { K10,   K11,   K12,   K13, K14,   K15,   K16,   K17    }, \
+    { K18,   K19,   K1A,   K1B, K1C,   K1D,   K1E,   K1F    }, \
+    { K20,   K21,   K22,   K23, K24,   K25,   K26,   K27    }, \
+    { K28,   K29,   K2A,   K2B, K2C,   K2D,   K2E,   K2F    }, \
+    { K30,   K31,   K32,   K33, KC_NO, K35,   K36,   K37    }, \
+    { K38,   K39,   K3A,   K3B, K3C,   K3D,   K3E,   KC_NO, }, \
+    { KC_NO, K41,   KC_NO, K43, KC_NO, K45,   KC_NO, K47    }, \
+    { KC_NO, KC_NO, KC_NO, K4B, K4C,   KC_NO, K4E,   KC_NO, }, \
+    { KC_NO, KC_NO, K52,   K53, K54,   K55,   K56,   K57    }, \
+    { K58,   K59,   KC_NO, K5B, K5C,   KC_NO, KC_NO, KC_NO, }, \
+    { K60,   K61,   K62,   K63, K64,   K65,   KC_NO, K67    }, \
+    { KC_NO, K69,   KC_NO, K6B, KC_NO, K6D,   KC_NO, K6F    }, \
+    { KC_NO, K71,   K72,   K73, K74,   K75,   K76,   K77    }, \
+    { K78,   K79,   K7A,   K7B, K7C,   K7D,   KC_NO, K7F    }  \
+}
+
+/* M0116 Apple Standard Keyboard ANSI
+ *                     +-------+
+ *                     | power |
+ *                     +-------+
+ * +---+---+---+---+---+---+---+---+---+---+---+---+---+-----+ +---+---+---+---+
+ * |esc| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | bks | |clr| = | / | * |
+ * +---------------------------------------------------------+ +---+---+---+---+
+ * | tab | q | w | e | r | t | y | u | i | o | p | [ | ] |   | | 7 | 8 | 9 | + |
+ * +-----------------------------------------------------+   | +---+---+---+---+
+ * | ctrl | a | s | d | f | g | h | j | k | l | ; | ' |return| | 4 | 5 | 6 | - |
+ * +---------------------------------------------------------+ +---+---+---+---+
+ * | shift  | z | x | c | v | b | n | m | , | . | / |  shift | | 1 | 2 | 3 |   |
+ * +---------------------------------------------------------+ +-------+---|ent|
+ * |cap|opt|comnd| ` |                   | \ |lef|rig|dwn|up | |   0   | . |   |
+ * +---------------------------------------------------------+ +-------+---+---+
+ */
+#define LAYOUT_m0116_ansi( \
+                           K7F,                                              \
+   K35,K12,K13,K14,K15,K17,K16,K1A,K1C,K19,K1D,K1B,K18,K33, K47,K51,K4B,K43, \
+   K30,K0C,K0D,K0E,K0F,K11,K10,K20,K22,K1F,K23,K21,K1E,     K59,K5B,K5C,K45, \
+   K36,K00,K01,K02,K03,K05,K04,K26,K28,K25,K29,K27,    K24, K56,K57,K58,K4E, \
+   K38,K06,K07,K08,K09,K0B,K2D,K2E,K2B,K2F,K2C,        K7B, K53,K54,K55,     \
+   K39,K3A,K37,K32,        K31,        K2A,K3B,K3C,K3D,K3E, K52,    K41,K4C  \
+) { \
+  { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07   }, \
+  { K08,   K09,   KC_NO, K0B,   K0C,   K0D,   K0E,   K0F   }, \
+  { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17   }, \
+  { K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F   }, \
+  { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27   }, \
+  { K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F   }, \
+  { K30,   K31,   K32,   K33,   KC_NO, K35,   K36,   K37   }, \
+  { K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E,   KC_NO }, \
+  { KC_NO, K41,   KC_NO, K43,   KC_NO, K45,   KC_NO, K47   }, \
+  { KC_NO, KC_NO, KC_NO, K4B,   K4C,   KC_NO, K4E,   KC_NO }, \
+  { KC_NO, K51,   K52,   K53,   K54,   K55,   K56,   K57   }, \
+  { K58,   K59,   KC_NO, K5B,   K5C,   KC_NO, KC_NO, KC_NO }, \
+  { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
+  { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
+  { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
+  { KC_NO, KC_NO, KC_NO, K7B,   KC_NO, KC_NO, KC_NO, K7F   }  \
+}
+
+#endif

keyboards/converter/adb_usb/config.h

@@ -0,0 +1,43 @@
+/*
+Copyright 2011 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/>.
+
+Ported to QMK by Peter Roe <pete@13bit.me>
+*/
+
+#pragma once
+
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0x0ADB
+#define DEVICE_VER      0x0101
+#define MANUFACTURER    QMK
+#define PRODUCT         ADB keyboard converter
+#define DESCRIPTION     Convert ADB keyboard to USB
+
+/* matrix size */
+#define MATRIX_ROWS 16  // keycode bit: 3-0
+#define MATRIX_COLS 8   // keycode bit: 6-4
+
+/* 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
+
+/* ADB port setting */
+#define ADB_PORT        PORTD
+#define ADB_PIN         PIND
+#define ADB_DDR         DDRD
+#define ADB_DATA_BIT    0
+//#define ADB_PSW_BIT     1       // optional

keyboards/converter/adb_usb/info.json

@@ -0,0 +1,204 @@
+{
+  "keyboard_name": "ADB to USB Keyboard Converter",
+  "url": "",
+  "maintainer": "qmk",
+  "width": 22.5,
+  "height": 7,
+  "layouts": {
+    "LAYOUT_ext_ansi": {
+      "layout": [
+        {"label":"Escape", "x":0, "y":0},
+        {"label":"F1", "x":2, "y":0},
+        {"label":"F2", "x":3, "y":0},
+        {"label":"F3", "x":4, "y":0},
+        {"label":"F4", "x":5, "y":0},
+        {"label":"F5", "x":6.5, "y":0},
+        {"label":"F6", "x":7.5, "y":0},
+        {"label":"F7", "x":8.5, "y":0},
+        {"label":"F8", "x":9.5, "y":0},
+        {"label":"F9", "x":11, "y":0},
+        {"label":"F10", "x":12, "y":0},
+        {"label":"F11", "x":13, "y":0},
+        {"label":"F12", "x":14, "y":0},
+        {"label":"Print Screen", "x":15.25, "y":0},
+        {"label":"Scroll Lock", "x":16.25, "y":0},
+        {"label":"Pause", "x":17.25, "y":0},
+        {"label":"Eject", "x":21.5, "y":0},
+        {"label":"`", "x":0, "y":2},
+        {"label":"1", "x":1, "y":2},
+        {"label":"2", "x":2, "y":2},
+        {"label":"3", "x":3, "y":2},
+        {"label":"4", "x":4, "y":2},
+        {"label":"5", "x":5, "y":2},
+        {"label":"6", "x":6, "y":2},
+        {"label":"7", "x":7, "y":2},
+        {"label":"8", "x":8, "y":2},
+        {"label":"9", "x":9, "y":2},
+        {"label":"0", "x":10, "y":2},
+        {"label":"-", "x":11, "y":2},
+        {"label":"=", "x":12, "y":2},
+        {"label":"Backspace", "x":13, "y":2, "w":2},
+        {"label":"Insert", "x":15.25, "y":2},
+        {"label":"Home", "x":16.25, "y":2},
+        {"label":"Page Up", "x":17.25, "y":2},
+        {"label":"Num Lock", "x":18.5, "y":2},
+        {"label":"Num =", "x":19.5, "y":2},
+        {"label":"Num /", "x":20.5, "y":2},
+        {"label":"Num *", "x":21.5, "y":2},
+        {"label":"Tab", "x":0, "y":3, "w":1.5},
+        {"label":"Q", "x":1.5, "y":3},
+        {"label":"W", "x":2.5, "y":3},
+        {"label":"E", "x":3.5, "y":3},
+        {"label":"R", "x":4.5, "y":3},
+        {"label":"T", "x":5.5, "y":3},
+        {"label":"Y", "x":6.5, "y":3},
+        {"label":"U", "x":7.5, "y":3},
+        {"label":"I", "x":8.5, "y":3},
+        {"label":"O", "x":9.5, "y":3},
+        {"label":"P", "x":10.5, "y":3},
+        {"label":"[", "x":11.5, "y":3},
+        {"label":"]", "x":12.5, "y":3},
+        {"label":"\\", "x":13.5, "y":3, "w":1.5},
+        {"label":"Delete", "x":15.25, "y":3},
+        {"label":"End", "x":16.25, "y":3},
+        {"label":"Page Down", "x":17.25, "y":3},
+        {"label":"Num 7", "x":18.5, "y":3},
+        {"label":"Num 8", "x":19.5, "y":3},
+        {"label":"Num 9", "x":20.5, "y":3},
+        {"label":"Num -", "x":21.5, "y":3},
+        {"label":"Lcap", "x":0, "y":4, "w":1.75},
+        {"label":"A", "x":1.75, "y":4},
+        {"label":"S", "x":2.75, "y":4},
+        {"label":"D", "x":3.75, "y":4},
+        {"label":"F", "x":4.75, "y":4},
+        {"label":"G", "x":5.75, "y":4},
+        {"label":"H", "x":6.75, "y":4},
+        {"label":"J", "x":7.75, "y":4},
+        {"label":"K", "x":8.75, "y":4},
+        {"label":"L", "x":9.75, "y":4},
+        {"label":";", "x":10.75, "y":4},
+        {"label":"\"", "x":11.75, "y":4},
+        {"label":"Enter", "x":12.75, "y":4, "w":2.25},
+        {"label":"Num 4", "x":18.5, "y":4},
+        {"label":"Num 5", "x":19.5, "y":4},
+        {"label":"Num 6", "x":20.5, "y":4},
+        {"label":"Num +", "x":21.5, "y":4},
+        {"label":"Shift", "x":0, "y":5, "w":2.25},
+        {"label":"Z", "x":2.25, "y":5},
+        {"label":"X", "x":3.25, "y":5},
+        {"label":"C", "x":4.25, "y":5},
+        {"label":"V", "x":5.25, "y":5},
+        {"label":"B", "x":6.25, "y":5},
+        {"label":"N", "x":7.25, "y":5},
+        {"label":"M", "x":8.25, "y":5},
+        {"label":",", "x":9.25, "y":5},
+        {"label":".", "x":10.25, "y":5},
+        {"label":"/", "x":11.25, "y":5},
+        {"label":"Shift", "x":12.25, "y":5, "w":2.75},
+        {"label":"Up", "x":16.25, "y":5},
+        {"label":"Num 1", "x":18.5, "y":5},
+        {"label":"Num 2", "x":19.5, "y":5},
+        {"label":"Num 3", "x":20.5, "y":5},
+        {"label":"Ctrl", "x":0, "y":6, "w":1.5},
+        {"label":"Alt", "x":1.5, "y":6, "w":1.25},
+        {"label":"Command", "x":2.75, "y":6, "w":1.5},
+        {"label":"Space", "x":4.25, "y":6, "w":6.5},
+        {"label":"Alt", "x":12.25, "y":6, "w":1.25},
+        {"label":"Ctrl", "x":13.5, "y":6, "w":1.5},
+        {"label":"Left", "x":15.25, "y":6},
+        {"label":"Down", "x":16.25, "y":6},
+        {"label":"Right", "x":17.25, "y":6},
+        {"label":"Num 0", "x":18.5, "y":6, "w":2},
+        {"label":"Num .", "x":20.5, "y":6},
+        {"label":"Num Enter", "x":21.5, "y":5, "h":2}
+      ]
+    },
+    "LAYOUT_m0116_ansi": {
+      "width": 19.5,
+      "height": 6.25,
+      "layout": [
+        {"label":"Power", "x":5, "y":0, "w":2},
+        {"label":"Esc", "x":0, "y":1.25},
+        {"label":"1", "x":1, "y":1.25},
+        {"label":"2", "x":2, "y":1.25},
+        {"label":"3", "x":3, "y":1.25},
+        {"label":"4", "x":4, "y":1.25},
+        {"label":"5", "x":5, "y":1.25},
+        {"label":"6", "x":6, "y":1.25},
+        {"label":"7", "x":7, "y":1.25},
+        {"label":"8", "x":8, "y":1.25},
+        {"label":"9", "x":9, "y":1.25},
+        {"label":"0", "x":10, "y":1.25},
+        {"label":"-", "x":11, "y":1.25},
+        {"label":"=", "x":12, "y":1.25},
+        {"label":"Delete", "x":13, "y":1.25, "w":1.5},
+        {"label":"Clear", "x":15.5, "y":1.25},
+        {"label":"Num =", "x":16.5, "y":1.25},
+        {"label":"Num /", "x":17.5, "y":1.25},
+        {"label":"Num *", "x":18.5, "y":1.25},
+        {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+        {"label":"Q", "x":1.5, "y":2.25},
+        {"label":"W", "x":2.5, "y":2.25},
+        {"label":"E", "x":3.5, "y":2.25},
+        {"label":"R", "x":4.5, "y":2.25},
+        {"label":"T", "x":5.5, "y":2.25},
+        {"label":"Y", "x":6.5, "y":2.25},
+        {"label":"U", "x":7.5, "y":2.25},
+        {"label":"I", "x":8.5, "y":2.25},
+        {"label":"O", "x":9.5, "y":2.25},
+        {"label":"P", "x":10.5, "y":2.25},
+        {"label":"[", "x":11.5, "y":2.25},
+        {"label":"]", "x":12.5, "y":2.25},
+        {"label":"Num 7", "x":15.5, "y":2.25},
+        {"label":"Num 8", "x":16.5, "y":2.25},
+        {"label":"Num 9", "x":17.5, "y":2.25},
+        {"label":"Num +", "x":18.5, "y":2.25},
+        {"label":"Ctrl", "x":0, "y":3.25, "w":1.75},
+        {"label":"A", "x":1.75, "y":3.25},
+        {"label":"S", "x":2.75, "y":3.25},
+        {"label":"D", "x":3.75, "y":3.25},
+        {"label":"F", "x":4.75, "y":3.25},
+        {"label":"G", "x":5.75, "y":3.25},
+        {"label":"H", "x":6.75, "y":3.25},
+        {"label":"J", "x":7.75, "y":3.25},
+        {"label":"K", "x":8.75, "y":3.25},
+        {"label":"L", "x":9.75, "y":3.25},
+        {"label":";", "x":10.75, "y":3.25},
+        {"label":"'", "x":11.75, "y":3.25},
+        {"label":"Return", "x":12.75, "y":3.25, "w":1.75},
+        {"label":"Num 4", "x":15.5, "y":3.25},
+        {"label":"Num 5", "x":16.5, "y":3.25},
+        {"label":"Num 6", "x":17.5, "y":3.25},
+        {"label":"Num -", "x":18.5, "y":3.25},
+        {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+        {"label":"Z", "x":2.25, "y":4.25},
+        {"label":"X", "x":3.25, "y":4.25},
+        {"label":"C", "x":4.25, "y":4.25},
+        {"label":"V", "x":5.25, "y":4.25},
+        {"label":"B", "x":6.25, "y":4.25},
+        {"label":"N", "x":7.25, "y":4.25},
+        {"label":"M", "x":8.25, "y":4.25},
+        {"label":",", "x":9.25, "y":4.25},
+        {"label":".", "x":10.25, "y":4.25},
+        {"label":"/", "x":11.25, "y":4.25},
+        {"label":"Shift", "x":12.25, "y":4.25, "w":2.25},
+        {"label":"Num 1", "x":15.5, "y":4.25},
+        {"label":"Num 2", "x":16.5, "y":4.25},
+        {"label":"Num 3", "x":17.5, "y":4.25},
+        {"label":"Caps Lock", "x":0, "y":5.25},
+        {"label":"Option", "x":1, "y":5.25},
+        {"label":"Command", "x":2, "y":5.25, "w":1.75},
+        {"label":"`", "x":3.75, "y":5.25},
+        {"label":"Space", "x":4.75, "y":5.25, "w":4.75},
+        {"label":"\\", "x":9.5, "y":5.25},
+        {"label":"Left", "x":10.5, "y":5.25},
+        {"label":"Right", "x":11.5, "y":5.25},
+        {"label":"Down", "x":12.5, "y":5.25},
+        {"label":"Up", "x":13.5, "y":5.25},
+        {"label":"Num 0", "x":15.5, "y":5.25, "w":2},
+        {"label":"Num .", "x":17.5, "y":5.25},
+        {"label":"Num Enter", "x":18.5, "y":4.25, "h":2}
+      ]
+    }
+  }
+}

keyboards/converter/adb_usb/keymaps/13bit/keymap.c

@@ -0,0 +1,26 @@
+#include QMK_KEYBOARD_H
+
+#define MCTL LCTL(KC_UP)
+#define SCST LSFT(LGUI(KC_4))
+#define SLP  LALT(LGUI(KC_EJCT))
+
+#define APP1 LSFT(LALT(LCTL(LGUI(KC_1))))
+#define APP2 LSFT(LALT(LCTL(LGUI(KC_2))))
+#define APP3 LSFT(LALT(LCTL(LGUI(KC_3))))
+#define APP4 LSFT(LALT(LCTL(LGUI(KC_4))))
+#define APP5 LSFT(LALT(LCTL(LGUI(KC_5))))
+#define APP6 LSFT(LALT(LCTL(LGUI(KC_6))))
+#define APP7 LSFT(LALT(LCTL(LGUI(KC_7))))
+#define APP8 LSFT(LALT(LCTL(LGUI(KC_8))))
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    LAYOUT_ext_ansi(
+    KC_ESC,  APP1,    APP2,   APP3,   APP4,   APP5,   APP6,   APP7,   APP8,    MCTL,   KC_MUTE, KC_VOLD, KC_VOLU,                SCST,   KC_SLCK, KC_PAUS,                               SLP,
+    KC_GRV,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC,       KC_INS, KC_HOME, KC_PGUP,     KC_NLCK, KC_EQL, KC_PSLS, KC_PAST,
+    KC_TAB,  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_BSLS,       KC_DEL, KC_END,  KC_PGDN,     KC_P7,   KC_P8,  KC_P9,   KC_PMNS,
+    KC_LCAP, 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_P4,   KC_P5,  KC_P6,   KC_PPLS,
+    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_P1,   KC_P2,  KC_P3,
+    KC_LCTL, KC_LALT, KC_LGUI,                KC_SPC,                                  KC_RALT, KC_RCTL,                         KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,           KC_PDOT, KC_PENT
+    ),
+};

keyboards/converter/adb_usb/keymaps/default/keymap.c

@@ -0,0 +1,13 @@
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    LAYOUT_ext_ansi(
+    KC_ESC,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,                 KC_PSCR,KC_SLCK,KC_PAUS,                                KC_EJCT,
+    KC_GRV,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC,       KC_INS, KC_HOME, KC_PGUP,     KC_NLCK, KC_EQL, KC_PSLS, KC_PAST,
+    KC_TAB,  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_BSLS,       KC_DEL, KC_END,  KC_PGDN,     KC_P7,   KC_P8,  KC_P9,   KC_PMNS,
+    KC_LCAP, 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_P4,   KC_P5,  KC_P6,   KC_PPLS,
+    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_P1,   KC_P2,  KC_P3,
+    KC_LCTL, KC_LALT, KC_LGUI,                KC_SPC,                                  KC_RALT, KC_RCTL,                         KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,           KC_PDOT, KC_PENT
+    ),
+};

keyboards/converter/adb_usb/led.c

@@ -0,0 +1,27 @@
+/*
+Copyright 2011 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/>.
+*/
+
+#include <stdint.h>
+#include <util/delay.h>
+#include "adb.h"
+#include "led.h"
+
+
+void led_set(uint8_t usb_led)
+{
+    adb_host_kbd_led(ADB_ADDR_KEYBOARD, ~usb_led);
+}

keyboards/converter/adb_usb/led.h

@@ -0,0 +1,43 @@
+/*
+Copyright 2011 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/>.
+
+Ported to QMK by Peter Roe <pete@13bit.me>
+*/
+
+#ifndef LED_H
+#define LED_H
+#include "stdint.h"
+
+
+/* keyboard LEDs */
+#define USB_LED_NUM_LOCK                0
+#define USB_LED_CAPS_LOCK               1
+#define USB_LED_SCROLL_LOCK             2
+#define USB_LED_COMPOSE                 3
+#define USB_LED_KANA                    4
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void led_set(uint8_t usb_led);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

keyboards/converter/adb_usb/matrix.c

@@ -0,0 +1,267 @@
+/*
+Copyright 2011 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/>.
+
+Ported to QMK by Peter Roe <pete@13bit.me>
+*/
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <avr/io.h>
+#include <util/delay.h>
+#include "print.h"
+#include "util.h"
+#include "debug.h"
+#include "adb.h"
+#include "matrix.h"
+#include "report.h"
+#include "host.h"
+#include "led.h"
+#include "timer.h"
+
+static bool is_iso_layout = false;
+
+// matrix state buffer(1:on, 0:off)
+static matrix_row_t matrix[MATRIX_ROWS];
+
+static void register_key(uint8_t key);
+
+__attribute__ ((weak))
+void matrix_init_kb(void) {
+    matrix_init_user();
+}
+
+__attribute__ ((weak))
+void matrix_scan_kb(void) {
+    matrix_scan_user();
+}
+
+__attribute__ ((weak))
+void matrix_init_user(void) {
+}
+
+__attribute__ ((weak))
+void matrix_scan_user(void) {
+}
+
+void matrix_init(void)
+{
+    // LED on
+    DDRD |= (1<<6); PORTD |= (1<<6);
+
+    adb_host_init();
+    // wait for keyboard to boot up and receive command
+    _delay_ms(2000);
+
+    // initialize matrix state: all keys off
+    for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00;
+
+    led_set(host_keyboard_leds());
+
+    // debug_enable = false;
+    // debug_matrix = true;
+    // debug_keyboard = true;
+    // debug_mouse = true;
+    // print("debug enabled.\n");
+
+    // LED off
+    DDRD |= (1<<6); PORTD &= ~(1<<6);
+    matrix_init_quantum();
+}
+
+#ifdef ADB_MOUSE_ENABLE
+
+#ifdef MAX
+#undef MAX
+#endif
+#define MAX(X, Y) ((X) > (Y) ? (X) : (Y))
+
+static report_mouse_t mouse_report = {};
+
+void adb_mouse_task(void)
+{
+    uint16_t codes;
+    int16_t x, y;
+    static int8_t mouseacc;
+
+    /* tick of last polling */
+    static uint16_t tick_ms;
+
+    // polling with 12ms interval
+    if (timer_elapsed(tick_ms) < 12) return;
+    tick_ms = timer_read();
+
+    codes = adb_host_mouse_recv();
+    // If nothing received reset mouse acceleration, and quit.
+    if (!codes) {
+        mouseacc = 1;
+        return;
+    };
+    // Bit sixteen is button.
+    if (~codes & (1 << 15))
+        mouse_report.buttons |= MOUSE_BTN1;
+    if (codes & (1 << 15))
+        mouse_report.buttons &= ~MOUSE_BTN1;
+    // lower seven bits are movement, as signed int_7.
+    // low byte is X-axis, high byte is Y.
+    y = (codes>>8 & 0x3F);
+    x = (codes>>0 & 0x3F);
+    // bit seven and fifteen is negative
+    // usb does not use int_8, but int_7 (measuring distance) with sign-bit.
+    if (codes & (1 << 6))
+          x = (x-0x40);
+    if (codes & (1 << 14))
+         y = (y-0x40);
+    // Accelerate mouse. (They weren't meant to be used on screens larger than 320x200).
+    x *= mouseacc;
+    y *= mouseacc;
+    // Cap our two bytes per axis to one byte.
+    // Easier with a MIN-function, but since -MAX(-a,-b) = MIN(a,b)...
+	 // I.E. MIN(MAX(x,-127),127) = -MAX(-MAX(x, -127), -127) = MIN(-MIN(-x,127),127)
+    mouse_report.x = -MAX(-MAX(x, -127), -127);
+    mouse_report.y = -MAX(-MAX(y, -127), -127);
+    if (debug_mouse) {
+            print("adb_host_mouse_recv: "); print_bin16(codes); print("\n");
+            print("adb_mouse raw: [");
+            phex(mouseacc); print(" ");
+            phex(mouse_report.buttons); print("|");
+            print_decs(mouse_report.x); print(" ");
+            print_decs(mouse_report.y); print("]\n");
+    }
+    // Send result by usb.
+    host_mouse_send(&mouse_report);
+    // increase acceleration of mouse
+    mouseacc += ( mouseacc < ADB_MOUSE_MAXACC ? 1 : 0 );
+    return;
+}
+#endif
+
+uint8_t matrix_scan(void)
+{
+    /* extra_key is volatile and more convoluted than necessary because gcc refused
+    to generate valid code otherwise. Making extra_key uint8_t and constructing codes
+    here via codes = extra_key<<8 | 0xFF; would consistently fail to even LOAD
+    extra_key from memory, and leave garbage in the high byte of codes. I tried
+    dozens of code variations and it kept generating broken assembly output. So
+    beware if attempting to make extra_key code more logical and efficient. */
+    static volatile uint16_t extra_key = 0xFFFF;
+    uint16_t codes;
+    uint8_t key0, key1;
+
+    /* tick of last polling */
+    static uint16_t tick_ms;
+
+    codes = extra_key;
+    extra_key = 0xFFFF;
+
+    if ( codes == 0xFFFF )
+    {
+        // polling with 12ms interval
+        if (timer_elapsed(tick_ms) < 12) return 0;
+        tick_ms = timer_read();
+
+        codes = adb_host_kbd_recv();
+    }
+
+    key0 = codes>>8;
+    key1 = codes&0xFF;
+
+    if (debug_matrix && codes) {
+        print("adb_host_kbd_recv: "); phex16(codes); print("\n");
+    }
+
+    if (codes == 0) {                           // no keys
+        return 0;
+    } else if (codes == 0x7F7F) {   // power key press
+        register_key(0x7F);
+    } else if (codes == 0xFFFF) {   // power key release
+        register_key(0xFF);
+    } else if (key0 == 0xFF) {      // error
+        xprintf("adb_host_kbd_recv: ERROR(%d)\n", codes);
+        // something wrong or plug-in
+        matrix_init();
+        return key1;
+    } else {
+        /* Swap codes for ISO keyboard
+         * https://github.com/tmk/tmk_keyboard/issues/35
+         *
+         * ANSI
+         * ,-----------    ----------.
+         * | *a|  1|  2     =|Backspa|
+         * |-----------    ----------|
+         * |Tab  |  Q|     |  ]|   *c|
+         * |-----------    ----------|
+         * |CapsLo|  A|    '|Return  |
+         * |-----------    ----------|
+         * |Shift   |      Shift     |
+         * `-----------    ----------'
+         *
+         * ISO
+         * ,-----------    ----------.
+         * | *a|  1|  2     =|Backspa|
+         * |-----------    ----------|
+         * |Tab  |  Q|     |  ]|Retur|
+         * |-----------    -----`    |
+         * |CapsLo|  A|    '| *c|    |
+         * |-----------    ----------|
+         * |Shif| *b|      Shift     |
+         * `-----------    ----------'
+         *
+         *         ADB scan code   USB usage
+         *         -------------   ---------
+         * Key     ANSI    ISO     ANSI    ISO
+         * ---------------------------------------------
+         * *a      0x32    0x0A    0x35    0x35
+         * *b      ----    0x32    ----    0x64
+         * *c      0x2A    0x2A    0x31    0x31(or 0x32)
+         */
+        if (is_iso_layout) {
+            if ((key0 & 0x7F) == 0x32) {
+                key0 = (key0 & 0x80) | 0x0A;
+            } else if ((key0 & 0x7F) == 0x0A) {
+                key0 = (key0 & 0x80) | 0x32;
+            }
+        }
+        register_key(key0);
+        if (key1 != 0xFF)       // key1 is 0xFF when no second key.
+            extra_key = key1<<8 | 0xFF; // process in a separate call
+    }
+
+    matrix_scan_quantum();
+    return 1;
+}
+
+void matrix_print(void){
+
+}
+
+inline
+matrix_row_t matrix_get_row(uint8_t row)
+{
+    return matrix[row];
+}
+
+inline
+static void register_key(uint8_t key)
+{
+    uint8_t col, row;
+    col = key&0x07;
+    row = (key>>3)&0x0F;
+    if (key&0x80) {
+        matrix[row] &= ~(1<<col);
+    } else {
+        matrix[row] |=  (1<<col);
+    }
+}

keyboards/converter/adb_usb/rules.mk

@@ -0,0 +1,73 @@
+# MCU name
+# atmega32u4 	Teensy2.0
+# atemga32u4	TMK Converter rev.1
+# atemga32u2	TMK Converter rev.2
+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
+# F_CPU = 8000000
+
+#
+# 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
+
+# Bootloader
+#     This definition is optional, and if your keyboard supports multiple bootloaders of
+#     different sizes, comment this out, and the correct address will be loaded
+#     automatically (+60). See bootloader.mk for all options.
+BOOTLOADER = caterina
+
+# Boot Section Size in *bytes*
+#   Teensy halfKay   512
+#   Teensy++ halfKay 1024
+#   Atmel DFU loader 4096	for TMK Converter rev.1/rev.2
+#   LUFA bootloader  4096
+#   USBaspLoader     2048
+
+# Build Options
+#   comment out to disable the options.
+#
+BOOTMAGIC_ENABLE	= no			# Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE		= no			# Mouse keys(+4700)
+CONSOLE_ENABLE		= no			# Console for debug(+400)
+COMMAND_ENABLE		= no  		# Commands for debug and configuration
+SLEEP_LED_ENABLE 	= no  		# Breathing sleep LED during USB suspend
+NKRO_ENABLE 		  = no			# USB Nkey Rollover - not yet supported in LUFA
+EXTRAKEY_ENABLE		= yes
+USB_HID_ENABLE 		= yes
+BACKLIGHT_ENABLE 	= no
+#BLUETOOTH 			= AdafruitBLE   # For Adafruit Feather 32U4 BLE support, uncomment this line
+
+CUSTOM_MATRIX = yes
+SRC = matrix.c \
+      adb.c

keyboards/converter/ibm_terminal/keymaps/default/rules.mk

@@ -14,7 +14,7 @@ AUDIO_ENABLE = no           # Audio output on port C6
 UNICODE_ENABLE = no         # Unicode
 UNICODEMAP_ENABLE = yes
 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.
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 PS2_USE_USART = yes
 API_SYSEX_ENABLE = no
 

keyboards/converter/ibm_terminal/keymaps/priyadi/rules.mk

@@ -14,7 +14,7 @@ AUDIO_ENABLE = no           # Audio output on port C6
 UNICODE_ENABLE = no         # Unicode
 UNICODEMAP_ENABLE = yes
 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.
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 PS2_USE_USART = yes
 API_SYSEX_ENABLE = no
 

keyboards/converter/ibm_terminal/rules.mk

@@ -61,7 +61,7 @@ AUDIO_ENABLE = no           # Audio output on port C6
 UNICODE_ENABLE = no         # Unicode
 UNICODEMAP_ENABLE = yes
 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.
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 PS2_USE_USART = yes
 API_SYSEX_ENABLE = n
 CUSTOM_MATRIX = yes

keyboards/converter/sun_usb/rules.mk

@@ -24,7 +24,7 @@ AUDIO_ENABLE = no           # Audio output on port C6
 UNICODE_ENABLE = no         # Unicode
 UNICODEMAP_ENABLE = yes
 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.
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 CUSTOM_MATRIX = yes
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE

keyboards/converter/usb_usb/info.json

@@ -0,0 +1,485 @@
+{
+  "keyboard_name": "converter/usb_usb",
+  "url": "",
+  "maintainer": "qmk",
+  "width": 22.5,
+  "height": 6.5,
+  "layouts": {
+    "LAYOUT_all": {
+      "layout": [
+        {"label":"F13", "x":2, "y":0},
+        {"label":"F14", "x":3, "y":0},
+        {"label":"F15", "x":4, "y":0},
+        {"label":"F16", "x":5, "y":0},
+        {"label":"F17", "x":6.5, "y":0},
+        {"label":"F18", "x":7.5, "y":0},
+        {"label":"F19", "x":8.5, "y":0},
+        {"label":"F20", "x":9.5, "y":0},
+        {"label":"F21", "x":11, "y":0},
+        {"label":"F22", "x":12, "y":0},
+        {"label":"F23", "x":13, "y":0},
+        {"label":"F24", "x":14, "y":0},
+        {"label":"Esc", "x":0, "y":1},
+        {"label":"F1", "x":2, "y":1},
+        {"label":"F2", "x":3, "y":1},
+        {"label":"F3", "x":4, "y":1},
+        {"label":"F4", "x":5, "y":1},
+        {"label":"F5", "x":6.5, "y":1},
+        {"label":"F6", "x":7.5, "y":1},
+        {"label":"F7", "x":8.5, "y":1},
+        {"label":"F8", "x":9.5, "y":1},
+        {"label":"F9", "x":11, "y":1},
+        {"label":"F10", "x":12, "y":1},
+        {"label":"F11", "x":13, "y":1},
+        {"label":"F12", "x":14, "y":1},
+        {"label":"Print Screen", "x":15.25, "y":1},
+        {"label":"Scroll Lock", "x":16.25, "y":1},
+        {"label":"Pause", "x":17.25, "y":1},
+        {"label":"Volume Down", "x":18.5, "y":1},
+        {"label":"Vol Up", "x":19.5, "y":1},
+        {"label":"Mute", "x":20.5, "y":1},
+        {"label":"Power", "x":21.5, "y":1},
+        {"label":"Help", "x":22.75, "y":1},
+        {"label":"`", "x":0, "y":2.5},
+        {"label":"1", "x":1, "y":2.5},
+        {"label":"2", "x":2, "y":2.5},
+        {"label":"3", "x":3, "y":2.5},
+        {"label":"4", "x":4, "y":2.5},
+        {"label":"5", "x":5, "y":2.5},
+        {"label":"6", "x":6, "y":2.5},
+        {"label":"7", "x":7, "y":2.5},
+        {"label":"8", "x":8, "y":2.5},
+        {"label":"9", "x":9, "y":2.5},
+        {"label":"0", "x":10, "y":2.5},
+        {"label":"-", "x":11, "y":2.5},
+        {"label":"=", "x":12, "y":2.5},
+        {"label":"Yen", "x":13, "y":2.5},
+        {"label":"Back Space", "x":14, "y":2.5},
+        {"label":"Insert", "x":15.25, "y":2.5},
+        {"label":"Home", "x":16.25, "y":2.5},
+        {"label":"Page Up", "x":17.25, "y":2.5},
+        {"label":"Num Lock", "x":18.5, "y":2.5},
+        {"label":"Num /", "x":19.5, "y":2.5},
+        {"label":"Num *", "x":20.5, "y":2.5},
+        {"label":"Num -", "x":21.5, "y":2.5},
+        {"label":"Stop", "x":22.75, "y":2.5},
+        {"label":"Again", "x":23.75, "y":2.5},
+        {"label":"Tab", "x":0, "y":3.5, "w":1.5},
+        {"label":"Q", "x":1.5, "y":3.5},
+        {"label":"W", "x":2.5, "y":3.5},
+        {"label":"E", "x":3.5, "y":3.5},
+        {"label":"R", "x":4.5, "y":3.5},
+        {"label":"T", "x":5.5, "y":3.5},
+        {"label":"Y", "x":6.5, "y":3.5},
+        {"label":"U", "x":7.5, "y":3.5},
+        {"label":"I", "x":8.5, "y":3.5},
+        {"label":"O", "x":9.5, "y":3.5},
+        {"label":"P", "x":10.5, "y":3.5},
+        {"label":"[", "x":11.5, "y":3.5},
+        {"label":"]", "x":12.5, "y":3.5},
+        {"label":"\\", "x":13.5, "y":3.5, "w":1.5},
+        {"label":"Delete", "x":15.25, "y":3.5},
+        {"label":"End", "x":16.25, "y":3.5},
+        {"label":"Page Down", "x":17.25, "y":3.5},
+        {"label":"Num 7", "x":18.5, "y":3.5},
+        {"label":"Num 8", "x":19.5, "y":3.5},
+        {"label":"Num 9", "x":20.5, "y":3.5},
+        {"label":"Num +", "x":21.5, "y":3.5},
+        {"label":"Menu", "x":22.75, "y":3.5},
+        {"label":"Undo", "x":23.75, "y":3.5},
+        {"label":"Caps Lock", "x":0, "y":4.5, "w":1.75},
+        {"label":"A", "x":1.75, "y":4.5},
+        {"label":"S", "x":2.75, "y":4.5},
+        {"label":"D", "x":3.75, "y":4.5},
+        {"label":"F", "x":4.75, "y":4.5},
+        {"label":"G", "x":5.75, "y":4.5},
+        {"label":"H", "x":6.75, "y":4.5},
+        {"label":"J", "x":7.75, "y":4.5},
+        {"label":"K", "x":8.75, "y":4.5},
+        {"label":"L", "x":9.75, "y":4.5},
+        {"label":";", "x":10.75, "y":4.5},
+        {"label":"\"", "x":11.75, "y":4.5},
+        {"label":"ISO #", "x":12.75, "y":4.5},
+        {"label":"Enter", "x":13.75, "y":4.5, "w":1.25},
+        {"label":"Num 4", "x":18.5, "y":4.5},
+        {"label":"Num 5", "x":19.5, "y":4.5},
+        {"label":"Num 6", "x":20.5, "y":4.5},
+        {"label":"Num , ", "x":21.5, "y":4.5},
+        {"label":"Select", "x":22.75, "y":4.5},
+        {"label":"Copy", "x":23.75, "y":4.5},
+        {"label":"Shift", "x":0, "y":5.5, "w":1.25},
+        {"label":"ISO \\", "x":1.25, "y":5.5},
+        {"label":"Z", "x":2.25, "y":5.5},
+        {"label":"X", "x":3.25, "y":5.5},
+        {"label":"C", "x":4.25, "y":5.5},
+        {"label":"V", "x":5.25, "y":5.5},
+        {"label":"B", "x":6.25, "y":5.5},
+        {"label":"N", "x":7.25, "y":5.5},
+        {"label":"M", "x":8.25, "y":5.5},
+        {"label":",", "x":9.25, "y":5.5},
+        {"label":".", "x":10.25, "y":5.5},
+        {"label":"/", "x":11.25, "y":5.5},
+        {"label":"JIS \\", "x":12.25, "y":5.5},
+        {"label":"Shift", "x":13.25, "y":5.5, "w":1.75},
+        {"label":"Up", "x":16.25, "y":5.5},
+        {"label":"Num 1", "x":18.5, "y":5.5},
+        {"label":"Num 2", "x":19.5, "y":5.5},
+        {"label":"Num 3", "x":20.5, "y":5.5},
+        {"label":"Num =", "x":21.5, "y":5.5},
+        {"label":"Exec", "x":22.75, "y":5.5},
+        {"label":"Paste", "x":23.75, "y":5.5},
+        {"label":"Ctrl", "x":0, "y":6.5},
+        {"label":"GUI", "x":1, "y":6.5},
+        {"label":"Alt", "x":2, "y":6.5},
+        {"label":"JIS Muhenkan", "x":3, "y":6.5},
+        {"label":"Hanja", "x":4, "y":6.5},
+        {"label":"Space", "x":5, "y":6.5, "w":3},
+        {"label":"Hangul/English", "x":8, "y":6.5},
+        {"label":"JIS Henkan", "x":9, "y":6.5},
+        {"label":"JIS Katakana/Hiragana", "x":10, "y":6.5},
+        {"label":"Alt", "x":11, "y":6.5},
+        {"label":"GUI", "x":12, "y":6.5},
+        {"label":"App", "x":13, "y":6.5},
+        {"label":"Ctrl", "x":14, "y":6.5},
+        {"label":"Left", "x":15.25, "y":6.5},
+        {"label":"Down", "x":16.25, "y":6.5},
+        {"label":"Right", "x":17.25, "y":6.5},
+        {"label":"Num 0", "x":18.5, "y":6.5, "w":2},
+        {"label":"Num .", "x":20.5, "y":6.5},
+        {"label":"Num Enter", "x":21.5, "y":6.5},
+        {"label":"Find", "x":22.75, "y":6.5},
+        {"label":"Cut", "x":23.75, "y":6.5}
+      ]
+    },
+    "LAYOUT_ansi": {
+      "layout": [
+        {"label":"Esc", "x":0, "y":0},
+        {"label":"F1", "x":2, "y":0},
+        {"label":"F2", "x":3, "y":0},
+        {"label":"F3", "x":4, "y":0},
+        {"label":"F4", "x":5, "y":0},
+        {"label":"F5", "x":6.5, "y":0},
+        {"label":"F6", "x":7.5, "y":0},
+        {"label":"F7", "x":8.5, "y":0},
+        {"label":"F8", "x":9.5, "y":0},
+        {"label":"F9", "x":11, "y":0},
+        {"label":"F10", "x":12, "y":0},
+        {"label":"F11", "x":13, "y":0},
+        {"label":"F12", "x":14, "y":0},
+        {"label":"PrtSc", "x":15.25, "y":0},
+        {"label":"Scroll Lock", "x":16.25, "y":0},
+        {"label":"Pause", "x":17.25, "y":0},
+        {"label":"`", "x":0, "y":1.5},
+        {"label":"1", "x":1, "y":1.5},
+        {"label":"2", "x":2, "y":1.5},
+        {"label":"3", "x":3, "y":1.5},
+        {"label":"4", "x":4, "y":1.5},
+        {"label":"5", "x":5, "y":1.5},
+        {"label":"6", "x":6, "y":1.5},
+        {"label":"7", "x":7, "y":1.5},
+        {"label":"8", "x":8, "y":1.5},
+        {"label":"9", "x":9, "y":1.5},
+        {"label":"0", "x":10, "y":1.5},
+        {"label":"-", "x":11, "y":1.5},
+        {"label":"=", "x":12, "y":1.5},
+        {"label":"Backspace", "x":13, "y":1.5, "w":2},
+        {"label":"Insert", "x":15.25, "y":1.5},
+        {"label":"Home", "x":16.25, "y":1.5},
+        {"label":"Page Up", "x":17.25, "y":1.5},
+        {"label":"Num Lock", "x":18.5, "y":1.5},
+        {"label":"Num /", "x":19.5, "y":1.5},
+        {"label":"Num *", "x":20.5, "y":1.5},
+        {"label":"Num -", "x":21.5, "y":1.5},
+        {"label":"Tab", "x":0, "y":2.5, "w":1.5},
+        {"label":"Q", "x":1.5, "y":2.5},
+        {"label":"W", "x":2.5, "y":2.5},
+        {"label":"E", "x":3.5, "y":2.5},
+        {"label":"R", "x":4.5, "y":2.5},
+        {"label":"T", "x":5.5, "y":2.5},
+        {"label":"Y", "x":6.5, "y":2.5},
+        {"label":"U", "x":7.5, "y":2.5},
+        {"label":"I", "x":8.5, "y":2.5},
+        {"label":"O", "x":9.5, "y":2.5},
+        {"label":"P", "x":10.5, "y":2.5},
+        {"label":"[", "x":11.5, "y":2.5},
+        {"label":"]", "x":12.5, "y":2.5},
+        {"label":"\\", "x":13.5, "y":2.5, "w":1.5},
+        {"label":"Delete", "x":15.25, "y":2.5},
+        {"label":"End", "x":16.25, "y":2.5},
+        {"label":"Page Down", "x":17.25, "y":2.5},
+        {"label":"Num 7", "x":18.5, "y":2.5},
+        {"label":"Num 8", "x":19.5, "y":2.5},
+        {"label":"Num 9", "x":20.5, "y":2.5},
+        {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
+        {"label":"A", "x":1.75, "y":3.5},
+        {"label":"S", "x":2.75, "y":3.5},
+        {"label":"D", "x":3.75, "y":3.5},
+        {"label":"F", "x":4.75, "y":3.5},
+        {"label":"G", "x":5.75, "y":3.5},
+        {"label":"H", "x":6.75, "y":3.5},
+        {"label":"J", "x":7.75, "y":3.5},
+        {"label":"K", "x":8.75, "y":3.5},
+        {"label":"L", "x":9.75, "y":3.5},
+        {"label":":", "x":10.75, "y":3.5},
+        {"label":"\"", "x":11.75, "y":3.5},
+        {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
+        {"label":"Num 4", "x":18.5, "y":3.5},
+        {"label":"Num 5", "x":19.5, "y":3.5},
+        {"label":"Num 6", "x":20.5, "y":3.5},
+        {"label":"Num +", "x":21.5, "y":2.5, "h":2},
+        {"label":"Shift", "x":0, "y":4.5, "w":2.25},
+        {"label":"Z", "x":2.25, "y":4.5},
+        {"label":"X", "x":3.25, "y":4.5},
+        {"label":"C", "x":4.25, "y":4.5},
+        {"label":"V", "x":5.25, "y":4.5},
+        {"label":"B", "x":6.25, "y":4.5},
+        {"label":"N", "x":7.25, "y":4.5},
+        {"label":"M", "x":8.25, "y":4.5},
+        {"label":",", "x":9.25, "y":4.5},
+        {"label":".", "x":10.25, "y":4.5},
+        {"label":"/", "x":11.25, "y":4.5},
+        {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
+        {"label":"Up", "x":16.25, "y":4.5},
+        {"label":"Num 1", "x":18.5, "y":4.5},
+        {"label":"Num 2", "x":19.5, "y":4.5},
+        {"label":"Num 3", "x":20.5, "y":4.5},
+        {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
+        {"label":"GUI", "x":1.25, "y":5.5, "w":1.25},
+        {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
+        {"label":"Space", "x":3.75, "y":5.5, "w":6.25},
+        {"label":"Alt", "x":10, "y":5.5, "w":1.25},
+        {"label":"GUI", "x":11.25, "y":5.5, "w":1.25},
+        {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
+        {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
+        {"label":"Left", "x":15.25, "y":5.5},
+        {"label":"Down", "x":16.25, "y":5.5},
+        {"label":"Right", "x":17.25, "y":5.5},
+        {"label":"Num 0", "x":18.5, "y":5.5, "w":2},
+        {"label":"Num .", "x":20.5, "y":5.5},
+        {"label":"Num Enter", "x":21.5, "y":4.5, "h":2}
+      ]
+    },
+    "LAYOUT_iso": {
+      "layout": [
+        {"label":"Esc", "x":0, "y":0},
+        {"label":"F1", "x":2, "y":0},
+        {"label":"F2", "x":3, "y":0},
+        {"label":"F3", "x":4, "y":0},
+        {"label":"F4", "x":5, "y":0},
+        {"label":"F5", "x":6.5, "y":0},
+        {"label":"F6", "x":7.5, "y":0},
+        {"label":"F7", "x":8.5, "y":0},
+        {"label":"F8", "x":9.5, "y":0},
+        {"label":"F9", "x":11, "y":0},
+        {"label":"F10", "x":12, "y":0},
+        {"label":"F11", "x":13, "y":0},
+        {"label":"F12", "x":14, "y":0},
+        {"label":"Print Screen", "x":15.25, "y":0},
+        {"label":"Scroll Lock", "x":16.25, "y":0},
+        {"label":"Pause", "x":17.25, "y":0},
+        {"label":"`", "x":0, "y":1.5},
+        {"label":"1", "x":1, "y":1.5},
+        {"label":"2", "x":2, "y":1.5},
+        {"label":"3", "x":3, "y":1.5},
+        {"label":"4", "x":4, "y":1.5},
+        {"label":"5", "x":5, "y":1.5},
+        {"label":"6", "x":6, "y":1.5},
+        {"label":"7", "x":7, "y":1.5},
+        {"label":"8", "x":8, "y":1.5},
+        {"label":"9", "x":9, "y":1.5},
+        {"label":"0", "x":10, "y":1.5},
+        {"label":"-", "x":11, "y":1.5},
+        {"label":"=", "x":12, "y":1.5},
+        {"label":"Backspace", "x":13, "y":1.5, "w":2},
+        {"label":"Insert", "x":15.25, "y":1.5},
+        {"label":"Home", "x":16.25, "y":1.5},
+        {"label":"Page Up", "x":17.25, "y":1.5},
+        {"label":"Num Lock", "x":18.5, "y":1.5},
+        {"label":"Num /", "x":19.5, "y":1.5},
+        {"label":"Num *", "x":20.5, "y":1.5},
+        {"label":"Num -", "x":21.5, "y":1.5},
+        {"label":"Tab", "x":0, "y":2.5, "w":1.5},
+        {"label":"Q", "x":1.5, "y":2.5},
+        {"label":"W", "x":2.5, "y":2.5},
+        {"label":"E", "x":3.5, "y":2.5},
+        {"label":"R", "x":4.5, "y":2.5},
+        {"label":"T", "x":5.5, "y":2.5},
+        {"label":"Y", "x":6.5, "y":2.5},
+        {"label":"U", "x":7.5, "y":2.5},
+        {"label":"I", "x":8.5, "y":2.5},
+        {"label":"O", "x":9.5, "y":2.5},
+        {"label":"P", "x":10.5, "y":2.5},
+        {"label":"[", "x":11.5, "y":2.5},
+        {"label":"]", "x":12.5, "y":2.5},
+        {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
+        {"label":"Delete", "x":15.25, "y":2.5},
+        {"label":"End", "x":16.25, "y":2.5},
+        {"label":"Page Down", "x":17.25, "y":2.5},
+        {"label":"Num 7", "x":18.5, "y":2.5},
+        {"label":"Num 8", "x":19.5, "y":2.5},
+        {"label":"Num 9", "x":20.5, "y":2.5},
+        {"label":"Num +", "x":21.5, "y":2.5, "h":2},
+        {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
+        {"label":"A", "x":1.75, "y":3.5},
+        {"label":"S", "x":2.75, "y":3.5},
+        {"label":"D", "x":3.75, "y":3.5},
+        {"label":"F", "x":4.75, "y":3.5},
+        {"label":"G", "x":5.75, "y":3.5},
+        {"label":"H", "x":6.75, "y":3.5},
+        {"label":"J", "x":7.75, "y":3.5},
+        {"label":"K", "x":8.75, "y":3.5},
+        {"label":"L", "x":9.75, "y":3.5},
+        {"label":";", "x":10.75, "y":3.5},
+        {"label":"'", "x":11.75, "y":3.5},
+        {"label":"ISO #", "x":12.75, "y":3.5},
+        {"label":"Num 4", "x":18.5, "y":3.5},
+        {"label":"Num 5", "x":19.5, "y":3.5},
+        {"label":"Num 6", "x":20.5, "y":3.5},
+        {"label":"Shift", "x":0, "y":4.5, "w":1.25},
+        {"label":"ISO \\", "x":1.25, "y":4.5},
+        {"label":"Z", "x":2.25, "y":4.5},
+        {"label":"X", "x":3.25, "y":4.5},
+        {"label":"C", "x":4.25, "y":4.5},
+        {"label":"V", "x":5.25, "y":4.5},
+        {"label":"B", "x":6.25, "y":4.5},
+        {"label":"N", "x":7.25, "y":4.5},
+        {"label":"M", "x":8.25, "y":4.5},
+        {"label":",", "x":9.25, "y":4.5},
+        {"label":".", "x":10.25, "y":4.5},
+        {"label":"/", "x":11.25, "y":4.5},
+        {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
+        {"label":"Up", "x":16.25, "y":4.5},
+        {"label":"Num 1", "x":18.5, "y":4.5},
+        {"label":"Num 2", "x":19.5, "y":4.5},
+        {"label":"Num 3", "x":20.5, "y":4.5},
+        {"label":"Num Enter", "x":21.5, "y":4.5, "h":2},
+        {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
+        {"label":"GUI", "x":1.25, "y":5.5, "w":1.25},
+        {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
+        {"label":"Space", "x":3.75, "y":5.5, "w":6.25},
+        {"label":"AltGr", "x":10, "y":5.5, "w":1.25},
+        {"label":"GUI", "x":11.25, "y":5.5, "w":1.25},
+        {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
+        {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
+        {"label":"Left", "x":15.25, "y":5.5},
+        {"label":"Down", "x":16.25, "y":5.5},
+        {"label":"Right", "x":17.25, "y":5.5},
+        {"label":"Num 0", "x":18.5, "y":5.5, "w":2},
+        {"label":"Num .", "x":20.5, "y":5.5}
+      ]
+    },
+    "LAYOUT_jis": {
+      "layout": [
+        {"label":"Esc", "x":0, "y":0},
+        {"label":"F1", "x":2, "y":0},
+        {"label":"F2", "x":3, "y":0},
+        {"label":"F3", "x":4, "y":0},
+        {"label":"F4", "x":5, "y":0},
+        {"label":"F5", "x":6.5, "y":0},
+        {"label":"F6", "x":7.5, "y":0},
+        {"label":"F7", "x":8.5, "y":0},
+        {"label":"F8", "x":9.5, "y":0},
+        {"label":"F9", "x":11, "y":0},
+        {"label":"F10", "x":12, "y":0},
+        {"label":"F11", "x":13, "y":0},
+        {"label":"F12", "x":14, "y":0},
+        {"label":"Print Screen", "x":15.25, "y":0},
+        {"label":"Scroll Lock", "x":16.25, "y":0},
+        {"label":"Pause", "x":17.25, "y":0},
+        {"label":"JIS Hankaku / Zenkaku", "x":0, "y":1.5},
+        {"label":"1", "x":1, "y":1.5},
+        {"label":"2", "x":2, "y":1.5},
+        {"label":"3", "x":3, "y":1.5},
+        {"label":"4", "x":4, "y":1.5},
+        {"label":"5", "x":5, "y":1.5},
+        {"label":"6", "x":6, "y":1.5},
+        {"label":"7", "x":7, "y":1.5},
+        {"label":"8", "x":8, "y":1.5},
+        {"label":"9", "x":9, "y":1.5},
+        {"label":"0", "x":10, "y":1.5},
+        {"label":"-", "x":11, "y":1.5},
+        {"label":"ˆ", "x":12, "y":1.5},
+        {"label":"JIS Yen", "x":13, "y":1.5},
+        {"label":"Back Space", "x":14, "y":1.5},
+        {"label":"Insert", "x":15.25, "y":1.5},
+        {"label":"Home", "x":16.25, "y":1.5},
+        {"label":"Page Up", "x":17.25, "y":1.5},
+        {"label":"Num Lock", "x":18.5, "y":1.5},
+        {"label":"Num /", "x":19.5, "y":1.5},
+        {"label":"Num *", "x":20.5, "y":1.5},
+        {"label":"Num -", "x":21.5, "y":1.5},
+        {"label":"Tab", "x":0, "y":2.5, "w":1.5},
+        {"label":"Q", "x":1.5, "y":2.5},
+        {"label":"W", "x":2.5, "y":2.5},
+        {"label":"E", "x":3.5, "y":2.5},
+        {"label":"R", "x":4.5, "y":2.5},
+        {"label":"T", "x":5.5, "y":2.5},
+        {"label":"Y", "x":6.5, "y":2.5},
+        {"label":"U", "x":7.5, "y":2.5},
+        {"label":"I", "x":8.5, "y":2.5},
+        {"label":"O", "x":9.5, "y":2.5},
+        {"label":"P", "x":10.5, "y":2.5},
+        {"label":"@", "x":11.5, "y":2.5},
+        {"label":"[", "x":12.5, "y":2.5},
+        {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
+        {"label":"Delete", "x":15.25, "y":2.5},
+        {"label":"End", "x":16.25, "y":2.5},
+        {"label":"Page Down", "x":17.25, "y":2.5},
+        {"label":"Num 7", "x":18.5, "y":2.5},
+        {"label":"Num 8", "x":19.5, "y":2.5},
+        {"label":"Num 9", "x":20.5, "y":2.5},
+        {"label":"Num +", "x":21.5, "y":2.5, "h":2},
+        {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
+        {"label":"A", "x":1.75, "y":3.5},
+        {"label":"S", "x":2.75, "y":3.5},
+        {"label":"D", "x":3.75, "y":3.5},
+        {"label":"F", "x":4.75, "y":3.5},
+        {"label":"G", "x":5.75, "y":3.5},
+        {"label":"H", "x":6.75, "y":3.5},
+        {"label":"J", "x":7.75, "y":3.5},
+        {"label":"K", "x":8.75, "y":3.5},
+        {"label":"L", "x":9.75, "y":3.5},
+        {"label":";", "x":10.75, "y":3.5},
+        {"label":":", "x":11.75, "y":3.5},
+        {"label":"]", "x":12.75, "y":3.5},
+        {"label":"Num 4", "x":18.5, "y":3.5},
+        {"label":"Num 5", "x":19.5, "y":3.5},
+        {"label":"Num 6", "x":20.5, "y":3.5},
+        {"label":"Shift", "x":0, "y":4.5, "w":2.25},
+        {"label":"Z", "x":2.25, "y":4.5},
+        {"label":"X", "x":3.25, "y":4.5},
+        {"label":"C", "x":4.25, "y":4.5},
+        {"label":"V", "x":5.25, "y":4.5},
+        {"label":"B", "x":6.25, "y":4.5},
+        {"label":"N", "x":7.25, "y":4.5},
+        {"label":"M", "x":8.25, "y":4.5},
+        {"label":",", "x":9.25, "y":4.5},
+        {"label":".", "x":10.25, "y":4.5},
+        {"label":"/", "x":11.25, "y":4.5},
+        {"label":"JIS \\", "x":12.25, "y":4.5},
+        {"label":"Shift", "x":13.25, "y":4.5, "w":1.75},
+        {"label":"Up", "x":16.25, "y":4.5},
+        {"label":"Num 1", "x":18.5, "y":4.5},
+        {"label":"Num 2", "x":19.5, "y":4.5},
+        {"label":"Num 3", "x":20.5, "y":4.5},
+        {"label":"Num Enter", "x":21.5, "y":4.5, "h":2},
+        {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
+        {"label":"GUI", "x":1.25, "y":5.5, "w":1.25},
+        {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
+        {"label":"JIS Muhenkan", "x":3.75, "y":5.5, "w":1.25},
+        {"label":"Space", "x":5, "y":5.5, "w":2.5},
+        {"label":"JIS Henkan", "x":7.5, "y":5.5, "w":1.25},
+        {"label":"JIS Hiragana / Katakana", "x":8.75, "y":5.5, "w":1.25},
+        {"label":"Alt", "x":10, "y":5.5, "w":1.25},
+        {"label":"GUI", "x":11.25, "y":5.5, "w":1.25},
+        {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
+        {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
+        {"label":"Left", "x":15.25, "y":5.5},
+        {"label":"Down", "x":16.25, "y":5.5},
+        {"label":"Right", "x":17.25, "y":5.5},
+        {"label":"Num 0", "x":18.5, "y":5.5, "w":2},
+        {"label":"Num .", "x":20.5, "y":5.5}
+      ]
+    }
+  }
+}

keyboards/converter/usb_usb/keymaps/ble/keymap.c

@@ -15,7 +15,7 @@ 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 "usb_usb.h"
+#include QMK_KEYBOARD_H
 
 const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
     /* 0: plain Qwerty without layer switching
@@ -36,9 +36,9 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
      * |Ctl|Gui|Alt|MHEN|HNJ| Space  |H/E|HENK|KANA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| |  0    |  .|Ent| |Fnd|Cut|
      * `-----------------------------------------------------------' `-----------' `---------------' `-------'
      */
-    [0] = KEYMAP_ALL(
+    [0] = LAYOUT_all(
                       KC_F13,  KC_F14,  KC_F15,  KC_F16, KC_F17, KC_F18, KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,               KC_PSCR, KC_SLCK, KC_PAUS,    KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR,     KC_HELP, 
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,               KC_PSCR, KC_SLCK, KC_PAUS,    KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR,     KC_HELP,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_JYEN, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,    KC_STOP, KC_AGIN,
     KC_TAB,  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_BSLS,     KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,    KC_MENU, KC_UNDO,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_NUHS, KC_ENT,                                    KC_P4,   KC_P5,   KC_P6,   KC_PCMM,    KC_SLCT, KC_COPY,
@@ -47,18 +47,6 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
     ),
 };
 
-const uint16_t PROGMEM fn_actions[] = {
-
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-  switch(id) {
-    default:
-      return MACRO_NONE;
-  }
-};
-
-
 void matrix_init_user(void) {
 
 }

keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c

@@ -15,7 +15,7 @@ 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 "usb_usb.h"
+#include QMK_KEYBOARD_H
 
 const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
     /* 0: plain Qwerty without layer switching
@@ -36,7 +36,7 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
      * |Ctl|Gui|Alt|MHEN|HNJ| Space  |H/E|HENK|KANA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| |  0    |  .|Ent| |Fnd|Cut|
      * `-----------------------------------------------------------' `-----------' `---------------' `-------'
      */
-    // KEYMAP_ALL(
+    // LAYOUT_all(
     //           F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24,
     // ESC,      F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12,           PSCR,SLCK,PAUS,    VOLD,VOLU,MUTE,PWR,     HELP,
     // GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, JYEN,BSPC,     INS, HOME,PGUP,    NLCK,PSLS,PAST,PMNS,    STOP,AGIN,
@@ -45,17 +45,17 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
     // LSFT,NUBS,Z,   X,   C,   V,   B,   N,   M,   COMM,DOT, SLSH,     RO,  RSFT,          UP,           P1,  P2,  P3,  PEQL,    EXEC,PSTE,
     // LCTL,LGUI,LALT,MHEN,HANJ,     SPC,      HAEN,HENK,KANA,RALT,RGUI,APP, RCTL,     LEFT,DOWN,RGHT,    P0,       PDOT,PENT,    FIND,CUT
     // ),
-    KEYMAP_ALL(
+    LAYOUT_all(
                       KC_F13,  KC_F14,  KC_F15,  KC_F16, KC_F17, KC_F18, KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,               KC_PSCR, KC_SLCK, KC_PAUS,    KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR,     KC_HELP, 
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,               KC_PSCR, KC_SLCK, KC_PAUS,    KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR,     KC_HELP,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_JYEN, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,    KC_STOP, KC_AGIN,
     KC_TAB,  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_BSLS,     KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,    KC_MENU, KC_UNDO,
     MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_NUHS, KC_ENT,                                    KC_P4,   KC_P5,   KC_P6,   KC_PCMM,    KC_SLCT, KC_COPY,
     KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RO,   KC_RSFT,              KC_UP,               KC_P1,   KC_P2,   KC_P3,   KC_PEQL,    KC_EXEC, KC_PSTE,
     KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN, KC_HANJ,         KC_SPC,         KC_HAEN, KC_HENK, KC_KANA, KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,            KC_PDOT, KC_PENT,    KC_FIND, KC_CUT
     ),
-    KEYMAP_ALL(
+    LAYOUT_all(
-                      ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______, ______, ______, 
+                      ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______, ______, ______,
     ______,           ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______, ______, ______,             ______,______,______,    ______,______,______,______,    ______,
     KC_GRV,  ______,  ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______, ______, ______, ______,     ______,______,______,    ______,______,______,______,    ______,______,
     KC_CAPS, KC_MPRV, KC_VOLU, KC_MNXT, ______, ______, ______,  ______,  ______, ______,  ______, ______, ______,         ______,     ______,______,______,    ______,______,______,______,    ______,______,
@@ -65,18 +65,6 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
     ),
 };
 
-const uint16_t PROGMEM fn_actions[] = {
-
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-  switch(id) {
-    default:
-      return MACRO_NONE;
-  }
-};
-
-
 void matrix_init_user(void) {
 
 }
@@ -113,7 +101,7 @@ void led_set_user(uint8_t usb_led) {
      * |Ctl|Gui|Alt|           Space               |Alt|Gui|App|Ctl| |Lef|Dow|Rig| |      0|  .|Ent|
      * `-----------------------------------------------------------' `-----------' `---------------'
      */
-    KEYMAP(
+    LAYOUT_ansi(
     ESC,      F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12,      PSCR,SLCK,BRK,
     GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, BSPC,     INS, HOME,PGUP,    NLCK,PSLS,PAST,PMNS,
     TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   LBRC,RBRC,BSLS,     DEL, END, PGDN,    P7,  P8,  P9,
@@ -138,13 +126,13 @@ void led_set_user(uint8_t usb_led) {
      * |Ctl|Gui|Alt|           Space       |HNK|KNA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| |      0|  .|   |
      * `-----------------------------------------------------------' `-----------' `---------------'
      */
-    KEYMAP_ISO(
+    LAYOUT_iso(
     ESC,      F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12,      PSCR,SLCK,BRK,
     GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, BSPC,     INS, HOME,PGUP,    NLCK,PSLS,PAST,PMNS,
     TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   LBRC,RBRC,ENT,      DEL, END, PGDN,    P7,  P8,  P9,  PPLS,
     LCTL,A,   S,   D,   F,   G,   H,   J,   K,   L,   SCLN,QUOT,NUHS,                             P4,  P5,  P6,
     LSFT,NUBS,Z,   X,   C,   V,   B,   N,   M,   COMM,DOT, SLSH,     RSFT,          UP,           P1,  P2,  P3,  PENT,
-    LCTL,LGUI,LALT,          SPC,                     RALT,RGUI,APP, RCTL,     LEFT,DOWN,RGHT,    P0,       PDOT 
+    LCTL,LGUI,LALT,          SPC,                     RALT,RGUI,APP, RCTL,     LEFT,DOWN,RGHT,    P0,       PDOT
     ),
 
     /* JIS layout
@@ -163,13 +151,13 @@ void led_set_user(uint8_t usb_led) {
      * |Ctl|Gui|Alt|MHEN|      Space      |HENK|KNA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| |      0|  .|   |
      * `-----------------------------------------------------------' `-----------' `---------------'
      */
-    KEYMAP_JIS(
+    LAYOUT_jis(
     ESC,      F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12,           PSCR,SLCK,BRK,
     GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, JPY, BSPC,     INS, HOME,PGUP,    NLCK,PSLS,PAST,PMNS,
     TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   LBRC,RBRC,     ENT,      DEL, END, PGDN,    P7,  P8,  P9,  PPLS,
     LCTL,A,   S,   D,   F,   G,   H,   J,   K,   L,   SCLN,QUOT,NUHS,                                  P4,  P5,  P6,
     LSFT,Z,   X,   C,   V,   B,   N,   M,   COMM,DOT, SLSH,          RO,  RSFT,          UP,           P1,  P2,  P3,  PENT,
-    LCTL,LGUI,LALT,MHEN,     SPC,                HENK,KANA,RALT,RGUI,APP, RCTL,     LEFT,DOWN,RGHT,    P0,       PDOT 
+    LCTL,LGUI,LALT,MHEN,     SPC,                HENK,KANA,RALT,RGUI,APP, RCTL,     LEFT,DOWN,RGHT,    P0,       PDOT
     ),
 
     /* Colemak http://colemak.com
@@ -185,7 +173,7 @@ void led_set_user(uint8_t usb_led) {
      * |Ctrl |Gui |Alt |         Space         |Alt |Gui |Menu|Ctrl|
      * `----------------------------------------------------------'
      */
-    KEYMAP_ALL(
+    LAYOUT_all(
               F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24,
     ESC,      F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12,           PSCR,SLCK,PAUS,    VOLD,VOLU,MUTE,PWR,     HELP,
     GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, JYEN,BSPC,     INS, HOME,PGUP,    NLCK,PSLS,PAST,PMNS,    STOP,AGIN,
@@ -208,7 +196,7 @@ void led_set_user(uint8_t usb_led) {
      * |Ctrl |Gui |Alt |         Space         |Alt |Gui |Menu|Ctrl|
      * `-----------------------------------------------------------'
      */
-    KEYMAP_ALL(
+    LAYOUT_all(
               F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24,
     ESC,      F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12,           PSCR,SLCK,PAUS,    VOLD,VOLU,MUTE,PWR,     HELP,
     GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   LBRC,RBRC,JYEN,BSPC,     INS, HOME,PGUP,    NLCK,PSLS,PAST,PMNS,    STOP,AGIN,
@@ -231,7 +219,7 @@ void led_set_user(uint8_t usb_led) {
      * |Ctrl |Gui |Alt |         Space         |Alt |Gui |Menu|Ctrl|
      * `-----------------------------------------------------------'
      */
-    KEYMAP_ALL(
+    LAYOUT_all(
               F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24,
     ESC,      F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12,           PSCR,SLCK,PAUS,    VOLD,VOLU,MUTE,PWR,     HELP,
     GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, JYEN,BSPC,     INS, HOME,PGUP,    NLCK,PSLS,PAST,PMNS,    STOP,AGIN,
@@ -265,7 +253,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |Ctl|Gui|Alt|MHEN|HNJ| Space  |H/E|HENK|KANA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| |  0    |  .|Ent| |Fnd|Cut|
      * `-----------------------------------------------------------' `-----------' `---------------' `-------'
      */
-    [0] = KEYMAP_ALL(
+    [0] = LAYOUT_all(
               F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24,
     ESC,      F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12,           PSCR,SLCK,PAUS,    VOLD,VOLU,MUTE,PWR,     HELP,
     ESC, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, JYEN,BSPC,     INS, HOME,PGUP,    NLCK,PSLS,PAST,PMNS,    STOP,AGIN,
@@ -288,7 +276,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |    |    |    |                        |    |    |    |    |
      * `-----------------------------------------------------------'
      */
-    [1] = KEYMAP_ALL(
+    [1] = LAYOUT_all(
               TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,
     TRNS,     TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,          TRNS,TRNS,TRNS,    TRNS,TRNS,TRNS,TRNS,    TRNS,
     GRV, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, TRNS,DEL,      TRNS,TRNS,TRNS,    TRNS,TRNS,TRNS,TRNS,    TRNS,TRNS,

keyboards/converter/usb_usb/keymaps/default/keymap.c

@@ -15,7 +15,7 @@ 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 "usb_usb.h"
+#include QMK_KEYBOARD_H
 
 const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
     /* 0: plain Qwerty without layer switching
@@ -36,17 +36,17 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
      * |Ctl|Gui|Alt|MHEN|HNJ| Space  |H/E|HENK|KANA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| |  0    |  .|Ent| |Fnd|Cut|
      * `-----------------------------------------------------------' `-----------' `---------------' `-------'
      */
-    [0] = KEYMAP_ALL(
+    [0] = LAYOUT_all(
                       KC_F13,  KC_F14,  KC_F15,  KC_F16, KC_F17, KC_F18, KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,               KC_PSCR, KC_SLCK, KC_PAUS,    KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR,     KC_HELP, 
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,               KC_PSCR, KC_SLCK, KC_PAUS,    KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR,     KC_HELP,
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_JYEN, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,    KC_STOP, KC_AGIN,
     KC_TAB,  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_BSLS,     KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,    KC_MENU, KC_UNDO,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_NUHS, KC_ENT,                                    KC_P4,   KC_P5,   KC_P6,   KC_PCMM,    KC_SLCT, KC_COPY,
     KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RO,   KC_RSFT,              KC_UP,               KC_P1,   KC_P2,   KC_P3,   KC_PEQL,    KC_EXEC, KC_PSTE,
     KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN, KC_HANJ,         KC_SPC,         KC_HAEN, KC_HENK, KC_KANA, KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,            KC_PDOT, KC_PENT,    KC_FIND, KC_CUT
     ),
-    [1] = KEYMAP_ALL(
+    [1] = LAYOUT_all(
-                      ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______, ______, ______, 
+                      ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______, ______, ______,
     ______,           ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______, ______, ______,             ______,______,______,    ______,______,______,______,    ______,
     ______,  ______,  ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______, ______, ______, ______,     ______,______,______,    ______,______,______,______,    ______,______,
     ______,  ______,  ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______, ______,         ______,     ______,______,______,    ______,______,______,______,    ______,______,
@@ -56,18 +56,6 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
     ),
 };
 
-const uint16_t PROGMEM fn_actions[] = {
-
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-  switch(id) {
-    default:
-      return MACRO_NONE;
-  }
-};
-
-
 void matrix_init_user(void) {
 
 }

keyboards/converter/usb_usb/usb_usb.h

@@ -62,7 +62,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * TODO: use same keycode to pass through instead of KC_NO?
  */
-#define KEYMAP_ALL( \
+#define LAYOUT_all( \
             K68,K69,K6A,K6B,K6C,K6D,K6E,K6F,K70,K71,K72,K73,                                              \
     K29,    K3A,K3B,K3C,K3D,K3E,K3F,K40,K41,K42,K43,K44,K45,      K46,K47,K48,  K81,K80,K7F,K66, K75,     \
     K35,K1E,K1F,K20,K21,K22,K23,K24,K25,K26,K27,K2D,K2E,K89,K2A,  K49,K4A,K4B,  K53,K54,K55,K56, K78,K79, \
@@ -120,21 +120,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * |Ctl|Gui|Alt|           Space               |Alt|Gui|App|Ctl| |Lef|Dow|Rig| |      0|  .|Ent|
  * `-----------------------------------------------------------' `-----------' `---------------'
  */
-#define KEYMAP( \
+#define LAYOUT_ansi( \
     K29,K3A,K3B,K3C,K3D,K3E,K3F,K40,K41,K42,K43,K44,K45,      K46,K47,K48,                   \
     K35,K1E,K1F,K20,K21,K22,K23,K24,K25,K26,K27,K2D,K2E,K2A,  K49,K4A,K4B,  K53,K54,K55,K56, \
     K2B,K14,K1A,K08,K15,K17,K1C,K18,K0C,K12,K13,K2F,K30,K31,  K4C,K4D,K4E,  K5F,K60,K61,     \
     K39,K04,K16,K07,K09,K0A,K0B,K0D,K0E,K0F,K33,K34,    K28,                K5C,K5D,K5E,K57, \
     KE1,K1D,K1B,K06,K19,K05,K11,K10,K36,K37,K38,        KE5,      K52,      K59,K5A,K5B,     \
     KE0,KE3,KE2,        K2C,                KE6,KE7,K65,KE4,  K50,K51,K4F,  K62,    K63,K58  \
-) KEYMAP_ALL( \
+) LAYOUT_all( \
-            KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,                                               \
+                  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,                                                                                \
-    K29,    K3A,K3B,K3C,K3D,K3E,K3F,K40,K41,K42,K43,K44,K45,      K46,K47,K48,  KC_NO, KC_NO, KC_NO, KC_NO,  KC_NO,      \
+    K29,          K3A,   K3B,   K3C,   K3D,   K3E,   K3F,   K40,   K41,   K42,   K43,   K44,   K45,             K46,   K47,   K48,      KC_NO, KC_NO, KC_NO, KC_NO,    KC_NO,        \
-    K35,K1E,K1F,K20,K21,K22,K23,K24,K25,K26,K27,K2D,K2E,KC_NO, K2A,  K49,K4A,K4B,  K53,K54,K55,K56, KC_NO, KC_NO,  \
+    K35,   K1E,   K1F,   K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K2D,   K2E,   KC_NO, K2A,      K49,   K4A,   K4B,      K53,   K54,   K55,   K56,      KC_NO, KC_NO, \
-    K2B,K14,K1A,K08,K15,K17,K1C,K18,K0C,K12,K13,K2F,K30,    K31,  K4C,K4D,K4E,  K5F,K60,K61,K57, KC_NO, KC_NO,  \
+    K2B,   K14,   K1A,   K08,   K15,   K17,   K1C,   K18,   K0C,   K12,   K13,   K2F,   K30,          K31,      K4C,   K4D,   K4E,      K5F,   K60,   K61,   K57,      KC_NO, KC_NO, \
-    K39,K04,K16,K07,K09,K0A,K0B,K0D,K0E,K0F,K33,K34,    KC_NO, K28,                K5C,K5D,K5E,KC_NO,  KC_NO, KC_NO,  \
+    K39,   K04,   K16,   K07,   K09,   K0A,   K0B,   K0D,   K0E,   K0F,   K33,   K34,          KC_NO, K28,                              K5C,   K5D,   K5E,   KC_NO,    KC_NO, KC_NO, \
-    KE1,KC_NO, K1D,K1B,K06,K19,K05,K11,K10,K36,K37,K38,    KC_NO, KE5,      K52,      K59,K5A,K5B,KC_NO,  KC_NO, KC_NO,  \
+    KE1,   KC_NO, K1D,   K1B,   K06,   K19,   K05,   K11,   K10,   K36,   K37,   K38,          KC_NO, KE5,             K52,             K59,   K5A,   K5B,   KC_NO,    KC_NO, KC_NO, \
-    KE0,KE3,KE2,KC_NO, KC_NO,     K2C,    KC_NO, KC_NO, KC_NO, KE6,KE7,K65,KE4,  K50,K51,K4F,  K62,    K63,K58, KC_NO, KC_NO   \
+    KE0,   KE3,   KE2,   KC_NO, KC_NO,        K2C,          KC_NO, KC_NO, KC_NO, KE6,   KE7,   K65,   KE4,      K50,   K51,   K4F,      K62,          K63,   K58,      KC_NO, KC_NO  \
 )
 
 /* ,---.   ,---------------. ,---------------. ,---------------. ,-----------.
@@ -152,21 +152,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * |Ctl|Gui|Alt|           Space               |Alt|Gui|App|Ctl| |Lef|Dow|Rig| |      0|  .|   |
  * `-----------------------------------------------------------' `-----------' `---------------'
  */
-#define KEYMAP_ISO( \
+#define LAYOUT_iso( \
     K29,    K3A,K3B,K3C,K3D,K3E,K3F,K40,K41,K42,K43,K44,K45,  K46,K47,K48,                   \
     K35,K1E,K1F,K20,K21,K22,K23,K24,K25,K26,K27,K2D,K2E,K2A,  K49,K4A,K4B,  K53,K54,K55,K56, \
     K2B,K14,K1A,K08,K15,K17,K1C,K18,K0C,K12,K13,K2F,K30,K28,  K4C,K4D,K4E,  K5F,K60,K61,K57, \
     K39,K04,K16,K07,K09,K0A,K0B,K0D,K0E,K0F,K33,K34,K32,                    K5C,K5D,K5E,     \
     KE1,K64,K1D,K1B,K06,K19,K05,K11,K10,K36,K37,K38,    KE5,      K52,      K59,K5A,K5B,K58, \
     KE0,KE3,KE2,        K2C,                KE6,KE7,K65,KE4,  K50,K51,K4F,  K62,    K63      \
-) KEYMAP_ALL( \
+) LAYOUT_all( \
-            KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,                                               \
+                  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,                                                                                \
-    K29,    K3A,K3B,K3C,K3D,K3E,K3F,K40,K41,K42,K43,K44,K45,      K46,K47,K48,  KC_NO, KC_NO, KC_NO, KC_NO,  KC_NO,      \
+    K29,          K3A,   K3B,   K3C,   K3D,   K3E,   K3F,   K40,   K41,   K42,   K43,   K44,   K45,             K46,   K47,   K48,      KC_NO, KC_NO, KC_NO, KC_NO,    KC_NO,        \
-    K35,K1E,K1F,K20,K21,K22,K23,K24,K25,K26,K27,K2D,K2E,KC_NO, K2A,  K49,K4A,K4B,  K53,K54,K55,K56, KC_NO, KC_NO,  \
+    K35,   K1E,   K1F,   K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K2D,   K2E,   KC_NO, K2A,      K49,   K4A,   K4B,      K53,   K54,   K55,   K56,      KC_NO, KC_NO, \
-    K2B,K14,K1A,K08,K15,K17,K1C,K18,K0C,K12,K13,K2F,K30,    K32,  K4C,K4D,K4E,  K5F,K60,K61,K57, KC_NO, KC_NO,  \
+    K2B,   K14,   K1A,   K08,   K15,   K17,   K1C,   K18,   K0C,   K12,   K13,   K2F,   K30,          K32,      K4C,   K4D,   K4E,      K5F,   K60,   K61,   K57,      KC_NO, KC_NO, \
-    K39,K04,K16,K07,K09,K0A,K0B,K0D,K0E,K0F,K33,K34,    K32,K28,                K5C,K5D,K5E,KC_NO,  KC_NO, KC_NO,  \
+    K39,   K04,   K16,   K07,   K09,   K0A,   K0B,   K0D,   K0E,   K0F,   K33,   K34,          K32,   K28,                              K5C,   K5D,   K5E,   KC_NO,    KC_NO, KC_NO, \
-    KE1,K64,K1D,K1B,K06,K19,K05,K11,K10,K36,K37,K38,    KC_NO, KE5,      K52,      K59,K5A,K5B,KC_NO,  KC_NO, KC_NO,  \
+    KE1,   K64,   K1D,   K1B,   K06,   K19,   K05,   K11,   K10,   K36,   K37,   K38,          KC_NO, KE5,             K52,             K59,   K5A,   K5B,   KC_NO,    KC_NO, KC_NO, \
-    KE0,KE3,KE2,KC_NO, KC_NO,     K2C,    KC_NO, KC_NO, KC_NO, KE6,KE7,K65,KE4,  K50,K51,K4F,  K62,    K63,K58, KC_NO, KC_NO   \
+    KE0,   KE3,   KE2,   KC_NO, KC_NO,        K2C,          KC_NO, KC_NO, KC_NO, KE6,   KE7,   K65,   KE4,      K50,   K51,   K4F,      K62,          K63,   K58,      KC_NO, KC_NO  \
 )
 
 /* ,---.   ,---------------. ,---------------. ,---------------. ,-----------.
@@ -184,20 +184,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * |Ctl|Gui|Alt|MHEN|      Space      |HENK|KNA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| |      0|  .|   |
  * `-----------------------------------------------------------' `-----------' `---------------'
  */
-#define KEYMAP_JIS( \
+#define LAYOUT_jis( \
     K29,    K3A,K3B,K3C,K3D,K3E,K3F,K40,K41,K42,K43,K44,K45,      K46,K47,K48,                   \
     K35,K1E,K1F,K20,K21,K22,K23,K24,K25,K26,K27,K2D,K2E,K89,K2A,  K49,K4A,K4B,  K53,K54,K55,K56, \
     K2B,K14,K1A,K08,K15,K17,K1C,K18,K0C,K12,K13,K2F,K30,    K28,  K4C,K4D,K4E,  K5F,K60,K61,K57, \
     K39,K04,K16,K07,K09,K0A,K0B,K0D,K0E,K0F,K33,K34,K32,                        K5C,K5D,K5E,     \
     KE1,K1D,K1B,K06,K19,K05,K11,K10,K36,K37,K38,        K87,KE5,      K52,      K59,K5A,K5B,K58, \
     KE0,KE3,KE2,K8B,    K2C,        K8A,K88,KE6,KE7,K65,KE4,      K50,K51,K4F,  K62,    K63      \
-) KEYMAP_ALL( \
+) LAYOUT_all( \
-            KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,                                               \
+                  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,    \
-    K29,    K3A,K3B,K3C,K3D,K3E,K3F,K40,K41,K42,K43,K44,K45,      K46,K47,K48,  KC_NO, KC_NO, KC_NO, KC_NO,  KC_NO,      \
+    K29,          K3A,   K3B,   K3C,   K3D,   K3E,   K3F,   K40,   K41,   K42,   K43,   K44,   K45,             K46,   K47,   K48,      KC_NO, KC_NO, KC_NO, KC_NO,    KC_NO,        \
-    K35,K1E,K1F,K20,K21,K22,K23,K24,K25,K26,K27,K2D,K2E,K89,K2A,  K49,K4A,K4B,  K53,K54,K55,K56, KC_NO, KC_NO,  \
+    K35,   K1E,   K1F,   K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K2D,   K2E,   K89,   K2A,      K49,   K4A,   K4B,      K53,   K54,   K55,   K56,      KC_NO, KC_NO, \
-    K2B,K14,K1A,K08,K15,K17,K1C,K18,K0C,K12,K13,K2F,K30,    K32,  K4C,K4D,K4E,  K5F,K60,K61,K57, KC_NO, KC_NO,  \
+    K2B,   K14,   K1A,   K08,   K15,   K17,   K1C,   K18,   K0C,   K12,   K13,   K2F,   K30,          K32,      K4C,   K4D,   K4E,      K5F,   K60,   K61,   K57,      KC_NO, KC_NO, \
-    K39,K04,K16,K07,K09,K0A,K0B,K0D,K0E,K0F,K33,K34,    K32,K28,                K5C,K5D,K5E,KC_NO,  KC_NO, KC_NO,  \
+    K39,   K04,   K16,   K07,   K09,   K0A,   K0B,   K0D,   K0E,   K0F,   K33,   K34,          K32,   K28,                              K5C,   K5D,   K5E,   KC_NO,    KC_NO, KC_NO, \
-    KE1,KC_NO, K1D,K1B,K06,K19,K05,K11,K10,K36,K37,K38,    K87,KE5,      K52,      K59,K5A,K5B,KC_NO,  KC_NO, KC_NO,  \
+    KE1,   KC_NO, K1D,   K1B,   K06,   K19,   K05,   K11,   K10,   K36,   K37,   K38,          K87,   KE5,             K52,             K59,   K5A,   K5B,   KC_NO,    KC_NO, KC_NO, \
-    KE0,KE3,KE2,K8B,KC_NO,     K2C,    KC_NO, K8A,K88,KE6,KE7,K65,KE4,  K50,K51,K4F,  K62,    K63,K58, KC_NO, KC_NO   \
+    KE0,   KE3,   KE2,   K8B,   KC_NO,        K2C,          KC_NO, K8A,   K88,   KE6,   KE7,   K65,   KE4,      K50,   K51,   K4F,      K62,          K63,   K58,      KC_NO, KC_NO  \
 )
 #endif

keyboards/converter/xt_usb/README.md

@@ -0,0 +1,17 @@
+XT to USB keyboard converter
+==============================
+This is a port of TMK's converter/xt_usb to QMK.
+
+This firmware converts XT keyboard protocol to USB.(It supports Scan Code Set 1.)
+
+
+Connect Wires
+-------------
+1. Connect **Vcc** and **GND**.
+2. Connect **Clock** and **Data** line. **Clock** is on `PD1`,  **Data** on `PD0` by default. And optionally you can use `PB7` for **Reset**.(Compatible to Soarer's converter) To change pin configuration edit `config.h`.
+3. You need pull-up resistor. **1K-10K Ohm** will be OK.
+
+
+XT keyboard protocol  resource
+------------------------------
+https://github.com/tmk/tmk_keyboard/wiki/IBM-PC-XT-Keyboard-Protocol

keyboards/converter/xt_usb/config.h

@@ -0,0 +1,78 @@
+/*
+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/>.
+*/
+
+#pragma once
+
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0x6512
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    QMK
+#define PRODUCT         XT keyboard converter
+#define DESCRIPTION     convert XT keyboard to USB
+
+
+/* matrix size */
+#define MATRIX_ROWS 16  // keycode bit: 3-0
+#define MATRIX_COLS 8   // keycode bit: 6-4
+
+/* key combination for command */
+#define IS_COMMAND() ( \
+    keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) || \
+    keyboard_report->mods == (MOD_BIT(KC_LCTRL) | MOD_BIT(KC_RSHIFT)) \
+)
+
+
+//#define NO_SUSPEND_POWER_DOWN
+
+/*
+ * XT Pin interrupt
+ */
+#define XT_CLOCK_PORT  PORTD
+#define XT_CLOCK_PIN   PIND
+#define XT_CLOCK_DDR   DDRD
+#define XT_CLOCK_BIT   1
+#define XT_DATA_PORT   PORTD
+#define XT_DATA_PIN    PIND
+#define XT_DATA_DDR    DDRD
+#define XT_DATA_BIT    0
+#define XT_RST_PORT    PORTB
+#define XT_RST_PIN     PINB
+#define XT_RST_DDR     DDRB
+#define XT_RST_BIT     7
+
+/* hard reset: low pulse for 500ms and after that HiZ for safety */
+#define XT_RESET() do { \
+    XT_RST_PORT &= ~(1<<XT_RST_BIT);  \
+    XT_RST_DDR  |=  (1<<XT_RST_BIT);  \
+    _delay_ms(500);                   \
+    XT_RST_DDR  &= ~(1<<XT_RST_BIT);  \
+} while (0)
+
+/* INT1 for falling edge of clock line */
+#define XT_INT_INIT()  do {    \
+    EICRA |= ((1<<ISC11) |      \
+              (0<<ISC10));      \
+} while (0)
+/* clears flag and enables interrupt */
+#define XT_INT_ON()  do {      \
+    EIFR  |= (1<<INTF1);        \
+    EIMSK |= (1<<INT1);         \
+} while (0)
+#define XT_INT_OFF() do {      \
+    EIMSK &= ~(1<<INT1);        \
+} while (0)
+#define XT_INT_VECT    INT1_vect