qmk cformat (#9500)

* enable NKRO and keep consistent with bootmagic set to lite

* Update keyboards/1upkeyboards/1up60hse/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>

.github/workflows/info.yml

@@ -0,0 +1,49 @@
+name: PR Lint keyboards
+
+on:
+  pull_request:
+    paths:
+    - 'keyboards/**'
+
+jobs:
+  info:
+    runs-on: ubuntu-latest
+
+    container: qmkfm/base_container
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+
+    - name: Print info
+      run: |
+        git rev-parse --short HEAD
+        echo ${{ github.event.pull_request.base.sha }}
+        git diff --name-only ${{ github.event.pull_request.base.sha }}...
+
+    - name: Run qmk info
+      shell: 'bash {0}'
+      run: |
+        QMK_CHANGES=$(git diff --name-only ${{ github.event.pull_request.base.sha }}...)
+        QMK_KEYBOARDS=$(qmk list-keyboards)
+
+        exit_code=0
+        for KB in $QMK_KEYBOARDS; do
+          KEYBOARD_CHANGES=$(echo "$QMK_CHANGES" | grep -E '^(keyboards/'${KB}'/)')
+          if [[ -z "$KEYBOARD_CHANGES" ]]; then
+            # skip as no changes for this keyboard
+            continue
+          fi
+
+          KEYMAP_ONLY=$(echo "$KEYBOARD_CHANGES" | grep -cv /keymaps/)
+          if [[ $KEYMAP_ONLY -gt 0 ]]; then
+            echo "linting ${KB}"
+
+            # TODO: info info always returns 0 - right now the only way to know failure is to inspect log lines
+            qmk info -kb ${KB} 2>&1 | tee /tmp/$$
+            !(grep -cq ☒ /tmp/$$)
+            : $((exit_code = $exit_code + $?))
+          fi
+        done
+        exit $exit_code

common_features.mk

@@ -144,7 +144,7 @@ ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
     endif
 endif
 
-VALID_MATRIX_TYPES := yes IS31FL3731 IS31FL3733 IS31FL3737 WS2812 custom
+VALID_MATRIX_TYPES := yes IS31FL3731 IS31FL3733 IS31FL3737 IS31FL3741 WS2812 custom
 
 LED_MATRIX_ENABLE ?= no
 ifneq ($(strip $(LED_MATRIX_ENABLE)), no)
@@ -205,6 +205,13 @@ ifeq ($(strip $(RGB_MATRIX_ENABLE)), IS31FL3737)
     QUANTUM_LIB_SRC += i2c_master.c
 endif
 
+ifeq ($(strip $(RGB_MATRIX_ENABLE)), IS31FL3741)
+    OPT_DEFS += -DIS31FL3741 -DSTM32_I2C -DHAL_USE_I2C=TRUE
+    COMMON_VPATH += $(DRIVER_PATH)/issi
+    SRC += is31fl3741.c
+    QUANTUM_LIB_SRC += i2c_master.c
+endif
+
 ifeq ($(strip $(RGB_MATRIX_ENABLE)), WS2812)
     OPT_DEFS += -DWS2812
     WS2812_DRIVER_REQUIRED := yes

docs/feature_encoders.md

@@ -26,7 +26,7 @@ If your encoder's clockwise directions are incorrect, you can swap the A & B pad
 #define ENCODER_DIRECTION_FLIP
 ```
 
-Additionally, the resolution can be specified in the same file (the default & suggested is 4):
+Additionally, the resolution, which defines how many pulses the encoder registers between each detent, can be defined with:
 
 ```c
 #define ENCODER_RESOLUTION 4

docs/feature_macros.md

@@ -6,34 +6,34 @@ Macros allow you to send multiple keystrokes when pressing just one key. QMK has
 
 ## The New Way: `SEND_STRING()` & `process_record_user`
 
-Sometimes you just want a key to type out words or phrases. For the most common situations we've provided `SEND_STRING()`, which will type out your string (i.e. a sequence of characters) for you. All ASCII characters that are easily translated to a keycode are supported (e.g. `\n\t`).
+Sometimes you want a key to type out words or phrases. For the most common situations, we've provided `SEND_STRING()`, which will type out a string (i.e. a sequence of characters) for you. All ASCII characters that are easily translatable to a keycode are supported (e.g. `qmk 123\n\t`).
 
 Here is an example `keymap.c` for a two-key keyboard:
 
 ```c
 enum custom_keycodes {
-  QMKBEST = SAFE_RANGE,
+    QMKBEST = SAFE_RANGE,
 };
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
+    switch (keycode) {
     case QMKBEST:
-      if (record->event.pressed) {
-        // when keycode QMKBEST is pressed
-        SEND_STRING("QMK is the best thing ever!");
-      } else {
-        // when keycode QMKBEST is released
-      }
-      break;
-
-  }
-  return true;
+        if (record->event.pressed) {
+            // when keycode QMKBEST is pressed
+            SEND_STRING("QMK is the best thing ever!");
+        } else {
+            // when keycode QMKBEST is released
+        }
+        break;
+    }
+    return true;
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = {
-    {QMKBEST, KC_ESC}
-  }
+    [0] = {
+        {QMKBEST, KC_ESC},
+        // ...
+    },
 };
 ```
 
@@ -49,42 +49,45 @@ You can do that by adding another keycode and adding another case to the switch
 
 ```c
 enum custom_keycodes {
-  QMKBEST = SAFE_RANGE,
-  QMKURL,
-  MY_OTHER_MACRO
+    QMKBEST = SAFE_RANGE,
+    QMKURL,
+    MY_OTHER_MACRO,
 };
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
+    switch (keycode) {
     case QMKBEST:
-      if (record->event.pressed) {
-        // when keycode QMKBEST is pressed
-        SEND_STRING("QMK is the best thing ever!");
-      } else {
-        // when keycode QMKBEST is released
-      }
-      break;
+        if (record->event.pressed) {
+            // when keycode QMKBEST is pressed
+            SEND_STRING("QMK is the best thing ever!");
+        } else {
+            // when keycode QMKBEST is released
+        }
+        break;
+
     case QMKURL:
-      if (record->event.pressed) {
-        // when keycode QMKURL is pressed
-        SEND_STRING("https://qmk.fm/\n");
-      } else {
-        // when keycode QMKURL is released
-      }
-      break;
+        if (record->event.pressed) {
+            // when keycode QMKURL is pressed
+            SEND_STRING("https://qmk.fm/\n");
+        } else {
+            // when keycode QMKURL is released
+        }
+        break;
+
     case MY_OTHER_MACRO:
-      if (record->event.pressed) {
-                SEND_STRING(SS_LCTL("ac")); // selects all and copies
-      }
-      break;
-  }
-  return true;
+        if (record->event.pressed) {
+           SEND_STRING(SS_LCTL("ac")); // selects all and copies
+        }
+        break;
+    }
+    return true;
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = {
-    {MY_CUSTOM_MACRO, MY_OTHER_MACRO}
-  }
+    [0] = {
+        {MY_CUSTOM_MACRO, MY_OTHER_MACRO},
+        // ...
+    },
 };
 ```
 

docs/feature_unicode.md

@@ -2,11 +2,25 @@
 
 Unicode characters can be input straight from your keyboard! There are some limitations, however.
 
-QMK has three different methods for enabling Unicode input and defining keycodes:
+In order to enable Unicode support on your keyboard, you will need to do the following:
 
-## Basic Unicode
+1. Choose one of three supported Unicode implementations: [Basic Unicode](#basic-unicode), [Unicode Map](#unicode-map), [UCIS](#ucis).
+2. Find which [input mode](#input-modes) is the best match for your operating system and setup.
+3. [Set](#setting-the-input-mode) the appropriate input mode (or modes) in your configuration.
+4. Add Unicode keycodes to your keymap.
 
-This method supports Unicode code points up to `0x7FFF`. This covers characters for most modern languages, as well as symbols, but it doesn't cover emoji.
+
+## 1. Methods :id=methods
+
+QMK supports three different methods for enabling Unicode input and adding Unicode characters to your keymap. Each has its pros and cons in terms of flexibility and ease of use. Choose the one that best fits your use case.
+
+The Basic method should be enough for most users. However, if you need a wider range of supported characters (including emoji, rare symbols etc.), you should use Unicode Map.
+
+<br>
+
+### 1.1. Basic Unicode :id=basic-unicode
+
+The easiest to use method, albeit somewhat limited. It stores Unicode characters as keycodes in the keymap itself, so it only supports code points up to `0x7FFF`. This covers characters for most modern languages (including East Asian), as well as symbols, but it doesn't cover emoji.
 
 Add the following to your `rules.mk`:
 
@@ -14,11 +28,13 @@ Add the following to your `rules.mk`:
 UNICODE_ENABLE = yes
 ```
 
-Then add `UC(c)` keycodes to your keymap, where _c_ is the code point (preferably in hexadecimal, up to 4 digits long). For example: `UC(0x45B)`, `UC(0x30C4)`.
+Then add `UC(c)` keycodes to your keymap, where _c_ is the code point of the desired character (preferably in hexadecimal, up to 4 digits long). For example, `UC(0x40B)` will output [Ћ](https://unicode-table.com/en/040B/), and `UC(0x30C4)` will output [ツ](https://unicode-table.com/en/30C4).
 
-## Unicode Map
+<br>
 
-This method supports all possible code points (up to `0x10FFFF`); however, you need to maintain a separate mapping table in your keymap file, which may contain at most 16384 entries.
+### 1.2. Unicode Map :id=unicode-map
+
+In addition to standard character ranges, this method also covers emoji, ancient scripts, rare symbols etc. In fact, all possible code points (up to `0x10FFFF`) are supported. Here, Unicode characters are stored in a separate mapping table. You need to maintain a `unicode_map` array in your keymap file, which may contain at most 16384 entries.
 
 Add the following to your `rules.mk`:
 
@@ -26,7 +42,7 @@ Add the following to your `rules.mk`:
 UNICODEMAP_ENABLE = yes
 ```
 
-Then add `X(i)` keycodes to your keymap, where _i_ is an array index into the mapping table:
+Then add `X(i)` keycodes to your keymap, where _i_ is the desired character's index in the mapping table. This can be a numeric value, but it's recommended to keep the indices in an enum and access them by name.
 
 ```c
 enum unicode_names {
@@ -44,15 +60,17 @@ const uint32_t PROGMEM unicode_map[] = {
 
 Then you can use `X(BANG)`, `X(SNEK)` etc. in your keymap.
 
-### Lower and Upper Case
+#### Lower and Upper Case
 
 Characters often come in lower and upper case pairs, such as å and Å. To make inputting these characters easier, you can use `XP(i, j)` in your keymap, where _i_ and _j_ are the mapping table indices of the lower and upper case character, respectively. If you're holding down Shift or have Caps Lock turned on when you press the key, the second (upper case) character will be inserted; otherwise, the first (lower case) version will appear.
 
 This is most useful when creating a keymap for an international layout with special characters. Instead of having to put the lower and upper case versions of a character on separate keys, you can have them both on the same key by using `XP()`. This helps blend Unicode keys in with regular alphas.
 
-Due to keycode size constraints, _i_ and _j_ can each only refer to one of the first 128 characters in your `unicode_map`. In other words, 0 ≤ _i_ ≤ 127 and 0 ≤ _j_ ≤ 127. This is enough for most use cases, but if you'd like to customize the index calculation, you can override the [`unicodemap_index()`](https://github.com/qmk/qmk_firmware/blob/71f640d47ee12c862c798e1f56392853c7b1c1a8/quantum/process_keycode/process_unicodemap.c#L40) function. This also allows you to, say, check Ctrl instead of Shift/Caps.
+Due to keycode size constraints, _i_ and _j_ can each only refer to one of the first 128 characters in your `unicode_map`. In other words, 0 ≤ _i_ ≤ 127 and 0 ≤ _j_ ≤ 127. This is enough for most use cases, but if you'd like to customize the index calculation, you can override the [`unicodemap_index()`](https://github.com/qmk/qmk_firmware/blob/71f640d47ee12c862c798e1f56392853c7b1c1a8/quantum/process_keycode/process_unicodemap.c#L36) function. This also allows you to, say, check Ctrl instead of Shift/Caps.
 
-## UCIS
+<br>
+
+### 1.3. UCIS :id=ucis
 
 This method also supports all possible code points. As with the Unicode Map method, you need to maintain a mapping table in your keymap file. However, there are no built-in keycodes for this feature — you have to create a custom keycode or function that invokes this functionality.
 
@@ -77,7 +95,7 @@ By default, each table entry may be up to 3 code points long. This number can be
 
 To use UCIS input, call `qk_ucis_start()`. Then, type the mnemonic for the character (such as "rofl") and hit Space, Enter or Esc. QMK should erase the "rofl" text and insert the laughing emoji.
 
-### Customization
+#### Customization
 
 There are several functions that you can define in your keymap to customize the functionality of this feature.
 
@@ -87,7 +105,8 @@ There are several functions that you can define in your keymap to customize the
 
 You can find the default implementations of these functions in [`process_ucis.c`](https://github.com/qmk/qmk_firmware/blob/master/quantum/process_keycode/process_ucis.c).
 
-## Input Modes
+
+## 2. Input Modes :id=input-modes
 
 Unicode input in QMK works by inputting a sequence of characters to the OS, sort of like a macro. Unfortunately, the way this is done differs for each platform. Specifically, each platform requires a different combination of keys to trigger Unicode input. Therefore, a corresponding input mode has to be set in QMK.
 
@@ -96,54 +115,67 @@ The following input modes are available:
 * **`UC_MAC`**: macOS built-in Unicode hex input. Supports code points up to `0x10FFFF` (all possible code points).
 
   To enable, go to _System Preferences > Keyboard > Input Sources_, add _Unicode Hex Input_ to the list (it's under _Other_), then activate it from the input dropdown in the Menu Bar.
-  By default, this mode uses the left Option key (`KC_LALT`) for Unicode input, but this can be changed by defining [`UNICODE_KEY_MAC`](#input-key-configuration) with another keycode.
+  By default, this mode uses the left Option key (`KC_LALT`) for Unicode input, but this can be changed by defining [`UNICODE_KEY_MAC`](#input-key-configuration) with a different keycode.
 
-  !> Using the _Unicode Hex Input_ input source may disable some Option based shortcuts, such as Option + Left Arrow and Option + Right Arrow.
+  !> Using the _Unicode Hex Input_ input source may disable some Option-based shortcuts, such as Option+Left and Option+Right.
 
-  !> `UC_OSX` is a deprecated alias of `UC_MAC` that will be removed in a future version of QMK.
+  !> `UC_OSX` is a deprecated alias of `UC_MAC` that will be removed in future versions of QMK. All new keymaps should use `UC_MAC`.
 
 * **`UC_LNX`**: Linux built-in IBus Unicode input. Supports code points up to `0x10FFFF` (all possible code points).
 
   Enabled by default and works almost anywhere on IBus-enabled distros. Without IBus, this mode works under GTK apps, but rarely anywhere else.
-  By default, this mode uses Ctrl+Shift+U (`LCTL(LSFT(KC_U))`) to start Unicode input, but this can be changed by defining [`UNICODE_KEY_LNX`](#input-key-configuration) with another keycode. This might be required for IBus versions ≥1.5.15, where Ctrl+Shift+U behavior is consolidated into Ctrl+Shift+E.
+  By default, this mode uses Ctrl+Shift+U (`LCTL(LSFT(KC_U))`) to start Unicode input, but this can be changed by defining [`UNICODE_KEY_LNX`](#input-key-configuration) with a different keycode. This might be required for IBus versions ≥1.5.15, where Ctrl+Shift+U behavior is consolidated into Ctrl+Shift+E.
 
 * **`UC_WIN`**: _(not recommended)_ Windows built-in hex numpad Unicode input. Supports code points up to `0xFFFF`.
 
-  To enable, create a registry key under `HKEY_CURRENT_USER\Control Panel\Input Method\EnableHexNumpad` of type `REG_SZ` called `EnableHexNumpad` and set its value to `1`. This can be done from the Command Prompt by running `reg add "HKCU\Control Panel\Input Method" -v EnableHexNumpad -t REG_SZ -d 1` with administrator privileges. Reboot afterwards.
+  To enable, create a registry key under `HKEY_CURRENT_USER\Control Panel\Input Method` of type `REG_SZ` called `EnableHexNumpad` and set its value to `1`. This can be done from the Command Prompt by running `reg add "HKCU\Control Panel\Input Method" -v EnableHexNumpad -t REG_SZ -d 1` with administrator privileges. Reboot afterwards.
   This mode is not recommended because of reliability and compatibility issues; use the `UC_WINC` mode instead.
 
 * **`UC_BSD`**: _(non implemented)_ Unicode input under BSD. Not implemented at this time. If you're a BSD user and want to help add support for it, please [open an issue on GitHub](https://github.com/qmk/qmk_firmware/issues).
 
 * **`UC_WINC`**: Windows Unicode input using [WinCompose](https://github.com/samhocevar/wincompose). As of v0.9.0, supports code points up to `0x10FFFF` (all possible code points).
 
-  To enable, install the [latest release](https://github.com/samhocevar/wincompose/releases/latest). Once installed, WinCompose will automatically run on startup. Works reliably under all version of Windows supported by the app.
-  By default, this mode uses right Alt (`KC_RALT`) as the Compose key, but this can be changed in the WinCompose settings and by defining [`UNICODE_KEY_WINC`](#input-key-configuration) with another keycode.
+  To enable, install the [latest release](https://github.com/samhocevar/wincompose/releases/latest). Once installed, WinCompose will automatically run on startup. This mode works reliably under all version of Windows supported by the app.
+  By default, this mode uses right Alt (`KC_RALT`) as the Compose key, but this can be changed in the WinCompose settings and by defining [`UNICODE_KEY_WINC`](#input-key-configuration) with a different keycode.
 
-### Switching Input Modes
 
-There are two ways to set the input mode for Unicode: by keycode or by function. Keep in mind that both methods write to persistent storage (EEPROM), and are loaded each time the keyboard starts. So once you've set it the first time, you don't need to set it again unless you want to change it, or you've reset the EEPROM settings.
+## 3. Setting the Input Mode :id=setting-the-input-mode
 
-You can switch the input mode at any time by using one of the following keycodes. The easiest way is to add the ones you use to your keymap.
-
-|Keycode               |Alias    |Input Mode  |Description                                                   |
-|----------------------|---------|------------|--------------------------------------------------------------|
-|`UNICODE_MODE_FORWARD`|`UC_MOD` |Next in list|[Cycle](#input-mode-cycling) through selected modes           |
-|`UNICODE_MODE_REVERSE`|`UC_RMOD`|Prev in list|[Cycle](#input-mode-cycling) through selected modes in reverse|
-|`UNICODE_MODE_MAC`    |`UC_M_MA`|`UC_MAC`    |Switch to macOS input                                         |
-|`UNICODE_MODE_LNX`    |`UC_M_LN`|`UC_LNX`    |Switch to Linux input                                         |
-|`UNICODE_MODE_WIN`    |`UC_M_WI`|`UC_WIN`    |Switch to Windows input                                       |
-|`UNICODE_MODE_BSD`    |`UC_M_BS`|`UC_BSD`    |Switch to BSD input (not implemented)                         |
-|`UNICODE_MODE_WINC`   |`UC_M_WC`|`UC_WINC`   |Switch to Windows input using WinCompose                      |
-
-You can also switch the input mode by calling `set_unicode_input_mode(x)` in your code, where _x_ is one of the above input mode constants (e.g. `UC_LNX`). Since the function only needs to be called once, it's recommended that you do it in `eeconfig_init_user()` (or a similar function). For example:
+To set your desired input mode, add the following define to your `config.h`:
 
 ```c
-void eeconfig_init_user(void) {
-    set_unicode_input_mode(UC_LNX);
-}
+#define UNICODE_SELECTED_MODES UC_LNX
 ```
 
-### Audio Feedback
+This example sets the board's default input mode to `UC_LNX`. You can replace this with `UC_MAC`, `UC_WINC`, or any of the other modes listed [above](#input-modes). The board will automatically use the selected mode on startup, unless you manually switch to another mode (see [below](#keycodes)).
+
+You can also select multiple input modes, which allows you to easily cycle through them using the `UC_MOD`/`UC_RMOD` keycodes.
+
+```c
+#define UNICODE_SELECTED_MODES UC_MAC, UC_LNX, UC_WINC
+```
+
+Note that the values are separated by commas. The board will remember the last used input mode and will continue using it on next power-up. You can disable this and force it to always start with the first mode in the list by adding `#define UNICODE_CYCLE_PERSIST false` to your `config.h`.
+
+#### Keycodes
+
+You can switch the input mode at any time by using the following keycodes. Adding these to your keymap allows you to quickly switch to a specific input mode, including modes not listed in `UNICODE_SELECTED_MODES`.
+
+|Keycode               |Alias    |Input Mode  |Description                                                                  |
+|----------------------|---------|------------|-----------------------------------------------------------------------------|
+|`UNICODE_MODE_FORWARD`|`UC_MOD` |Next in list|Cycle through selected modes, reverse direction when Shift is held           |
+|`UNICODE_MODE_REVERSE`|`UC_RMOD`|Prev in list|Cycle through selected modes in reverse, forward direction when Shift is held|
+|`UNICODE_MODE_MAC`    |`UC_M_MA`|`UC_MAC`    |Switch to macOS input                                                        |
+|`UNICODE_MODE_LNX`    |`UC_M_LN`|`UC_LNX`    |Switch to Linux input                                                        |
+|`UNICODE_MODE_WIN`    |`UC_M_WI`|`UC_WIN`    |Switch to Windows input                                                      |
+|`UNICODE_MODE_BSD`    |`UC_M_BS`|`UC_BSD`    |Switch to BSD input _(not implemented)_                                      |
+|`UNICODE_MODE_WINC`   |`UC_M_WC`|`UC_WINC`   |Switch to Windows input using WinCompose                                     |
+
+You can also switch the input mode by calling `set_unicode_input_mode(x)` in your code, where _x_ is one of the above input mode constants (e.g. `UC_LNX`).
+
+?> Using `UNICODE_SELECTED_MODES` is preferable to calling `set_unicode_input_mode()` in `matrix_init_user()` or similar functions, since it's better integrated into the Unicode system and has the added benefit of avoiding unnecessary writes to EEPROM.
+
+#### Audio Feedback
 
 If you have the [Audio feature](feature_audio.md) enabled on the board, you can set melodies to be played when you press the above keys. That way you can have some audio feedback when switching input modes.
 
@@ -157,20 +189,21 @@ For instance, you can add these definitions to your `config.h` file:
 #define UNICODE_SONG_WINC UNICODE_WINDOWS
 ```
 
-### Additional Customization
+
+## Additional Customization
 
 Because Unicode is a large and versatile feature, there are a number of options you can customize to make it work better on your system.
 
-#### Start and Finish Input Functions
+### Start and Finish Input Functions
 
 The functions for starting and finishing Unicode input on your platform can be overridden locally. Possible uses include customizing input mode behavior if you don't use the default keys, or adding extra visual/audio feedback to Unicode input.
 
-* `void unicode_input_start(void)` – This sends the initial sequence that tells your platform to enter Unicode input mode. For example, it presses Ctrl+Shift+U on Linux and holds the Option key on macOS.
-* `void unicode_input_finish(void)` – This is called to exit Unicode input mode, for example by pressing Space or releasing the Option key.
+* `void unicode_input_start(void)` – This sends the initial sequence that tells your platform to enter Unicode input mode. For example, it holds the left Alt key followed by Num+ on Windows, and presses the `UNICODE_KEY_LNX` combination (default: Ctrl+Shift+U) on Linux.
+* `void unicode_input_finish(void)` – This is called to exit Unicode input mode, for example by pressing Space or releasing the Alt key.
 
 You can find the default implementations of these functions in [`process_unicode_common.c`](https://github.com/qmk/qmk_firmware/blob/master/quantum/process_keycode/process_unicode_common.c).
 
-#### Input Key Configuration
+### Input Key Configuration
 
 You can customize the keys used to trigger Unicode input for macOS, Linux and WinCompose by adding corresponding defines to your `config.h`. The default values match the platforms' default settings, so you shouldn't need to change this unless Unicode input isn't working, or you want to use a different key (e.g. in order to free up left or right Alt).
 
@@ -180,54 +213,47 @@ You can customize the keys used to trigger Unicode input for macOS, Linux and Wi
 |`UNICODE_KEY_LNX` |`uint16_t`|`LCTL(LSFT(KC_U))`|`#define UNICODE_KEY_LNX  LCTL(LSFT(KC_E))`|
 |`UNICODE_KEY_WINC`|`uint8_t` |`KC_RALT`         |`#define UNICODE_KEY_WINC KC_RGUI`         |
 
-#### Input Mode Cycling
 
-You can choose which input modes are available for cycling through. By default, this is disabled. If you want to enable it, limiting it to just the modes you use makes sense. Note that the values in the list are comma-delimited.
+## Sending Unicode Strings
 
-```c
-#define UNICODE_SELECTED_MODES UC_MAC, UC_LNX, UC_WIN, UC_WINC
-```
+QMK provides several functions that allow you to send Unicode input to the host programmatically:
 
-You can cycle through the selected modes by using the `UC_MOD`/`UC_RMOD` keycodes, or by calling `cycle_unicode_input_mode(offset)` in your code (`offset` is how many modes to move forward by, so +1 corresponds to `UC_MOD`).
+### `send_unicode_string()`
 
-By default, when the keyboard boots, it will initialize the input mode to the last one you used. You can disable this and make it start with the first mode in the list every time by adding the following to your `config.h`:
-
-```c
-#define UNICODE_CYCLE_PERSIST false
-```
-
-!> Using `UNICODE_SELECTED_MODES` means you don't have to initially set the input mode in `matrix_init_user()` (or a similar function); the Unicode system will do that for you on startup. This has the added benefit of avoiding unnecessary writes to EEPROM.
-
-## `send_unicode_string()`
-
-This function is much like `send_string()` but allows you to input UTF-8 characters directly, and supports all code points (provided the selected input method also supports it). Make sure your `keymap.c` is formatted in UTF-8 encoding.
+This function is much like `send_string()`, but it allows you to input UTF-8 characters directly. It supports all code points, provided the selected input mode also supports it. Make sure your `keymap.c` file is formatted using UTF-8 encoding.
 
 ```c
 send_unicode_string("(ノಠ痊ಠ)ノ彡┻━┻");
 ```
 
-## `send_unicode_hex_string()`
+Example uses include sending Unicode strings when a key is pressed, as described in [Macros](feature_macros.md).
 
-Similar to `send_unicode_string()`, but the characters are represented by their code point values in ASCII, separated by spaces. For example, the table flip above would be achieved with:
+### `send_unicode_hex_string()`
+
+Similar to `send_unicode_string()`, but the characters are represented by their Unicode code points, written in hexadecimal and separated by spaces. For example, the table flip above would be achieved with:
 
 ```c
 send_unicode_hex_string("0028 30CE 0CA0 75CA 0CA0 0029 30CE 5F61 253B 2501 253B");
 ```
 
-An easy way to convert your Unicode string to this format is by using [this site](https://r12a.github.io/app-conversion/), and taking the result in the "Hex/UTF-32" section.
+An easy way to convert your Unicode string to this format is to use [this site](https://r12a.github.io/app-conversion/) and take the result in the "Hex/UTF-32" section.
+
 
 ## Additional Language Support
 
-In `quantum/keymap_extras/`, you'll see various language files - these work the same way as the alternative layout ones do. Most are defined by their two letter country/language code followed by an underscore and a 4-letter abbreviation of its name. `FR_UGRV` which will result in a `ù` when using a software-implemented AZERTY layout. It's currently difficult to send such characters in just the firmware.
+In `quantum/keymap_extras`, you'll see various language files — these work the same way as the ones for alternative layouts such as Colemak or BÉPO. When you include one of these language headers, you gain access to keycodes specific to that language / national layout. Such keycodes are defined by a 2-letter country/language code, followed by an underscore and a 4-letter abbreviation of the character to which the key corresponds. For example, including `keymap_french.h` and using `FR_UGRV` in your keymap will output `ù` when typed on a system with a native French AZERTY layout.
+
+If the primary system layout you use on your machine is different from US ANSI, using these language-specific keycodes can help your QMK keymaps better match what will actually be output on the screen. However, keep in mind that these keycodes are just aliases for the corresponding default US keycodes under the hood, and that the HID protocol used by keyboards is itself inherently based on US ANSI.
+
 
 ## International Characters on Windows
 
-### AutoHotkey allows Windows users to create custom hotkeys among others.
+### AutoHotkey
 
-The method does not require Unicode support in the keyboard itself but depends instead of [AutoHotkey](https://autohotkey.com) running in the background.
+The method does not require Unicode support in the keyboard itself but instead depends on [AutoHotkey](https://autohotkey.com) running in the background.
 
 First you need to select a modifier combination that is not in use by any of your programs.
-CtrlAltWin is not used very widely and should therefore be perfect for this.
+Ctrl+Alt+Win is not used very widely and should therefore be perfect for this.
 There is a macro defined for a mod-tab combo `LCAG_T`.
 Add this mod-tab combo to a key on your keyboard, e.g.: `LCAG_T(KC_TAB)`.
 This makes the key behave like a tab key if pressed and released immediately but changes it to the modifier if used with another key.
@@ -242,8 +268,5 @@ AutoHotkey inserts the Text right of `Send, ` when this combination is pressed.
 
 ### US International
 
-If you enable the US International layout on the system, it will use punctuation to accent the characters.
-
-For instance, typing "\`a" will result in à.
-
+If you enable the US International layout on the system, it will use punctuation to accent the characters. For instance, typing "\`a" will result in à.
 You can find details on how to enable this [here](https://support.microsoft.com/en-us/help/17424/windows-change-keyboard-layout).

docs/ja/_summary.md

@@ -106,7 +106,7 @@
     * [Velocikey](ja/feature_velocikey.md)
 
 * QMK の開発
-  * 破壊的な変更
+  * 互換性を破る変更/Breaking changes
     * [概要](ja/breaking_changes.md)
     * [プルリクエストにフラグが付けられた](ja/breaking_changes_instructions.md)
     * 履歴

docs/ja/breaking_changes.md

@@ -0,0 +1,120 @@
+# Breaking changes/互換性を破る変更
+
+<!---
+  grep --no-filename "^[ ]*git diff" docs/ja/*.md | sh
+  original document: 0.9.0:docs/breaking_changes.md
+  git diff 0.9.0 HEAD -- docs/breaking_changes.md | cat
+-->
+
+このドキュメントは QMK の互換性を破る変更(Breaking change) のプロセスについて説明します。
+互換性を破る変更とは、互換性がなかったり潜在的な危険が生じるように QMK の動作を変える変更を指します。
+ユーザが QMK ツリーを更新しても自分のキーマップが壊れない事を確信できるように、これらの変更を制限します。(訳注：以後、原文のまま Breaking change を用語として使用します。)
+
+Breaking change ピリオドとは、危険な変更、または予想外の変更を QMK へ行なう PR をマージする時のことです。
+付随するテスト期間があるため、問題が起きることはまれか、有りえないと確信しています。
+
+## 過去の Breaking change には何が含まれますか？
+
+* [2020年5月30日](ja/ChangeLog/20200530.md)
+* [2020年2月29日](ja/ChangeLog/20200229.md)
+* [2019年8月30日](ja/ChangeLog/20190830.md)
+
+## 次の Breaking change はいつですか？
+
+次の Breaking change は2020年8月29日に予定されています。
+
+### 重要な日付
+
+* [x] 2020年 5月30日 - `develop` が作成されました。毎週リベースされます。
+* [ ] 2020年 8月 1日 - `develop` は新しいPRを取り込みません。
+* [ ] 2020年 8月 1日 - テスターの募集。
+* [ ] 2020年 8月27日 - `master`がロックされ、PR はマージされません。
+* [ ] 2020年 8月29日 - `develop` を `master` にマージします。
+* [ ] 2020年 8月29日 - `master` のロックが解除されます。PR を再びマージすることができます。
+
+## どのような変更が含まれますか？
+
+最新の Breaking change 候補を見るには、[`breaking_change` ラベル](https://github.com/qmk/qmk_firmware/pulls?q=is%3Aopen+label%3Abreaking_change+is%3Apr)を参照してください。
+現在から `develop` が閉じられるまでの間に新しい変更が追加される可能性があり、そのラベルが適用された PR はマージされることは保証されていません。
+
+このラウンドに、あなたの Breaking change を含めたい場合は、`breaking_change` ラベルを持つ PR を作成し、`develop` が閉じる前に承認してもらう必要があります。
+`develop` が閉じた後は、新しい Breaking change は受け付けられません。
+
+受け入れの基準:
+
+* PR が完了し、マージの準備ができている
+* PR が ChangeLog を持つ
+
+# チェックリスト
+
+ここでは、Breaking change プロセスを実行する時に使用する様々なプロセスについて説明します。
+
+## `master` から `develop` をリベースします
+
+これは `develop` が開いている間、毎週金曜日に実行されます。
+
+プロセス:
+
+```
+cd qmk_firmware
+git checkout master
+git pull --ff-only
+git checkout develop
+git rebase master
+git push --force
+```
+
+## `develop` ブランチの作成
+
+以前の `develop` ブランチがマージされた直後に、これが発生します。
+
+* `qmk_firmware` git commands
+   * [ ] `git checkout master`
+   * [ ] `git pull --ff-only`
+   * [ ] `git checkout -b develop`
+   * [ ] Edit `readme.md`
+      * [ ] これがテストブランチであることを上部に大きな通知で追加します。
+      * [ ] このドキュメントへのリンクを含めます
+   * [ ] `git commit -m 'Branch point for <DATE> Breaking Change'`
+   * [ ] `git tag breakpoint_<YYYY>_<MM>_<DD>`
+   * [ ] `git tag <next_version>` # ブレーキング ポイント タグがバージョンの増分を混乱させないようにします
+   * [ ] `git push origin develop`
+   * [ ] `git push --tags`
+
+## マージの 4 週間前
+
+* `develop` は新しい PR に対して閉じられ、現在の PR の修正のみがマージされる可能性があります。
+* テスターの呼び出しを投稿します
+   * [ ] Discord
+   * [ ] GitHub PR
+   * [ ] https://reddit.com/r/olkb
+
+## マージの 1 週間前
+
+* master が < 2 日前> から <マージの日> まで閉じられることを発表します
+   * [ ] Discord
+   * [ ] GitHub PR
+   * [ ] https://reddit.com/r/olkb
+
+## マージの 2 日前
+
+* master が 2 日間閉じられることを発表します
+   * [ ] Discord
+   * [ ] GitHub PR
+   * [ ] https://reddit.com/r/olkb
+
+## マージの日
+
+* `qmk_firmware` git commands
+   * [ ] `git checkout develop`
+   * [ ] `git pull --ff-only`
+   * [ ] `git rebase origin/master`
+   * [ ] Edit `readme.md`
+      * [ ] `develop` についてのメモを削除
+   * [ ] ChangeLog を 1 つのファイルにまとめます。
+   * [ ] `git commit -m 'Merge point for <DATE> Breaking Change'`
+   * [ ] `git push origin develop`
+* GitHub Actions
+   * [ ] `develop`の PR を作成します
+   * [ ] travis がクリーンに戻ったことを確認します
+   * [ ] `develop` PR をマージします

docs/ja/breaking_changes_instructions.md

@@ -0,0 +1,51 @@
+# breaking changes/互換性を破る変更: プルリクエストにフラグが付けられた
+
+<!---
+  grep --no-filename "^[ ]*git diff" docs/ja/*.md | sh
+  original document: 0.9.0:docs/breaking_changes_instructions.md
+  git diff 0.9.0 HEAD -- docs/breaking_changes_instructions.md | cat
+-->
+
+QMK のメンバーがあなたのプルリクエストに返信し、あなたの提出したものは Breaking change (互換性を破る変更) であると述べている場合があります。メンバーの判断では、あなたが提案した変更は QMK やその利用者にとってより大きな影響を持つと考えられます。
+
+プルリクエストにフラグが立てられる原因となるものには、以下のようなものがあります:
+
+- **ユーザーのキーマップに対する編集**
+  ユーザーが自分のキーマップを QMK に提出した後、しばらくしてさらに更新してプルリクエストを開いたところ、それが `qmk/qmk_firmware` リポジトリで編集されていたためにマージできなかったことに気づくことがあるかもしれません。すべてのユーザーが Git や GitHub を使いこなせるわけではないので、ユーザー自身で問題を修正できないことに気づくかもしれません。
+- **期待される動作の変更**
+  QMK の動作を変更すると、既存の QMK 機能への変更を組み込んだ新しいファームウェアをフラッシュした場合、ユーザはハードウェアまたは QMK が壊れていると考え、希望する動作を復元する手段がないことに気付くことがあります。
+- **ユーザーのアクションを必要とする変更**
+  変更には、ツールチェインを更新したり、Git で何らかのアクションを取るなど、ユーザーがアクションを行う必要がある場合もあります。
+- **精査が必要な変更**
+  時には、投稿がプロジェクトとしての QMK に影響を与えることもあります。これは、著作権やライセンスの問題、コーディング規約、大規模な機能のオーバーホール、コミュニティによるより広範なテストを必要とする「リスクの高い」変更、あるいは全く別のものである可能性があります。
+- **エンドユーザーとのコミュニケーションを必要とする変更**
+  これには、将来の非推奨化への警告、時代遅れの慣習、その他伝えなければならないが上記のカテゴリのどれかに当てはまらないものが含まれます。
+
+## 何をすればいいのか?
+
+提出したものが Breaking change だと判断された場合、手続きをスムーズに進めるためにできることがいくつかあります。
+
+### PR を分割することを検討する
+
+あなたがコアコードを投稿していて、それが Breaking change プロセスを経る必要がある唯一の理由が、あなたの変更に合わせてキーマップを更新していることである場合、古いキーマップが機能し続けるような方法であなたの機能を投稿できるかどうかを検討してください。
+そののち、Breaking change プロセスを経て古いコードを削除する別の PR を提出してください。
+
+### ChangeLog エントリの提供
+
+Breaking change プロセスを経て提出する際には、変更ログのエントリを含めることを我々は要請します。
+エントリーは、あなたのプルリクエストが行う変更の短い要約としてください &ndash; [ここの各セクションは changelog として開始されました](ja/ChangeLog/20190830.md "n.b. This should link to the 2019 Aug 30 Breaking Changes doc - @noroadsleft")。
+
+変更ログは `docs/ChangeLog/YYYYMMDD/PR####.md` に置いてください。
+ここで、`YYYYMMDD` は QMK の breaking change ブランチ &ndash; 通常は `develop` という名称 &ndash; が `master` ブランチにマージされる日付、`####` はプルリクエストの番号です。
+
+ユーザー側でのアクションを必要とする場合、あなたの変更ログは、どのようなアクションを取らなければならないかをユーザーに指示するか、そのようなアクションを指示する場所にリンクする必要があります。
+
+### 変更点を文書化する
+
+提出物の目的を理解し、それが必要とする可能性のある意味合いやアクションを理解することで、レビュープロセスをより簡単にすることができます。この目的のためには変更履歴で十分かもしれませんが、より広範囲の変更を行う場合には、変更履歴には不向きな詳細レベルが必要になるかもしれません。
+
+あなたのプルリクエストにコメントしたり、質問やコメント、変更要求に対応したりすることは、非常にありがたいことです。
+
+### 助けを求める
+
+あなたの提出物にフラグが立ったことで、あなたはびっくりしてしまったかもしれません。もし、あなた自身が脅されたり、圧倒されたりしていると感じたら、私たちに知らせてください。プルリクエストにコメントするか、[Discord で QMK チームに連絡を取ってください](https://discord.gg/Uq7gcHh)。

docs/ja/cli_configuration.md

@@ -1,8 +1,8 @@
 # QMK CLI 設定
 
 <!---
-  original document: d598f01cb:docs/cli_configuration.md
-  git diff d598f01cb HEAD -- docs/cli_configuration.md | cat
+  original document: 0.9.0:docs/cli_configuration.md
+  git diff 0.9.0 HEAD -- docs/cli_configuration.md | cat
 -->
 
 このドキュメントは `qmk config` がどのように動作するかを説明します。

docs/ja/driver_installation_zadig.md

@@ -1,8 +1,8 @@
 # Zadig を使ったブートローダドライバのインストール
 
 <!---
-  original document: d598f01cb:docs/driver_installation_zadig.md
-  git diff d598f01cb HEAD -- docs/driver_installation_zadig.md | cat
+  original document: 0.9.0:docs/driver_installation_zadig.md
+  git diff 0.9.0 HEAD -- docs/driver_installation_zadig.md | cat
 -->
 
 QMK はホストにたいして通常の HID キーボードデバイスとして振る舞うため特別なドライバは必要ありません。しかし、Windows でのキーボードへの書き込みは、多くの場合、キーボードをリセットした時に現れるブートローダデバイスで*行います*。

docs/ja/faq_debug.md

@@ -1,8 +1,8 @@
 # デバッグの FAQ
 
 <!---
-  original document: 376419a4f:docs/faq_debug.md
-  git diff 376419a4f HEAD -- docs/faq_debug.md | cat
+  original document: 0.9.10:docs/faq_debug.md
+  git diff 0.9.10 HEAD -- docs/faq_debug.md | cat
 -->
 
 このページは、キーボードのトラブルシューティングについての様々な一般的な質問を説明します。

docs/ja/feature_audio.md

@@ -1,8 +1,8 @@
 # オーディオ
 
 <!---
-  original document: 5d5ff80:docs/feature_audio.md
-  git diff 5d5ff80 HEAD -- docs/feature_audio.md | cat
+  original document: 0.9.0:docs/feature_audio.md
+  git diff 0.9.0 HEAD -- docs/feature_audio.md | cat
 -->
 
 キーボードは音を出すことができます！Planck、Preonic あるいは特定の PWM 対応ピンにアクセスできる AVR キーボードがある場合は、単純なスピーカーを接続してビープ音を鳴らすことができます。これらのビープ音を使ってレイヤーの変化、モディファイア、特殊キーを示したり、あるいは単にイカした8ビットの曲を鳴らすことができます。

docs/ja/feature_auto_shift.md

@@ -1,8 +1,8 @@
 # 自動シフト: なぜシフトキーが必要ですか？
 
 <!---
-  original document: 5d5ff80:docs/feature_auto_shift.md
-  git diff 5d5ff80 HEAD -- docs/feature_auto_shift.md | cat
+  original document: 0.9.0:docs/feature_auto_shift.md
+  git diff 0.9.0 HEAD -- docs/feature_auto_shift.md | cat
 -->
 
 キーをタップすると、その文字を取得します。キーをタップするが、*わずかに*長く押し続けると、シフト状態になります。ほら！シフトキーは必要ありません！

docs/ja/feature_bluetooth.md

@@ -1,8 +1,8 @@
 # Bluetooth
 
 <!---
-  original document: 5d5ff80:docs/feature_bluetooth.md
-  git diff 5d5ff80 HEAD -- docs/feature_bluetooth.md | cat
+  original document: 0.9.0:docs/feature_bluetooth.md
+  git diff 0.9.0 HEAD -- docs/feature_bluetooth.md | cat
 -->
 
 ## Bluetooth の既知のサポートハードウェア

docs/ja/feature_bootmagic.md

@@ -1,8 +1,8 @@
 # ブートマジック
 
 <!---
-  original document: 5d5ff80:docs/feature_bootmagic.md
-  git diff 5d5ff80 HEAD -- docs/feature_bootmagic.md | cat
+  original document: 0.9.0:docs/feature_bootmagic.md
+  git diff 0.9.0 HEAD -- docs/feature_bootmagic.md | cat
 -->
 
 再書き込みせずにキーボードの挙動を変更することができる、3つの独立した関連する機能があります。それぞれは似たような機能を持ちますが、キーボードがどのように設定されているかによって異なる方法でアクセスされます。
@@ -149,6 +149,17 @@ BOOTMAGIC_ENABLE = lite
 
 !> ブートマジックライトを使用すると、EEPROM を**常にリセットします**。つまり保存された全ての設定は失われます。
 
+## 分割キーボード
+
+`SPLIT_HAND_PIN` のようなオプションで、左右の設定があらかじめ決められている場合は、キーボードの左右で別のキーを設定する必要があるかもしれません。これを行うには、`config.h` ファイルに以下のエントリを追加します。
+
+```c
+#define BOOTMAGIC_LITE_ROW_RIGHT 4
+#define BOOTMAGIC_LITE_COLUMN_RIGHT 1
+```
+
+デフォルトでは、これらの値は設定されていません。
+
 ## 高度なブートマジックライト
 
 `bootmagic_lite` 関数は必要に応じてコード内で置き換えることができるように、弱く定義されています。これの良い例は Zeal60 キーボードで、追加の処理が必要です。

docs/ja/feature_pointing_device.md

@@ -32,7 +32,7 @@ report_mouse_t (ここでは "mouseReport") が以下のプロパティを持つ
 
 ```c
 case MS_SPECIAL:
-	report_mouse_t currentReport = pointing_device_get_report();
+    report_mouse_t currentReport = pointing_device_get_report();
     if (record->event.pressed) {
         currentReport.v = 127;
         currentReport.h = 127;
@@ -42,7 +42,7 @@ case MS_SPECIAL:
         currentReport.h = -127;
         currentReport.buttons &= ~MOUSE_BTN1;
     }
-	pointing_device_set_report(currentReport);
+    pointing_device_set_report(currentReport);
     break;
 ```
 

docs/ja/feature_tap_dance.md

@@ -1,8 +1,8 @@
 # タップダンス: 1つのキーが3つ、5つまたは100の異なる動作をします
 
 <!---
-  original document: 634b277b0:docs/feature_tap_dance.md
-  git diff 634b277b0 HEAD -- docs//feature_tap_dance.md | cat
+  original document: 0.9.0:docs/feature_tap_dance.md
+  git diff 0.9.0 HEAD -- docs/feature_tap_dance.md | cat
 --> 
 
 ## イントロダクション

docs/ja/flashing.md

@@ -1,8 +1,8 @@
 # 書き込みの手順とブートローダ情報
 
 <!---
-  original document: 0.8.62:docs/flashing.md
-  git diff 0.8.62 HEAD -- docs/flashing.md | cat
+  original document: 0.9.10:docs/flashing.md
+  git diff 0.9.10 HEAD -- docs/flashing.md | cat
 -->
 
 キーボードが使用するブートローダにはかなり多くの種類があり、ほぼ全てが異なる書き込みの方法を使います。幸いなことに、[QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases) のようなプロジェクトは、あまり深く考える必要無しに様々なタイプと互換性を持つことを目指していますが、この文章では様々なタイプのブートローダとそれらを書き込むために利用可能な方法について説明します。

docs/ja/getting_started_make_guide.md

@@ -1,8 +1,8 @@
 # より詳細な `make` 手順
 
 <!---
-  original document: 5f35203d1:docs/getting_started_make_guide.md
-  git diff 5f35203d1 HEAD -- docs/getting_started_make_guide.md | cat
+  original document: 0.9.0:docs/getting_started_make_guide.md
+  git diff 0.9.0 HEAD -- docs/getting_started_make_guide.md | cat
 -->
 
 `make` コマンドの完全な構文は `<keyboard_folder>:<keymap>:<target>` です:

docs/ja/getting_started_vagrant.md

@@ -1,8 +1,8 @@
 # Vagrant クイックスタート
 
 <!---
-  original document: 7494490d6:docs/getting_started_vagrant.md
-  git diff 7494490d6 HEAD -- docs/getting_started_vagrant.md | cat
+  original document: 0.9.10:docs/getting_started_vagrant.md
+  git diff 0.9.10 HEAD -- docs/getting_started_vagrant.md | cat
 -->
 
 このプロジェクトは、プライマリオペレーティングシステムに大きな変更を加えることなくキーボードの新しいファームウェアを非常に簡単に構築することができる `Vagrantfile` を含みます。これは、あなたがプロジェクトをクローンしビルドを実行した時に、ビルドのために Vagrantfile を使っている他のユーザと全く同じ環境を持つことも保証します。これにより、人々はあなたが遭遇した問題の解決をより簡単に行えるようになります。

docs/ja/hardware_avr.md

@@ -2,8 +2,8 @@
 
 <!---
   grep --no-filename "^[ ]*git diff" docs/ja/*.md | sh
-  original document: c9e3fa6f7:docs/hardware_avr.md
-  git diff c9e3fa6f7 HEAD -- docs/hardware_avr.md | cat
+  original document: 0.9.0:docs/hardware_avr.md
+  git diff 0.9.0 HEAD -- docs/hardware_avr.md | cat
 -->
 
 このページでは QMK における AVR マイコンのサポートについて説明します。AVR マイコンには、Atmel 社製の atmega32u4、atmega32u2、at90usb1286 やその他のマイコンを含みます。AVR マイコンは、簡単に動かせるよう設計された8ビットの MCU です。キーボードでよく使用される AVR マイコンには USB 機能や大きなキーボードマトリックスのためのたくさんの GPIO を搭載しています。これらは、現在、キーボードで使われる最も一般的な MCU です。

docs/ja/hardware_drivers.md

@@ -2,8 +2,8 @@
 
 <!---
   grep --no-filename "^[ ]*git diff" docs/ja/*.md | sh
-  original document: c9e3fa6f7:docs/hardware_drivers.md
-  git diff c9e3fa6f7 HEAD -- docs/hardware_drivers.md | cat
+  original document: 0.9.0:docs/hardware_drivers.md
+  git diff 0.9.0 HEAD -- docs/hardware_drivers.md | cat
 -->
 
 QMK はたくさんの異なるハードウェアで使われています。最も一般的な MCU とマトリックス構成をサポートしていますが、キーボードへ他のハードウェアを追加し制御するためのドライバーもいくつか用意されています。例えば、マウスやポインティングデバイス、分割キーボード用の IO エキスパンダ、Bluetooth モジュール、LCD、OLED、TFT 液晶などがあります。

docs/ja/hardware_keyboard_guidelines.md

@@ -2,8 +2,8 @@
 
 <!---
   grep --no-filename "^[ ]*git diff" docs/ja/*.md | sh
-  original document: c9e3fa6f7:docs/hardware_keyboard_guidelines.md
-  git diff c9e3fa6f7 HEAD -- docs/hardware_keyboard_guidelines.md | cat
+  original document: 0.9.0:docs/hardware_keyboard_guidelines.md
+  git diff 0.9.0 HEAD -- docs/hardware_keyboard_guidelines.md | cat
 -->
 
 QMK は開始以来、コミュニティにおけるキーボードの作成や保守に貢献しているあなたのような人たちのおかげで飛躍的に成長しました。私たちが成長するにつれて、うまくやるためのいくつかのパターンを発見しました。他の人たちがあなたの苦労の恩恵を受けやすくするため、それにあわせてもらえるようお願いします。
@@ -66,10 +66,77 @@ Clueboard は、サブフォルダをまとめるためとキーボードのリ
 
 全てのプロジェクトには、マトリックスサイズ、製品名、USB VID/PID、説明、その他の設定などが含まれた `config.h` ファイルが必要です。一般に、このファイルを使用して常に機能するキーボードの重要な情報やデフォルトを設定します。
 
+また、`config.h` ファイルはサブフォルダにも置くことができ、その読み込み順は以下の通りです。
+
+* `keyboards/top_folder/config.h`
+  * `keyboards/top_folder/sub_1/config.h`
+    * `keyboards/top_folder/sub_1/sub_2/config.h`
+      * `keyboards/top_folder/sub_1/sub_2/sub_3/config.h`
+        * `keyboards/top_folder/sub_1/sub_2/sub_3/sub_4/config.h`
+          * `users/a_user_folder/config.h`
+          * `keyboards/top_folder/keymaps/a_keymap/config.h`
+        * `keyboards/top_folder/sub_1/sub_2/sub_3/sub_4/post_config.h`
+      * `keyboards/top_folder/sub_1/sub_2/sub_3/post_config.h`
+    * `keyboards/top_folder/sub_1/sub_2/post_config.h`
+  * `keyboards/top_folder/sub_1/post_config.h`
+* `keyboards/top_folder/post_config.h`
+
+`post_config.h` ファイルは、`config.h` ファイルで指定された内容に応じて、追加の後処理を行うために使用することができます。
+例えば、キーマップレベルの `config.h` ファイルで `IOS_DEVICE_ENABLE` マクロを以下のように定義すると、`post_config.h` ファイルでより詳細な設定を行うことができます。
+
+* `keyboards/top_folder/keymaps/a_keymap/config.h`
+  ```c
+  #define IOS_DEVICE_ENABLE
+  ```
+* `keyboards/top_folder/post_config.h`
+  ```c
+  #ifndef IOS_DEVICE_ENABLE
+    // USB_MAX_POWER_CONSUMPTION value for this keyboard
+    #define USB_MAX_POWER_CONSUMPTION 400
+  #else
+    // fix iPhone and iPad power adapter issue
+    // iOS device need lessthan 100
+    #define USB_MAX_POWER_CONSUMPTION 100
+  #endif
+  
+  #ifdef RGBLIGHT_ENABLE
+    #ifndef IOS_DEVICE_ENABLE
+      #define RGBLIGHT_LIMIT_VAL 200
+      #define RGBLIGHT_VAL_STEP 17
+    #else
+      #define RGBLIGHT_LIMIT_VAL 35
+      #define RGBLIGHT_VAL_STEP 4
+    #endif
+    #ifndef RGBLIGHT_HUE_STEP
+      #define RGBLIGHT_HUE_STEP 10
+    #endif
+    #ifndef RGBLIGHT_SAT_STEP
+      #define RGBLIGHT_SAT_STEP 17
+    #endif
+  #endif
+  ```
+
+?> 上記の例のように `post_config.h` でオプションを定義する場合、キーボードやユーザレベルの `config.h` で同じオプションを定義してはいけません。
+
 ### `rules.mk`
 
 このファイルが存在するということは、フォルダがキーボードであり、`make` コマンドで使用できることを意味します。ここでキーボードのビルド環境を構築し、デフォルトの機能を設定します。
 
+`rules.mk` ファイルはサブフォルダにも置くことができ、その読み込み順は以下の通りです。
+
+* `keyboards/top_folder/rules.mk`
+  * `keyboards/top_folder/sub_1/rules.mk`
+    * `keyboards/top_folder/sub_1/sub_2/rules.mk`
+      * `keyboards/top_folder/sub_1/sub_2/sub_3/rules.mk`
+        * `keyboards/top_folder/sub_1/sub_2/sub_3/sub_4/rules.mk`
+          * `keyboards/top_folder/keymaps/a_keymap/rules.mk`
+          * `users/a_user_folder/rules.mk`
+* `common_features.mk`
+
+`rules.mk` ファイルに書かれた多くの設定は `common_features.mk` によって解釈され、必要なソースファイルやコンパイラのオプションが設定されます。
+
+?> 詳しくは `build_keyboard.mk` と `common_features.mk` を見てください。
+
 ### `<keyboard_name.c>`
 
 ここではキーボードのカスタマイズされたコードを記述します。通常、初期化してキーボードのハードウェアを制御するコードを記述します。キーボードが LED やスピーカー、その他付属ハードウェアのないキーマトリックスのみで構成されている場合は空にできます。

docs/newbs_getting_started.md

@@ -41,16 +41,11 @@ We've tried to make QMK as easy to set up as possible. You only have to prepare
 
 You will need to install MSYS2, Git, and the QMK CLI.
 
-* Follow the installation instructions on the [MSYS2 homepage](http://www.msys2.org).
-* Close any open MSYS2 terminals and open a new MSYS2 MinGW 64-bit terminal. NOTE: This is **not** the same as the MSYS terminal that opens when installation is completed.
+Follow the installation instructions on the [MSYS2 homepage](http://www.msys2.org). Close any open MSYS terminals and open a new MinGW 64-bit terminal. **NOTE: This is *not* the same as the MSYS terminal that opens when installation is completed.**
 
-After opening a new MSYS2 MinGW 64-bit terminal, make sure `pacman` is up to date with:
+Then, run the following:
 
-    pacman -Syu
-
-You may be asked to close and reopen the window. Do this and keep running the above command until it says `there is nothing to do`. Then run the following:
-
-    pacman -S git mingw-w64-x86_64-toolchain mingw-w64-x86_64-python3-pip
+    pacman --needed --noconfirm --disable-download-timeout -S git mingw-w64-x86_64-toolchain mingw-w64-x86_64-python3-pip
     python3 -m pip install qmk
 
 ### macOS

drivers/issi/is31fl3741.c

@@ -0,0 +1,288 @@
+/* Copyright 2017 Jason Williams
+ * Copyright 2018 Jack Humbert
+ * Copyright 2018 Yiancar
+ * Copyright 2020 MelGeek
+ *
+ * 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 "wait.h"
+
+#include "is31fl3741.h"
+#include <string.h>
+#include "i2c_master.h"
+#include "progmem.h"
+
+// This is a 7-bit address, that gets left-shifted and bit 0
+// set to 0 for write, 1 for read (as per I2C protocol)
+// The address will vary depending on your wiring:
+// 00 <-> GND
+// 01 <-> SCL
+// 10 <-> SDA
+// 11 <-> VCC
+// ADDR1 represents A1:A0 of the 7-bit address.
+// ADDR2 represents A3:A2 of the 7-bit address.
+// The result is: 0b101(ADDR2)(ADDR1)
+#define ISSI_ADDR_DEFAULT 0x60
+
+#define ISSI_COMMANDREGISTER 0xFD
+#define ISSI_COMMANDREGISTER_WRITELOCK 0xFE
+#define ISSI_INTERRUPTMASKREGISTER 0xF0
+#define ISSI_INTERRUPTSTATUSREGISTER 0xF1
+#define ISSI_IDREGISTER 0xFC
+
+#define ISSI_PAGE_PWM0 0x00       // PG0
+#define ISSI_PAGE_PWM1 0x01       // PG1
+#define ISSI_PAGE_SCALING_0 0x02  // PG2
+#define ISSI_PAGE_SCALING_1 0x03  // PG3
+#define ISSI_PAGE_FUNCTION 0x04   // PG4
+
+#define ISSI_REG_CONFIGURATION 0x00  // PG4
+#define ISSI_REG_GLOBALCURRENT 0x01  // PG4
+#define ISSI_REG_PULLDOWNUP 0x02     // PG4
+#define ISSI_REG_RESET 0x3F          // PG4
+
+#ifndef ISSI_TIMEOUT
+#    define ISSI_TIMEOUT 100
+#endif
+
+#ifndef ISSI_PERSISTENCE
+#    define ISSI_PERSISTENCE 0
+#endif
+
+#define ISSI_MAX_LEDS 351
+
+// Transfer buffer for TWITransmitData()
+uint8_t g_twi_transfer_buffer[20] = {0xFF};
+
+// These buffers match the IS31FL3741 and IS31FL3741A PWM registers.
+// The scaling buffers match the PG2 and PG3 LED On/Off registers.
+// Storing them like this is optimal for I2C transfers to the registers.
+// We could optimize this and take out the unused registers from these
+// buffers and the transfers in IS31FL3741_write_pwm_buffer() but it's
+// probably not worth the extra complexity.
+uint8_t g_pwm_buffer[DRIVER_COUNT][ISSI_MAX_LEDS];
+bool    g_pwm_buffer_update_required                      = false;
+bool    g_scaling_registers_update_required[DRIVER_COUNT] = {false};
+
+uint8_t g_scaling_registers[DRIVER_COUNT][ISSI_MAX_LEDS];
+
+uint32_t IS31FL3741_get_cw_sw_position(uint8_t cs, uint8_t sw) {
+    uint32_t pos = 0;
+
+    if (cs < 31) {
+        if (sw < 7) {
+            pos = (sw - 1) * 30 + (cs - 1);
+
+        } else {
+            pos = 0xB4 + (sw - 7) * 30 + (cs - 1);
+        }
+    } else {
+        pos = 0xB4 + 0x5A + (sw - 1) * 9 + (cs - 31);
+    }
+
+    return pos;
+}
+
+void IS31FL3741_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
+    g_twi_transfer_buffer[0] = reg;
+    g_twi_transfer_buffer[1] = data;
+
+#if ISSI_PERSISTENCE > 0
+    for (uint8_t i = 0; i < ISSI_PERSISTENCE; i++) {
+        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, ISSI_TIMEOUT) == 0) break;
+    }
+#else
+    i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, ISSI_TIMEOUT);
+#endif
+}
+
+bool IS31FL3741_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
+    // unlock the command register and select PG2
+    IS31FL3741_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+    IS31FL3741_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM0);
+
+    for (int i = 0; i < 342; i += 18) {
+        g_twi_transfer_buffer[0] = i % 180;
+
+        if (i == 180) {
+            // unlock the command register and select PG2
+            IS31FL3741_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+            IS31FL3741_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM1);
+        }
+
+        memcpy(g_twi_transfer_buffer + 1, pwm_buffer + i, 18);
+
+#if ISSI_PERSISTENCE > 0
+        for (uint8_t i = 0; i < ISSI_PERSISTENCE; i++) {
+            if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 19, ISSI_TIMEOUT) != 0) {
+                return false;
+            }
+        }
+#else
+        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 19, ISSI_TIMEOUT) != 0) {
+            return false;
+        }
+#endif
+    }
+
+    // transfer the left cause the total number is 351
+    g_twi_transfer_buffer[0] = 162;
+    memcpy(g_twi_transfer_buffer + 1, pwm_buffer + 342, 9);
+
+#if ISSI_PERSISTENCE > 0
+    for (uint8_t i = 0; i < ISSI_PERSISTENCE; i++) {
+        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 10, ISSI_TIMEOUT) != 0) {
+            return false;
+        }
+    }
+#else
+    if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 10, ISSI_TIMEOUT) != 0) {
+        return false;
+    }
+#endif
+
+    return true;
+}
+
+void IS31FL3741_init(uint8_t addr) {
+    // In order to avoid the LEDs being driven with garbage data
+    // in the LED driver's PWM registers, shutdown is enabled last.
+    // Set up the mode and other settings, clear the PWM registers,
+    // then disable software shutdown.
+    // Unlock the command register.
+
+    // Unlock the command register.
+    IS31FL3741_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+
+    // Select PG4
+    IS31FL3741_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_FUNCTION);
+
+    // Set to Normal operation
+    IS31FL3741_write_register(addr, ISSI_REG_CONFIGURATION, 0x01);
+
+    // Set Golbal Current Control Register
+    IS31FL3741_write_register(addr, ISSI_REG_GLOBALCURRENT, 0xFF);
+    // Set Pull up & Down for SWx CSy
+    IS31FL3741_write_register(addr, ISSI_REG_PULLDOWNUP, 0x77);
+
+    // IS31FL3741_update_led_scaling_registers(addr, 0xFF, 0xFF, 0xFF);
+
+    // Wait 10ms to ensure the device has woken up.
+    wait_ms(10);
+}
+
+void IS31FL3741_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
+    if (index >= 0 && index < DRIVER_LED_TOTAL) {
+        is31_led led = g_is31_leds[index];
+        uint32_t rp = 0, gp = 0, bp = 0;
+
+        rp = IS31FL3741_get_cw_sw_position(led.rcs, led.rsw);
+        gp = IS31FL3741_get_cw_sw_position(led.gcs, led.gsw);
+        bp = IS31FL3741_get_cw_sw_position(led.bcs, led.bsw);
+
+        g_pwm_buffer[led.driver][rp] = red;
+        g_pwm_buffer[led.driver][gp] = green;
+        g_pwm_buffer[led.driver][bp] = blue;
+        g_pwm_buffer_update_required = true;
+    }
+}
+
+void IS31FL3741_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
+    for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+        IS31FL3741_set_color(i, red, green, blue);
+    }
+}
+
+void IS31FL3741_set_led_control_register(uint8_t index, bool red, bool green, bool blue) {
+    is31_led led = g_is31_leds[index];
+
+    uint32_t scaling_register_r = IS31FL3741_get_cw_sw_position(led.rcs, led.rsw);
+    uint32_t scaling_register_g = IS31FL3741_get_cw_sw_position(led.gcs, led.gsw);
+    uint32_t scaling_register_b = IS31FL3741_get_cw_sw_position(led.bcs, led.bsw);
+
+    if (red) {
+        g_scaling_registers[led.driver][scaling_register_r] = 0xFF;
+    } else {
+        g_scaling_registers[led.driver][scaling_register_r] = 0x00;
+    }
+
+    if (green) {
+        g_scaling_registers[led.driver][scaling_register_g] = 0xFF;
+    } else {
+        g_scaling_registers[led.driver][scaling_register_g] = 0x00;
+    }
+
+    if (blue) {
+        g_scaling_registers[led.driver][scaling_register_b] = 0xFF;
+    } else {
+        g_scaling_registers[led.driver][scaling_register_b] = 0x00;
+    }
+
+    g_scaling_registers_update_required[led.driver] = true;
+}
+
+void IS31FL3741_update_pwm_buffers(uint8_t addr1, uint8_t addr2) {
+    if (g_pwm_buffer_update_required) {
+        IS31FL3741_write_pwm_buffer(addr1, g_pwm_buffer[0]);
+    }
+
+    g_pwm_buffer_update_required = false;
+}
+
+void IS31FL3741_set_pwm_buffer(const is31_led *pled, uint8_t red, uint8_t green, uint8_t blue) {
+    uint32_t rp = 0, gp = 0, bp = 0;
+
+    rp = IS31FL3741_get_cw_sw_position(pled->rcs, pled->rsw);
+    gp = IS31FL3741_get_cw_sw_position(pled->gcs, pled->gsw);
+    bp = IS31FL3741_get_cw_sw_position(pled->bcs, pled->bsw);
+
+    g_pwm_buffer[pled->driver][rp] = red;
+    g_pwm_buffer[pled->driver][gp] = green;
+    g_pwm_buffer[pled->driver][bp] = blue;
+
+    g_pwm_buffer_update_required = true;
+}
+
+void IS31FL3741_update_led_control_registers(uint8_t addr, uint8_t index) {
+    if (g_scaling_registers_update_required[index]) {
+        // unlock the command register and select PG2
+        IS31FL3741_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+        IS31FL3741_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_SCALING_0);
+
+        for (int i = 0; i < 180; ++i) {
+            IS31FL3741_write_register(addr, i, g_scaling_registers[0][i]);
+        }
+
+        // unlock the command register and select PG3
+        IS31FL3741_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+        IS31FL3741_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_SCALING_1);
+
+        for (int i = 0; i < 171; ++i) {
+            IS31FL3741_write_register(addr, i, g_scaling_registers[0][180 + i]);
+        }
+    }
+}
+
+void IS31FL3741_set_scaling_registers(const is31_led *pled, uint8_t red, uint8_t green, uint8_t blue) {
+    uint32_t rp = 0, gp = 0, bp = 0;
+
+    rp = IS31FL3741_get_cw_sw_position(pled->rcs, pled->rsw);
+    gp = IS31FL3741_get_cw_sw_position(pled->gcs, pled->gsw);
+    bp = IS31FL3741_get_cw_sw_position(pled->bcs, pled->bsw);
+
+    g_scaling_registers[pled->driver][rp] = red;
+    g_scaling_registers[pled->driver][gp] = green;
+    g_scaling_registers[pled->driver][bp] = blue;
+}

drivers/issi/is31fl3741.h

@@ -0,0 +1,55 @@
+/* Copyright 2017 Jason Williams
+ * Copyright 2018 Jack Humbert
+ * Copyright 2018 Yiancar
+ * Copyright 2020 MelGeek
+ *
+ * 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 <stdint.h>
+#include <stdbool.h>
+
+typedef struct is31_led {
+    uint8_t driver : 2;
+    uint8_t rcs;
+    uint8_t rsw;
+    uint8_t gcs;
+    uint8_t gsw;
+    uint8_t bcs;
+    uint8_t bsw;
+} __attribute__((packed)) is31_led;
+
+extern const is31_led g_is31_leds[DRIVER_LED_TOTAL];
+extern const is31_led g_is31_indicator_leds[DRIVER_INDICATOR_LED_TOTAL];
+
+void IS31FL3741_init(uint8_t addr);
+void IS31FL3741_write_register(uint8_t addr, uint8_t reg, uint8_t data);
+bool IS31FL3741_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer);
+
+void IS31FL3741_set_color(int index, uint8_t red, uint8_t green, uint8_t blue);
+void IS31FL3741_set_color_all(uint8_t red, uint8_t green, uint8_t blue);
+
+void IS31FL3741_set_led_control_register(uint8_t index, bool red, bool green, bool blue);
+
+// This should not be called from an interrupt
+// (eg. from a timer interrupt).
+// Call this while idle (in between matrix scans).
+// If the buffer is dirty, it will update the driver with the buffer.
+void IS31FL3741_update_pwm_buffers(uint8_t addr1, uint8_t addr2);
+void IS31FL3741_update_led_control_registers(uint8_t addr1, uint8_t addr2);
+void IS31FL3741_set_scaling_registers(const is31_led *pled, uint8_t red, uint8_t green, uint8_t blue);
+
+void IS31FL3741_set_pwm_buffer(const is31_led *pled, uint8_t red, uint8_t green, uint8_t blue);

drivers/ws2812.h

@@ -18,12 +18,12 @@
 #include "quantum/color.h"
 
 /*
- * Older WS2812s can handle a reset time (TRST) of 50us, but recent 
+ * Older WS2812s can handle a reset time (TRST) of 50us, but recent
  * component revisions require a minimum of 280us.
  */
 
 #if !defined(WS2812_TRST_US)
-#define WS2812_TRST_US 280
+#    define WS2812_TRST_US 280
 #endif
 
 /* User Interface

keyboards/1upkeyboards/1up60hse/rules.mk

@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = no      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = lite      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = no       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes        # Console for debug
@@ -22,8 +22,8 @@ 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 = no            # USB Nkey Rollover
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality on B7 by default
+NKRO_ENABLE = yes            # USB Nkey Rollover
+BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 MIDI_ENABLE = no            # MIDI support
 UNICODE_ENABLE = no         # Unicode

keyboards/1upkeyboards/1up60rgb/rules.mk

@@ -14,7 +14,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes	# Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = lite	# Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes	# Mouse keys
 EXTRAKEY_ENABLE = yes	# Audio control and System control
 CONSOLE_ENABLE = no	# Console for debug

keyboards/absinthe/rules.mk

@@ -11,16 +11,6 @@ MCU = atmega32u4
 #   ATmega328P   USBasp
 BOOTLOADER = atmel-dfu
 
-# 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
-# Otherwise, delete this section
-#   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
 #
@@ -39,7 +29,5 @@ MIDI_ENABLE = no            # MIDI support
 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
 ENCODER_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-# EXTRAFLAGS += -flto

keyboards/boardsource/5x12/5x12.c

@@ -0,0 +1 @@
+#include "5x12.h"

keyboards/boardsource/5x12/5x12.h

@@ -0,0 +1,17 @@
+#pragma once
+#include "quantum.h"
+
+#define LAYOUT_ortho_5x12( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, \
+    K12, K13, K14, K15, K16, K17, K18, K19, K20, K21, K22, K23, \
+    K24, K25, K26, K27, K28, K29, K30, K31, K32, K33, K34, K35, \
+    K36, K37, K38, K39, K40, K41, K42, K43, K44, K45, K46, K47, \
+    K48, K49, K50, K51, K52, K53, K54, K55, K56, K57, K58, K59 \
+    ) { \
+        {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11}, \
+        {K12, K13, K14, K15, K16, K17, K18, K19, K20, K21, K22, K23}, \
+        {K24, K25, K26, K27, K28, K29, K30, K31, K32, K33, K34, K35}, \
+        {K36, K37, K38, K39, K40, K41, K42, K43, K44, K45, K46, K47}, \
+        {K48, K49, K50, K51, K52, K53, K54, K55, K56, K57, K58, K59} \
+    }
+

keyboards/boardsource/5x12/config.h

@@ -0,0 +1,143 @@
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xF7E0
+#define PRODUCT_ID      0x0412
+#define DEVICE_VER      0x0000
+#define MANUFACTURER    Boardsource
+#define PRODUCT         5x12
+#define DESCRIPTION     50 percent ortho keyboard
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 12
+#define MATRIX_ROW_PINS { D2, D3, D1, D0, D4 }
+#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, B5, B4, E6, D7 }
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* 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.
+ *
+ */
+
+/* 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

keyboards/boardsource/5x12/info.json

@@ -0,0 +1,77 @@
+{
+    "keyboard_name": "boardsource 5x12",
+    "url": "https://boardsource.xyz",
+    "maintainer": "boardsource",
+    "width": 12,
+    "height": 5,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "label": "K01", "x": 0, "y": 0 },
+                { "label": "K02", "x": 1, "y": 0 },
+                { "label": "K03", "x": 2, "y": 0 },
+                { "label": "K04", "x": 3, "y": 0 },
+                { "label": "K05", "x": 4, "y": 0 },
+                { "label": "K06", "x": 5, "y": 0 },
+                { "label": "K07", "x": 6, "y": 0 },
+                { "label": "K08", "x": 7, "y": 0 },
+                { "label": "K09", "x": 8, "y": 0 },
+                { "label": "K010", "x": 9, "y": 0 },
+                { "label": "K011", "x": 10, "y": 0 },
+                { "label": "K012", "x": 11, "y": 0 },
+
+                { "label": "K11", "x": 0, "y": 1 },
+                { "label": "K12", "x": 1, "y": 1 },
+                { "label": "K13", "x": 2, "y": 1 },
+                { "label": "K14", "x": 3, "y": 1 },
+                { "label": "K15", "x": 4, "y": 1 },
+                { "label": "K16", "x": 5, "y": 1 },
+                { "label": "K17", "x": 6, "y": 1 },
+                { "label": "K18", "x": 7, "y": 1 },
+                { "label": "K19", "x": 8, "y": 1 },
+                { "label": "K110", "x": 9, "y": 1 },
+                { "label": "K111", "x": 10, "y": 1 },
+                { "label": "K112", "x": 11, "y": 1 },
+
+                { "label": "K21", "x": 0, "y": 2 },
+                { "label": "K22", "x": 1, "y": 2 },
+                { "label": "K23", "x": 2, "y": 2 },
+                { "label": "K24", "x": 3, "y": 2 },
+                { "label": "K25", "x": 4, "y": 2 },
+                { "label": "K26", "x": 5, "y": 2 },
+                { "label": "K27", "x": 6, "y": 2 },
+                { "label": "K28", "x": 7, "y": 2 },
+                { "label": "K29", "x": 8, "y": 2 },
+                { "label": "K210", "x": 9, "y": 2 },
+                { "label": "K211", "x": 10, "y": 2 },
+                { "label": "K212", "x": 11, "y": 2 },
+
+                { "label": "K31", "x": 0, "y": 3 },
+                { "label": "K32", "x": 1, "y": 3 },
+                { "label": "K33", "x": 2, "y": 3 },
+                { "label": "K34", "x": 3, "y": 3 },
+                { "label": "K35", "x": 4, "y": 3 },
+                { "label": "K36", "x": 5, "y": 3 },
+                { "label": "K37", "x": 6, "y": 3 },
+                { "label": "K38", "x": 7, "y": 3 },
+                { "label": "K39", "x": 8, "y": 3 },
+                { "label": "K310", "x": 9, "y": 3 },
+                { "label": "K311", "x": 10, "y": 3 },
+                { "label": "K312", "x": 11, "y": 3 },
+
+                { "label": "K41", "x": 0, "y": 4 },
+                { "label": "K42", "x": 1, "y": 4 },
+                { "label": "K43", "x": 2, "y": 4 },
+                { "label": "K44", "x": 3, "y": 4 },
+                { "label": "K45", "x": 4, "y": 4 },
+                { "label": "K46", "x": 5, "y": 4 },
+                { "label": "K47", "x": 6, "y": 4 },
+                { "label": "K48", "x": 7, "y": 4 },
+                { "label": "K49", "x": 8, "y": 4 },
+                { "label": "K410", "x": 9, "y": 4 },
+                { "label": "K411", "x": 10, "y": 4 },
+                { "label": "K412", "x": 11, "y": 4 }
+            ]
+        }
+    }
+}

keyboards/boardsource/5x12/keymaps/default/keymap.c

@@ -0,0 +1,39 @@
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _MAIN,
+    _RAISE,
+    _LOWER,
+};
+
+// Readability keycodes
+#define LOWER   MO(_LOWER)
+#define RAISE   MO(_RAISE)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_MAIN] = LAYOUT_ortho_5x12(
+  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    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_DEL,
+  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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
+  KC_PIPE, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+  ),
+
+  [_RAISE] = LAYOUT_ortho_5x12(
+  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
+  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
+  _______, KC_4,    KC_5,    KC_6,    KC_PLUS, KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______,
+  KC_ENT,  KC_7,    KC_8,    KC_9,    KC_MINS, KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_MUTE, _______, KC_BSLS,
+  RESET,   _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+  ),
+
+  [_LOWER] = LAYOUT_ortho_5x12(
+  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_UP,   _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
+  KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  RESET,   _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+  )
+
+};

keyboards/boardsource/5x12/readme.md

@@ -0,0 +1,13 @@
+# 5x12
+
+![boardsource 5x12](https://i.imgur.com/xuNxpgh.jpg)
+
+* Keyboard Maintainer: [Boardsource](https://github.com/daysgobye) 
+* Hardware Supported: 5x12 v1
+* Hardware Availability: this keyboard is available from the [Boardsource store](https://boardsource.xyz/store/5ecb822386879c9a0c22db84)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make boardsource/5x12: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/boardsource/5x12/rules.mk

@@ -0,0 +1,33 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite      # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+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 = no            # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+MIDI_ENABLE = no            # MIDI support
+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
+
+LAYOUTS = ortho_5x12

keyboards/exclusive/e85/config.h

@@ -0,0 +1,209 @@
+/*
+Copyright 2020 MechMerlin
+
+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 0x4558 // EX
+#define PRODUCT_ID 0xE851 // E8.5 Version 1
+#define DEVICE_VER 0x0001
+#define MANUFACTURER Exclusive
+#define PRODUCT E8.5 Hotswap PCB
+#define DESCRIPTION A custom TKL keyboard
+
+/* key matrix size */
+#define MATRIX_ROWS 11
+#define MATRIX_COLS 9
+
+/*
+ * 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)
+ *
+ */
+
+//                         0   1   2   3   4   5   6   7   8   9   A
+#define MATRIX_ROW_PINS { E6, B0, B1, B2, B3, B7, F7, F6, F5, F4, F1 }
+#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION ROW2COL
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
+// #define BACKLIGHT_PIN B6
+// #define BACKLIGHT_BREATHING
+// #define BACKLIGHT_LEVELS 6
+
+#define RGB_DI_PIN E2
+#ifdef RGB_DI_PIN
+  #define RGBLED_NUM 18
+  #define RGBLIGHT_HUE_STEP 8
+  #define RGBLIGHT_SAT_STEP 8
+  #define RGBLIGHT_VAL_STEP 8
+  #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+  #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+  #define RGBLIGHT_ANIMATIONS
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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 */
+/* defined by default; to change, uncomment and set to the combination you want */
+// #define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT)
+
+/* 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_HELP           H
+//#define MAGIC_KEY_HELP_ALT       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         0
+//#define MAGIC_KEY_LAYER0_ALT     GRAVE
+//#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     B
+//#define MAGIC_KEY_BOOTLOADER_ALT ESC
+//#define MAGIC_KEY_LOCK           CAPS
+//#define MAGIC_KEY_EEPROM         E
+//#define MAGIC_KEY_EEPROM_CLEAR   BSPACE
+//#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
+
+/* disable these deprecated features by default */
+#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
+
+/* Bootmagic Lite key configuration */
+// #define BOOTMAGIC_LITE_ROW 0
+// #define BOOTMAGIC_LITE_COLUMN 0

keyboards/exclusive/e85/e85.c

@@ -1,4 +1,4 @@
-/* Copyright 2019 Sebastian Williams
+/* Copyright 2020 MechMerlin
  *
  * 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
@@ -13,4 +13,5 @@
  * 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 "smd_milk.h"
+
+#include "e85.h"

keyboards/exclusive/e85/e85.h

@@ -0,0 +1,87 @@
+/* Copyright 2020 MechMerlin
+ *
+ * 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
+
+// This is the layout for the soldered PCB
+#define LAYOUT_all( \
+    K00,  K01, K02, K03, K04,  K05, K06, K07, K08,  K68, K67, K65, K64,   K63,  K66, K62, K61,  \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K78, K70, K77, K75, K74, K73,  K76, K72, K71,  \
+    K20,   K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K85, K84, K94,     K86, K82, K81,  \
+    K30,    K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K95, K83,                         \
+    K40,  K41, K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA5, KA4,     KA3,       K92,       \
+    K50,  K51,  K52,              K56,                K58,  K57,  K54,  K53,    KA6, KA2, KA1   \
+) { \
+    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08   }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18   }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28   }, \
+    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38   }, \
+    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48   }, \
+    { K50,   K51,   K52,   K53,   K54,   KC_NO, K56,   K57,   K58   }, \
+    { KC_NO, K61,   K62,   K63,   K64,   K65,   K66,   K67,   K68   }, \
+    { K70,   K71,   K72,   K73,   K74,   K75,   K76,   K77,   K78   }, \
+    { KC_NO, K81,   K82,   K83,   K84,   K85,   K86,   K87,   K88   }, \
+    { KC_NO, KC_NO, K92,   KC_NO, K94,   K95,   KC_NO, K97,   K98   }, \
+    { KC_NO, KA1,   KA2,   KA3,   KA4,   KA5,   KA6,   KA7,   KA8   }, \
+}
+
+// This is the layout for one hotswap PCB and can also be used on the soldered edition 
+#define LAYOUT_ansi_standard( \
+    K00,  K01, K02, K03, K04,  K05, K06, K07, K08,  K68, K67, K65, K64,   K63,  K66, K62, K61,  \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K78, K70, K77, K75, K73,       K76, K72, K71,  \
+    K20,   K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K85, K84, K83,     K86, K82, K81,  \
+    K30,    K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K95, K93,                         \
+    K40,       K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA5, KA4,                K92,       \
+    K50,   K51, K52,                  K56,             K58,  K57,   K54, K53,   KA6, KA2, KA1   \
+) { \
+    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08   }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18   }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28   }, \
+    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38   }, \
+    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48   }, \
+    { K50,   K51,   K52,   K53,   K54,   KC_NO, K56,   K57,   K58   }, \
+    { KC_NO, K61,   K62,   K63,   K64,   K65,   K66,   K67,   K68   }, \
+    { K70,   K71,   K72,   K73,   KC_NO, K75,   K76,   K77,   K78   }, \
+    { KC_NO, K81,   K82,   K83,   K84,   K85,   K86,   K87,   K88   }, \
+    { KC_NO, KC_NO, K92,   K93,   KC_NO, K95,   KC_NO, K97,   K98   }, \
+    { KC_NO, KA1,   KA2,   KC_NO, KA4,   KA5,   KA6,   KA7,   KA8   }, \
+}
+
+// This is the layout for one hotswap PCB and can also be used on the soldered edition 
+#define LAYOUT_ansi_tsangan( \
+    K00,  K01, K02, K03, K04,  K05, K06, K07, K08,  K68, K67, K65, K64,   K63,  K66, K62, K61,  \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K78, K70, K77, K75, K73,       K76, K72, K71,  \
+    K20,   K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K85, K84, K83,     K86, K82, K81,  \
+    K30,    K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K95, K93,                         \
+    K40,       K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA5, KA4,                K92,       \
+    K50,   K51, K52,                  K56,                 K57,   K54, K53,     KA6, KA2, KA1   \
+) { \
+    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08   }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18   }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28   }, \
+    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38   }, \
+    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48   }, \
+    { K50,   K51,   K52,   K53,   K54,   KC_NO, K56,   K57,   KC_NO }, \
+    { KC_NO, K61,   K62,   K63,   K64,   K65,   K66,   K67,   K68   }, \
+    { K70,   K71,   K72,   K73,   KC_NO, K75,   K76,   K77,   K78   }, \
+    { KC_NO, K81,   K82,   K83,   K84,   K85,   K86,   K87,   K88   }, \
+    { KC_NO, KC_NO, K92,   K93,   KC_NO, K95,   KC_NO, K97,   K98   }, \
+    { KC_NO, KA1,   KA2,   KC_NO, KA4,   KA5,   KA6,   KA7,   KA8   }, \
+}

keyboards/exclusive/e85/info.json

@@ -0,0 +1,293 @@
+{
+    "keyboard_name": "Exclusive E8.5 TKL",
+    "url": "",
+    "maintainer": "qmk",
+    "width": 18.25,
+    "height": 6.5,
+    "layouts": {
+        "LAYOUT_all": {
+            "key_count": 91,
+            "layout": [
+                {"label":"K00 (E6,D0)", "x":0, "y":0},
+                {"label":"K01 (E6,D1)", "x":1.25, "y":0},
+                {"label":"K02 (E6,D2)", "x":2.25, "y":0},
+                {"label":"K03 (E6,D3)", "x":3.25, "y":0},
+                {"label":"K04 (E6,D5)", "x":4.25, "y":0},
+                {"label":"K05 (E6,D4)", "x":5.5, "y":0},
+                {"label":"K06 (E6,D6)", "x":6.5, "y":0},
+                {"label":"K07 (E6,D7)", "x":7.5, "y":0},
+                {"label":"K08 (E6,B4)", "x":8.5, "y":0},
+                {"label":"K68 (F7,B4)", "x":9.75, "y":0},
+                {"label":"K67 (F7,D7)", "x":10.75, "y":0},
+                {"label":"K65 (F7,D4)", "x":11.75, "y":0},
+                {"label":"K64 (F7,D5)", "x":12.75, "y":0},
+                {"label":"K63 (F7,D3)", "x":14, "y":0},
+                {"label":"K66 (F7,D6)", "x":15.25, "y":0},
+                {"label":"K62 (F7,D2)", "x":16.25, "y":0},
+                {"label":"K61 (F7,D1)", "x":17.25, "y":0},
+                {"label":"K10 (B0,D0)", "x":0, "y":1.5},
+                {"label":"K11 (B0,D1)", "x":1, "y":1.5},
+                {"label":"K12 (B0,D2)", "x":2, "y":1.5},
+                {"label":"K13 (B0,D3)", "x":3, "y":1.5},
+                {"label":"K14 (B0,D5)", "x":4, "y":1.5},
+                {"label":"K15 (B0,D4)", "x":5, "y":1.5},
+                {"label":"K16 (B0,D6)", "x":6, "y":1.5},
+                {"label":"K17 (B0,D7)", "x":7, "y":1.5},
+                {"label":"K18 (B0,B4)", "x":8, "y":1.5},
+                {"label":"K78 (F6,B4)", "x":9, "y":1.5},
+                {"label":"K70 (F6,D0)", "x":10, "y":1.5},
+                {"label":"K77 (F6,D7)", "x":11, "y":1.5},
+                {"label":"K75 (F6,D4)", "x":12, "y":1.5},
+                {"label":"K74 (F6,D5)", "x":13, "y":1.5},
+                {"label":"K73 (F6,D3)", "x":14, "y":1.5},
+                {"label":"K76 (F6,D6)", "x":15.25, "y":1.5},
+                {"label":"K72 (F6,D2)", "x":16.25, "y":1.5},
+                {"label":"K71 (F6,D1)", "x":17.25, "y":1.5},
+                {"label":"K20 (B1,D0)", "x":0, "y":2.5, "w":1.5},
+                {"label":"K21 (B1,D1)", "x":1.5, "y":2.5},
+                {"label":"K22 (B1,D2)", "x":2.5, "y":2.5},
+                {"label":"K23 (B1,D3)", "x":3.5, "y":2.5},
+                {"label":"K24 (B1,D5)", "x":4.5, "y":2.5},
+                {"label":"K25 (B1,D4)", "x":5.5, "y":2.5},
+                {"label":"K26 (B1,D6)", "x":6.5, "y":2.5},
+                {"label":"K27 (B1,D7)", "x":7.5, "y":2.5},
+                {"label":"K28 (B1,B4)", "x":8.5, "y":2.5},
+                {"label":"K88 (F5,B4)", "x":9.5, "y":2.5},
+                {"label":"K87 (F5,D7)", "x":10.5, "y":2.5},
+                {"label":"K85 (F5,D4)", "x":11.5, "y":2.5},
+                {"label":"K84 (F5,D5)", "x":12.5, "y":2.5},
+                {"label":"K94 (F4,D5)", "x":13.5, "y":2.5, "w":1.5},
+                {"label":"K86 (F5,D6)", "x":15.25, "y":2.5},
+                {"label":"K82 (F5,D2)", "x":16.25, "y":2.5},
+                {"label":"K81 (F5,D1)", "x":17.25, "y":2.5},
+                {"label":"K30 (B2,D0)", "x":0, "y":3.5, "w":1.75},
+                {"label":"K31 (B2,D1)", "x":1.75, "y":3.5},
+                {"label":"K32 (B2,D2)", "x":2.75, "y":3.5},
+                {"label":"K33 (B2,D3)", "x":3.75, "y":3.5},
+                {"label":"K34 (B2,D5)", "x":4.75, "y":3.5},
+                {"label":"K35 (B2,D4)", "x":5.75, "y":3.5},
+                {"label":"K36 (B2,D6)", "x":6.75, "y":3.5},
+                {"label":"K37 (B2,D7)", "x":7.75, "y":3.5},
+                {"label":"K38 (B2,B4)", "x":8.75, "y":3.5},
+                {"label":"K98 (F4,B4)", "x":9.75, "y":3.5},
+                {"label":"K97 (F4,D7)", "x":10.75, "y":3.5},
+                {"label":"K95 (F4,D4)", "x":11.75, "y":3.5},
+                {"label":"K83 (F5,D3)", "x":12.75, "y":3.5, "w":2.25},
+                {"label":"K40 (B3,D0)", "x":0, "y":4.5, "w":1.25},
+                {"label":"K41 (B3,D1)", "x":1.25, "y":4.5},
+                {"label":"K42 (B3,D2)", "x":2.25, "y":4.5},
+                {"label":"K43 (B3,D3)", "x":3.25, "y":4.5},
+                {"label":"K44 (B3,D5)", "x":4.25, "y":4.5},
+                {"label":"K45 (B3,D4)", "x":5.25, "y":4.5},
+                {"label":"K46 (B3,D6)", "x":6.25, "y":4.5},
+                {"label":"K47 (B3,D7)", "x":7.25, "y":4.5},
+                {"label":"K48 (B3,B4)", "x":8.25, "y":4.5},
+                {"label":"KA8 (F1,B4)", "x":9.25, "y":4.5},
+                {"label":"KA7 (F1,D7)", "x":10.25, "y":4.5},
+                {"label":"KA5 (F1,D4)", "x":11.25, "y":4.5},
+                {"label":"KA4 (F1,D5)", "x":12.25, "y":4.5, "w":1.75},
+                {"label":"KA3 (F1,D3)", "x":14, "y":4.5},
+                {"label":"K92 (F4,D2)", "x":16.25, "y":4.5},
+                {"label":"K50 (B7,D0)", "x":0, "y":5.5, "w":1.25},
+                {"label":"K51 (B7,D1)", "x":1.25, "y":5.5, "w":1.25},
+                {"label":"K52 (B7,D2)", "x":2.5, "y":5.5, "w":1.25},
+                {"label":"K56 (B7,D6)", "x":3.75, "y":5.5, "w":6.25},
+                {"label":"K58 (B7,B4)", "x":10, "y":5.5, "w":1.25},
+                {"label":"K57 (B7,D7)", "x":11.25, "y":5.5, "w":1.25},
+                {"label":"K54 (B7,D5)", "x":12.5, "y":5.5, "w":1.25},
+                {"label":"K53 (B7,D3)", "x":13.75, "y":5.5, "w":1.25},
+                {"label":"KA6 (F1,D6)", "x":15.25, "y":5.5},
+                {"label":"KA2 (F1,D2)", "x":16.25, "y":5.5},
+                {"label":"KA1 (F1,D1)", "x":17.25, "y":5.5}
+            ]
+        },
+
+        "LAYOUT_ansi_standard": {
+            "key_count": 88,
+            "layout": [
+                {"label":"K00 (E6,D0)", "x":0, "y":0},
+                {"label":"K01 (E6,D1)", "x":1.25, "y":0},
+                {"label":"K02 (E6,D2)", "x":2.25, "y":0},
+                {"label":"K03 (E6,D3)", "x":3.25, "y":0},
+                {"label":"K04 (E6,D5)", "x":4.25, "y":0},
+                {"label":"K05 (E6,D4)", "x":5.5, "y":0},
+                {"label":"K06 (E6,D6)", "x":6.5, "y":0},
+                {"label":"K07 (E6,D7)", "x":7.5, "y":0},
+                {"label":"K08 (E6,B4)", "x":8.5, "y":0},
+                {"label":"K68 (F7,B4)", "x":9.75, "y":0},
+                {"label":"K67 (F7,D7)", "x":10.75, "y":0},
+                {"label":"K65 (F7,D4)", "x":11.75, "y":0},
+                {"label":"K64 (F7,D5)", "x":12.75, "y":0},
+                {"label":"K63 (F7,D3)", "x":14, "y":0},
+                {"label":"K66 (F7,D6)", "x":15.25, "y":0},
+                {"label":"K62 (F7,D2)", "x":16.25, "y":0},
+                {"label":"K61 (F7,D1)", "x":17.25, "y":0},
+                {"label":"K10 (B0,D0)", "x":0, "y":1.5},
+                {"label":"K11 (B0,D1)", "x":1, "y":1.5},
+                {"label":"K12 (B0,D2)", "x":2, "y":1.5},
+                {"label":"K13 (B0,D3)", "x":3, "y":1.5},
+                {"label":"K14 (B0,D5)", "x":4, "y":1.5},
+                {"label":"K15 (B0,D4)", "x":5, "y":1.5},
+                {"label":"K16 (B0,D6)", "x":6, "y":1.5},
+                {"label":"K17 (B0,D7)", "x":7, "y":1.5},
+                {"label":"K18 (B0,B4)", "x":8, "y":1.5},
+                {"label":"K78 (F6,B4)", "x":9, "y":1.5},
+                {"label":"K70 (F6,D0)", "x":10, "y":1.5},
+                {"label":"K77 (F6,D7)", "x":11, "y":1.5},
+                {"label":"K75 (F6,D4)", "x":12, "y":1.5},
+                {"label":"K73 (F6,D3)", "x":13, "y":1.5, "w":2},
+                {"label":"K76 (F6,D6)", "x":15.25, "y":1.5},
+                {"label":"K72 (F6,D2)", "x":16.25, "y":1.5},
+                {"label":"K71 (F6,D1)", "x":17.25, "y":1.5},
+                {"label":"K20 (B1,D0)", "x":0, "y":2.5, "w":1.5},
+                {"label":"K21 (B1,D1)", "x":1.5, "y":2.5},
+                {"label":"K22 (B1,D2)", "x":2.5, "y":2.5},
+                {"label":"K23 (B1,D3)", "x":3.5, "y":2.5},
+                {"label":"K24 (B1,D5)", "x":4.5, "y":2.5},
+                {"label":"K25 (B1,D4)", "x":5.5, "y":2.5},
+                {"label":"K26 (B1,D6)", "x":6.5, "y":2.5},
+                {"label":"K27 (B1,D7)", "x":7.5, "y":2.5},
+                {"label":"K28 (B1,B4)", "x":8.5, "y":2.5},
+                {"label":"K88 (F5,B4)", "x":9.5, "y":2.5},
+                {"label":"K87 (F5,D7)", "x":10.5, "y":2.5},
+                {"label":"K85 (F5,D4)", "x":11.5, "y":2.5},
+                {"label":"K84 (F5,D5)", "x":12.5, "y":2.5},
+                {"label":"K83 (F5,D3)", "x":13.5, "y":2.5, "w":1.5},
+                {"label":"K86 (F5,D6)", "x":15.25, "y":2.5},
+                {"label":"K82 (F5,D2)", "x":16.25, "y":2.5},
+                {"label":"K81 (F5,D1)", "x":17.25, "y":2.5},
+                {"label":"K30 (B2,D0)", "x":0, "y":3.5, "w":1.75},
+                {"label":"K31 (B2,D1)", "x":1.75, "y":3.5},
+                {"label":"K32 (B2,D2)", "x":2.75, "y":3.5},
+                {"label":"K33 (B2,D3)", "x":3.75, "y":3.5},
+                {"label":"K34 (B2,D5)", "x":4.75, "y":3.5},
+                {"label":"K35 (B2,D4)", "x":5.75, "y":3.5},
+                {"label":"K36 (B2,D6)", "x":6.75, "y":3.5},
+                {"label":"K37 (B2,D7)", "x":7.75, "y":3.5},
+                {"label":"K38 (B2,B4)", "x":8.75, "y":3.5},
+                {"label":"K98 (F4,B4)", "x":9.75, "y":3.5},
+                {"label":"K97 (F4,D7)", "x":10.75, "y":3.5},
+                {"label":"K95 (F4,D4)", "x":11.75, "y":3.5},
+                {"label":"K93 (F4,D3)", "x":12.75, "y":3.5, "w":2.25},
+                {"label":"K40 (B3,D0)", "x":0, "y":4.5, "w":2.25},
+                {"label":"K42 (B3,D2)", "x":2.25, "y":4.5},
+                {"label":"K43 (B3,D3)", "x":3.25, "y":4.5},
+                {"label":"K44 (B3,D5)", "x":4.25, "y":4.5},
+                {"label":"K45 (B3,D4)", "x":5.25, "y":4.5},
+                {"label":"K46 (B3,D6)", "x":6.25, "y":4.5},
+                {"label":"K47 (B3,D7)", "x":7.25, "y":4.5},
+                {"label":"K48 (B3,B4)", "x":8.25, "y":4.5},
+                {"label":"KA8 (F1,B4)", "x":9.25, "y":4.5},
+                {"label":"KA7 (F1,D7)", "x":10.25, "y":4.5},
+                {"label":"KA5 (F1,D4)", "x":11.25, "y":4.5},
+                {"label":"KA4 (F1,D5)", "x":12.25, "y":4.5, "w":2.75},
+                {"label":"K92 (F4,D2)", "x":16.25, "y":4.5},
+                {"label":"K50 (B7,D0)", "x":0, "y":5.5, "w":1.25},
+                {"label":"K51 (B7,D1)", "x":1.25, "y":5.5, "w":1.25},
+                {"label":"K52 (B7,D2)", "x":2.5, "y":5.5, "w":1.25},
+                {"label":"K56 (B7,D6)", "x":3.75, "y":5.5, "w":6.25},
+                {"label":"K58 (B7,B4)", "x":10, "y":5.5, "w":1.25},
+                {"label":"K57 (B7,D7)", "x":11.25, "y":5.5, "w":1.25},
+                {"label":"K54 (B7,D5)", "x":12.5, "y":5.5, "w":1.25},
+                {"label":"K53 (B7,D3)", "x":13.75, "y":5.5, "w":1.25},
+                {"label":"KA6 (F1,D6)", "x":15.25, "y":5.5},
+                {"label":"KA2 (F1,D2)", "x":16.25, "y":5.5},
+                {"label":"KA1 (F1,D1)", "x":17.25, "y":5.5}
+            ]
+        },
+
+        "LAYOUT_ansi_tsangan": {
+            "key_count": 87,
+            "layout": [
+                {"label":"K00 (E6,D0)", "x":0, "y":0},
+                {"label":"K01 (E6,D1)", "x":1.25, "y":0},
+                {"label":"K02 (E6,D2)", "x":2.25, "y":0},
+                {"label":"K03 (E6,D3)", "x":3.25, "y":0},
+                {"label":"K04 (E6,D5)", "x":4.25, "y":0},
+                {"label":"K05 (E6,D4)", "x":5.5, "y":0},
+                {"label":"K06 (E6,D6)", "x":6.5, "y":0},
+                {"label":"K07 (E6,D7)", "x":7.5, "y":0},
+                {"label":"K08 (E6,B4)", "x":8.5, "y":0},
+                {"label":"K68 (F7,B4)", "x":9.75, "y":0},
+                {"label":"K67 (F7,D7)", "x":10.75, "y":0},
+                {"label":"K65 (F7,D4)", "x":11.75, "y":0},
+                {"label":"K64 (F7,D5)", "x":12.75, "y":0},
+                {"label":"K63 (F7,D3)", "x":14, "y":0},
+                {"label":"K66 (F7,D6)", "x":15.25, "y":0},
+                {"label":"K62 (F7,D2)", "x":16.25, "y":0},
+                {"label":"K61 (F7,D1)", "x":17.25, "y":0},
+                {"label":"K10 (B0,D0)", "x":0, "y":1.5},
+                {"label":"K11 (B0,D1)", "x":1, "y":1.5},
+                {"label":"K12 (B0,D2)", "x":2, "y":1.5},
+                {"label":"K13 (B0,D3)", "x":3, "y":1.5},
+                {"label":"K14 (B0,D5)", "x":4, "y":1.5},
+                {"label":"K15 (B0,D4)", "x":5, "y":1.5},
+                {"label":"K16 (B0,D6)", "x":6, "y":1.5},
+                {"label":"K17 (B0,D7)", "x":7, "y":1.5},
+                {"label":"K18 (B0,B4)", "x":8, "y":1.5},
+                {"label":"K78 (F6,B4)", "x":9, "y":1.5},
+                {"label":"K70 (F6,D0)", "x":10, "y":1.5},
+                {"label":"K77 (F6,D7)", "x":11, "y":1.5},
+                {"label":"K75 (F6,D4)", "x":12, "y":1.5},
+                {"label":"K73 (F6,D3)", "x":13, "y":1.5, "w":2},
+                {"label":"K76 (F6,D6)", "x":15.25, "y":1.5},
+                {"label":"K72 (F6,D2)", "x":16.25, "y":1.5},
+                {"label":"K71 (F6,D1)", "x":17.25, "y":1.5},
+                {"label":"K20 (B1,D0)", "x":0, "y":2.5, "w":1.5},
+                {"label":"K21 (B1,D1)", "x":1.5, "y":2.5},
+                {"label":"K22 (B1,D2)", "x":2.5, "y":2.5},
+                {"label":"K23 (B1,D3)", "x":3.5, "y":2.5},
+                {"label":"K24 (B1,D5)", "x":4.5, "y":2.5},
+                {"label":"K25 (B1,D4)", "x":5.5, "y":2.5},
+                {"label":"K26 (B1,D6)", "x":6.5, "y":2.5},
+                {"label":"K27 (B1,D7)", "x":7.5, "y":2.5},
+                {"label":"K28 (B1,B4)", "x":8.5, "y":2.5},
+                {"label":"K88 (F5,B4)", "x":9.5, "y":2.5},
+                {"label":"K87 (F5,D7)", "x":10.5, "y":2.5},
+                {"label":"K85 (F5,D4)", "x":11.5, "y":2.5},
+                {"label":"K84 (F5,D5)", "x":12.5, "y":2.5},
+                {"label":"K83 (F5,D3)", "x":13.5, "y":2.5, "w":1.5},
+                {"label":"K86 (F5,D6)", "x":15.25, "y":2.5},
+                {"label":"K82 (F5,D2)", "x":16.25, "y":2.5},
+                {"label":"K81 (F5,D1)", "x":17.25, "y":2.5},
+                {"label":"K30 (B2,D0)", "x":0, "y":3.5, "w":1.75},
+                {"label":"K31 (B2,D1)", "x":1.75, "y":3.5},
+                {"label":"K32 (B2,D2)", "x":2.75, "y":3.5},
+                {"label":"K33 (B2,D3)", "x":3.75, "y":3.5},
+                {"label":"K34 (B2,D5)", "x":4.75, "y":3.5},
+                {"label":"K35 (B2,D4)", "x":5.75, "y":3.5},
+                {"label":"K36 (B2,D6)", "x":6.75, "y":3.5},
+                {"label":"K37 (B2,D7)", "x":7.75, "y":3.5},
+                {"label":"K38 (B2,B4)", "x":8.75, "y":3.5},
+                {"label":"K98 (F4,B4)", "x":9.75, "y":3.5},
+                {"label":"K97 (F4,D7)", "x":10.75, "y":3.5},
+                {"label":"K95 (F4,D4)", "x":11.75, "y":3.5},
+                {"label":"K93 (F4,D3)", "x":12.75, "y":3.5, "w":2.25},
+                {"label":"K40 (B3,D0)", "x":0, "y":4.5, "w":2.25},
+                {"label":"K42 (B3,D2)", "x":2.25, "y":4.5},
+                {"label":"K43 (B3,D3)", "x":3.25, "y":4.5},
+                {"label":"K44 (B3,D5)", "x":4.25, "y":4.5},
+                {"label":"K45 (B3,D4)", "x":5.25, "y":4.5},
+                {"label":"K46 (B3,D6)", "x":6.25, "y":4.5},
+                {"label":"K47 (B3,D7)", "x":7.25, "y":4.5},
+                {"label":"K48 (B3,B4)", "x":8.25, "y":4.5},
+                {"label":"KA8 (F1,B4)", "x":9.25, "y":4.5},
+                {"label":"KA7 (F1,D7)", "x":10.25, "y":4.5},
+                {"label":"KA5 (F1,D4)", "x":11.25, "y":4.5},
+                {"label":"KA4 (F1,D5)", "x":12.25, "y":4.5, "w":2.75},
+                {"label":"K92 (F4,D2)", "x":16.25, "y":4.5},
+                {"label":"K50 (B7,D0)", "x":0, "y":5.5, "w":1.5},
+                {"label":"K51 (B7,D1)", "x":1.5, "y":5.5},
+                {"label":"K52 (B7,D2)", "x":2.5, "y":5.5, "w":1.5},
+                {"label":"K56 (B7,D6)", "x":4, "y":5.5, "w":7},
+                {"label":"K57 (B7,D7)", "x":11, "y":5.5, "w":1.5},
+                {"label":"K54 (B7,D5)", "x":12.5, "y":5.5},
+                {"label":"K53 (B7,D3)", "x":13.5, "y":5.5, "w":1.5},
+                {"label":"KA6 (F1,D6)", "x":15.25, "y":5.5},
+                {"label":"KA2 (F1,D2)", "x":16.25, "y":5.5},
+                {"label":"KA1 (F1,D1)", "x":17.25, "y":5.5}
+            ]
+        }
+    }
+    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
+}

keyboards/exclusive/e85/keymaps/default/keymap.c

@@ -0,0 +1,37 @@
+/* Copyright 2020 MechMerlin
+ *
+ * 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_ansi_tsangan(
+        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,     MO(1),     KC_PSCR, KC_SLCK, KC_PAUS,
+        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_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_CAPS,       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_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                            KC_UP,
+        KC_LCTL,     KC_LGUI, KC_LALT,                             KC_SPC,                                 KC_RALT,     KC_RGUI, KC_RCTL,        KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    
+    [1] = LAYOUT_ansi_tsangan(
+        _______,   _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______,   _______, _______, _______,
+        RGB_MOD, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+        _______,     _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______, _______,
+        BL_TOGG,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                            _______,
+        _______,     _______, _______,                            _______,                                 _______,     _______, _______,        _______, _______, _______
+    ),
+
+};

keyboards/exclusive/e85/keymaps/standard/keymap.c

@@ -0,0 +1,37 @@
+/* Copyright 2020 MechMerlin
+ *
+ * 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_ansi_standard(
+        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,     MO(1),     KC_PSCR, KC_SLCK, KC_PAUS,
+        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_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_CAPS,       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_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                            KC_UP,
+        KC_LCTL,     KC_LGUI, KC_LALT,                             KC_SPC,                                 KC_RALT, KC_APP,  KC_RGUI, KC_RCTL,        KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    
+    [1] = LAYOUT_ansi_standard(
+        _______,   _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______,   _______, _______, _______,
+        RGB_MOD, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+        _______,     _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______, _______,
+        BL_TOGG,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                            _______,
+        _______,     _______, _______,                            _______,                                 _______, _______,   _______, _______,        _______, _______, _______
+    ),
+
+};

keyboards/exclusive/e85/keymaps/tsangan/keymap.c

@@ -0,0 +1,37 @@
+/* Copyright 2020 MechMerlin
+ *
+ * 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_ansi_tsangan(
+        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,     MO(1),     KC_PSCR, KC_SLCK, KC_PAUS,
+        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_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_CAPS,       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_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                            KC_UP,
+        KC_LCTL,     KC_LGUI, KC_LALT,                             KC_SPC,                                 KC_RALT,     KC_RGUI, KC_RCTL,        KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    
+    [1] = LAYOUT_ansi_tsangan(
+        _______,   _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______,   _______, _______, _______,
+        RGB_MOD, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+        _______,     _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______, _______,
+        BL_TOGG,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                            _______,
+        _______,     _______, _______,                            _______,                                 _______,     _______, _______,        _______, _______, _______
+    ),
+
+};

keyboards/exclusive/e85/keymaps/via/config.h

@@ -0,0 +1 @@
+  #define DYNAMIC_KEYMAP_LAYER_COUNT 3

keyboards/exclusive/e85/keymaps/via/keymap.c

@@ -0,0 +1,45 @@
+/* Copyright 2020 MechMerlin
+ *
+ * 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_ansi_tsangan(
+        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,     MO(1),     KC_PSCR, KC_SLCK, KC_PAUS,
+        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_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_CAPS,       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_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                            KC_UP,
+        KC_LCTL,     KC_LGUI, KC_LALT,                             KC_SPC,                                 KC_RALT,     KC_RGUI, KC_RCTL,        KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [1] = LAYOUT_ansi_tsangan(
+        _______,   _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______,   _______, _______, _______,
+        RGB_MOD, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+        _______,     _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______, _______,
+        BL_TOGG,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                            _______,
+        _______,     _______, _______,                            _______,                                 _______,     _______, _______,        _______, _______, _______
+    ),
+
+    [2] = LAYOUT_ansi_tsangan(
+        _______,   _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______, _______,
+        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                            _______,
+        _______,     _______, _______,                            _______,                                 _______,     _______, _______,        _______, _______, _______
+    ),
+};

keyboards/exclusive/e85/keymaps/via/rules.mk

@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+CONSOLE_ENABLE = no        # Console for debug
+COMMAND_ENABLE = no        # Commands for debug and configuration

keyboards/exclusive/e85/readme.md

@@ -0,0 +1,17 @@
+# Exclusive E8.5 Hotswap
+
+Custom hotswap PCB for Exclusive E8.5. 
+
+The switch matrix is identical between all three PCB variants of this board. Choose the correct LAYOUT that best matches the physical LAYOUT of your PCB.  
+
+* Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin)
+* Hardware Supported: E8.5 Hotswap/Soldered, atmega32u4
+* Hardware Availability: [Geekhack GB](https://geekhack.org/index.php?topic=103520)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make exclusive/e85:default
+
+**Reset Key**: The board can be reset by shorting the two holes underneath the PCB, or pressing the reset button on the reverse side. 
+
+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/exclusive/e85/rules.mk

@@ -0,0 +1,32 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite      # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+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 = no            # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+MIDI_ENABLE = no            # MIDI support
+BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
+AUDIO_ENABLE = no           # Audio output
+FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
+LTO_ENABLE = yes

keyboards/exclusive/readme.md

@@ -8,3 +8,4 @@ All files related to firmware of keyboards designed by Exclusive.
 * [e6-v2](./e6v2/): maintainers [MechMerlin](https://github.com/mechmerlin), [amnesia0287](https://github.com/amnesia0287)
 * [e7-v1](./e7v1): maintainer [masterzen](https://github.com/masterzen)
 * [e6.5](./e65): maintainer [masterzen](https://github.com/masterzen)
+* [e8.5](./e85): maintainer [MechMerlin](https://github.com/mechmerlin)

keyboards/hhkb/ansi/config.h

@@ -54,11 +54,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define SUART_IN_BIT    1
 
 #ifdef __AVR_ATmega32U4__
-    /* iom32u4.h has no definition of UCSR1D. copy from iom32u2.h */
-    #define UCSR1D _SFR_MEM8(0xCB)
-    #define RTSEN 0
-    #define CTSEN 1
-
     #define SERIAL_UART_BAUD        115200
     #define SERIAL_UART_DATA        UDR1
     #define SERIAL_UART_UBRR        ((F_CPU/(16.0*SERIAL_UART_BAUD)-1+0.5))

keyboards/hhkb/jp/config.h

@@ -54,11 +54,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define SUART_IN_BIT    1
 
 #ifdef __AVR_ATmega32U4__
-    /* iom32u4.h has no definition of UCSR1D. copy from iom32u2.h */
-    #define UCSR1D _SFR_MEM8(0xCB)
-    #define RTSEN 0
-    #define CTSEN 1
-
     #define SERIAL_UART_BAUD        115200
     #define SERIAL_UART_DATA        UDR1
     #define SERIAL_UART_UBRR        ((F_CPU/(16.0*SERIAL_UART_BAUD)-1+0.5))

keyboards/keebio/quefrency/rev1/rules.mk

@@ -1 +1,3 @@
 BOOTLOADER = caterina
+
+MOUSEKEY_ENABLE = yes       # Mouse keys

keyboards/kingly_keys/smd_milk/2_milk.h

@@ -1,26 +0,0 @@
-/* Copyright 2019 Sebastian Williams
- *
- * 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 LAYOUT( \
-  K00,  \
-  K01  \
-) { \
-  { K00 }, \
-  { K01 } \
-}

keyboards/mixi/config.h

@@ -21,8 +21,8 @@
     { C6, F7, B6 } \
 }
 
-#define ENCODERS_PAD_A { F5 }
-#define ENCODERS_PAD_B { F4 }
+#define ENCODERS_PAD_A { D7, B1 }
+#define ENCODERS_PAD_B { E6, B3 }
 
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5

keyboards/mixi/keymaps/default/keymap.c

@@ -6,36 +6,37 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /*
-     * | Knob: Layer +/-                       |
-     * .---------------------------------------.
-     * | Mute     | Play/Pause | Hold: Layer 2 |
-     * |----------|------------|---------------|
-     * | Previous | Up         | Next          |
-     * |----------|------------|---------------|
-     * | Left     | Down       | Right         |
-     * '---------------------------------------'
+     * | Knob: Layer +/-                                |
+     * .------------------------------------------------.
+     * | Volume Mute | Media Play/Pause | Hold: Layer 2 |
+     * |-------------|------------------|---------------|
+     * | Media Prev  | Up               | Media Next    |
+     * |-------------|------------------|---------------|
+     * | Left        | Down             | Right         |
+     * '------------------------------------------------'
      */
     [0] =
         LAYOUT(
-                KC_MUTE,  KC_MPLY, MO(2), 
-                KC_MNXT,  KC_UP  , KC_MPRV     , 
+                KC_MUTE,  KC_MPLY, MO(2)  , 
+                KC_MPRV,  KC_UP  , KC_MNXT, 
                 KC_LEFT, KC_DOWN , KC_RGHT
               ),
 
     /*
-     * .-----------------------.
-     * | NUM 7 | NUM 8 | NUM 9 |
-     * |-------|-------|-------|
-     * | NUM 4 | NUM 5 | NUM 6 |
-     * |-------|-------|-------|
-     * | NUM 1 | NUM 2 | NUM 3 |
-     * '-----------------------'
+     * | Knob: Layer +/-                                   |
+     * .---------------------------------------------------.
+     * | RGB Toggle     | Media Play/Pause | Hold: Layer 2 |
+     * |----------------|------------------|---------------|
+     * | Media Previous | RGB Bright+      | Media Next    |
+     * |----------------|------------------|---------------|
+     * | RGB Anim-      | RGB Bright-      | RGB Anim+     |
+     * '---------------------------------------------------'
      */
     [1] =
         LAYOUT(
-                KC_P7, KC_P8, KC_P8,
-                KC_P4, KC_P5, KC_P6,
-                KC_P1, KC_P2, KC_P3
+                RGB_TOG , KC_TRNS, KC_TRNS,
+                KC_TRNS , RGB_VAI, KC_TRNS,
+                RGB_RMOD, RGB_VAD, RGB_MOD
               ),
 
     /*
@@ -58,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 const rgblight_segment_t PROGMEM _base_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-        {0, RGBLED_NUM, HSV_WHITE}
+        {0, RGBLED_NUM, HSV_BLUE}
         );
 const rgblight_segment_t PROGMEM _middle_layer[] = RGBLIGHT_LAYER_SEGMENTS(
         {0, RGBLED_NUM, HSV_GREEN}

keyboards/mixi/keymaps/default/readme.md

@@ -1,4 +1,4 @@
-![Mixi Layout Image](https://i.imgur.com/UIXj9O6.png)
+![Mixi Layout Image](https://i.imgur.com/WCtQ6GG.jpg)
 
 # Default Mixi Layout
 

keyboards/mixi/keymaps/via/keymap.c

@@ -6,36 +6,37 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /*
-     * | Knob: Layer +/-                       |
-     * .---------------------------------------.
-     * | Mute     | Play/Pause | Hold: Layer 2 |
-     * |----------|------------|---------------|
-     * | Previous | Up         | Next          |
-     * |----------|------------|---------------|
-     * | Left     | Down       | Right         |
-     * '---------------------------------------'
+     * | Knob: Layer +/-                                |
+     * .------------------------------------------------.
+     * | Volume Mute | Media Play/Pause | Hold: Layer 2 |
+     * |-------------|------------------|---------------|
+     * | Media Prev  | Up               | Media Next    |
+     * |-------------|------------------|---------------|
+     * | Left        | Down             | Right         |
+     * '------------------------------------------------'
      */
     [0] =
         LAYOUT(
-                KC_MUTE,  KC_MPLY, MO(2), 
-                KC_MNXT,  KC_UP  , KC_MPRV     , 
+                KC_MUTE,  KC_MPLY, MO(2)  , 
+                KC_MPRV,  KC_UP  , KC_MNXT, 
                 KC_LEFT, KC_DOWN , KC_RGHT
               ),
 
     /*
-     * .-----------------------.
-     * | NUM 7 | NUM 8 | NUM 9 |
-     * |-------|-------|-------|
-     * | NUM 4 | NUM 5 | NUM 6 |
-     * |-------|-------|-------|
-     * | NUM 1 | NUM 2 | NUM 3 |
-     * '-----------------------'
+     * | Knob: Layer +/-                                   |
+     * .---------------------------------------------------.
+     * | RGB Toggle     | Media Play/Pause | Hold: Layer 2 |
+     * |----------------|------------------|---------------|
+     * | Media Previous | RGB Bright+      | Media Next    |
+     * |----------------|------------------|---------------|
+     * | RGB Anim-      | RGB Bright-      | RGB Anim+     |
+     * '---------------------------------------------------'
      */
     [1] =
         LAYOUT(
-                KC_P7, KC_P8, KC_P8,
-                KC_P4, KC_P5, KC_P6,
-                KC_P1, KC_P2, KC_P3
+                RGB_TOG , KC_TRNS, KC_TRNS,
+                KC_TRNS , RGB_VAI, KC_TRNS,
+                RGB_RMOD, RGB_VAD, RGB_MOD
               ),
 
     /*
@@ -53,12 +54,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                 KC_NO  , KC_NO, KC_TRNS, 
                 EEP_RST, RESET, DEBUG  , 
                 KC_NO  , KC_NO, KC_NO
+              ),
+
+    /*
+     * | Knob: N/A       |
+     * .-----------------.
+     * | N/A | N/A | N/A |
+     * |-----------------|
+     * | N/A | N/A | N/A |
+     * |-----------------|
+     * | N/A | N/A | N/A |
+     * '-----------------'
+     */
+    [3] =
+        LAYOUT(
+                KC_NO, KC_NO, KC_NO,
+                KC_NO, KC_NO, KC_NO,
+                KC_NO, KC_NO, KC_NO
               )
 
 };
 
 const rgblight_segment_t PROGMEM _base_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-        {0, RGBLED_NUM, HSV_WHITE}
+        {0, RGBLED_NUM, HSV_BLUE}
         );
 const rgblight_segment_t PROGMEM _middle_layer[] = RGBLIGHT_LAYER_SEGMENTS(
         {0, RGBLED_NUM, HSV_GREEN}

keyboards/mixi/mixi.c

@@ -3,8 +3,9 @@
 void eeconfig_init_kb(void) {
 #ifdef RGBLIGHT_ENABLE
     rgblight_enable(); // Enable RGB underglow by default
+    rgblight_sethsv(0, 255, 255);
 #ifdef RGBLIGHT_ANIMATIONS
-    rgblight_mode(RGBLIGHT_MODE_TWINKLE + 5); // Set to RGB_TWINKLE animation by default
+    rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 5); // Set to RGB_RAINBOW_SWIRL animation by default
 #endif
 #endif
 

keyboards/mixi/readme.md

@@ -1,6 +1,6 @@
 # Mixi
 
-![Mixi](https://i.imgur.com/GPO6Khu.jpg)
+![Mixi](https://i.imgur.com/f6hHXKZ.jpg)
 
 A mini 3x3 macropad with rotary encoders support and RGB underglow and also tray mount support. Currently the PCB and kits can only be purchased in Indonesia.
 

keyboards/projectkb/alice/keymaps/stanrc85/keymap.c

@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_FN2_60] = LAYOUT_default(
     BL_TOGG,  RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, RGB_SAI, RGB_HUD,  RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______,
-    BL_INC,   _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, RESET,
+    BL_INC,   VLK_TOG, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, RESET,
     BL_DEC,   _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______,          KC_MAKE,
               _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, _______,
               _______,          _______, _______, _______,                             _______,          _______,          TG(_DEFAULT)

keyboards/xd87/keymaps/mac_underglow/keymap.c

@@ -26,8 +26,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [1] = LAYOUT_tkl_ansi(
       RESET,            EEP_RST, DEBUG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, BL_TOGG, BL_INC,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, BL_BRTG, BL_DEC,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+      KC_TRNS, RGB_TOG, RGB_VAI, RGB_MOD, RGB_HUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, BL_BRTG, BL_DEC,
+      KC_TRNS, KC_TRNS, RGB_VAD, RGB_RMOD,RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,           KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS,                          KC_TRNS,                              KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS   )
 };

quantum/process_keycode/process_ucis.c

@@ -72,8 +72,7 @@ bool process_ucis(uint16_t keycode, keyrecord_t *record) {
         return true;
     }
 
-    bool special = keycode == KC_SPC || keycode == KC_ENT ||
-                   keycode == KC_ESC || keycode == KC_BSPC;
+    bool special = keycode == KC_SPC || keycode == KC_ENT || keycode == KC_ESC || keycode == KC_BSPC;
     if (qk_ucis_state.count >= UCIS_MAX_SYMBOL_LENGTH && !special) {
         return false;
     }
@@ -82,49 +81,49 @@ bool process_ucis(uint16_t keycode, keyrecord_t *record) {
     qk_ucis_state.count++;
 
     switch (keycode) {
-    case KC_BSPC:
-        if (qk_ucis_state.count >= 2) {
-            qk_ucis_state.count -= 2;
-            return true;
-        } else {
-            qk_ucis_state.count--;
-            return false;
-        }
-
-    case KC_SPC:
-    case KC_ENT:
-    case KC_ESC:
-        for (uint8_t i = 0; i < qk_ucis_state.count; i++) {
-            register_code(KC_BSPC);
-            unregister_code(KC_BSPC);
-            wait_ms(UNICODE_TYPE_DELAY);
-        }
-
-        if (keycode == KC_ESC) {
-            qk_ucis_state.in_progress = false;
-            qk_ucis_cancel();
-            return false;
-        }
-
-        uint8_t i;
-        bool    symbol_found = false;
-        for (i = 0; ucis_symbol_table[i].symbol; i++) {
-            if (is_uni_seq(ucis_symbol_table[i].symbol)) {
-                symbol_found = true;
-                register_ucis(ucis_symbol_table[i].code_points);
-                break;
+        case KC_BSPC:
+            if (qk_ucis_state.count >= 2) {
+                qk_ucis_state.count -= 2;
+                return true;
+            } else {
+                qk_ucis_state.count--;
+                return false;
             }
-        }
-        if (symbol_found) {
-            qk_ucis_success(i);
-        } else {
-            qk_ucis_symbol_fallback();
-        }
 
-        qk_ucis_state.in_progress = false;
-        return false;
+        case KC_SPC:
+        case KC_ENT:
+        case KC_ESC:
+            for (uint8_t i = 0; i < qk_ucis_state.count; i++) {
+                register_code(KC_BSPC);
+                unregister_code(KC_BSPC);
+                wait_ms(UNICODE_TYPE_DELAY);
+            }
 
-    default:
-        return true;
+            if (keycode == KC_ESC) {
+                qk_ucis_state.in_progress = false;
+                qk_ucis_cancel();
+                return false;
+            }
+
+            uint8_t i;
+            bool    symbol_found = false;
+            for (i = 0; ucis_symbol_table[i].symbol; i++) {
+                if (is_uni_seq(ucis_symbol_table[i].symbol)) {
+                    symbol_found = true;
+                    register_ucis(ucis_symbol_table[i].code_points);
+                    break;
+                }
+            }
+            if (symbol_found) {
+                qk_ucis_success(i);
+            } else {
+                qk_ucis_symbol_fallback();
+            }
+
+            qk_ucis_state.in_progress = false;
+            return false;
+
+        default:
+            return true;
     }
 }

quantum/process_keycode/process_unicode_common.c

@@ -257,7 +257,7 @@ void send_unicode_string(const char *str) {
 
     while (*str) {
         int32_t code_point = 0;
-        str = decode_utf8(str, &code_point);
+        str                = decode_utf8(str, &code_point);
 
         if (code_point >= 0) {
             register_unicode(code_point);

quantum/process_keycode/process_unicodemap.c

@@ -22,7 +22,7 @@ __attribute__((weak)) uint16_t unicodemap_index(uint16_t keycode) {
         uint16_t index = keycode - QK_UNICODEMAP_PAIR;
 
         bool shift = unicode_saved_mods & MOD_MASK_SHIFT;
-        bool caps = IS_HOST_LED_ON(USB_LED_CAPS_LOCK);
+        bool caps  = IS_HOST_LED_ON(USB_LED_CAPS_LOCK);
         if (shift ^ caps) {
             index >>= 7;
         }

quantum/rgb_matrix.h

@@ -32,6 +32,8 @@
 #    include "is31fl3733.h"
 #elif defined(IS31FL3737)
 #    include "is31fl3737.h"
+#elif defined(IS31FL3741)
+#    include "is31fl3741.h"
 #elif defined(WS2812)
 #    include "ws2812.h"
 #endif

quantum/rgb_matrix_drivers.c

@@ -23,7 +23,7 @@
  * be here if shared between boards.
  */
 
-#if defined(IS31FL3731) || defined(IS31FL3733) || defined(IS31FL3737)
+#if defined(IS31FL3731) || defined(IS31FL3733) || defined(IS31FL3737) || defined(IS31FL3741)
 
 #    include "i2c_master.h"
 
@@ -34,8 +34,10 @@ static void init(void) {
     IS31FL3731_init(DRIVER_ADDR_2);
 #    elif defined(IS31FL3733)
     IS31FL3733_init(DRIVER_ADDR_1, 0);
-#    else
+#    elif defined(IS31FL3737)
     IS31FL3737_init(DRIVER_ADDR_1);
+#    else
+    IS31FL3741_init(DRIVER_ADDR_1);
 #    endif
     for (int index = 0; index < DRIVER_LED_TOTAL; index++) {
         bool enabled = true;
@@ -44,8 +46,10 @@ static void init(void) {
         IS31FL3731_set_led_control_register(index, enabled, enabled, enabled);
 #    elif defined(IS31FL3733)
         IS31FL3733_set_led_control_register(index, enabled, enabled, enabled);
-#    else
+#    elif defined(IS31FL3737)
         IS31FL3737_set_led_control_register(index, enabled, enabled, enabled);
+#    else
+        IS31FL3741_set_led_control_register(index, enabled, enabled, enabled);
 #    endif
     }
     // This actually updates the LED drivers
@@ -55,8 +59,10 @@ static void init(void) {
 #    elif defined(IS31FL3733)
     IS31FL3733_update_led_control_registers(DRIVER_ADDR_1, 0);
     IS31FL3733_update_led_control_registers(DRIVER_ADDR_2, 1);
-#    else
+#    elif defined(IS31FL3737)
     IS31FL3737_update_led_control_registers(DRIVER_ADDR_1, DRIVER_ADDR_2);
+#    else
+    IS31FL3741_update_led_control_registers(DRIVER_ADDR_1, 0);
 #    endif
 }
 
@@ -84,7 +90,7 @@ const rgb_matrix_driver_t rgb_matrix_driver = {
     .set_color = IS31FL3733_set_color,
     .set_color_all = IS31FL3733_set_color_all,
 };
-#    else
+#    elif defined(IS31FL3737)
 static void flush(void) { IS31FL3737_update_pwm_buffers(DRIVER_ADDR_1, DRIVER_ADDR_2); }
 
 const rgb_matrix_driver_t rgb_matrix_driver = {
@@ -93,32 +99,41 @@ const rgb_matrix_driver_t rgb_matrix_driver = {
     .set_color = IS31FL3737_set_color,
     .set_color_all = IS31FL3737_set_color_all,
 };
+#    else
+static void flush(void) { IS31FL3741_update_pwm_buffers(DRIVER_ADDR_1, DRIVER_ADDR_2); }
+
+const rgb_matrix_driver_t rgb_matrix_driver = {
+    .init = init,
+    .flush = flush,
+    .set_color = IS31FL3741_set_color,
+    .set_color_all = IS31FL3741_set_color_all,
+};
 #    endif
 
 #elif defined(WS2812)
 
 // LED color buffer
-LED_TYPE led[DRIVER_LED_TOTAL];
+LED_TYPE rgb_matrix_ws2812_array[DRIVER_LED_TOTAL];
 
 static void init(void) {}
 
 static void flush(void) {
     // Assumes use of RGB_DI_PIN
-    ws2812_setleds(led, DRIVER_LED_TOTAL);
+    ws2812_setleds(rgb_matrix_ws2812_array, DRIVER_LED_TOTAL);
 }
 
 // Set an led in the buffer to a color
 static inline void setled(int i, uint8_t r, uint8_t g, uint8_t b) {
-    led[i].r = r;
-    led[i].g = g;
-    led[i].b = b;
+    rgb_matrix_ws2812_array[i].r = r;
+    rgb_matrix_ws2812_array[i].g = g;
+    rgb_matrix_ws2812_array[i].b = b;
 #    ifdef RGBW
-    convert_rgb_to_rgbw(led[i]);
+    convert_rgb_to_rgbw(rgb_matrix_ws2812_array[i]);
 #    endif
 }
 
 static void setled_all(uint8_t r, uint8_t g, uint8_t b) {
-    for (int i = 0; i < sizeof(led) / sizeof(led[0]); i++) {
+    for (int i = 0; i < sizeof(rgb_matrix_ws2812_array) / sizeof(rgb_matrix_ws2812_array[0]); i++) {
         setled(i, r, g, b);
     }
 }

shell.nix

@@ -8,26 +8,21 @@ let
     in {
       dfu-programmer = addDarwinSupport super.dfu-programmer;
       teensy-loader-cli = addDarwinSupport super.teensy-loader-cli;
-
-      avrgcc = super.avrgcc.overrideAttrs (oldAttrs: rec {
-        name = "avr-gcc-8.1.0";
-        src = super.fetchurl {
-          url = "mirror://gcc/releases/gcc-8.1.0/gcc-8.1.0.tar.xz";
-          sha256 = "0lxil8x0jjx7zbf90cy1rli650akaa6hpk8wk8s62vk2jbwnc60x";
-        };
-      });
     };
 
   nixpkgs = builtins.fetchTarball {
-    url = "https://github.com/NixOS/nixpkgs/archive/0260747427737b980f0.tar.gz";
-    sha256 = "1p2yc6b40xvvxvmlqd9wb440pkrimnlc2wsbpa5rddlpx1dn8qmf";
+    url = "https://github.com/NixOS/nixpkgs/archive/903266491b7b9b0379e88709feca0af900def0d9.tar.gz";
+    sha256 = "1b5wjrfgyha6s15k1yjyx41hvrpmd5szpkpkxk6l5hyrfqsr8wip";
   };
 
   pkgs = import nixpkgs { overlays = [ overlay ]; };
 in
 
 with pkgs;
-let avr_incflags = [
+let 
+  avrlibc = pkgsCross.avr.libcCross;
+
+  avr_incflags = [
     "-isystem ${avrlibc}/avr/include"
     "-B${avrlibc}/avr/lib/avr5"
     "-L${avrlibc}/avr/lib/avr5"
@@ -41,7 +36,12 @@ stdenv.mkDerivation {
   name = "qmk-firmware";
 
   buildInputs = [ dfu-programmer dfu-util diffutils git python3 ]
-    ++ lib.optional avr [ avrbinutils avrgcc avrlibc avrdude ]
+    ++ lib.optional avr [ 
+      pkgsCross.avr.buildPackages.binutils
+      pkgsCross.avr.buildPackages.gcc8
+      avrlibc
+      avrdude
+    ]
     ++ lib.optional arm [ gcc-arm-embedded ]
     ++ lib.optional teensy [ teensy-loader-cli ];
 

users/spidey3/spidey3.c

@@ -223,7 +223,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
             break;
 
-        case KC_F1 ... KC_F24:
+        case KC_F1 ... KC_F12:
             return process_gflock(keycode, record);
     }
 

users/stanrc85/rules.mk

@@ -24,4 +24,5 @@ ifeq ($(strip $(KEYBOARD)), projectkb/alice/rev1)
   SRC += rgblight_layers.c
   VIA_ENABLE = yes
   LTO_ENABLE = no
+  VELOCIKEY_ENABLE=yes
 endif