Fix MATRIX_X_PINS_RIGHT ARM compilation (#6395 )

[Keymap] Jarred's Plaid keymap (#6049 )
* Add my plaid keymap * Move planck / plaid keymaps to common layout folder
2025-01-07 23:41:41 +00:00 · 2019-07-23 09:11:37 -04:00 · 2019-07-23 00:07:57 -07:00 · 2019-07-22 23:59:12 -07:00 · 2019-07-22 23:28:25 -07:00 · 2019-07-22 20:55:23 -07:00
299 changed files with 6226 additions and 2788 deletions
--- a/docs/config_options.md
+++ b/docs/config_options.md
@ -89,7 +89,7 @@ This is a C header file that is one of the first things included, and will persi
  * mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
 * `#define LOCKING_RESYNC_ENABLE`
  * tries to keep switch state consistent with keyboard LED state
-* `#define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))`
+* `#define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT)`
  * key combination that allows the use of magic commands (useful for debugging)
 * `#define USB_MAX_POWER_CONSUMPTION`
  * sets the maximum power (in mA) over USB for the device (default: 500)
--- a/docs/faq_build.md
+++ b/docs/faq_build.md
@ -49,15 +49,13 @@ Pro Micro (Atmega32u4), make sure to include `CONFIG_USB_ACM=y`. Other devices m

 ## Unknown Device for DFU Bootloader

-If you're using Windows to flash your keyboard, and you are running into issues, check the Device Manager.  If you see an "Unknown Device" when the keyboard is in "bootloader mode", then you may have a driver issue.
+Issues encountered when flashing keyboards on Windows are most often due to having the wrong drivers installed for the bootloader. 

-Re-running the installation script for MSYS2 may help (eg run `./util/qmk_install.sh` from MSYS2/WSL) or reinstalling the QMK Toolbox may fix the issue.
+Re-running the installation script for MSYS2 may help (eg run `util/qmk_install.sh` from MSYS2/WSL) or reinstalling the QMK Toolbox may fix the issue. Alternatively, you can download and run the [`qmk_driver_installer`](https://github.com/qmk/qmk_driver_installer) package.

-If that doesn't work, then you may need to grab the [Zadig Utility](https://zadig.akeo.ie/). Download this, find the device in question, and select the `WinUSB` option, and hit "Reinstall driver". Once you've done that, try flashing your board, again.  If that doesn't work, try all of the options, until one works. 
+If that doesn't work, then you may need to grab the [Zadig Utility](https://zadig.akeo.ie/). Download this, and run it on the system.  Then, you will need to reset your board into bootloader mode.  After that, locate the device in question. If the device doesn't show up in the list (or nothing shows up in the list), you may need to enable the `List all devices` option in the `Options` menu.

-?> There isn't a best option for which driver should be used here.  Some options work better on some systems than others.  libUSB and WinUSB seem to be the best options here.
-
-If the bootloader doesn't show up in the list for devices, you may need to enable the "List all devices" option in the `Options` menu, and then find the bootloader in question. 
+From here, you will need to know what type of controller the board is using.  You may see it listed in the Device Manager as `ATmega32U4` device (which is an AVR board), or an `STM32` device (Which is an ARM board).  For AVR boards, use `libusb-win32` for the driver. For ARM boards, use the `WinUSB` driver.  Once the correct driver type has been selected, click on the `Replace Driver` button, unplug your board, plug it back in, and reset it again.


 ## WINAVR is Obsolete
--- a/docs/feature_backlight.md
+++ b/docs/feature_backlight.md
@ -73,8 +73,10 @@ To change the behaviour of the backlighting, `#define` these in your `config.h`:

 ## Backlight On State

-Most backlight circuits are driven by an N-channel MOSFET or NPN transistor. This means that to turn the transistor *on* and light the LEDs, you must drive the backlight pin, connected to the gate or base, *low*.
-Sometimes, however, a P-channel MOSFET, or a PNP transistor is used. In this case you must `#define BACKLIGHT_ON_STATE 1`, so that when the transistor is on, the pin is driven *high* instead.
+Most backlight circuits are driven by an N-channel MOSFET or NPN transistor. This means that to turn the transistor *on* and light the LEDs, you must drive the backlight pin, connected to the gate or base, *high*.
+Sometimes, however, a P-channel MOSFET, or a PNP transistor is used. In this case, when the transistor is on, the pin is driven *low* instead.
+
+This functionality is configured at the keyboard level with the `BACKLIGHT_ON_STATE` define.

 ## Multiple backlight pins

--- a/docs/feature_command.md
+++ b/docs/feature_command.md
@ -16,36 +16,36 @@ To use Command, hold down the key combination defined by the `IS_COMMAND()` macr

 If you would like to change the key assignments for Command, `#define` these in your `config.h` at either the keyboard or keymap level. All keycode assignments here must omit the `KC_` prefix.

-|Define                              |Default                                                                    |Description                                     |
-|------------------------------------|---------------------------------------------------------------------------|------------------------------------------------|
-|`IS_COMMAND()`                      |<code>(get_mods() == (MOD_BIT(KC_LSHIFT) &#124; MOD_BIT(KC_RSHIFT)))</code>|The key combination to activate Command         |
-|`MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS` |`true`                                                                     |Set default layer with the Function row         |
-|`MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS` |`true`                                                                     |Set default layer with the number keys          |
-|`MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM`|`false`                                                                    |Set default layer with `MAGIC_KEY_LAYER0..9`    |
-|`MAGIC_KEY_DEBUG`                   |`D`                                                                        |Toggle debugging over serial                    |
-|`MAGIC_KEY_DEBUG_MATRIX`            |`X`                                                                        |Toggle key matrix debugging                     |
-|`MAGIC_KEY_DEBUG_KBD`               |`K`                                                                        |Toggle keyboard debugging                       |
-|`MAGIC_KEY_DEBUG_MOUSE`             |`M`                                                                        |Toggle mouse debugging                          |
-|`MAGIC_KEY_CONSOLE`                 |`C`                                                                        |Enable the Command console                      |
-|`MAGIC_KEY_VERSION`                 |`V`                                                                        |Print the running QMK version to the console    |
-|`MAGIC_KEY_STATUS`                  |`S`                                                                        |Print the current keyboard status to the console|
-|`MAGIC_KEY_HELP`                    |`H`                                                                        |Print Command help to the console               |
-|`MAGIC_KEY_HELP_ALT`                |`SLASH`                                                                    |Print Command help to the console (alternate)   |
-|`MAGIC_KEY_LAYER0`                  |`0`                                                                        |Make layer 0 the default layer                  |
-|`MAGIC_KEY_LAYER0_ALT`              |`GRAVE`                                                                    |Make layer 0 the default layer (alternate)      |
-|`MAGIC_KEY_LAYER1`                  |`1`                                                                        |Make layer 1 the default layer                  |
-|`MAGIC_KEY_LAYER2`                  |`2`                                                                        |Make layer 2 the default layer                  |
-|`MAGIC_KEY_LAYER3`                  |`3`                                                                        |Make layer 3 the default layer                  |
-|`MAGIC_KEY_LAYER4`                  |`4`                                                                        |Make layer 4 the default layer                  |
-|`MAGIC_KEY_LAYER5`                  |`5`                                                                        |Make layer 5 the default layer                  |
-|`MAGIC_KEY_LAYER6`                  |`6`                                                                        |Make layer 6 the default layer                  |
-|`MAGIC_KEY_LAYER7`                  |`7`                                                                        |Make layer 7 the default layer                  |
-|`MAGIC_KEY_LAYER8`                  |`8`                                                                        |Make layer 8 the default layer                  |
-|`MAGIC_KEY_LAYER9`                  |`9`                                                                        |Make layer 9 the default layer                  |
-|`MAGIC_KEY_BOOTLOADER`              |`B`                                                                        |Jump to bootloader                              |
-|`MAGIC_KEY_BOOTLOADER_ALT`          |`ESC`                                                                      |Jump to bootloader (alternate)                  |
-|`MAGIC_KEY_LOCK`                    |`CAPS`                                                                     |Lock the keyboard so nothing can be typed       |
-|`MAGIC_KEY_EEPROM`                  |`E`                                                                        |Print stored EEPROM config to the console       |
-|`MAGIC_KEY_EEPROM_CLEAR`            |`BSPACE`                                                                   |Clear the EEPROM                                |
-|`MAGIC_KEY_NKRO`                    |`N`                                                                        |Toggle N-Key Rollover (NKRO)                    |
-|`MAGIC_KEY_SLEEP_LED`               |`Z`                                                                        |Toggle LED when computer is sleeping            |
+|Define                              |Default                         |Description                                     |
+|------------------------------------|--------------------------------|------------------------------------------------|
+|`IS_COMMAND()`                      |`(get_mods() == MOD_MASK_SHIFT)`|The key combination to activate Command         |
+|`MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS` |`true`                          |Set default layer with the Function row         |
+|`MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS` |`true`                          |Set default layer with the number keys          |
+|`MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM`|`false`                         |Set default layer with `MAGIC_KEY_LAYER0..9`    |
+|`MAGIC_KEY_DEBUG`                   |`D`                             |Toggle debugging over serial                    |
+|`MAGIC_KEY_DEBUG_MATRIX`            |`X`                             |Toggle key matrix debugging                     |
+|`MAGIC_KEY_DEBUG_KBD`               |`K`                             |Toggle keyboard debugging                       |
+|`MAGIC_KEY_DEBUG_MOUSE`             |`M`                             |Toggle mouse debugging                          |
+|`MAGIC_KEY_CONSOLE`                 |`C`                             |Enable the Command console                      |
+|`MAGIC_KEY_VERSION`                 |`V`                             |Print the running QMK version to the console    |
+|`MAGIC_KEY_STATUS`                  |`S`                             |Print the current keyboard status to the console|
+|`MAGIC_KEY_HELP`                    |`H`                             |Print Command help to the console               |
+|`MAGIC_KEY_HELP_ALT`                |`SLASH`                         |Print Command help to the console (alternate)   |
+|`MAGIC_KEY_LAYER0`                  |`0`                             |Make layer 0 the default layer                  |
+|`MAGIC_KEY_LAYER0_ALT`              |`GRAVE`                         |Make layer 0 the default layer (alternate)      |
+|`MAGIC_KEY_LAYER1`                  |`1`                             |Make layer 1 the default layer                  |
+|`MAGIC_KEY_LAYER2`                  |`2`                             |Make layer 2 the default layer                  |
+|`MAGIC_KEY_LAYER3`                  |`3`                             |Make layer 3 the default layer                  |
+|`MAGIC_KEY_LAYER4`                  |`4`                             |Make layer 4 the default layer                  |
+|`MAGIC_KEY_LAYER5`                  |`5`                             |Make layer 5 the default layer                  |
+|`MAGIC_KEY_LAYER6`                  |`6`                             |Make layer 6 the default layer                  |
+|`MAGIC_KEY_LAYER7`                  |`7`                             |Make layer 7 the default layer                  |
+|`MAGIC_KEY_LAYER8`                  |`8`                             |Make layer 8 the default layer                  |
+|`MAGIC_KEY_LAYER9`                  |`9`                             |Make layer 9 the default layer                  |
+|`MAGIC_KEY_BOOTLOADER`              |`B`                             |Jump to bootloader                              |
+|`MAGIC_KEY_BOOTLOADER_ALT`          |`ESC`                           |Jump to bootloader (alternate)                  |
+|`MAGIC_KEY_LOCK`                    |`CAPS`                          |Lock the keyboard so nothing can be typed       |
+|`MAGIC_KEY_EEPROM`                  |`E`                             |Print stored EEPROM config to the console       |
+|`MAGIC_KEY_EEPROM_CLEAR`            |`BSPACE`                        |Clear the EEPROM                                |
+|`MAGIC_KEY_NKRO`                    |`N`                             |Toggle N-Key Rollover (NKRO)                    |
+|`MAGIC_KEY_SLEEP_LED`               |`Z`                             |Toggle LED when computer is sleeping            |
--- a/drivers/issi/is31fl3731.c
+++ b/drivers/issi/is31fl3731.c
@ -71,10 +71,10 @@ uint8_t g_twi_transfer_buffer[20];
 // buffers and the transfers in IS31FL3731_write_pwm_buffer() but it's
 // probably not worth the extra complexity.
 uint8_t g_pwm_buffer[DRIVER_COUNT][144];
-bool g_pwm_buffer_update_required = false;
+bool g_pwm_buffer_update_required[DRIVER_COUNT] = { false };

 uint8_t g_led_control_registers[DRIVER_COUNT][18] = { { 0 }, { 0 } };
-bool g_led_control_registers_update_required = false;
+bool g_led_control_registers_update_required[DRIVER_COUNT] = { false };

 // This is the bit pattern in the LED control registers
 // (for matrix A, add one to register for matrix B)
@ -204,7 +204,7 @@ void IS31FL3731_set_color( int index, uint8_t red, uint8_t green, uint8_t blue )
        g_pwm_buffer[led.driver][led.r - 0x24] = red;
        g_pwm_buffer[led.driver][led.g - 0x24] = green;
        g_pwm_buffer[led.driver][led.b - 0x24] = blue;
-        g_pwm_buffer_update_required = true;
+        g_pwm_buffer_update_required[led.driver] = true;
    }
 }

@ -220,12 +220,12 @@ void IS31FL3731_set_led_control_register( uint8_t index, bool red, bool green, b
 {
    is31_led led = g_is31_leds[index];

-  uint8_t control_register_r = (led.r - 0x24) / 8;
-  uint8_t control_register_g = (led.g - 0x24) / 8;
-  uint8_t control_register_b = (led.b - 0x24) / 8;
-  uint8_t bit_r = (led.r - 0x24) % 8;
-  uint8_t bit_g = (led.g - 0x24) % 8;
-  uint8_t bit_b = (led.b - 0x24) % 8;
+    uint8_t control_register_r = (led.r - 0x24) / 8;
+    uint8_t control_register_g = (led.g - 0x24) / 8;
+    uint8_t control_register_b = (led.b - 0x24) / 8;
+    uint8_t bit_r = (led.r - 0x24) % 8;
+    uint8_t bit_g = (led.g - 0x24) % 8;
+    uint8_t bit_b = (led.b - 0x24) % 8;

    if ( red ) {
        g_led_control_registers[led.driver][control_register_r] |= (1 << bit_r);
@ -243,28 +243,26 @@ void IS31FL3731_set_led_control_register( uint8_t index, bool red, bool green, b
        g_led_control_registers[led.driver][control_register_b] &= ~(1 << bit_b);
    }

-    g_led_control_registers_update_required = true;
+    g_led_control_registers_update_required[led.driver] = true;

 }

-void IS31FL3731_update_pwm_buffers( uint8_t addr1, uint8_t addr2 )
+void IS31FL3731_update_pwm_buffers( uint8_t addr, uint8_t index )
 {
-    if ( g_pwm_buffer_update_required )
+    if ( g_pwm_buffer_update_required[index] )
    {
-        IS31FL3731_write_pwm_buffer( addr1, g_pwm_buffer[0] );
-        IS31FL3731_write_pwm_buffer( addr2, g_pwm_buffer[1] );
+        IS31FL3731_write_pwm_buffer( addr, g_pwm_buffer[index] );
    }
-    g_pwm_buffer_update_required = false;
+    g_pwm_buffer_update_required[index] = false;
 }

-void IS31FL3731_update_led_control_registers( uint8_t addr1, uint8_t addr2 )
+void IS31FL3731_update_led_control_registers( uint8_t addr, uint8_t index )
 {
-    if ( g_led_control_registers_update_required )
+    if ( g_led_control_registers_update_required[index] )
    {
        for ( int i=0; i<18; i++ )
        {
-            IS31FL3731_write_register(addr1, i, g_led_control_registers[0][i] );
-            IS31FL3731_write_register(addr2, i, g_led_control_registers[1][i] );
+            IS31FL3731_write_register( addr, i, g_led_control_registers[index][i] );
        }
    }
 }
--- a/drivers/issi/is31fl3731.h
+++ b/drivers/issi/is31fl3731.h
@ -44,8 +44,8 @@ void IS31FL3731_set_led_control_register( uint8_t index, bool red, bool green, b
 // (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 IS31FL3731_update_pwm_buffers( uint8_t addr1, uint8_t addr2 );
-void IS31FL3731_update_led_control_registers( uint8_t addr1, uint8_t addr2 );
+void IS31FL3731_update_pwm_buffers( uint8_t addr, uint8_t index  );
+void IS31FL3731_update_led_control_registers( uint8_t addr, uint8_t index );

 #define C1_1  0x24
 #define C1_2  0x25
--- a/keyboards/alf/x11/info.json
+++ b/keyboards/alf/x11/info.json
@ -1,103 +1,112 @@
 {
-    "keyboard_name": "QMK80",
-    "url": "",
-    "maintainer": "qmk",
-    "width": 18.25,
-    "height": 6.5,
-    "layouts": {
-      "LAYOUT": {
-        "key_count": 88,
-        "layout": [
-          {"label":"K00", "x":0, "y":0},
-          {"label":"K01", "x":2, "y":0},
-          {"label":"K02", "x":3, "y":0},
-          {"label":"K03", "x":4, "y":0},
-          {"label":"K04", "x":5, "y":0},
-          {"label":"K05", "x":6.5, "y":0},
-          {"label":"K06", "x":7.5, "y":0},
-          {"label":"K07", "x":8.5, "y":0},
-          {"label":"K08", "x":9.5, "y":0},
-          {"label":"K09", "x":11, "y":0},
-          {"label":"K0A", "x":12, "y":0},
-          {"label":"K0B", "x":13, "y":0},
-          {"label":"K0C", "x":14, "y":0},
-          {"label":"K60", "x":15.25, "y":0},
-          {"label":"K61", "x":16.25, "y":0},
-          {"label":"K62", "x":17.25, "y":0},
-          {"label":"K10", "x":0, "y":1.5},
-          {"label":"K11", "x":1, "y":1.5},
-          {"label":"K12", "x":2, "y":1.5},
-          {"label":"K13", "x":3, "y":1.5},
-          {"label":"K14", "x":4, "y":1.5},
-          {"label":"K15", "x":5, "y":1.5},
-          {"label":"K16", "x":6, "y":1.5},
-          {"label":"K17", "x":7, "y":1.5},
-          {"label":"K18", "x":8, "y":1.5},
-          {"label":"K19", "x":9, "y":1.5},
-          {"label":"K1A", "x":10, "y":1.5},
-          {"label":"K1B", "x":11, "y":1.5},
-          {"label":"K1C", "x":12, "y":1.5},
-          {"label":"K5A", "x":13, "y":1.5, "w":2},
-          {"label":"K63", "x":15.25, "y":1.5},
-          {"label":"K65", "x":16.25, "y":1.5},
-          {"label":"K67", "x":17.25, "y":1.5},
-          {"label":"K20", "x":0, "y":2.5, "w":1.5},
-          {"label":"K21", "x":1.5, "y":2.5},
-          {"label":"K22", "x":2.5, "y":2.5},
-          {"label":"K23", "x":3.5, "y":2.5},
-          {"label":"K24", "x":4.5, "y":2.5},
-          {"label":"K25", "x":5.5, "y":2.5},
-          {"label":"K26", "x":6.5, "y":2.5},
-          {"label":"K27", "x":7.5, "y":2.5},
-          {"label":"K28", "x":8.5, "y":2.5},
-          {"label":"K29", "x":9.5, "y":2.5},
-          {"label":"K2A", "x":10.5, "y":2.5},
-          {"label":"K2B", "x":11.5, "y":2.5},
-          {"label":"K2C", "x":12.5, "y":2.5},
-          {"label":"K4C", "x":13.5, "y":2.5, "w":1.5},
-          {"label":"K64", "x":15.25, "y":2.5},
-          {"label":"K66", "x":16.25, "y":2.5},
-          {"label":"K68", "x":17.25, "y":2.5},
-          {"label":"K30", "x":0, "y":3.5, "w":1.75},
-          {"label":"K31", "x":1.75, "y":3.5},
-          {"label":"K32", "x":2.75, "y":3.5},
-          {"label":"K33", "x":3.75, "y":3.5},
-          {"label":"K34", "x":4.75, "y":3.5},
-          {"label":"K35", "x":5.75, "y":3.5},
-          {"label":"K36", "x":6.75, "y":3.5},
-          {"label":"K37", "x":7.75, "y":3.5},
-          {"label":"K38", "x":8.75, "y":3.5},
-          {"label":"K39", "x":9.75, "y":3.5},
-          {"label":"K3A", "x":10.75, "y":3.5},
-          {"label":"K3B", "x":11.75, "y":3.5},
-          {"label":"K3C", "x":12.75, "y":3.5, "w":2.25},
-          {"label":"K40", "x":0, "y":4.5, "w":2.25},
-          {"label":"K41", "x":2.25, "y":4.5},
-          {"label":"K42", "x":3.25, "y":4.5},
-          {"label":"K43", "x":4.25, "y":4.5},
-          {"label":"K44", "x":5.25, "y":4.5},
-          {"label":"K45", "x":6.25, "y":4.5},
-          {"label":"K46", "x":7.25, "y":4.5},
-          {"label":"K47", "x":8.25, "y":4.5},
-          {"label":"K48", "x":9.25, "y":4.5},
-          {"label":"K49", "x":10.25, "y":4.5},
-          {"label":"K4A", "x":11.25, "y":4.5},
-          {"label":"K4B", "x":12.25, "y":4.5, "w":1.75},
-          {"label":"K69", "x":14, "y":4.5},
-          {"label":"K58", "x":16.25, "y":4.5},
-          {"label":"K50", "x":0, "y":5.5, "w":1.25},
-          {"label":"K51", "x":1.25, "y":5.5, "w":1.25},
-          {"label":"K52", "x":2.5, "y":5.5, "w":1.25},
-          {"label":"K53", "x":3.75, "y":5.5, "w":6.25},
-          {"label":"K54", "x":10, "y":5.5, "w":1.25},
-          {"label":"K55", "x":11.25, "y":5.5, "w":1.25},
-          {"label":"K56", "x":12.5, "y":5.5, "w":1.25},
-          {"label":"K57", "x":13.75, "y":5.5, "w":1.25},
-          {"label":"K6A", "x":15.25, "y":5.5},
-          {"label":"K59", "x":16.25, "y":5.5},
-          {"label":"K6B", "x":17.25, "y":5.5}
-        ]
-      }
+  "keyboard_name": "x11",
+  "url": "",
+  "maintainer": "qmk",
+  "width": 18.25,
+  "height": 6.5,
+  "layouts": {
+    "LAYOUT": {
+      "key_count": 88,
+      "layout": [
+        {"label":"K00", "x":0, "y":0},
+        {"label":"K01", "x":2, "y":0},
+        {"label":"K02", "x":3, "y":0},
+        {"label":"K03", "x":4, "y":0},
+        {"label":"K04", "x":5, "y":0},
+        {"label":"K05", "x":6.5, "y":0},
+        {"label":"K06", "x":7.5, "y":0},
+        {"label":"K07", "x":8.5, "y":0},
+        {"label":"K08", "x":9.5, "y":0},
+        {"label":"K09", "x":11, "y":0},
+        {"label":"K0A", "x":12, "y":0},
+        {"label":"K0B", "x":13, "y":0},
+        {"label":"K0C", "x":14, "y":0},
+
+        {"label":"K62", "x":15.25, "y":0},
+        {"label":"K61", "x":16.25, "y":0},
+        {"label":"K60", "x":17.25, "y":0},
+
+        {"label":"K10", "x":0, "y":1.5},
+        {"label":"K11", "x":1, "y":1.5},
+        {"label":"K12", "x":2, "y":1.5},
+        {"label":"K13", "x":3, "y":1.5},
+        {"label":"K14", "x":4, "y":1.5},
+        {"label":"K15", "x":5, "y":1.5},
+        {"label":"K16", "x":6, "y":1.5},
+        {"label":"K17", "x":7, "y":1.5},
+        {"label":"K18", "x":8, "y":1.5},
+        {"label":"K19", "x":9, "y":1.5},
+        {"label":"K1A", "x":10, "y":1.5},
+        {"label":"K1B", "x":11, "y":1.5},
+        {"label":"K1C", "x":12, "y":1.5},
+        {"label":"K5A", "x":13, "y":1.5, "w":2},
+
+        {"label":"K63", "x":15.25, "y":1.5},
+        {"label":"K65", "x":16.25, "y":1.5},
+        {"label":"K67", "x":17.25, "y":1.5},
+
+        {"label":"K20", "x":0, "y":2.5, "w":1.5},
+        {"label":"K21", "x":1.5, "y":2.5},
+        {"label":"K22", "x":2.5, "y":2.5},
+        {"label":"K23", "x":3.5, "y":2.5},
+        {"label":"K24", "x":4.5, "y":2.5},
+        {"label":"K25", "x":5.5, "y":2.5},
+        {"label":"K26", "x":6.5, "y":2.5},
+        {"label":"K27", "x":7.5, "y":2.5},
+        {"label":"K28", "x":8.5, "y":2.5},
+        {"label":"K29", "x":9.5, "y":2.5},
+        {"label":"K2A", "x":10.5, "y":2.5},
+        {"label":"K2B", "x":11.5, "y":2.5},
+        {"label":"K2C", "x":12.5, "y":2.5},
+        {"label":"K4C", "x":13.5, "y":2.5, "w":1.5},
+
+        {"label":"K64", "x":15.25, "y":2.5},
+        {"label":"K66", "x":16.25, "y":2.5},
+        {"label":"K68", "x":17.25, "y":2.5},
+
+        {"label":"K30", "x":0, "y":3.5, "w":1.75},
+        {"label":"K31", "x":1.75, "y":3.5},
+        {"label":"K32", "x":2.75, "y":3.5},
+        {"label":"K33", "x":3.75, "y":3.5},
+        {"label":"K34", "x":4.75, "y":3.5},
+        {"label":"K35", "x":5.75, "y":3.5},
+        {"label":"K36", "x":6.75, "y":3.5},
+        {"label":"K37", "x":7.75, "y":3.5},
+        {"label":"K38", "x":8.75, "y":3.5},
+        {"label":"K39", "x":9.75, "y":3.5},
+        {"label":"K3A", "x":10.75, "y":3.5},
+        {"label":"K3B", "x":11.75, "y":3.5},
+        {"label":"K3C", "x":12.75, "y":3.5, "w":2.25},
+
+        {"label":"K40", "x":0, "y":4.5, "w":2.25},
+        {"label":"K41", "x":2.25, "y":4.5},
+        {"label":"K42", "x":3.25, "y":4.5},
+        {"label":"K43", "x":4.25, "y":4.5},
+        {"label":"K44", "x":5.25, "y":4.5},
+        {"label":"K45", "x":6.25, "y":4.5},
+        {"label":"K46", "x":7.25, "y":4.5},
+        {"label":"K47", "x":8.25, "y":4.5},
+        {"label":"K48", "x":9.25, "y":4.5},
+        {"label":"K49", "x":10.25, "y":4.5},
+        {"label":"K4A", "x":11.25, "y":4.5},
+        {"label":"K4B", "x":12.25, "y":4.5, "w":1.75},
+        {"label":"K69", "x":14, "y":4.5},
+
+        {"label":"K58", "x":16.25, "y":4.5},
+
+        {"label":"K50", "x":0, "y":5.5, "w":1.25},
+        {"label":"K51", "x":1.25, "y":5.5, "w":1.25},
+        {"label":"K52", "x":2.5, "y":5.5, "w":1.25},
+        {"label":"K53", "x":3.75, "y":5.5, "w":6.25},
+        {"label":"K54", "x":10, "y":5.5, "w":1.25},
+        {"label":"K55", "x":11.25, "y":5.5, "w":1.25},
+        {"label":"K56", "x":12.5, "y":5.5, "w":1.25},
+        {"label":"K57", "x":13.75, "y":5.5, "w":1.25},
+
+        {"label":"K6A", "x":15.25, "y":5.5},
+        {"label":"K59", "x":16.25, "y":5.5},
+        {"label":"K6B", "x":17.25, "y":5.5}
+      ]
    }
  }
-  
+}
--- a/keyboards/alf/x11/keymaps/default/keymap.c
+++ b/keyboards/alf/x11/keymaps/default/keymap.c
@ -15,64 +15,23 @@
 */
 #include QMK_KEYBOARD_H

-// Defines the keycodes used by our macros in process_record_user
-enum custom_keycodes {
-  QMKBEST = SAFE_RANGE,
-  QMKURL
-};
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT( \
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-    KC_PSCR, KC_SLCK, KC_PAUS, KC_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, MO(1),   KC_UP,   KC_LCTL, \
-    KC_LGUI, KC_LALT, KC_SPC,  KC_RALT, MO(1),   KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT  \
-  ),
-  [1] = LAYOUT( \
-    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, RESET,   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_DEC,  BL_INC,  BL_STEP, KC_TRNS, KC_TRNS, \
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_MPLY, KC_MSTP, RGB_TOG, RGB_MOD, \
-    RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, 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, RGB_VAI, KC_TRNS, \
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, RGB_VAD, RGB_SAD  \
-  ),
+    [0] = LAYOUT(
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_PSCR, KC_SLCK, KC_PAUS,

+        KC_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, MO(1),                KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RGUI, KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT(
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, RESET,
+
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,
+        BL_TOGG, BL_DEC,  BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     KC_MUTE, KC_MPLY, KC_MSTP,
+        RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,              _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,     _______, _______, _______
+    )
 };
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  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;
-    case QMKURL:
-      if (record->event.pressed) {
-        // when keycode QMKURL is pressed
-        SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER));
-      } else {
-        // when keycode QMKURL is released
-      }
-      break;
-  }
-  return true;
-}
-
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
--- a/keyboards/alf/x11/x11.c
+++ b/keyboards/alf/x11/x11.c
@ -16,48 +16,49 @@
 #include "x11.h"

 void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-	setPinOutput(C6);
-	setPinOutput(E6);
-	setPinOutput(C7);
-	matrix_init_user();
+    // put your keyboard start-up code here
+    // runs once when the firmware starts up
+
+    setPinOutput(C6);
+    setPinOutput(E6);
+    setPinOutput(C7);
+    matrix_init_user();
 }

 void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
+    // put your looping keyboard code here
+    // runs every cycle (a lot)

-	matrix_scan_user();
+    matrix_scan_user();
 }

 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
+    // put your per-action keyboard code here
+    // runs for every action, just before processing by the firmware

-	return process_record_user(keycode, record);
+    return process_record_user(keycode, record);
 }

 void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
+    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here

-	if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
-		writePinLow(C6);
-	} else {
-		writePinHigh(C6);
-	}
+    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
+        writePinLow(C6);
+    } else {
+        writePinHigh(C6);
+    }

-	if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
-		writePinLow(E6);
-	} else {
-		writePinHigh(E6);
-	}
+    if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
+        writePinLow(E6);
+    } else {
+        writePinHigh(E6);
+    }

-	if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) {
-		writePinLow(C7);
-	} else {
-		writePinHigh(C7);
-	}
+    if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) {
+        writePinLow(C7);
+    } else {
+        writePinHigh(C7);
+    }

-	led_set_user(usb_led);
+    led_set_user(usb_led);
 }
--- a/keyboards/alf/x11/x11.h
+++ b/keyboards/alf/x11/x11.h
@ -26,18 +26,18 @@
 * represents the switch matrix.
 */
 #define LAYOUT( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K60, K61, K62, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K5A, K63, K65, K67, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K4C, K64, K66, K68, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \
-  K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K69, K58, \
-  K50, K51, K52, K53, K54, K55, K56, K57, K6A, K59, K6B  \
+    K00,      K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K62, K61, K60, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K5A,      K63, K65, K67, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K4C,      K64, K66, K68, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C, \
+    K40,      K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K69,           K58, \
+    K50, K51, K52,                K53,                K54, K55, K56, K57,      K6A, K59, K6B  \
 ) { \
-  {   K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C   }, \
-  {   K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C   }, \
-  {   K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C   }, \
-  {   K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C   }, \
-  {   K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C   }, \
-  {   K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57,   K58,   K59,   K5A,   KC_NO, KC_NO }, \
-  {   K60,   K61,   K62,   K63,   K64,   K65,   K66,   K67,   K68,   K69,   K6A,   K6B,   KC_NO }, \
+    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C   }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C   }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C   }, \
+    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C   }, \
+    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C   }, \
+    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57,   K58,   K59,   K5A,   KC_NO, KC_NO }, \
+    { K60,   K61,   K62,   K63,   K64,   K65,   K66,   K67,   K68,   K69,   K6A,   K6B,   KC_NO }, \
 }
--- a/keyboards/cannonkeys/satisfaction75/satisfaction75.c
+++ b/keyboards/cannonkeys/satisfaction75/satisfaction75.c
@ -17,8 +17,8 @@
 #include "tmk_core/common/eeprom.h"

 // HACK
-#include "keyboards/zeal60/zeal60_api.h" // Temporary hack
-#include "keyboards/zeal60/zeal60_keycodes.h" // Temporary hack
+#include "keyboards/wilba_tech/via_api.h" // Temporary hack
+#include "keyboards/wilba_tech/via_keycodes.h" // Temporary hack


 /* Artificial delay added to get media keys to work in the encoder*/
@ -72,7 +72,7 @@ void eeprom_set_valid(bool valid)

 void eeprom_reset(void)
 {
-	// Set the Zeal60 specific EEPROM state as invalid.
+	// Set the VIA specific EEPROM state as invalid.
 	eeprom_set_valid(false);
 	// Set the TMK/QMK EEPROM state as invalid.
 	eeconfig_disable();
--- a/keyboards/cannonkeys/stm32f072/keyboard.c
+++ b/keyboards/cannonkeys/stm32f072/keyboard.c
@ -12,8 +12,8 @@
 #include "tmk_core/common/eeprom.h"

 // HACK
-#include "keyboards/zeal60/zeal60_api.h" // Temporary hack
-#include "keyboards/zeal60/zeal60_keycodes.h" // Temporary hack
+#include "keyboards/wilba_tech/via_api.h" // Temporary hack
+#include "keyboards/wilba_tech/via_keycodes.h" // Temporary hack


 backlight_config_t kb_backlight_config = {
@ -162,7 +162,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
 	}
    #endif //DYNAMIC_KEYMAP_ENABLE

-  return true;
+  return process_record_user(keycode, record);;
 }


--- a/keyboards/converter/usb_usb/custom_matrix.cpp
+++ b/keyboards/converter/usb_usb/custom_matrix.cpp
@ -74,8 +74,6 @@ static bool matrix_is_mod = false;
 * This supports two cascaded hubs and four keyboards
 */
 USB usb_host;
-USBHub hub1(&usb_host);
-USBHub hub2(&usb_host);
 HIDBoot<HID_PROTOCOL_KEYBOARD>    kbd1(&usb_host);
 HIDBoot<HID_PROTOCOL_KEYBOARD>    kbd2(&usb_host);
 HIDBoot<HID_PROTOCOL_KEYBOARD>    kbd3(&usb_host);
@ -84,6 +82,8 @@ KBDReportParser kbd_parser1;
 KBDReportParser kbd_parser2;
 KBDReportParser kbd_parser3;
 KBDReportParser kbd_parser4;
+USBHub hub1(&usb_host);
+USBHub hub2(&usb_host);


 extern "C"
@ -252,10 +252,10 @@ extern "C"

    void led_set(uint8_t usb_led)
    {
-        kbd1.SetReport(0, 0, 2, 0, 1, &usb_led);
-        kbd2.SetReport(0, 0, 2, 0, 1, &usb_led);
-        kbd3.SetReport(0, 0, 2, 0, 1, &usb_led);
-        kbd4.SetReport(0, 0, 2, 0, 1, &usb_led);
+        if (kbd1.isReady()) kbd1.SetReport(0, 0, 2, 0, 1, &usb_led);
+        if (kbd2.isReady()) kbd2.SetReport(0, 0, 2, 0, 1, &usb_led);
+        if (kbd3.isReady()) kbd3.SetReport(0, 0, 2, 0, 1, &usb_led);
+        if (kbd4.isReady()) kbd4.SetReport(0, 0, 2, 0, 1, &usb_led);
        led_set_kb(usb_led);
    }

--- a/keyboards/crkbd/keymaps/drashna/config.h
+++ b/keyboards/crkbd/keymaps/drashna/config.h
@ -20,7 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #pragma once

-
 /* Select hand configuration */

 // #define MASTER_LEFT
@ -36,52 +35,31 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define TAPPING_TERM 100

 #ifdef RGBLIGHT_ENABLE
-#   undef RGBLED_NUM
-#   define RGBLED_NUM 27
+#    undef RGBLED_NUM
+#    define RGBLED_NUM 27

-#   define RGBLIGHT_HUE_STEP 8
-#   define RGBLIGHT_SAT_STEP 8
-#   define RGBLIGHT_VAL_STEP 8
-#   define RGBLIGHT_LIMIT_VAL 100
+#    define RGBLIGHT_HUE_STEP 8
+#    define RGBLIGHT_SAT_STEP 8
+#    define RGBLIGHT_VAL_STEP 5
+#    define RGBLIGHT_LIMIT_VAL 150
 #endif

 #ifdef RGB_MATRIX_ENABLE
-#   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#   define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
-#   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-// #   define DISABLE_RGB_MATRIX_ALPHAS_MODS
-#   define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#   define DISABLE_RGB_MATRIX_BREATHING
-#   define DISABLE_RGB_MATRIX_CYCLE_ALL
-#   define DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#   define DISABLE_RGB_MATRIX_CYCLE_UP_DOWN
-// #   define DISABLE_RGB_MATRIX_CYCLE_OUT_IN
-// #   define DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#   define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#   define DISABLE_RGB_MATRIX_DUAL_BEACON
-#   define DISABLE_RGB_MATRIX_RAINBOW_BEACON
-#   define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-// #   define DISABLE_RGB_MATRIX_RAINDROPS
-// #   define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-// #   define DISABLE_RGB_MATRIX_TYPING_HEATMAP
-// #   define DISABLE_RGB_MATRIX_DIGITAL_RAIN
-#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE
-#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#   define DISABLE_RGB_MATRIX_SPLASH
-// #   define DISABLE_RGB_MATRIX_MULTISPLASH
-#   define DISABLE_RGB_MATRIX_SOLID_SPLASH
-#   define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#    define RGB_MATRIX_KEYPRESSES  // reacts to keypresses
+// #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
+// #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED true  // turn off effects when suspended
+// #   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+// #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150  // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
+#    define RGB_MATRIX_HUE_STEP 8
+#    define RGB_MATRIX_SAT_STEP 8
+#    define RGB_MATRIX_VAL_STEP 5
+#    define RGB_MATRIX_SPD_STEP 10
 #endif

 #ifdef AUDIO_ENABLE
-#   define B6_AUDIO
+#    define B6_AUDIO
 // #define NO_MUSIC_MODE
 #endif

@ -92,4 +70,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define OLED_FONT_WIDTH 5
 // #define OLED_FONT_HEIGHT 7

+#define OLED_DISABLE_TIMEOUT
 #define TAPPING_TERM_PER_KEY
--- a/keyboards/crkbd/keymaps/drashna/keymap.c
+++ b/keyboards/crkbd/keymaps/drashna/keymap.c
--- a/keyboards/crkbd/keymaps/drashna/rules.mk
+++ b/keyboards/crkbd/keymaps/drashna/rules.mk
@ -16,7 +16,6 @@ UNICODE_ENABLE             = no  # Unicode
 BLUETOOTH_ENABLE           = no  # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE            = no  # Enable WS2812 RGB underlight.
 SWAP_HANDS_ENABLE          = no  # Enable one-hand typing
-RGBLIGHT_STARTUP_ANIMATION = yes
 RGB_MATRIX_ENABLE = WS2812

 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
@ -25,7 +24,3 @@ SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 BOOTLOADER = qmk-dfu

 OLED_DRIVER_ENABLE = yes
-
-ifneq ($(strip $(OLED_DRIVER_ENABLE)), yes)
-    RGB_MATRIX_SPLIT_RIGHT=yes
-endif
--- a/keyboards/ergodash/rev1/info.json
+++ b/keyboards/ergodash/rev1/info.json
--- a/keyboards/ergodash/rev1/rev1.h
+++ b/keyboards/ergodash/rev1/rev1.h
@ -10,8 +10,8 @@
 #ifdef USE_I2C
 #include <stddef.h>
 #ifdef __AVR__
-	#include <avr/io.h>
-	#include <avr/interrupt.h>
+    #include <avr/io.h>
+    #include <avr/interrupt.h>
 #endif
 #endif

@ -20,47 +20,132 @@
 #ifndef FLIP_HALF
 // Standard Keymap
 // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
-#define LAYOUT( \
-	L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
-	L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
-	L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
-	L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
-	L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46  \
-	) \
-	{ \
-		{ L00, L01, L02, L03, L04, L05, L06 }, \
-		{ L10, L11, L12, L13, L14, L15, L16 }, \
-		{ L20, L21, L22, L23, L24, L25, L26 }, \
-		{ L30, L31, L32, L33, L34, L35, L36 }, \
-		{ L40, L41, L42, L43, L44, L45, L46 }, \
-		{ R06, R05, R04, R03, R02, R01, R00 }, \
-		{ R16, R15, R14, R13, R12, R11, R10 }, \
-		{ R26, R25, R24, R23, R22, R21, R20 }, \
-		{ R36, R35, R34, R33, R32, R31, R30 }, \
-		{ R46, R45, R44, R43, R42, R41, R40 }  \
-	}
+#define LAYOUT_4key( \
+    L00, L01, L02, L03, L04, L05, L06,           R00, R01, R02, R03, R04, R05, R06, \
+    L10, L11, L12, L13, L14, L15, L16,           R10, R11, R12, R13, R14, R15, R16, \
+    L20, L21, L22, L23, L24, L25, L26,           R20, R21, R22, R23, R24, R25, R26, \
+    L30, L31, L32, L33, L34, L35, L36,           R30, R31, R32, R33, R34, R35, R36, \
+    L40, L41, L42, L43,      L44, L45, L46, R40, R41, R42,      R43, R44, R45, R46  \
+    ) \
+    { \
+        { L00, L01, L02, L03, L04, L05, L06 }, \
+        { L10, L11, L12, L13, L14, L15, L16 }, \
+        { L20, L21, L22, L23, L24, L25, L26 }, \
+        { L30, L31, L32, L33, L34, L35, L36 }, \
+        { L40, L41, L42, L43, L44, L45, L46 }, \
+        { R06, R05, R04, R03, R02, R01, R00 }, \
+        { R16, R15, R14, R13, R12, R11, R10 }, \
+        { R26, R25, R24, R23, R22, R21, R20 }, \
+        { R36, R35, R34, R33, R32, R31, R30 }, \
+        { R46, R45, R44, R43, R42, R41, R40 }  \
+    }
+
+// Just defined for configurator support, the matrix is identical to LAYOUT_4key
+#define LAYOUT_4key_2u_inner( \
+    L00, L01, L02, L03, L04, L05, L06,           R00, R01, R02, R03, R04, R05, R06, \
+    L10, L11, L12, L13, L14, L15, L16,           R10, R11, R12, R13, R14, R15, R16, \
+    L20, L21, L22, L23, L24, L25, L26,           R20, R21, R22, R23, R24, R25, R26, \
+    L30, L31, L32, L33, L34, L35,      L36, R30,      R31, R32, R33, R34, R35, R36, \
+    L40, L41, L42, L43,      L44, L45, L46, R40, R41, R42,      R43, R44, R45, R46  \
+    ) \
+    { \
+        { L00, L01, L02, L03, L04, L05, L06 }, \
+        { L10, L11, L12, L13, L14, L15, L16 }, \
+        { L20, L21, L22, L23, L24, L25, L26 }, \
+        { L30, L31, L32, L33, L34, L35, L36 }, \
+        { L40, L41, L42, L43, L44, L45, L46 }, \
+        { R06, R05, R04, R03, R02, R01, R00 }, \
+        { R16, R15, R14, R13, R12, R11, R10 }, \
+        { R26, R25, R24, R23, R22, R21, R20 }, \
+        { R36, R35, R34, R33, R32, R31, R30 }, \
+        { R46, R45, R44, R43, R42, R41, R40 }  \
+    }
+
+#define LAYOUT_3key_2us( \
+    L00, L01, L02, L03, L04, L05, L06,           R00, R01, R02, R03, R04, R05, R06, \
+    L10, L11, L12, L13, L14, L15, L16,           R10, R11, R12, R13, R14, R15, R16, \
+    L20, L21, L22, L23, L24, L25, L26,           R20, R21, R22, R23, R24, R25, R26, \
+    L30, L31, L32, L33, L34, L35,                     R31, R32, R33, R34, R35, R36, \
+    L40, L41, L42, L43,      L44, L45, L46, R40, R41, R42,      R43, R44, R45, R46  \
+    ) \
+    { \
+        { L00, L01, L02, L03, L04, L05, L06 }, \
+        { L10, L11, L12, L13, L14, L15, L16 }, \
+        { L20, L21, L22, L23, L24, L25, L26 }, \
+        { L30, L31, L32, L33, L34, L35, KC_NO }, \
+        { L40, L41, L42, L43, L44, L45, L46 }, \
+        { R06, R05, R04, R03, R02, R01, R00 }, \
+        { R16, R15, R14, R13, R12, R11, R10 }, \
+        { R26, R25, R24, R23, R22, R21, R20 }, \
+        { R36, R35, R34, R33, R32, R31, KC_NO }, \
+        { R46, R45, R44, R43, R42, R41, R40 }  \
+    }
+
+
+#define LAYOUT_3key_1us( \
+    L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
+    L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
+    L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
+    L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
+    L40, L41, L42, L43,      L44, L45, R41, R42,      R43, R44, R45, R46  \
+    ) \
+    { \
+        { L00, L01, L02, L03, L04, L05, L06 }, \
+        { L10, L11, L12, L13, L14, L15, L16 }, \
+        { L20, L21, L22, L23, L24, L25, L26 }, \
+        { L30, L31, L32, L33, L34, L35, L36 }, \
+        { L40, L41, L42, L43, L44, L45, KC_NO }, \
+        { R06, R05, R04, R03, R02, R01, R00 }, \
+        { R16, R15, R14, R13, R12, R11, R10 }, \
+        { R26, R25, R24, R23, R22, R21, R20 }, \
+        { R36, R35, R34, R33, R32, R31, R30 }, \
+        { R46, R45, R44, R43, R42, R41, KC_NO }  \
+    }
+
+#define LAYOUT_2key( \
+    L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
+    L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
+    L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
+    L30, L31, L32, L33, L34, L35,           R31, R32, R33, R34, R35, R36, \
+    L40, L41, L42, L43,      L44, L45, R41, R42,      R43, R44, R45, R46  \
+    ) \
+    { \
+        { L00, L01, L02, L03, L04, L05, L06 }, \
+        { L10, L11, L12, L13, L14, L15, L16 }, \
+        { L20, L21, L22, L23, L24, L25, L26 }, \
+        { L30, L31, L32, L33, L34, L35, KC_NO }, \
+        { L40, L41, L42, L43, L44, L45, KC_NO }, \
+        { R06, R05, R04, R03, R02, R01, R00 }, \
+        { R16, R15, R14, R13, R12, R11, R10 }, \
+        { R26, R25, R24, R23, R22, R21, R20 }, \
+        { R36, R35, R34, R33, R32, R31, KC_NO }, \
+        { R46, R45, R44, R43, R42, R41, KC_NO }  \
+    }
+
+#define LAYOUT LAYOUT_4key
+
 #else
 // Keymap with right side flipped
 // (TRRS jack on both halves are to the right)
 #define LAYOUT( \
-	L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
-	L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
-	L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
-	L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
-	L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46  \
-	) \
-	{ \
-		{ L00, L01, L02, L03, L04, L05, L06 }, \
-		{ L10, L11, L12, L13, L14, L15, L16 }, \
-		{ L20, L21, L22, L23, L24, L25, L26 }, \
-		{ L30, L31, L32, L33, L34, L35, L36 }, \
-		{ L40, L41, L42, L43, L44, L45, L46 }, \
-		{ R00, R01, R02, R03, R04, R05, R06 }, \
-		{ R10, R11, R12, R13, R14, R15, R16 }, \
-		{ R20, R21, R22, R23, R24, R25, R26 }, \
-		{ R30, R31, R32, R33, R34, R35, R36 }, \
-		{ R40, R41, R42, R43, R44, R45, R46 }  \
-	}
+    L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
+    L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
+    L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
+    L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
+    L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46  \
+    ) \
+    { \
+        { L00, L01, L02, L03, L04, L05, L06 }, \
+        { L10, L11, L12, L13, L14, L15, L16 }, \
+        { L20, L21, L22, L23, L24, L25, L26 }, \
+        { L30, L31, L32, L33, L34, L35, L36 }, \
+        { L40, L41, L42, L43, L44, L45, L46 }, \
+        { R00, R01, R02, R03, R04, R05, R06 }, \
+        { R10, R11, R12, R13, R14, R15, R16 }, \
+        { R20, R21, R22, R23, R24, R25, R26 }, \
+        { R30, R31, R32, R33, R34, R35, R36 }, \
+        { R40, R41, R42, R43, R44, R45, R46 }  \
+    }
 #endif

 #endif
--- a/keyboards/fc660c/keymaps/siroleo/README.md
+++ b/keyboards/fc660c/keymaps/siroleo/README.md
@ -6,3 +6,4 @@ Emulates original keymap with modifications for:
 - Grave key(s)
 - Reset on the function layer
 - Mouse keys ala Tada68
+- A layer for playing with Colemak
--- a/keyboards/fc660c/keymaps/siroleo/keymap.c
+++ b/keyboards/fc660c/keymaps/siroleo/keymap.c
@ -16,6 +16,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include QMK_KEYBOARD_H

+enum siroleo_layers
+{
+    _QWERTY,
+    _COLEMAK,
+    _FNM
+};
+
+enum siroleo_keycodes
+{
+    QWERTY = SAFE_RANGE,
+    COLEMAK
+};
+
+#define FNM MO(_FNM)
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    /* BASE layer: Default Layer
   * ,--------------------------------------------------------------------------------------------------.
@ -30,12 +45,32 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   * | Ctrl  | Alt   | Gui  |               Space                | Fn  | Ctrl | Alt   | Left| Down|Right|
   * `--------------------------------------------------------------------------------------------------´
   */
-  [0] = LAYOUT(
-        KC_ESC, 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_GRV,
-        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_GRV ,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_LALT,KC_LGUI,          KC_SPC,                       MO(1),KC_RCTL,KC_RALT,      KC_LEFT,KC_DOWN,KC_RGHT
+  [_QWERTY] = LAYOUT(
+        KC_GESC, 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_GRV,
+        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_GRV , 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_LALT,KC_LGUI,          KC_SPC,                      FNM,KC_RCTL,KC_RALT,    KC_LEFT,KC_DOWN,KC_RGHT
+    ),
+    /* Colemak Layer
+   * ,--------------------------------------------------------------------------------------------------.
+   * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  | Backspace |  | `   |
+   * |-----------------------------------------------------------------------------------------+  +-----+
+   * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |  Bksp  |  | Del |
+   * |-----------------------------------------------------------------------------------------+  +-----+
+   * | `       |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
+   * |--------------------------------------------------------------------------------------------+
+   * | Shift      |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  | Shift       | Up  |
+   * +--------------------------------------------------------------------------------------------+-----+
+   * | Ctrl  | Alt   | Gui  |               Space                | Fn  | Ctrl | Alt   | Left| Down|Right|
+   * `--------------------------------------------------------------------------------------------------´
+   */
+  [_COLEMAK] = LAYOUT(
+        KC_GESC, 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_GRV,
+        KC_TAB,  KC_Q,   KC_W,   KC_F,  KC_P,  KC_G,  KC_J,  KC_L,  KC_U,   KC_Y,  KC_SCLN,KC_LBRC,KC_RBRC,KC_BSLS,    KC_DEL,
+        KC_GRV , KC_A,   KC_R,   KC_S,  KC_T,  KC_D,  KC_H,  KC_N,  KC_E,   KC_I,  KC_O   ,KC_QUOT,     KC_ENT,
+        KC_LSFT, KC_Z,   KC_X,   KC_C,  KC_V,  KC_B,  KC_K,  KC_M,  KC_COMM,KC_DOT,KC_SLSH,KC_RSFT,     KC_UP,
+        KC_LCTL, KC_LALT,KC_LGUI,          KC_SPC,                      FNM,KC_RCTL,KC_RALT,    KC_LEFT,KC_DOWN,KC_RGHT
    ),
   /* FN layer
   * ,--------------------------------------------------------------------------------------------------.
@ -50,11 +85,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   * |       | Reset |      |                                    |      |      |      | MsL | MsD | MsR |
   * `--------------------------------------------------------------------------------------------------´
   */
-  [1] = LAYOUT(
+  [_FNM] = LAYOUT(
        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_F12, KC_MUTE,     KC_VOLU,
-        _______,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK,KC_PAUS,_______,_______,_______,     KC_VOLD,
-        _______,_______,_______,_______,_______,_______,_______,_______,KC_HOME,KC_PGUP,_______,_______,     _______,
+        _______,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK,KC_PAUS,_______,_______,  RESET,     KC_VOLD,
+        _______,_______,_______, QWERTY,COLEMAK,_______,_______,_______,KC_HOME,KC_PGUP,_______,_______,     _______,
        _______,_______,_______,_______,_______,_______,_______,_______,KC_END, KC_PGDN,_______,KC_BTN1,     KC_MS_U,
-        _______,  RESET,_______,                _______,                MO(1),  _______,_______,       KC_MS_L,KC_MS_D,KC_MS_R
+        _______,_______,_______,                _______,               _______,_______,_______,       KC_MS_L,KC_MS_D,KC_MS_R
    )
 };
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case QWERTY:
+      if (record->event.pressed) {
+        set_single_persistent_default_layer(_QWERTY);
+      }
+      return false;
+    case COLEMAK:
+      if (record->event.pressed) {
+        set_single_persistent_default_layer(_COLEMAK);
+      }
+      return false;
+  }
+  return true;
+}
--- a/keyboards/gergo/keymaps/drashna/keymap.c
+++ b/keyboards/gergo/keymaps/drashna/keymap.c
@ -9,7 +9,7 @@
 #include QMK_KEYBOARD_H
 #include "drashna.h"

-
+// clang-format off
 #define LAYOUT_gergo_base( \
    K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
    K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
@ -111,3 +111,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        ),

    */
+// clang-format on
--- a/keyboards/gray_studio/space65/space65.c
+++ b/keyboards/gray_studio/space65/space65.c
@ -19,6 +19,7 @@ void matrix_init_kb(void) {
 	// put your keyboard start-up code here
 	// runs once when the firmware starts up

+	setPinOutput(E6);
 	matrix_init_user();
 }

@ -39,9 +40,9 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
  if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
-    writePinHigh(E6);
-  } else {
    writePinLow(E6);
+  } else {
+    writePinHigh(E6);
  }

 	led_set_user(usb_led);
--- a/keyboards/grid600/press/config.h
+++ b/keyboards/grid600/press/config.h
@ -0,0 +1,78 @@
+/*
+Copyright 2019 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       0xFEED
+#define PRODUCT_ID      0x7539
+#define DEVICE_VER      0x0005
+#define MANUFACTURER    Grid
+#define PRODUCT         PRESS
+#define DESCRIPTION     Top module for Grid 600
+
+/* key matrix size */
+#define MATRIX_ROWS 1
+#define MATRIX_COLS 4
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+#define MATRIX_ROW_PINS { F0 }
+#define MATRIX_COL_PINS { F1, F4, F5, F6 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+
+#define RGB_DI_PIN B6
+#ifdef RGB_DI_PIN
+  #define RGBLED_NUM 4
+  #define RGBLIGHT_HUE_STEP 10
+  #define RGBLIGHT_SAT_STEP 17
+  #define RGBLIGHT_VAL_STEP 17
+  #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 */
+  #define RGBLIGHT_ANIMATIONS
+/*== customize breathing effect ==*/
+  /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+  #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+  /*==== use exp() and sin() ====*/
+  #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+  #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+#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
--- a/keyboards/grid600/press/info.json
+++ b/keyboards/grid600/press/info.json
@ -0,0 +1,12 @@
+{
+    "keyboard_name": "Grid 600 Type 05 PRESS Cover Module", 
+    "url": "", 
+    "maintainer": "qmk", 
+    "width": 4, 
+    "height": 1, 
+    "layouts": {
+        "LAYOUT": {
+            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}]
+        }
+    }
+}
--- a/keyboards/grid600/press/keymaps/default/config.h
+++ b/keyboards/grid600/press/keymaps/default/config.h
@ -1,4 +1,4 @@
-/* Copyright 2018 amnesia0287
+/* Copyright 2019 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
--- a/keyboards/grid600/press/keymaps/default/keymap.c
+++ b/keyboards/grid600/press/keymaps/default/keymap.c
@ -1,4 +1,4 @@
-/* Copyright 2018 Jarred Steenvoorden
+/* Copyright 2019 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,22 +13,22 @@
 * 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 "planck.h"
-#include "jarred.h"
+#include QMK_KEYBOARD_H

 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QW] = LAYOUT_planck_grid_wrapper(QWERTY_4x12),
-    [_GAME] = LAYOUT_planck_grid_wrapper(GAME_4x12),
-    [_LW] = LAYOUT_planck_grid_wrapper(LOWER_4x12),
-    [_NV] = LAYOUT_planck_grid_wrapper(NAV_4x12),
-    [_NP] = LAYOUT_planck_grid_wrapper(NUMPAD_4x12),
-    [_MS] = LAYOUT_planck_grid_wrapper(MOUSE_4x12)
+  [0] = LAYOUT( /* Base */
+    KC_G,  KC_R,  KC_I, KC_D
+  ),
 };

-#ifdef RGB_MATRIX_H
-void rgb_matrix_indicators_user(void) {
-    // Disable light in middle of 2U position
-    rgb_matrix_set_color(42, 0, 0, 0);
+void matrix_init_user(void) {
+
+}
+
+void matrix_scan_user(void) {
+
+}
+
+void led_set_user(uint8_t usb_led) {
+
 }
-#endif
--- a/keyboards/grid600/press/keymaps/default/readme.md
+++ b/keyboards/grid600/press/keymaps/default/readme.md
@ -0,0 +1 @@
+# The default keymap for grid
--- a/keyboards/grid600/press/press.c
+++ b/keyboards/grid600/press/press.c
@ -0,0 +1,16 @@
+/* Copyright 2019 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 "press.h"
--- a/keyboards/grid600/press/press.h
+++ b/keyboards/grid600/press/press.h
@ -0,0 +1,32 @@
+/* Copyright 2019 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"
+
+/* This a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT( \
+	K00, K01, K02, K03 \
+) { \
+	{ K00,   K01,   K02,   K03 }  \
+}
--- a/keyboards/grid600/press/readme.md
+++ b/keyboards/grid600/press/readme.md
@ -0,0 +1,18 @@
+# Grid 600 Type 05 "PRESS" Cover Module
+
+Cover module for Grid 600 Keyboard with 4 keys.
+
+Code for the module was originally located at [gridishere's QMK fork](https://github.com/gridishere/qmk_firmware/tree/master/keyboards/grid/gridmod5).  
+
+Please keep in mind that this is actually a separate keyboard from the one installed in the Grid 600. 
+Functionality such as layer changes and light modifications triggered on one PCB will not affect the other.  
+
+Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin)  
+Hardware Supported: Grid 600 Type 05 "PRESS" cover module.   
+Hardware Availability: [zFrontier](https://en.zfrontier.com/products/grid600s)  
+
+Make example for this keyboard (after setting up your build environment):
+
+    make grid600/press: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).
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Joel Challis	b1691ba696	Fix MATRIX_X_PINS_RIGHT ARM compilation (#6395 )	2019-07-23 09:11:37 -04:00
Jarred Steenvoorden	7ec583e5ef	[Keymap] Jarred's Plaid keymap (#6049 ) * Add my plaid keymap * Move planck / plaid keymaps to common layout folder	2019-07-23 00:07:57 -07:00
Will Sturgiss	c966da89da	[Keymap] Added wsturgiss keymap for mechmini2 (#4917 ) * basic layout v1.0 * changed KC_TRNS to _______ * most symbols are on double tap, except quote, that was cancer * better formatting and set toggle for game layer * added colors to layers to make knowing your current layer easy * have an empty macro working * enabled unicode * moved stuff to my folder and removed edits from communal files * cleanup * removed the game layer. Never used it * made changes requested by drashna and vomindoraan * got rid of some unnecessary code * got very basic unicode on mac working * added ctrl_esc * more changes as requested by noroadsleft * more leader additions, removed macros because leader stuff replaces that functionality * removed an old macro I forgot to remove earlier * final deletion at noroadsleft request * changed a line to explicitly specify a purple color.	2019-07-22 23:59:12 -07:00
Drashna Jaelre	8060e52946	[Keyboard] Align Planck EZ config with ZSA/Ergodox config (#6371 )	2019-07-22 23:28:25 -07:00
mechmerlin	2e8cdb126e	update docs based on fireworm's comments	2019-07-22 20:55:23 -07:00
Drashna Jaelre	3261c408e4	Add support for TAP_CODE_DELAY to Hold-Tap keys (#5400 ) * Add support for TAP_CODE_DELAY to Hold-Tap keys * Better handling for tap code delay and caps version	2019-07-22 20:23:57 -07:00
Drashna Jaelre	d41961c9ed	[Keymap] Drashna's Feature madness (#6128 ) * Fix my Tap Dance issues after I broke them * Cleanup and organization of userspace documentation As well as some additional cleanup of functions due to review of documentation. * Enable Tapdance on Glow and remove more animations * Revert to Eager PR debouncing * Add better check for startup animation * Move where RGB Matrix defines are listed * Limit RGB Matrix max val * Update keyboard for Iris Rev 3 conflicts * Enable encoder support on planck ez * Remove is_master check from corne\'s OLED code * Overhaul OLED screens for my Corne * One last removal * Show RGB valu On both sides * Updates for OLED display info * Fix compile issues for rgb config * Disabled Space Cadet for all drashna keymaps * Fix OLED Screen configs * Minor OLED Tweaks * Revert some Iris changes * Fix song include * Handle MAKE macro for the Corne boards better * Add super hacky-hack for eeconfig initialization * Add audio support for Fractal since Elite Cs support it * Add defines for keycode steps * Add White layout * Update Corne RGB info * Add fun effects to layer indication for RGB Matrix enabled boards * Use proper define for product name detection * Update formatting * Use custom timeout mechanism for OLED timeout * Fix up OLED screen HSV code for new HSV structure * Better handle turning off RGB Matrix when sleeping * Disable MultiSplash Animation * Change Iris back to using serial * Why was RGB disabled?!?!?! * Limit val in rgb_matrix_layer_helper function * Remove EECONFIG setting for RGB matrix	2019-07-22 20:22:33 -07:00
tucznak	840b9090a0	Adding personal keymaps (#6384 ) * initial commit * migrated the actual keymap to this keyboard * added the actual Tanuki keymap * Added QMK DFU bootloader support * TuCZnak's keymaps - final * Update keyboards/tanuki/keymaps/tucznak/config.h Co-Authored-By: Drashna Jaelre <drashna@live.com> * Update keyboards/ut472/keymaps/tucznak/config.h Co-Authored-By: Drashna Jaelre <drashna@live.com> * Apply suggestions from code review Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>	2019-07-22 16:32:47 -07:00
XScorpion2	40b0ddd425	Sol Rev 2 Keyboard (#6389 ) * Basic Rev 2 implementation * Updated LED defines and added Extra encoder support * Fixed rgb pin assignment * Physically accurate LED positions * Single Color Band scrolling left to right effects * Spirals, Pinwheels, and Documentation....Oh My! * Spiral effect band thickness adjustments * Fixing animation spin directions * Full hand LED positions * Basic Rev 2 implementation Updated LED defines and added Extra encoder support Fixed rgb pin assignment Physically accurate LED positions Full hand LED positions Moving rev2 folder * RGB Center Point LED position update * Fixing led config commas * Fixing led config commas * fix enter key * fix enter * Small changes to default * update default * typo fix * update default * Fixing defines & led config, turned full hand & extra encoders into rules.mk feature * Refactored rules.mk to have a post_rules.mk * Forgot to offset the matrix to led map due to the edge led additions * Updated LED flags and fixed my keymap * Update keymap.c include speed controls for RGB * Fixing more rules.mk and adding keymap like encoders functionality * Sol Rev 2 Implementation * Minor fixes * Keymap fixes * Fix Colemak, add lock keys	2019-07-22 10:43:52 -07:00
Collin Diekvoss	17ff9cf554	New Keyboard: ZJ68 (#6378 ) * added zj68 keyboard * Suggested changes * Suggested changes * Suggested changes * Requested changes * Update keyboards/zj68/rules.mk Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>	2019-07-22 10:17:11 -07:00
MechMerlin	d3ebf903c9	[Keyboard] Add Unikorn 60 tsangan_hhkb layout (#6390 ) * fix default keymap to not have Q in the 1 position. * add tsangan hhkb layout * add a tsangan default keymap * clean up the default keymap * add qmk configurator support for new layout	2019-07-22 02:20:20 -07:00
George Petri	f1c89280d5	[Keymap] Update keymap for keebio/quefrency 65% version (#6388 ) * minor keymap changes * minor keymap changes update readme * update rules.mk * add rgb * add add arrows in hjkl * removed backslashes * fix missing comma * spacing fix * minor cleanup * add r layer * impl navigation layer * moved backspace nearby * updated readme	2019-07-22 02:14:43 -07:00
Sid Carter	4602361095	[Keymap] Switch Iris keymap from workman to colemak (#6385 ) * via support and colemak layout * figures tap and hold parts don't work vith via enabled - so those are commented out for now	2019-07-22 02:13:38 -07:00
Michael Pishchagin	28f53462d0	[Keyboard] Backport two fixes from TMK: usb-usb converter (#6383 ) * usb_usb: Order of init prevents uneeded bus reset `7c228967a4 (diff-deed77fb597e3a0019ce59fc1d09e260)` * usb_usb: Fix startup block bug `c2ce617a36 (diff-deed77fb597e3a0019ce59fc1d09e260)`	2019-07-22 02:07:28 -07:00
Luke Wesley-Holley	4532caf5f2	[Keyboard] KBP V60 Type R Added ISO default (#6372 ) * [Layout] KBP V60 Type R ISO default * Remove ifdef * Apply suggestions from code review @noroadsleft I've accepted your suggestions. Tried locally any everything works as expected. Thanks again - this if my first keyboard and first time looking at/ using/ contributing to qmk so I appreciate the feedback 👍 Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>	2019-07-22 02:06:06 -07:00
noroadsleft	e08e6c11e3	[Keyboard] Fix QMK Configurator bug with Wilba Tech Zeal60 LAYOUT_60_all (#6387 ) info.json file had the wrong name for the JSON key; the macro that is normally named LAYOUT_all by convention is named LAYOUT_60_all on the Zeal60. Bug flagged by drashna for flight505 on QMK Discord.	2019-07-22 02:03:19 -07:00
Wilba	bffbb4b42d	Refactoring wilba.tech PCBs, updating Rama Works U80-A (#6272 ) * Added WT65-B, WT75-B, minor fixes * Update keyboards/wilba_tech/wt65_b/config.h Co-Authored-By: Drashna Jaelre <drashna@live.com> * Update keyboards/wilba_tech/wt65_b/readme.md Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update keyboards/wilba_tech/wt75_b/config.h Co-Authored-By: Drashna Jaelre <drashna@live.com> * Change DEBOUNCING_DELAY to DEBOUNCE * Change DEBOUNCING_DELAY to DEBOUNCE * Move Zeal60/Zeal65 files to keyboards/wilba_tech * Change DEBOUNCING_DELAY to DEBOUNCE * Refactoring zeal60 code to wilba_tech * Moved Rama Works PCBs to wilba_tech * Rename Rama Works files * Cleanup info.json * Cleanup readme.md * Cleanup USB device strings * U80-A RGB matrix, IS31FL3731 driver changes * Fixed #include from keyboards/zeal60	2019-07-21 07:46:22 -04:00
noroadsleft	d686c0ea43	[Keyboard] Snagpad Configurator bugfix and readme refactor (#6381 ) * Update snagpad.h White-space changes only. Making this file easier to read. * Update info.json Refactor: - add labels - debug linting (one key object per line) - reorder keys for LAYOUT_numpad_5x4 (fixes QMK Configurator assigning keys to incorrect positions) * Update readme.md Refactor to conform to QMK template. Updated link to The Board Podcast (old link was Error 404).	2019-07-20 13:49:28 -07:00
trinity1561	b3cdc7ef70	[Keyboard] Update space65.c to fix caps lock LED (#6375 )	2019-07-20 13:37:42 -07:00
Sid Carter	cf2ffadbcd	[Keymap] Add Colemak to existing fc660c keymap (#6374 ) * consistent enums * add colemak to another layer for fun * update readme * consistent enums * add colemak to another layer for fun * update readme	2019-07-20 13:36:14 -07:00
Joel Challis	0da743d80b	[Keyboard] Refactor handwired/splittest to support multiple boards (#6373 ) * Refactor splittest to support multiple dev boards * Refactor splittest to support multiple dev boards - revert change to number of RGB led * Refactor splittest to support multiple dev boards - update docs * Refactor splittest to support multiple dev boards - correct docs * Refactor splittest to support multiple dev boards - update teensy master logic	2019-07-20 13:35:30 -07:00
MechMerlin	7afae46ea6	[Keyboard] Grid 600 Type 05 "PRESS" Cover Module (#6368 ) * add grid600 type 5 press cover module * Update keyboards/grid600/press/keymaps/default/keymap.c Co-Authored-By: fauxpark <fauxpark@gmail.com> * remove unused custom keycode enum	2019-07-20 13:30:38 -07:00
jotix	c644299820	[Keyboard] leds in default keymap (#6357 )	2019-07-20 13:25:20 -07:00
Konstantin Đorđević	a2e91ebec9	Update IS_COMMAND definitions to use MOD_MASK_SHIFT (#6348 ) * Update IS_COMMAND definition in templates to use MOD_MASK_SHIFT * Update IS_COMMAND in docs * Update IS_COMMAND default definition in tmk_core * Update table in Command docs based on suggestion Co-Authored-By: fauxpark <fauxpark@gmail.com>	2019-07-20 13:21:40 -07:00
Danny	a40dbf94e8	Merge pull request #6264 from zvecr/split_master_check Allow board to override split keyboard master check	2019-07-20 15:13:01 -04:00
Danny	1c0a7ad6c2	Fix Numbrero Handwired make example in readme (#6379 ) Fix Numbrero Handwired make example in readme	2019-07-20 15:09:13 -04:00
noroadsleft	6b1db7da23	Fix Numbrero Handwired make example in readme	2019-07-20 11:06:18 -07:00
Drashna Jaelre	001a6c24ae	[Docs] Clarify Zadig usage in FAQ Docs (#6360 ) * Rewrite Zadig section to be more clear * Wordsmithing Co-Authored-By: MechMerlin <30334081+mechmerlin@users.noreply.github.com>	2019-07-19 13:23:16 -07:00
noroadsleft	b1fc3f35c6	Melody96 Configurator updates and minor refactoring (#6365 ) * Add Configurator layout data for LAYOUT_hotswap * Add LAYOUT_std60_split_num0 Requested by 李小安#9728 on QMK Discord. Standard 60% ANSI layout for the alphanumeric region, with a split-0 Numpad. Includes a sample keymap. * Update Docs links on readme * Change melody96.h to use #pragma once include guard * Change config.h to use #pragma once include guard * Add readme for default_std60_split_num0 keymap	2019-07-19 10:39:20 -07:00
Konstantin Đorđević	e040028f1b	Change xprintf() calls in rgblight.c to dprintf() (#6363 )	2019-07-19 08:47:04 -07:00
fauxpark	d417b0cc7d	Tidy up ALF X1.1 (#6367 ) * Tidy up ALF X1.1 * Correct x positions * 4 spaces * Remove a stray TRNS key	2019-07-18 22:05:25 -07:00
mechmerlin	b12b26946d	simple readme fix	2019-07-18 21:16:30 -07:00
trinity1561	918fb7f8da	Print Screen and Pause placement swap (#5981 ) * Update x11.h The original json file that was given by the designer was incorrect. The Print Screen and Pause button is swapped. * Update space65.c Fixing the Caps Lock LED. * Revert "Update space65.c" This reverts commit 1f5de1abaefadd2e54259999a29bab501da5f67a.	2019-07-18 20:04:01 -07:00
jotix	455f15528c	Jotix (#6355 ) * add unicode_map * add unicode_map * numpad change	2019-07-18 19:27:09 -07:00
Joao Maia	00c6892b3f	[Keyboard] Add 6macro keyboard (#6362 ) * Initial commit for 6macro firmware * Updated layout documentation * Removed unused commented code	2019-07-18 12:31:40 -07:00
Fred Silberberg	171f7c561b	Add more layouts for the ergodash (#6336 )	2019-07-18 07:45:48 -07:00
fauxpark	5b4187ad1b	Correct backlight on state docs (#6358 ) * Correct backlight on state docs * Reword to make it less confusing	2019-07-18 07:45:00 -07:00
Ethan Madden	d5b01bd34b	Add prime_e keymap (#6350 )	2019-07-18 06:55:31 -07:00
jshuf	1650ba00f1	Allow userspace the opportunity to handle keycodes	2019-07-17 12:38:08 -07:00
dsanchezseco	f9d47ebe2f	cleanup and start sound (#6353 )	2019-07-17 09:24:49 -07:00
zvecr	05990c9bda	Small fix to allow board to override split keyboard master check	2019-07-05 18:45:57 +01:00