[Docs] Use HTTPS for qmk.fm link (#5506)

* Use HTTPS for qmk.fm link

* Fix the rest of the HTTP links

.gitignore

@@ -54,6 +54,7 @@ util/Win_Check_Output.txt
 .vscode/tasks.json
 .vscode/last.sql
 .vscode/temp.sql
+.vscode/ipch/
 .stfolder
 .tags
 

common_features.mk

@@ -351,3 +351,9 @@ ifeq ($(strip $(OLED_DRIVER_ENABLE)), yes)
     QUANTUM_LIB_SRC += i2c_master.c
     SRC += oled_driver.c
 endif
+
+SPACE_CADET_ENABLE ?= yes
+ifeq ($(strip $(SPACE_CADET_ENABLE)), yes)
+  SRC += $(QUANTUM_DIR)/process_keycode/process_space_cadet.c
+  OPT_DEFS += -DSPACE_CADET_ENABLE
+endif

docs/_summary.md

@@ -63,13 +63,13 @@
   * [LED Matrix](feature_led_matrix.md)
   * [Macros](feature_macros.md)
   * [Mouse Keys](feature_mouse_keys.md)
+  * [OLED Driver](feature_oled_driver)
   * [One Shot Keys](feature_advanced_keycodes.md#one-shot-keys)
   * [Pointing Device](feature_pointing_device.md)
   * [PS/2 Mouse](feature_ps2_mouse.md)
   * [RGB Lighting](feature_rgblight.md)
   * [RGB Matrix](feature_rgb_matrix.md)
-  * [Space Cadet Shift](feature_space_cadet_shift.md)
+  * [Space Cadet](feature_space_cadet.md)
-  * [Space Cadet Shift Enter](feature_space_cadet_shift_enter.md)
   * [Stenography](feature_stenography.md)
   * [Swap Hands](feature_swap_hands.md)
   * [Tap Dance](feature_tap_dance.md)

docs/feature_rgb_matrix.md

@@ -127,13 +127,13 @@ Configure the hardware via your `config.h`:
 From this point forward the configuration is the same for all the drivers. The struct rgb_led array tells the system for each led, what key electrical matrix it represents, what the physical position is on the board, and if the led is for a modifier key or not. Here is a brief example:
 
 ```C
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
 /*  {row | col << 4}
     *    |         {x=0..224, y=0..64}
-    *    |            |              modifier
+    *    |            |              flags
     *    |            |                | */
     {{0|(0<<4)},   {20.36*0, 21.33*0}, 1},
-    {{0|(1<<4)},   {20.36*1, 21.33*0}, 1},
+    {{0|(1<<4)},   {20.36*1, 21.33*0}, 4},
     ....
 }
 ```
@@ -147,7 +147,19 @@ y =  64 / (NUMBER_OF_ROWS - 1) * ROW_POSITION
 
 Where NUMBER_OF_COLS, NUMBER_OF_ROWS, COL_POSITION, & ROW_POSITION are all based on the physical layout of your keyboard, not the electrical layout.
 
-`modifier` is a boolean, whether or not a certain key is considered a modifier (used in some effects).
+`flags` is a bitmask, whether or not a certain LEDs is of a certain type. It is recommended that LEDs are set to only 1 type.
+
+## Flags
+
+|Define                              |Description                                |
+|------------------------------------|-------------------------------------------|
+|`#define HAS_FLAGS(bits, flags)`    |Returns true if `bits` has all `flags` set.|
+|`#define HAS_ANY_FLAGS(bits, flags)`|Returns true if `bits` has any `flags` set.|
+|`#define LED_FLAG_NONE      0x00`   |If thes LED has no flags.                  |
+|`#define LED_FLAG_ALL       0xFF`   |If thes LED has all flags.                 |
+|`#define LED_FLAG_MODIFIER  0x01`   |If the Key for this LED is a modifier.     |
+|`#define LED_FLAG_UNDERGLOW 0x02`   |If the LED is for underglow.               |
+|`#define LED_FLAG_KEYLIGHT  0x04`   |If the LED is for key backlight.           |
 
 ## Keycodes
 

docs/feature_space_cadet.md

@@ -0,0 +1,59 @@
+# Space Cadet: The Future, Built In
+
+Steve Losh described the [Space Cadet Shift](http://stevelosh.com/blog/2012/10/a-modern-space-cadet/) quite well. Essentially, when you tap Left Shift on its own, you get an opening parenthesis; tap Right Shift on its own and you get the closing one. When held, the Shift keys function as normal. Yes, it's as cool as it sounds, and now even cooler supporting Control and Alt as well!
+
+## Usage
+
+Firstly, in your keymap, do one of the following:
+- Replace the Left Shift key with `KC_LSPO` (Left Shift, Parenthesis Open), and Right Shift with `KC_RSPC` (Right Shift, Parenthesis Close).
+- Replace the Left Control key with `KC_LCPO` (Left Control, Parenthesis Open), and Right Control with `KC_RCPC` (Right Control, Parenthesis Close).
+- Replace the Left Alt key with `KC_LAPO` (Left Alt, Parenthesis Open), and Right Alt with `KC_RAPC` (Right Alt, Parenthesis Close).
+- Replace any Shift key in your keymap with `KC_SFTENT` (Right Shift, Enter).
+
+## Keycodes
+
+|Keycode    |Description                                |
+|-----------|-------------------------------------------|
+|`KC_LSPO`  |Left Shift when held, `(` when tapped      |
+|`KC_RSPC`  |Right Shift when held, `)` when tapped     |
+|`KC_LCPO`  |Left Control when held, `(` when tapped    |
+|`KC_RCPC`  |Right Control when held, `)` when tapped   |
+|`KC_LAPO`  |Left Alt when held, `(` when tapped        |
+|`KC_RAPC`  |Right Alt when held, `)` when tapped       |
+|`KC_SFTENT`|Right Shift when held, `Enter` when tapped |
+
+## Caveats
+
+Space Cadet's functionality can conflict with the default Command functionality when both Shift keys are held at the same time. See the [Command feature](feature_command.md) for info on how to change it, or make sure that Command is disabled in your `rules.mk` with:
+
+```make
+COMMAND_ENABLE = no
+```
+
+## Configuration
+
+By default Space Cadet assumes a US ANSI layout, but if your layout uses different keys for parentheses, you can redefine them in your `config.h`. In addition, you can redefine the modifier to send on tap, or even send no modifier at all. The new configuration defines bundle all options up into a single define of 3 key codes in this order: the `Modifier` when held or when used with other keys, the `Tap Modifer` sent when tapped (no modifier if `KC_TRNS`), finally the `Keycode` sent when tapped. Now keep in mind, mods from other keys will still apply to the `Keycode` if say `KC_RSFT` is held while tapping `KC_LSPO` key with `KC_TRNS` as the `Tap Modifer`.
+
+|Define          |Default                        |Description                                                                      |
+|----------------|-------------------------------|---------------------------------------------------------------------------------|
+|`LSPO_KEYS`     |`KC_LSFT, LSPO_MOD, LSPO_KEY`  |Send `KC_LSFT` when held, the mod and  key defined by `LSPO_MOD` and `LSPO_KEY`. |
+|`RSPC_KEYS`     |`KC_RSFT, RSPC_MOD, RSPC_KEY`  |Send `KC_RSFT` when held, the mod and  key defined by `RSPC_MOD` and `RSPC_KEY`. |
+|`LCPO_KEYS`     |`KC_LCTL, KC_LCTL, KC_9`       |Send `KC_LCTL` when held, the mod `KC_LCTL` with the key `KC_9` when tapped.     |
+|`RCPO_KEYS`     |`KC_RCTL, KC_RCTL, KC_0`       |Send `KC_RCTL` when held, the mod `KC_RCTL` with the key `KC_0` when tapped.     |
+|`LAPO_KEYS`     |`KC_LALT, KC_LALT, KC_9`       |Send `KC_LALT` when held, the mod `KC_LALT` with the key `KC_9` when tapped.     |
+|`RAPO_KEYS`     |`KC_RALT, KC_RALT, KC_0`       |Send `KC_RALT` when held, the mod `KC_RALT` with the key `KC_0` when tapped.     |
+|`SFTENT_KEYS`   |`KC_RSFT, KC_TRNS, SFTENT_KEY` |Send `KC_RSFT` when held, no mod with the key `SFTENT_KEY` when tapped.          |
+
+
+## Obsolete Configuration
+
+These defines are used in the above defines internally to support backwards compatibility, so you may continue to use them, however the above defines open up a larger range of flexibility than before. As an example, say you want to not send any modifier when you tap just `KC_LSPO`, with the old defines you had an all or nothing choice of using the `DISABLE_SPACE_CADET_MODIFIER` define. Now you can define that key as: `#define KC_LSPO_KEYS KC_LSFT, KC_TRNS, KC_9`. This tells the system to set Left Shift if held or used with other keys, then on tap send no modifier (transparent) with the `KC_9`
+
+|Define                        |Default      |Description                                                       |
+|------------------------------|-------------|------------------------------------------------------------------|
+|`LSPO_KEY`                    |`KC_9`       |The keycode to send when Left Shift is tapped                     |
+|`RSPC_KEY`                    |`KC_0`       |The keycode to send when Right Shift is tapped                    |
+|`LSPO_MOD`                    |`KC_LSFT`    |The modifier to apply to `LSPO_KEY`                               |
+|`RSPC_MOD`                    |`KC_RSFT`    |The modifier to apply to `RSPC_KEY`                               |
+|`SFTENT_KEY`                  |`KC_ENT`     |The keycode to send when the Shift key is tapped                  |
+|`DISABLE_SPACE_CADET_MODIFIER`|*Not defined*|If defined, prevent the Space Cadet from applying a modifier      |

docs/feature_space_cadet_shift.md

@@ -1,37 +0,0 @@
-# Space Cadet Shift: The Future, Built In
-
-Steve Losh described the [Space Cadet Shift](http://stevelosh.com/blog/2012/10/a-modern-space-cadet/) quite well. Essentially, when you tap Left Shift on its own, you get an opening parenthesis; tap Right Shift on its own and you get the closing one. When held, the Shift keys function as normal. Yes, it's as cool as it sounds.
-
-## Usage
-
-Replace the Left Shift key in your keymap with `KC_LSPO` (Left Shift, Parenthesis Open), and Right Shift with `KC_RSPC` (Right Shift, Parenthesis Close).
-
-## Keycodes
-
-|Keycode  |Description                           |
-|---------|--------------------------------------|
-|`KC_LSPO`|Left Shift when held, `(` when tapped |
-|`KC_RSPC`|Right Shift when held, `)` when tapped|
-
-## Caveats
-
-Space Cadet's functionality can conflict with the default Command functionality when both Shift keys are held at the same time. Make sure that Command is disabled in your `rules.mk` with:
-
-```make
-COMMAND_ENABLE = no
-```
-
-## Configuration
-
-By default Space Cadet assumes a US ANSI layout, but if your layout uses different keys for parentheses, you can redefine them in your `config.h`.
-You can also disable the rollover, allowing you to use the opposite Shift key to cancel the Space Cadet state in the event of an erroneous press, instead of emitting a pair of parentheses when the keys are released.
-Also, by default, the Space Cadet applies modifiers LSPO_MOD and RSPC_MOD to keys defined by LSPO_KEY and RSPC_KEY. You can override this behavior by redefining those variables in your `config.h`. You can also prevent the Space Cadet to apply a modifier by defining DISABLE_SPACE_CADET_MODIFIER in your `config.h`.
-
-|Define                        |Default      |Description                                                                     |
-|------------------------------|-------------|--------------------------------------------------------------------------------|
-|`LSPO_KEY`                    |`KC_9`       |The keycode to send when Left Shift is tapped                                   |
-|`RSPC_KEY`                    |`KC_0`       |The keycode to send when Right Shift is tapped                                  |
-|`LSPO_MOD`                    |`KC_LSFT`    |The keycode to send when Left Shift is tapped                                   |
-|`RSPC_MOD`                    |`KC_RSFT`    |The keycode to send when Right Shift is tapped                                  |
-|`DISABLE_SPACE_CADET_ROLLOVER`|*Not defined*|If defined, use the opposite Shift key to cancel Space Cadet                    |
-|`DISABLE_SPACE_CADET_MODIFIER`|*Not defined*|If defined, prevent the Space Cadet to apply a modifier to LSPO_KEY and RSPC_KEY|

docs/feature_space_cadet_shift_enter.md

@@ -1,31 +0,0 @@
-# Space Cadet Shift Enter
-
-Based on the [Space Cadet Shift](feature_space_cadet_shift.md) feature. Tap the Shift key on its own, and it behaves like Enter. When held, the Shift functions as normal.
-
-## Usage
-
-Replace any Shift key in your keymap with `KC_SFTENT` (Shift, Enter), and you're done.
-
-## Keycodes
-
-|Keycode    |Description                             |
-|-----------|----------------------------------------|
-|`KC_SFTENT`|Right Shift when held, Enter when tapped|
-
-## Caveats
-
-As with Space Cadet Shift, this feature may conflict with Command, so it should be disabled in your `rules.mk` with:
-
-```make
-COMMAND_ENABLE = no
-```
-
-This feature also uses the same timers as Space Cadet Shift, so using them in tandem may produce strange results.
-
-## Configuration
-
-By default Space Cadet assumes a US ANSI layout, but if you'd like to use a different key for Enter, you can redefine it in your `config.h`:
-
-|Define      |Default |Description                                     |
-|------------|--------|------------------------------------------------|
-|`SFTENT_KEY`|`KC_ENT`|The keycode to send when the Shift key is tapped|

keyboards/baguette/info.json

@@ -123,7 +123,7 @@
         {"label":";", "x":10.75, "y":2},
         {"label":"'", "x":11.75, "y":2},
         {"label":"ISO #", "x":12.75, "y":2},
-        {"label":"Enter", "x":13.75, "y":2, "w":1.25, "h":2},
+        {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
         {"label":"Shift", "x":0, "y":3, "w":1.25},
         {"label":"ISO \\", "x":1.25, "y":3},
         {"label":"Z", "x":2.25, "y":3},

keyboards/bm16s/bm16s.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT_ortho_4x4( \
+	K00, K01, K02, K03, \
+	K10, K11, K12, K13, \
+	K20, K21, K22, K23, \
+	K30, K31, K32, K33  \
+) { \
+	{ K00,   K01,   K02,   K03 }, \
+	{ K10,   K11,   K12,   K13 }, \
+	{ K20,   K21,   K22,   K23 }, \
+	{ K30,   K31,   K32,   K33 }  \
+}

keyboards/bm16s/config.h

@@ -0,0 +1,46 @@
+#pragma once
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0x6060
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    KPrepublic
+#define PRODUCT         bm16s
+#define DESCRIPTION     KPrepublic bm16s
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 4
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { D1, D0, D3, D2 }
+#define MATRIX_COL_PINS { F7, F6, D4, D6 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* number of backlight levels */
+
+#ifdef BACKLIGHT_PIN
+    #define BACKLIGHT_LEVELS 3
+#endif
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCING_DELAY 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
+
+#define RGB_DI_PIN E2
+#ifdef RGB_DI_PIN
+    #define RGBLIGHT_ANIMATIONS
+    #define RGBLED_NUM 16
+    #define RGBLIGHT_HUE_STEP 8
+    #define RGBLIGHT_SAT_STEP 8
+    #define RGBLIGHT_VAL_STEP 8
+#endif

keyboards/bm16s/info.json

@@ -0,0 +1,30 @@
+{
+    "keyboard_name": "bm16s",
+    "url": "",
+    "maintainer": "qmk",
+    "width": 4,
+    "height": 4,
+    "layouts": {
+      "LAYOUT_ortho_4x4": {
+        "key_count": 16,
+        "layout": [
+          {"x":0, "y":0},
+          {"x":1, "y":0},
+          {"x":2, "y":0},
+          {"x":3, "y":0},
+          {"x":0, "y":1},
+          {"x":1, "y":1},
+          {"x":2, "y":1},
+          {"x":3, "y":1},
+          {"x":0, "y":2},
+          {"x":1, "y":2},
+          {"x":2, "y":2},
+          {"x":3, "y":2},
+          {"x":0, "y":3},
+          {"x":1, "y":3},
+          {"x":2, "y":3},
+          {"x":3, "y":3}
+        ]
+      }
+    }
+  }

keyboards/bm16s/keymaps/default/keymap.c

@@ -0,0 +1,16 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT_ortho_4x4(
+		KC_KP_7, KC_KP_8, KC_KP_9, MO(1),   \
+		KC_KP_4, KC_KP_5, KC_KP_6, KC_PMNS, \
+		KC_KP_1, KC_KP_2, KC_KP_3, KC_PPLS, \
+		KC_KP_0, KC_PDOT, KC_PCMM, KC_PENT  \
+	),
+	[1] = LAYOUT_ortho_4x4(
+		RESET,   BL_STEP, _______, KC_VOLU, \
+		BL_TOGG, BL_DEC,  BL_INC,  KC_VOLD, \
+		RGB_TOG, RGB_MOD, RGB_HUI, KC_MUTE, \
+		RGB_SAI, RGB_SAD, RGB_HUD, _______  \
+	),
+};

keyboards/bm16s/keymaps/media/keymap.c

@@ -0,0 +1,20 @@
+#include QMK_KEYBOARD_H
+
+#define RGB_BRU RGB_VAI
+#define RGB_BRD RGB_VAD
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_ortho_4x4(
+		KC_BRIU, _______, _______, KC_VOLU, \
+		KC_BRID, _______, _______, KC_VOLD, \
+		_______, _______, _______, KC_MUTE, \
+		KC_MPRV, KC_MPLY, KC_MNXT, MO(1)    \
+	),
+	[1] = LAYOUT_ortho_4x4(
+		RESET,    _______, _______, _______, \
+		RGB_SPD,  RGB_BRU, RGB_SPI, _______, \
+		RGB_RMOD, RGB_BRD, RGB_MOD, _______, \
+		RGB_TOG,  _______, _______, _______  \
+	),
+};

keyboards/bm16s/readme.md

@@ -0,0 +1,13 @@
+# bm16s
+
+A 16-key macropad, with USB C and per-key RGB backlighting. This is a variant of the BM16A, but with low profile Choc switches.
+
+Keyboard Maintainer: QMK Community  
+Hardware Supported: The PCBs, controllers supported  
+Hardware Availability: [KPrepublic](https://kprepublic.com/collections/pcb/products/bm16s-16-keys-custom-mechanical-keyboard-pcb-plate-programmed-numpad-layouts-qmk-firmware-with-rgb-switch-leds-choc-switch); [AliExpress](https://www.aliexpress.com/item/bm16s-16-keys-Custom-Mechanical-Keyboard-PCB-plate-programmed-numpad-layouts-qmk-firmware-with-rgb-switch/32999247908.html); [Massdrop](https://www.massdrop.com/buy/78169)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make bm16s: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/bm16s/rules.mk

@@ -0,0 +1,72 @@
+# MCU name
+MCU = atmega32u4
+
+# Processor frequency.
+#     This will define a symbol, F_CPU, in all source code files equal to the
+#     processor frequency in Hz. You can then use this symbol in your source code to
+#     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
+#     automatically to create a 32-bit value in your source code.
+#
+#     This will be an integer division of F_USB below, as it is sourced by
+#     F_USB after it has run through any CPU prescalers. Note that this value
+#     does not *change* the processor frequency - it should merely be updated to
+#     reflect the processor speed set externally so that the code can use accurate
+#     software delays.
+F_CPU = 16000000
+
+#
+# LUFA specific
+#
+# Target architecture (see library "Board Types" documentation).
+ARCH = AVR8
+
+# Input clock frequency.
+#     This will define a symbol, F_USB, in all source code files equal to the
+#     input clock frequency (before any prescaling is performed) in Hz. This value may
+#     differ from F_CPU if prescaling is used on the latter, and is required as the
+#     raw input clock is fed directly to the PLL sections of the AVR for high speed
+#     clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
+#     at the end, this will be done automatically to create a 32-bit value in your
+#     source code.
+#
+#     If no clock division is performed on the input clock inside the AVR (via the
+#     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
+F_USB = $(F_CPU)
+
+# Interrupt driven control endpoint task(+60)
+OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   atmega32a    bootloadHID
+BOOTLOADER = 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
+#   Teensy halfKay      512
+#   Teensy++ halfKay    1024
+#   Atmel DFU loader    4096
+#   LUFA bootloader     4096
+#   USBaspLoader        2048
+# OPT_DEFS += -DBOOTLOADER_SIZE=4096
+
+# Build Options
+#   comment out to disable the options.
+#
+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
+COMMAND_ENABLE   = no   # Commands for debug and configuration
+SLEEP_LED_ENABLE = no   # Breathing sleep LED during USB suspend
+NKRO_ENABLE      = yes  # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+BACKLIGHT_ENABLE = no   # Enable keyboard backlight functionality
+AUDIO_ENABLE     = no
+RGBLIGHT_ENABLE  = yes
+
+LAYOUTS = ortho_4x4

keyboards/boston_meetup/2019/2019.c

@@ -21,17 +21,17 @@
 #ifdef RGB_MATRIX_ENABLE
 #include "rgblight.h"
 
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
   /*{row | col << 4}
     |             {x=0..224, y=0..64}
     |              |         modifier
     |              |         | */
-  {{1|(3<<4)},    {188, 16}, 0},
+  {{1|(3<<4)},    {188, 16}, 4},
-  {{3|(3<<4)},    {187, 48}, 0},
+  {{3|(3<<4)},    {187, 48}, 4},
-  {{4|(2<<4)},    {149, 64}, 0},
+  {{4|(2<<4)},    {149, 64}, 4},
-  {{4|(1<<4)},    {112, 64}, 0},
+  {{4|(1<<4)},    {112, 64}, 4},
-  {{3|(0<<4)},    {37,  48}, 0},
+  {{3|(0<<4)},    {37,  48}, 4},
-  {{1|(0<<4)},    {38, 16}, 0}
+  {{1|(0<<4)},    {38, 16}, 4}
 };
 #endif
 

keyboards/butterstick/butterstick.c

@@ -0,0 +1,56 @@
+/* Copyright 2019 Jeremy Bernhardt
+ *
+ * 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 "butterstick.h"
+
+// Optional override functions below.
+// You can leave any or all of these undefined.
+// These are only required if you want to perform custom actions.
+
+/*
+
+void matrix_init_kb(void) {
+  // put your keyboard start-up code here
+  // runs once when the firmware starts up
+
+  matrix_init_user();
+}
+*/
+
+void matrix_scan_kb(void) {
+#ifdef DEBUG_MATRIX
+    for (uint8_t c = 0; c < MATRIX_COLS; c++)
+		for (uint8_t r = 0; r < MATRIX_ROWS; r++)
+		  if (matrix_is_on(r, c)) xprintf("r:%d c:%d \n", r, c);
+#endif
+
+  matrix_scan_user();
+}
+
+/*
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+  // put your per-action keyboard code here
+  // runs for every action, just before processing by the firmware
+
+  return process_record_user(keycode, record);
+}
+
+void led_set_kb(uint8_t usb_led) {
+  // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
+
+  led_set_user(usb_led);
+}
+
+*/

keyboards/butterstick/butterstick.h

@@ -0,0 +1,11 @@
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT_butter( 										\
+    k09, k08, k07, k06, k05, k04, k03, k02, k01, k00,		\
+	k19, k18, k17, k16, k15, k14, k13, k12, k11, k10		\
+) { 														\
+	{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09},	\
+	{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19},	\
+}

keyboards/butterstick/config.h

@@ -0,0 +1,26 @@
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0x1337
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    g Heavy Industries
+#define PRODUCT         Butter Stick
+#define DESCRIPTION     Its a stick of butter
+#define VERSION 		"Paula Deen"
+
+#define DEBOUNCING_DELAY 5
+#define FORCE_NKRO
+
+/* key matrix size */
+#define MATRIX_ROWS 2
+#define MATRIX_COLS 10
+#define MATRIX_ROW_PINS { F4, F5 }
+#define MATRIX_COL_PINS { B0, B1, B2, B3, B4, B5, B6, B7, C6, C7}
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION ROW2COL
+

keyboards/butterstick/keymaps/default/keymap.c

@@ -0,0 +1,183 @@
+#include QMK_KEYBOARD_H
+
+#include "sten.h"
+/* 	 	
+ *  Key names are inherited from steno machines
+ *  .-----------------------------------------------------.
+ *	| LSU | LFT | LP | LH | ST1 | RF | RP | RL | RT | RD  |
+ *  |-----------------------------------------------------|
+ *	| LSD | LK  | LW | LR | ST2 | RR | RB | RG | RS | RZ  |
+ *  '-----------------------------------------------------'
+ */
+
+// Function prefixes
+#define MEDIA 	(LSD | LK  | LW | LR)	
+#define FUNCT 	(LSD | LK  | LP | LH)	
+#define MOVE	(LSU | LFT | LP | LH)	
+#define SYMB	(RD  | RZ)	
+#define NUMA    (LW  | LR)	
+#define NUMB    (RR  | RB)	
+
+// QMK Layer Numbers
+ #define BASE 0
+ #define GAME 1
+
+// Do not change QMK Layer 0! This is your main keyboard.
+// Make your QMK modifications to the later layers, to add 
+// keys/customize on the first layer modify processQwerty():
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [BASE] = LAYOUT_butter(
+  	STN_S1,  STN_TL,  STN_PL,  STN_HL,  STN_ST1, STN_FR,  STN_PR,  STN_LR,  STN_TR,  STN_DR,
+   	STN_S2,  STN_KL,  STN_WL,  STN_RL,  STN_ST2, STN_RR,  STN_BR,  STN_GR,  STN_SR,  STN_ZR
+  ),
+  // I don't game don't roast me thanks
+  [GAME] = LAYOUT_butter(
+  	KC_Q,  KC_W,  KC_E,  KC_R,  KC_T, KC_Y, KC_U, KC_I,  KC_O, KC_ENT,
+  	KC_A,  KC_S,  KC_D,  KC_F,  KC_G, KC_H, KC_J, KC_K,  KC_L, TO(BASE)
+  )
+};
+
+// Note: You can only use basic keycodes here!
+// P() is just a wrapper to make your life easier, any C code can be executed.
+// Only the longest matched chord is run!
+//
+// http://docs.gboards.ca
+uint32_t processQwerty(bool lookup) {
+    // SECRET AGENT CHORDS
+    P( LSU | LK | RS | RD,    	SEND_STRING(VERSION); SEND_STRING(__DATE__));
+    P( LSD | RZ,   			 	SEND(KC_SPC));
+
+    // Dual chords
+    P( LP  | LH,    			CLICK_MOUSE(KC_MS_BTN2));
+    P( ST1 | RF,    			CLICK_MOUSE(KC_MS_BTN1));
+    P( LSU | LFT,               SEND(KC_ESC));
+	P( LSD | LK,				SEND(KC_LSFT));
+	P( RZ  | RS,				SEND(KC_LSFT));
+	P( ST2 | RR,				SEND(KC_SPC));
+    P( RP  | RL,    			SEND(KC_LGUI));
+    P( RT  | RD,    			SEND(KC_LCTL));
+    P( RL  | RT,    			SEND(KC_LALT));
+	P( LSU | LSD | LFT | LK,	SEND(KC_LCTL));
+	P( RS  | RT  | RD  | RZ,	SEND(KC_ENT));
+
+    // Function Layer
+    P( FUNCT | RF,         SEND(KC_F1));
+    P( FUNCT | RP,         SEND(KC_F2));
+    P( FUNCT | RL,         SEND(KC_F3));
+    P( FUNCT | RT,         SEND(KC_F4));
+    P( FUNCT | RF | RR,    SEND(KC_F5));
+    P( FUNCT | RP | RB,    SEND(KC_F6));
+    P( FUNCT | RL | RG,    SEND(KC_F7));
+    P( FUNCT | RT | RS,    SEND(KC_F8));
+    P( FUNCT | RR,         SEND(KC_F9));
+    P( FUNCT | RB,         SEND(KC_F10));
+    P( FUNCT | RG,         SEND(KC_F11));
+    P( FUNCT | RS,         SEND(KC_F12));
+
+    // Movement Layer
+    P( MOVE | RF,     SEND(KC_LEFT));
+    P( MOVE | RP,     SEND(KC_DOWN));
+    P( MOVE | RL,     SEND(KC_UP));
+    P( MOVE | RT,     SEND(KC_RIGHT));
+    P( MOVE | ST1,    SEND(KC_PGUP));
+    P( MOVE | ST2,    SEND(KC_PGDN));
+
+    // Media Layer
+    P( MEDIA | RF,    SEND(KC_MPRV));
+    P( MEDIA | RP,    SEND(KC_MPLY));
+    P( MEDIA | RL,    SEND(KC_MPLY));
+    P( MEDIA | RT,    SEND(KC_MNXT));
+    P( MEDIA | RG,	  SEND(KC_VOLU));
+    P( MEDIA | RB,    SEND(KC_VOLD));
+    P( MEDIA | RS,    SEND(KC_MUTE));
+
+    // Number Row, Right
+    P( NUMB | LSU,    SEND(KC_1));
+    P( NUMB | LFT,    SEND(KC_2));
+    P( NUMB | LP,     SEND(KC_3));
+    P( NUMB | LH,     SEND(KC_4));
+    P( NUMB | ST1,    SEND(KC_5));
+    P( NUMB | RF,     SEND(KC_6));
+    P( NUMB | RP,     SEND(KC_7));
+    P( NUMB | RL,     SEND(KC_8));
+    P( NUMB | RT,     SEND(KC_9));
+    P( NUMB | RD,     SEND(KC_0));
+
+    // Number Row, Left
+    P( NUMA | LSU,    SEND(KC_1));
+    P( NUMA | LFT,    SEND(KC_2));
+    P( NUMA | LP,     SEND(KC_3));
+    P( NUMA | LH,     SEND(KC_4));
+    P( NUMA | ST1,    SEND(KC_5));
+    P( NUMA | RF,     SEND(KC_6));
+    P( NUMA | RP,     SEND(KC_7));
+    P( NUMA | RL,     SEND(KC_8));
+    P( NUMA | RT,     SEND(KC_9));
+    P( NUMA | RD,     SEND(KC_0));
+
+
+    // Symbols and Numbers
+    P( SYMB | LP | LW,      SEND(KC_LSFT); SEND(KC_9));       // (
+    P( SYMB | LH | LR,      SEND(KC_LSFT); SEND(KC_0));       // )
+    P( SYMB | ST1 | ST2,    SEND(KC_GRV));                    // `
+    P( SYMB | RR  | RF,    	SEND(KC_LSFT); SEND(KC_3));       // #
+    P( SYMB | LFT | LK,     SEND(KC_LSFT); SEND(KC_4));       // $
+    P( SYMB | LSU,          SEND(KC_LSFT); SEND(KC_1));       // !
+    P( SYMB | LSD,          SEND(KC_LSFT); SEND(KC_5));       // %
+    P( SYMB | LFT,          SEND(KC_LSFT); SEND(KC_2));       // @
+    P( SYMB | LK,           SEND(KC_LSFT); SEND(KC_6));       // ^
+    P( SYMB | LP,           SEND(KC_LSFT); SEND(KC_LBRC));    // {
+    P( SYMB | LW,           SEND(KC_LBRC));
+    P( SYMB | LH,           SEND(KC_LSFT); SEND(KC_RBRC));    // }
+    P( SYMB | LR,           SEND(KC_RBRC));
+    P( SYMB | ST1,          SEND(KC_LSFT); SEND(KC_BSLS));    // |
+    P( SYMB | ST2,          SEND(KC_LSFT); SEND(KC_GRV));     // ~
+    P( SYMB | RP | RB,      SEND(KC_QUOT));
+    P( SYMB | RP | RG,      SEND(KC_LSFT); SEND(KC_QUOT));    // "
+    P( SYMB | RF,           SEND(KC_KP_PLUS));
+    P( SYMB | RR,           SEND(KC_LSFT); SEND(KC_7));       // &
+    P( SYMB | RP,           SEND(KC_MINS));
+    P( SYMB | RB,           SEND(KC_EQL));
+    P( SYMB | RL,           SEND(KC_SLSH));
+    P( SYMB | RG,           SEND(KC_COMM));
+    P( SYMB | RT,           SEND(KC_PAST));
+    P( SYMB | RS,           SEND(KC_DOT));
+
+    // Letters
+    P( LSU | LSD,    SEND(KC_A));
+    P( LFT | LK,     SEND(KC_S));
+    P( LP  | LW,     SEND(KC_D));
+    P( LH  | LR,     SEND(KC_F));
+    P( ST1 | ST2,    SEND(KC_G));
+    P( RF  | RR,     SEND(KC_H));
+    P( RT  | RS,     SEND(KC_L));
+    P( RD  | RZ,     SEND(KC_SCLN));
+    P( RG  | RL,     SEND(KC_K));
+    P( RP  | RB,     SEND(KC_J));
+    P( LSU,          SEND(KC_Q));
+    P( LSD,          SEND(KC_Z));
+    P( LFT,          SEND(KC_W));
+    P( LK,           SEND(KC_X));
+    P( LP,           SEND(KC_E));
+    P( LW,           SEND(KC_C));
+    P( LH,           SEND(KC_R));
+    P( LR,           SEND(KC_V));
+    P( ST1,          SEND(KC_T));
+    P( ST2,          SEND(KC_B));
+    P( RF,          SEND(KC_Y));
+    P( RR,          SEND(KC_N));
+    P( RP,           SEND(KC_U));
+    P( RB,           SEND(KC_M));
+    P( RL,           SEND(KC_I));
+    P( RG,           SEND(KC_COMM));
+    P( RT,           SEND(KC_O));
+    P( RS,           SEND(KC_DOT));
+    P( RD,           SEND(KC_P));
+    P( RZ,           SEND(KC_SLSH));
+
+    return 0;
+}
+
+
+// Don't fuck with this, thanks.
+size_t keymapsCount  = sizeof(keymaps)/sizeof(keymaps[0]);

keyboards/butterstick/readme.md

@@ -0,0 +1,14 @@
+# Butter Stick
+
+![Butter Stick](https://i.redd.it/mvteaomko7s21.jpg)
+
+A chorded 20% keyboard packing full sized useage into  your pocket. More info on [gboards.ca](http://docs.gboards.ca/Meet-Butter-Stick)!
+
+Keyboard Maintainer: [Germ](https://github.com/germ)  
+Hardware Availability: [g Heavy Industries](https://www.gboards.ca/product/butter-stick-limited-edition)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make butterstick: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/butterstick/rules.mk

@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+F_CPU = 16000000
+ARCH = AVR8
+F_USB = $(F_CPU)
+
+OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT -DONLYQWERTY -DDEBUG_MATRIX
+SRC += sten.c
+EXTRAFLAGS += -flto
+
+
+BOOTLOADER = atmel-dfu
+MOUSEKEY_ENABLE 	= yes		# Mouse keys(+4700)
+EXTRAKEY_ENABLE 	= yes       # Audio control and System control(+450)
+CONSOLE_ENABLE 		= yes       # Console for debug(+400)
+COMMAND_ENABLE 		= no		# Commands for debug and configuration
+NKRO_ENABLE 		= yes       # USB Nkey Rollover
+STENO_ENABLE		= yes 		# Needed for chording
+

keyboards/butterstick/sten.c

@@ -0,0 +1,367 @@
+#include "sten.h"
+
+// Chord state
+uint32_t cChord 		= 0;		// Current Chord
+int		 chordIndex 	= 0;		// Keys in previousachord
+int32_t  chordState[32];			// Full Chord history
+#define  QWERBUF		24			// Size of chords to buffer for output
+
+bool	 repeatFlag 	= false;	// Should we repeat?
+uint32_t pChord 		= 0;		// Previous Chord
+int		 pChordIndex 	= 0;		// Keys in previousachord
+uint32_t pChordState[32];			// Previous chord sate 
+uint32_t stickyBits = 0;			// Or'd with every incoming press
+
+// Mode state
+enum MODE { STENO = 0, QWERTY, COMMAND };
+enum MODE pMode;
+bool QWERSTENO = false;
+#ifdef ONLYQWERTY
+enum MODE cMode = QWERTY;
+#else
+enum MODE cMode = STENO;
+#endif
+
+// Command State
+#define MAX_CMD_BUF   20
+uint8_t	 CMDLEN 	= 0;
+uint8_t	 CMDBUF[MAX_CMD_BUF];
+
+// Key Repeat state
+bool     inChord  		= false;
+bool	 repEngaged 	= false;
+uint16_t repTimer 		= 0;
+#define  REP_INIT_DELAY 750
+#define  REP_DELAY 		25
+
+// Mousekeys state
+bool	inMouse 		= false;
+int8_t	mousePress;
+
+// All processing done at chordUp goes through here
+// Note, this is a gutted version of the Georgi sten.h
+bool send_steno_chord_user(steno_mode_t mode, uint8_t chord[6]) { 
+	// Check for mousekeys, this is release
+#ifdef MOUSEKEY_ENABLE
+	if (inMouse) {
+		inMouse = false;
+		mousekey_off(mousePress);
+		mousekey_send();
+	}
+#endif
+
+	// handle command mode
+	if (cChord == (LSU | LSD | RD | RZ)) {
+		if (cMode != COMMAND) {   // Entering Command Mode
+			CMDLEN = 0;
+			pMode = cMode;
+			cMode = COMMAND;
+		} else {                  // Exiting Command Mode
+			cMode = pMode;
+
+			// Press all and release all
+			for (int i = 0; i < CMDLEN; i++) {
+				register_code(CMDBUF[i]);
+			}
+			clear_keyboard();
+		}
+
+		goto out;
+	}
+
+	// Handle Gaming Toggle,
+	if (cChord == (LSU | LSD | LFT | LK | RT | RS | RD | RZ) && keymapsCount > 1) {
+#ifndef NO_DEBUG
+		uprintf("Switching to QMK\n");
+#endif
+		layer_on(1);
+		goto out;
+	}
+
+	// Do QWERTY and Momentary QWERTY
+	if (cMode == QWERTY || (cMode == COMMAND)) {
+		processChord(false);
+		goto out;
+	} 
+
+out:
+	cChord = 0;
+	inChord = false;
+	chordIndex = 0;
+	clear_keyboard();
+	repEngaged  = false;
+	for (int i = 0; i < 32; i++)
+		chordState[i] = 0xFFFF;
+
+	return false;
+}
+
+// Update Chord State 
+bool process_steno_user(uint16_t keycode, keyrecord_t *record) { 
+	// Everything happens in here when steno keys come in.
+	// Bail on keyup
+	if (!record->event.pressed) return true;
+
+	// Update key repeat timers
+	repTimer = timer_read();
+	inChord  = true;
+
+	// Switch on the press adding to chord
+	bool pr = record->event.pressed;
+	switch (keycode) {
+			// Mods and stuff
+			case STN_ST1:			pr ? (cChord |= (ST1)): (cChord &= ~(ST1)); break;
+			case STN_ST2:			pr ? (cChord |= (ST2)): (cChord &= ~(ST2)); break;
+			case STN_ST3:			pr ? (cChord |= (ST3)): (cChord &= ~(ST3)); break;
+			case STN_ST4:			pr ? (cChord |= (ST4)): (cChord &= ~(ST4)); break;
+			case STN_FN:			pr ? (cChord |= (FN)) : (cChord &= ~(FN)); break;
+			case STN_PWR:			pr ? (cChord |= (PWR)): (cChord &= ~(PWR)); break;
+			case STN_N1...STN_N6:	pr ? (cChord |= (LNO)): (cChord &= ~(LNO)); break;
+			case STN_N7...STN_NC:	pr ? (cChord |= (RNO)): (cChord &= ~(RNO)); break;
+
+			// All the letter keys
+			case STN_S1:			pr ? (cChord |= (LSU)) : (cChord &= ~(LSU));  break;
+			case STN_S2:			pr ? (cChord |= (LSD)) : (cChord &= ~(LSD));  break;
+			case STN_TL:			pr ? (cChord |= (LFT)) : (cChord &= ~(LFT)); break;
+			case STN_KL:			pr ? (cChord |= (LK)) : (cChord &= ~(LK)); break;
+			case STN_PL:			pr ? (cChord |= (LP)) : (cChord &= ~(LP)); break;
+			case STN_WL:			pr ? (cChord |= (LW)) : (cChord &= ~(LW)); break;
+			case STN_HL:			pr ? (cChord |= (LH)) : (cChord &= ~(LH)); break;
+			case STN_RL:			pr ? (cChord |= (LR)) : (cChord &= ~(LR)); break;
+			case STN_A:				pr ? (cChord |= (LA)) : (cChord &= ~(LA)); break;
+			case STN_O:				pr ? (cChord |= (LO)) : (cChord &= ~(LO)); break;
+			case STN_E:				pr ? (cChord |= (RE)) : (cChord &= ~(RE)); break;
+			case STN_U:				pr ? (cChord |= (RU)) : (cChord &= ~(RU)); break;
+			case STN_FR:			pr ? (cChord |= (RF)) : (cChord &= ~(RF)); break;
+			case STN_RR:			pr ? (cChord |= (RR)) : (cChord &= ~(RR)); break;
+			case STN_PR:			pr ? (cChord |= (RP)) : (cChord &= ~(RP)); break;
+			case STN_BR:			pr ? (cChord |= (RB)) : (cChord &= ~(RB)); break;
+			case STN_LR:			pr ? (cChord |= (RL)) : (cChord &= ~(RL)); break;
+			case STN_GR:			pr ? (cChord |= (RG)) : (cChord &= ~(RG)); break;
+			case STN_TR:			pr ? (cChord |= (RT)) : (cChord &= ~(RT)); break;
+			case STN_SR:			pr ? (cChord |= (RS)) : (cChord &= ~(RS)); break;
+			case STN_DR:			pr ? (cChord |= (RD)) : (cChord &= ~(RD)); break;
+			case STN_ZR:			pr ? (cChord |= (RZ)) : (cChord &= ~(RZ)); break;
+	}
+
+	// Store previous state for fastQWER
+	if (pr) {
+		chordState[chordIndex] = cChord; 
+		chordIndex++;
+	}
+
+	return true; 
+}
+void matrix_scan_user(void) {
+	// We abuse this for early sending of key
+	// Key repeat only on QWER/SYMB layers
+	if (cMode != QWERTY || !inChord) return;
+
+	// Check timers
+#ifndef NO_REPEAT
+	if (repEngaged && timer_elapsed(repTimer) > REP_DELAY) {
+		// Process Key for report
+		processChord(false);
+
+		// Send report to host
+		send_keyboard_report();
+		clear_keyboard();
+		repTimer = timer_read();
+	}
+
+	if (!repEngaged && timer_elapsed(repTimer) > REP_INIT_DELAY) {
+		repEngaged = true;
+	}
+#endif
+};
+
+// For Plover NKRO
+uint32_t processFakeSteno(bool lookup) { 
+	P( LSU,				SEND(KC_Q););
+	P( LSD,				SEND(KC_A););
+	P( LFT,				SEND(KC_W););
+	P( LP,				SEND(KC_E););
+	P( LH,				SEND(KC_R););
+	P( LK,				SEND(KC_S););
+	P( LW,				SEND(KC_D););
+	P( LR,				SEND(KC_F););
+	P( ST1,				SEND(KC_T););
+	P( ST2,				SEND(KC_G););
+	P( LA,				SEND(KC_C););
+	P( LO,				SEND(KC_V););
+	P( RE,				SEND(KC_N););
+	P( RU,				SEND(KC_M););
+	P( ST3,				SEND(KC_Y););
+	P( ST4,				SEND(KC_H););
+	P( RF,				SEND(KC_U););
+	P( RP,				SEND(KC_I););
+	P( RL,				SEND(KC_O););
+	P( RT,				SEND(KC_P););
+	P( RD,				SEND(KC_LBRC););
+	P( RR,				SEND(KC_J););
+	P( RB,				SEND(KC_K););
+	P( RG,				SEND(KC_L););
+	P( RS,				SEND(KC_SCLN););
+	P( RZ,				SEND(KC_COMM););
+	P( LNO,				SEND(KC_1););
+	P( RNO,				SEND(KC_1););
+
+	return 0;
+}
+
+// Traverse the chord history to a given point
+// Returns the mask to use
+void processChord(bool useFakeSteno) {
+	// Save the clean chord state
+	uint32_t savedChord = cChord;
+
+	// Apply Stick Bits if needed
+	if (stickyBits != 0) {
+		cChord |= stickyBits;
+		for (int i = 0; i <= chordIndex; i++)
+			chordState[i] |= stickyBits;
+	}
+
+	// Strip FN
+	if (cChord & FN) cChord ^= FN;
+
+	// First we test if a whole chord was passsed
+	// If so we just run it handling repeat logic
+	if (useFakeSteno && processFakeSteno(true) == cChord) {
+		processFakeSteno(false);
+		return;
+	} else if (processQwerty(true) == cChord) {
+		processQwerty(false);
+		// Repeat logic
+		if (repeatFlag) {
+			restoreState();
+			repeatFlag = false;
+			processChord(false);
+		} else {
+			saveState(cChord);
+		}
+		return;
+	}
+
+	// Iterate through chord picking out the individual 
+	// and longest chords
+	uint32_t bufChords[QWERBUF];
+	int 	 bufLen		= 0;
+	uint32_t mask		= 0;
+
+	// We iterate over it multiple times to catch the longest
+	// chord. Then that gets addded to the mask and re run.
+	while (savedChord != mask) {
+		uint32_t test  	 		= 0;
+		uint32_t longestChord	= 0;
+
+		for (int i = 0; i <= chordIndex; i++) {
+			cChord = chordState[i] & ~mask;
+			if (cChord == 0)
+				continue;
+
+			// Assume mid parse Sym is new chord
+			if (i != 0 && test != 0 && (cChord ^ test) == PWR) {
+				longestChord = test;
+				break;
+			}
+
+			// Lock SYM layer in once detected
+			if (mask & PWR)
+				cChord |= PWR;
+
+
+			// Testing for keycodes
+			if (useFakeSteno) {
+				test = processFakeSteno(true);
+			} else {
+				test = processQwerty(true);
+			}
+		 
+			if (test != 0) {
+				longestChord = test;
+			}
+		}
+		
+		mask |= longestChord;
+		bufChords[bufLen] = longestChord;
+		bufLen++;
+
+		// That's a loop of sorts, halt processing
+		if (bufLen >= QWERBUF) {
+			return;
+		}
+	}
+	
+	// Now that the buffer is populated, we run it
+	for (int i = 0; i < bufLen ; i++) {
+		cChord = bufChords[i];
+		if (useFakeSteno) {
+			processFakeSteno(false);
+		} else {
+			processQwerty(false);
+		}
+	}
+
+	// Save state in case of repeat
+	if (!repeatFlag) {			
+		saveState(savedChord);
+	}
+
+	// Restore cChord for held repeat
+	cChord = savedChord;
+
+	return;
+}
+void saveState(uint32_t cleanChord) {
+	pChord = cleanChord;
+	pChordIndex = chordIndex;
+	for (int i = 0; i < 32; i++) 
+		pChordState[i] = chordState[i];
+}
+void restoreState() {
+	cChord = pChord;
+	chordIndex = pChordIndex;
+	for (int i = 0; i < 32; i++) 
+		chordState[i] = pChordState[i];
+}
+
+// Macros for calling from keymap.c
+void SEND(uint8_t kc) {
+	// Send Keycode, Does not work for Quantum Codes
+	if (cMode == COMMAND && CMDLEN < MAX_CMD_BUF) {
+#ifndef NO_DEBUG
+		uprintf("CMD LEN: %d BUF: %d\n", CMDLEN, MAX_CMD_BUF);
+#endif
+		CMDBUF[CMDLEN] = kc;
+		CMDLEN++;
+	} 
+
+	if (cMode != COMMAND) register_code(kc);
+	return;
+}
+void REPEAT(void) {
+	if (cMode != QWERTY)
+		return;
+
+	repeatFlag = true;
+	return;
+}
+void SET_STICKY(uint32_t stick) {
+	stickyBits = stick;
+	return;
+}
+void SWITCH_LAYER(int layer) {
+	if (keymapsCount >= layer) 
+		layer_on(layer);
+}
+void CLICK_MOUSE(uint8_t kc) {
+#ifdef MOUSEKEY_ENABLE
+	mousekey_on(kc);
+	mousekey_send();
+
+	// Store state for later use
+	inMouse = true;
+	mousePress = kc;
+#endif
+}

keyboards/butterstick/sten.h

@@ -0,0 +1,77 @@
+// 2019, g Heavy Industries
+// Blessed mother of Christ, please keep this readable
+// and protect us from segfaults. For thine is the clock,
+// the slave and the master. Until we return from main.
+//
+// Amen.
+
+#include QMK_KEYBOARD_H
+#include "mousekey.h"
+#include "keymap.h"
+#include "keymap_steno.h"
+#include "wait.h"
+
+extern size_t keymapsCount;			// Total keymaps
+extern uint32_t cChord;				// Current Chord
+
+// Function defs
+void 			processChord(bool useFakeSteno);
+uint32_t		processQwerty(bool lookup);
+uint32_t 		processFakeSteno(bool lookup);
+void 			saveState(uint32_t cChord);
+void 			restoreState(void);
+
+// Macros for use in keymap.c
+void 			SEND(uint8_t kc);
+void 			REPEAT(void);
+void 			SET_STICKY(uint32_t);
+void 			SWITCH_LAYER(int);
+void 			CLICK_MOUSE(uint8_t);
+
+// Keymap helper
+#define P(chord, act) if (cChord == (chord)) { if (!lookup) {act;} return chord;}
+
+// Shift to internal representation
+// i.e) S(teno)R(ight)F
+#define STN(n) (1L<<n)
+enum ORDER { 
+		SFN = 0, SPWR, SST1, SST2, SST3, SST4, SNUML, SNUMR,
+		SLSU, SLSD, SLT, SLK, SLP, SLW, SLH, SLR, SLA, SLO, 
+		SRE, SRU, SRF, SRR, SRP, SRB, SRL, SRG, SRT, SRS, SRD, SRZ, SRES1, SRES2
+};
+
+// Break it all out
+#define FN	STN(SFN)
+#define PWR	STN(SPWR)
+#define ST1 STN(SST1)
+#define ST2 STN(SST2)
+#define ST3 STN(SST3)
+#define ST4 STN(SST4)
+#define LNO STN(SNUML) 	// STN1-6
+#define RNO STN(SNUMR) 	// STN7-C
+#define RES1 STN(SRES1) // Use reserved for sticky state
+#define RES2 STN(SRES2)
+
+#define LSU STN(SLSU)
+#define LSD STN(SLSD)
+#define LFT STN(SLT)  	// (L)e(F)t (T), preprocessor conflict
+#define LK  STN(SLK)
+#define LP  STN(SLP)
+#define LW  STN(SLW)
+#define LH  STN(SLH)
+#define LR  STN(SLR)
+#define LA  STN(SLA)
+#define LO  STN(SLO)
+
+#define RE  STN(SRE)
+#define RU  STN(SRU)
+#define RF  STN(SRF)
+#define RR  STN(SRR)
+#define RP  STN(SRP)
+#define RB  STN(SRB)
+#define RL  STN(SRL)
+#define RG  STN(SRG)
+#define RT  STN(SRT)
+#define RS  STN(SRS)
+#define RD  STN(SRD)
+#define RZ  STN(SRZ)

keyboards/crkbd/rev1/rev1.c

@@ -56,70 +56,70 @@ void led_set_kb(uint8_t usb_led) {
  *      |                            |           |     modifier
  *      |                            |           |   */
 #define RGB_MATRIX_LEFT_LEDS  \
-    { { 0xFF           }, {  85, 16 }, 0 }, /*  1 */ \
+    { { 0xFF           }, {  85, 16 }, 2 }, /*  1 */ \
-    { { 0xFF           }, {  50, 13 }, 0 }, /*  2 */ \
+    { { 0xFF           }, {  50, 13 }, 2 }, /*  2 */ \
-    { { 0xFF           }, {  16, 20 }, 0 }, /*  3 */ \
+    { { 0xFF           }, {  16, 20 }, 2 }, /*  3 */ \
-    { { 0xFF           }, {  16, 38 }, 0 }, /*  4 */ \
+    { { 0xFF           }, {  16, 38 }, 2 }, /*  4 */ \
-    { { 0xFF           }, {  50, 48 }, 0 }, /*  5 */ \
+    { { 0xFF           }, {  50, 48 }, 2 }, /*  5 */ \
-    { { 0xFF           }, {  85, 52 }, 0 }, /*  6 */ \
+    { { 0xFF           }, {  85, 52 }, 2 }, /*  6 */ \
     { { 3 | ( 5 << 4 ) }, {  95, 63 }, 1 }, /*  7 */ \
-    { { 2 | ( 5 << 4 ) }, {  85, 39 }, 0 }, /*  8 */ \
+    { { 2 | ( 5 << 4 ) }, {  85, 39 }, 4 }, /*  8 */ \
-    { { 1 | ( 5 << 4 ) }, {  85, 21 }, 0 }, /*  9 */ \
+    { { 1 | ( 5 << 4 ) }, {  85, 21 }, 4 }, /*  9 */ \
-    { { 0 | ( 5 << 4 ) }, {  85,  4 }, 0 }, /* 10 */ \
+    { { 0 | ( 5 << 4 ) }, {  85,  4 }, 4 }, /* 10 */ \
-    { { 0 | ( 4 << 4 ) }, {  68, 02 }, 0 }, /* 11 */ \
+    { { 0 | ( 4 << 4 ) }, {  68, 02 }, 4 }, /* 11 */ \
-    { { 1 | ( 4 << 4 ) }, {  68, 19 }, 0 }, /* 12 */ \
+    { { 1 | ( 4 << 4 ) }, {  68, 19 }, 4 }, /* 12 */ \
-    { { 2 | ( 4 << 4 ) }, {  68, 37 }, 0 }, /* 13 */ \
+    { { 2 | ( 4 << 4 ) }, {  68, 37 }, 4 }, /* 13 */ \
     { { 3 | ( 4 << 4 ) }, {  80, 58 }, 1 }, /* 14 */ \
     { { 3 | ( 3 << 4 ) }, {  60, 55 }, 1 }, /* 15 */ \
-    { { 2 | ( 3 << 4 ) }, {  50, 35 }, 0 }, /* 16 */ \
+    { { 2 | ( 3 << 4 ) }, {  50, 35 }, 4 }, /* 16 */ \
-    { { 1 | ( 3 << 4 ) }, {  50, 13 }, 0 }, /* 17 */ \
+    { { 1 | ( 3 << 4 ) }, {  50, 13 }, 4 }, /* 17 */ \
-    { { 0 | ( 3 << 4 ) }, {  50,  0 }, 0 }, /* 18 */ \
+    { { 0 | ( 3 << 4 ) }, {  50,  0 }, 4 }, /* 18 */ \
-    { { 0 | ( 2 << 4 ) }, {  33,  3 }, 0 }, /* 19 */ \
+    { { 0 | ( 2 << 4 ) }, {  33,  3 }, 4 }, /* 19 */ \
-    { { 1 | ( 2 << 4 ) }, {  33, 20 }, 0 }, /* 20 */ \
+    { { 1 | ( 2 << 4 ) }, {  33, 20 }, 4 }, /* 20 */ \
-    { { 2 | ( 2 << 4 ) }, {  33, 37 }, 0 }, /* 21 */ \
+    { { 2 | ( 2 << 4 ) }, {  33, 37 }, 4 }, /* 21 */ \
-    { { 2 | ( 1 << 4 ) }, {  16, 42 }, 0 }, /* 22 */ \
+    { { 2 | ( 1 << 4 ) }, {  16, 42 }, 4 }, /* 22 */ \
-    { { 1 | ( 1 << 4 ) }, {  16, 24 }, 0 }, /* 23 */ \
+    { { 1 | ( 1 << 4 ) }, {  16, 24 }, 4 }, /* 23 */ \
-    { { 0 | ( 1 << 4 ) }, {  16,  7 }, 0 }, /* 24 */ \
+    { { 0 | ( 1 << 4 ) }, {  16,  7 }, 4 }, /* 24 */ \
     { { 0 | ( 0 << 4 ) }, {   0,  7 }, 1 }, /* 25 */ \
     { { 1 | ( 0 << 4 ) }, {   0, 24 }, 1 }, /* 26 */ \
     { { 2 | ( 0 << 4 ) }, {   0, 41 }, 1 }, /* 27 */
 
 #define RGB_MATRIX_RIGHT_LEDS  \
-    { { 0xFF           }, { 139, 16 }, 0 }, /*  1 */ \
+    { { 0xFF           }, { 139, 16 }, 2 }, /*  1 */ \
-    { { 0xFF           }, { 174, 13 }, 0 }, /*  2 */ \
+    { { 0xFF           }, { 174, 13 }, 2 }, /*  2 */ \
-    { { 0xFF           }, { 208, 20 }, 0 }, /*  3 */ \
+    { { 0xFF           }, { 208, 20 }, 2 }, /*  3 */ \
-    { { 0xFF           }, { 208, 38 }, 0 }, /*  4 */ \
+    { { 0xFF           }, { 208, 38 }, 2 }, /*  4 */ \
-    { { 0xFF           }, { 174, 48 }, 0 }, /*  5 */ \
+    { { 0xFF           }, { 174, 48 }, 2 }, /*  5 */ \
-    { { 0xFF           }, { 139, 52 }, 0 }, /*  6 */ \
+    { { 0xFF           }, { 139, 52 }, 2 }, /*  6 */ \
     { { 7 | ( 5 << 4 ) }, { 129, 63 }, 1 }, /*  7 */ \
-    { { 6 | ( 5 << 4 ) }, { 139, 39 }, 0 }, /*  8 */ \
+    { { 6 | ( 5 << 4 ) }, { 139, 39 }, 4 }, /*  8 */ \
-    { { 5 | ( 5 << 4 ) }, { 139, 21 }, 0 }, /*  9 */ \
+    { { 5 | ( 5 << 4 ) }, { 139, 21 }, 4 }, /*  9 */ \
-    { { 4 | ( 5 << 4 ) }, { 139,  4 }, 0 }, /* 10 */ \
+    { { 4 | ( 5 << 4 ) }, { 139,  4 }, 4 }, /* 10 */ \
-    { { 4 | ( 4 << 4 ) }, { 156, 02 }, 0 }, /* 11 */ \
+    { { 4 | ( 4 << 4 ) }, { 156, 02 }, 4 }, /* 11 */ \
-    { { 5 | ( 4 << 4 ) }, { 156, 19 }, 0 }, /* 12 */ \
+    { { 5 | ( 4 << 4 ) }, { 156, 19 }, 4 }, /* 12 */ \
-    { { 6 | ( 4 << 4 ) }, { 156, 37 }, 0 }, /* 13 */ \
+    { { 6 | ( 4 << 4 ) }, { 156, 37 }, 4 }, /* 13 */ \
     { { 7 | ( 4 << 4 ) }, { 144, 58 }, 1 }, /* 14 */ \
     { { 7 | ( 3 << 4 ) }, { 164, 55 }, 1 }, /* 15 */ \
-    { { 6 | ( 3 << 4 ) }, { 174, 35 }, 0 }, /* 16 */ \
+    { { 6 | ( 3 << 4 ) }, { 174, 35 }, 4 }, /* 16 */ \
-    { { 5 | ( 3 << 4 ) }, { 174, 13 }, 0 }, /* 17 */ \
+    { { 5 | ( 3 << 4 ) }, { 174, 13 }, 4 }, /* 17 */ \
-    { { 4 | ( 3 << 4 ) }, { 174,  0 }, 0 }, /* 18 */ \
+    { { 4 | ( 3 << 4 ) }, { 174,  0 }, 4 }, /* 18 */ \
-    { { 4 | ( 2 << 4 ) }, { 191,  3 }, 0 }, /* 19 */ \
+    { { 4 | ( 2 << 4 ) }, { 191,  3 }, 4 }, /* 19 */ \
-    { { 5 | ( 2 << 4 ) }, { 191, 20 }, 0 }, /* 20 */ \
+    { { 5 | ( 2 << 4 ) }, { 191, 20 }, 4 }, /* 20 */ \
-    { { 6 | ( 2 << 4 ) }, { 191, 37 }, 0 }, /* 21 */ \
+    { { 6 | ( 2 << 4 ) }, { 191, 37 }, 4 }, /* 21 */ \
-    { { 6 | ( 1 << 4 ) }, { 208, 42 }, 0 }, /* 22 */ \
+    { { 6 | ( 1 << 4 ) }, { 208, 42 }, 4 }, /* 22 */ \
-    { { 5 | ( 1 << 4 ) }, { 208, 24 }, 0 }, /* 23 */ \
+    { { 5 | ( 1 << 4 ) }, { 208, 24 }, 4 }, /* 23 */ \
-    { { 4 | ( 1 << 4 ) }, { 208,  7 }, 0 }, /* 24 */ \
+    { { 4 | ( 1 << 4 ) }, { 208,  7 }, 4 }, /* 24 */ \
     { { 4 | ( 0 << 4 ) }, { 224,  7 }, 1 }, /* 25 */ \
     { { 5 | ( 0 << 4 ) }, { 224, 24 }, 1 }, /* 26 */ \
     { { 6 | ( 0 << 4 ) }, { 224, 41 }, 1 }, /* 27 */
 
 #ifdef RGB_MATRIX_SPLIT_RIGHT
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
         RGB_MATRIX_RIGHT_LEDS
         RGB_MATRIX_LEFT_LEDS
     };
 #else
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
         RGB_MATRIX_LEFT_LEDS
         RGB_MATRIX_RIGHT_LEDS
     };

keyboards/doro67/multi/keymaps/default/readme.md

@@ -1,5 +1,12 @@
 # Default Doro67 ANSI layout.
 
+**THIS IS THE DEFAULT ANSI KEYMAP (AVAILABILITY: CHINA + INTERNATIONAL GB)**
+The "multi" directory includes keymaps for the multi-layout PCB, which supports ANSI, ISO, and multi (split backspace & non-blocker).
+The keymap you choose from the "multi" directory must correspond to the integrated plate option you chose.
+
+The multi-layout PCB and RGB pcb were the only two options available to NON-china buyers.
+If you purchased an RGB PCB, please see the 'rgb' directory.
+
 This is the default ANSI layout that comes flashed on the Doro67 multi PCB with
 the exception of adding backtick as it was not mapped.
 

keyboards/doro67/multi/keymaps/default_iso/readme.md

@@ -1,5 +1,12 @@
 # Default Doro67 ISO layout.
 
+**THIS IS THE DEFAULT ISO KEYMAP (AVAILABILITY: CHINA + INTERNATIONAL GB)**
+The "multi" directory includes keymaps for the multi-layout PCB, which supports ANSI, ISO, and multi (split backspace & non-blocker).
+The keymap you choose from the "multi" directory must correspond to the integrated plate option you chose.
+
+The multi-layout PCB and RGB pcb were the only two options available to NON-china buyers.
+If you purchased an RGB PCB, please see the 'rgb' directory.
+
 This is the default ISO layout that comes flashed on the Doro67 multi PCB with
 the exception of adding backtick and UK ISO specific keycodes as they were not mapped.
 

keyboards/doro67/multi/keymaps/default_multi/readme.md

@@ -1,5 +1,12 @@
 # Default Doro67 Multi layout.
 
+**THIS IS THE DEFAULT MULTI-LAYOUT (SPLIT BACKSPACE) KEYMAP (AVAILABILITY: CHINA + INTERNATIONAL GB)**
+The "multi" directory includes keymaps for the multi-layout PCB, which supports ANSI, ISO, and multi (split backspace & non-blocker).
+The keymap you choose from the "multi" directory must correspond to the integrated plate option you chose.
+
+The multi-layout PCB and RGB pcb were the only two options available to NON-china buyers.
+If you purchased an RGB PCB, please see the 'rgb' directory.
+
 This is the default Multi layout that comes flashed on the Doro67 multi PCB with
 the exception of adding backtick as it was not mapped.
 

keyboards/doro67/multi/readme.md

@@ -2,6 +2,13 @@
 
 65% custom keyboard made by 80ultraman/Alf/Backprop Studios with multiple layout support. Despite the layout options available, layout is dictated by the selected integrated plate.  
 
+**MULTI-LAYOUT PCB (AVAILABILITY: CHINA + INTERNATIONAL GB)**
+The "multi" directory includes keymaps for the multi-layout PCB, which supports ANSI, ISO, and multi (split backspace & non-blocker).
+The keymap you choose from the "multi" directory must correspond to the integrated plate option you chose.
+
+The multi-layout PCB and RGB pcb were the only two options available to NON-china buyers.
+If you purchased an RGB PCB, please see the 'rgb' directory.
+
 Keyboard Maintainer: [ShadeDream](https://github.com/shadedream)  
 Hardware Supported: Doro67 Multi PCB  
 Hardware Availability: [Geekhack GB](https://geekhack.org/index.php?topic=97265.0)

keyboards/doro67/regular/keymaps/default/readme.md

@@ -1 +1,5 @@
 # The default keymap for doro67
+
+**THIS IS THE DEFAULT KEYMAP DIRECTORY (AVAILABILITY: CHINA GB ONLY)**
+If you are a non-china buyer, you probably have the multi PCB or rgb PCB. 
+Please look at the "multi" and "rgb" readme files.

keyboards/doro67/regular/readme.md

@@ -4,6 +4,10 @@
 
 This is not the PCB with RGB support. Do not flash RGB firmware for this board. 
 
+**REGULAR PCB (AVAILABILITY: CHINA GB ONLY)*
+If you are a non-china buyer, you probably have the multi PCB or rgb PCB. 
+Please look at the "multi" and "rgb" readme files.
+
 Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin)  
 Hardware Supported: Doro67 Regular PCB  
 Hardware Availability: [Geekhack GB](https://geekhack.org/index.php?topic=97265.0)

keyboards/doro67/rgb/keymaps/default/readme.md

@@ -1 +1,7 @@
 # The default keymap for rgb
+
+**RGB PCB (AVAILABILITY: CHINA + INTERNATIONAL GB)**
+The "rgb" directory includes the keymap for the RGB PCB.
+
+The multi-layout PCB and RGB pcb were the only two options available to NON-china buyers.
+If you purchased a non-rgb PCB, please see the 'multi' directory.

keyboards/doro67/rgb/readme.md

@@ -4,6 +4,12 @@
 
 Flashing the regular PCB firmware on this board will work, but will disable RGB lighting. 
 
+**THIS IS THE RGB PCB DIRECTORY (AVAILABILITY: CHINA + INTERNATIONAL GB)**
+The "rgb" directory includes the keymap for the RGB PCB.
+
+The multi-layout PCB and RGB pcb were the only two options available to NON-china buyers.
+If you purchased a non-rgb PCB, please see the 'multi' directory.
+
 Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin)  
 Hardware Supported: Doro 67 RGB PCB  
 Hardware Availability: [Geekhack GB](https://geekhack.org/index.php?topic=97265.0)

keyboards/doro67/rgb/rgb.c

@@ -52,65 +52,65 @@ void led_set_kb(uint8_t usb_led) {
 	led_set_user(usb_led);
 }
 
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
-    {{0|(0<<4)},   {15*0, 0},  0},     // Esc
+    {{0|(0<<4)},   {15*0, 0},  4},     // Esc
-    {{0|(1<<4)},   {15*1, 0},  0},     // 1
+    {{0|(1<<4)},   {15*1, 0},  4},     // 1
-    {{0|(2<<4)},   {15*2, 0},  0},     // 2
+    {{0|(2<<4)},   {15*2, 0},  4},     // 2
-    {{0|(3<<4)},   {15*3, 0},  0},     // 3
+    {{0|(3<<4)},   {15*3, 0},  4},     // 3
-    {{0|(4<<4)},   {15*4, 0},  0},     // 4
+    {{0|(4<<4)},   {15*4, 0},  4},     // 4
-    {{0|(5<<4)},   {15*5, 0},  0},     // 5
+    {{0|(5<<4)},   {15*5, 0},  4},     // 5
-    {{0|(6<<4)},   {15*6, 0},  0},     // 6
+    {{0|(6<<4)},   {15*6, 0},  4},     // 6
-    {{0|(7<<4)},   {15*7, 0},  0},     // 7
+    {{0|(7<<4)},   {15*7, 0},  4},     // 7
-    {{0|(8<<4)},   {15*8, 0},  0},     // 8
+    {{0|(8<<4)},   {15*8, 0},  4},     // 8
-    {{0|(9<<4)},   {15*9, 0},  0},     // 9
+    {{0|(9<<4)},   {15*9, 0},  4},     // 9
-    {{0|(10<<4)},  {15*10, 0}, 0},     // 0
+    {{0|(10<<4)},  {15*10, 0}, 4},     // 0
-    {{0|(11<<4)},  {15*11, 0}, 0},     // -
+    {{0|(11<<4)},  {15*11, 0}, 4},     // -
-    {{0|(12<<4)},  {15*12, 0}, 0},     // =
+    {{0|(12<<4)},  {15*12, 0}, 4},     // =
     {{0|(13<<4)},  {15*13.5, 0}, 1},   // Backspace
     {{0|(14<<4)},  {15*15, 0},   1},   // Ins
 
     {{1|(0<<4)},   {15*0.5, 16},  1},  // Tab
-    {{1|(1<<4)},   {15*1.5, 16},  0},  // Q
+    {{1|(1<<4)},   {15*1.5, 16},  4},  // Q
-    {{1|(2<<4)},   {15*2.5, 16},  0},  // W
+    {{1|(2<<4)},   {15*2.5, 16},  4},  // W
-    {{1|(3<<4)},   {15*3.5, 16},  0},  // E
+    {{1|(3<<4)},   {15*3.5, 16},  4},  // E
-    {{1|(4<<4)},   {15*4.5, 16},  0},  // R
+    {{1|(4<<4)},   {15*4.5, 16},  4},  // R
-    {{1|(5<<4)},   {15*5.5, 16},  0},  // T
+    {{1|(5<<4)},   {15*5.5, 16},  4},  // T
-    {{1|(6<<4)},   {15*6.5, 16},  0},  // Y
+    {{1|(6<<4)},   {15*6.5, 16},  4},  // Y
-    {{1|(7<<4)},   {15*7.5, 16},  0},  // U
+    {{1|(7<<4)},   {15*7.5, 16},  4},  // U
-    {{1|(8<<4)},   {15*8.5, 16},  0},  // I
+    {{1|(8<<4)},   {15*8.5, 16},  4},  // I
-    {{1|(9<<4)},   {15*9.5, 16},  0},  // O
+    {{1|(9<<4)},   {15*9.5, 16},  4},  // O
-    {{1|(10<<4)},  {15*10.5, 16}, 0},  // P
+    {{1|(10<<4)},  {15*10.5, 16}, 4},  // P
-    {{1|(11<<4)},  {15*11.5, 16}, 0},  // [
+    {{1|(11<<4)},  {15*11.5, 16}, 4},  // [
-    {{1|(12<<4)},  {15*12.5, 16},  0}, // ]
+    {{1|(12<<4)},  {15*12.5, 16},  4}, // ]
     {{1|(13<<4)},  {15*13.75, 16}, 1}, //
     {{1|(14<<4)},  {15*15, 16},    1}, // Del
 
     {{2|(0<<4)},   {15*0.75, 32},  1}, // Capslock
-    {{2|(1<<4)},   {15*1.75, 32},  0}, // A
+    {{2|(1<<4)},   {15*1.75, 32},  4}, // A
-    {{2|(2<<4)},   {15*2.75, 32},  0}, // S
+    {{2|(2<<4)},   {15*2.75, 32},  4}, // S
-    {{2|(3<<4)},   {15*3.75, 32},  0}, // D
+    {{2|(3<<4)},   {15*3.75, 32},  4}, // D
-    {{2|(4<<4)},   {15*4.75, 32},  0}, // F
+    {{2|(4<<4)},   {15*4.75, 32},  4}, // F
-    {{2|(5<<4)},   {15*5.75, 32},  0}, // G
+    {{2|(5<<4)},   {15*5.75, 32},  4}, // G
-    {{2|(6<<4)},   {15*6.75, 32},  0}, // H
+    {{2|(6<<4)},   {15*6.75, 32},  4}, // H
-    {{2|(7<<4)},   {15*7.75, 32},  0}, // J
+    {{2|(7<<4)},   {15*7.75, 32},  4}, // J
-    {{2|(8<<4)},   {15*8.75, 32},  0}, // K
+    {{2|(8<<4)},   {15*8.75, 32},  4}, // K
-    {{2|(9<<4)},   {15*9.75, 32},  0}, // L
+    {{2|(9<<4)},   {15*9.75, 32},  4}, // L
-    {{2|(10<<4)},  {15*10.75, 32}, 0}, // ;
+    {{2|(10<<4)},  {15*10.75, 32}, 4}, // ;
-    {{2|(11<<4)},  {15*11.75, 32}, 0}, // '
+    {{2|(11<<4)},  {15*11.75, 32}, 4}, // '
     {{2|(13<<4)},  {15*13.25, 32}, 1}, // Enter
     {{2|(14<<4)},  {15*15, 32},    1}, // Pgup
 
     {{3|(0<<4)},   {15*1.25, 48},  1}, // LShift
-    {{3|(2<<4)},   {15*2, 48},  0},    // Z
+    {{3|(2<<4)},   {15*2, 48},  4},    // Z
-    {{3|(3<<4)},   {15*3, 48},  0},    // X
+    {{3|(3<<4)},   {15*3, 48},  4},    // X
-    {{3|(4<<4)},   {15*4, 48},  0},    // C
+    {{3|(4<<4)},   {15*4, 48},  4},    // C
-    {{3|(5<<4)},   {15*5, 48},  0},    // V
+    {{3|(5<<4)},   {15*5, 48},  4},    // V
-    {{3|(6<<4)},   {15*6, 48},  0},    // B
+    {{3|(6<<4)},   {15*6, 48},  4},    // B
-    {{3|(7<<4)},   {15*7, 48},  0},    // N
+    {{3|(7<<4)},   {15*7, 48},  4},    // N
-    {{3|(8<<4)},   {15*8, 48},  0},    // M
+    {{3|(8<<4)},   {15*8, 48},  4},    // M
-    {{3|(9<<4)},   {15*9, 48},  0},    // ,
+    {{3|(9<<4)},   {15*9, 48},  4},    // ,
-    {{3|(10<<4)},  {15*10, 48},  0},   // .
+    {{3|(10<<4)},  {15*10, 48},  4},   // .
-    {{3|(11<<4)},  {15*11, 48}, 0},    // /
+    {{3|(11<<4)},  {15*11, 48}, 4},    // /
     {{3|(12<<4)},  {15*12.75, 48}, 1}, // Shift
     {{3|(13<<4)},  {15*14, 48}, 1},    // Up
     {{3|(14<<4)},  {15*15, 48}, 1},    // Pgdn
@@ -118,7 +118,7 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
     {{4|(0<<4)},   {15*0.25,  64}, 1}, // Ctrl
     {{4|(1<<4)},   {15*1.5,   64}, 1}, // GUI
     {{4|(2<<4)},   {15*2.25,  64}, 1}, // Alt
-    {{4|(3<<4)},   {15*6.75,  64}, 0}, // Space
+    {{4|(3<<4)},   {15*6.75,  64}, 4}, // Space
     {{4|(9<<4)},   {15*9,     64}, 1}, // RAlt
     {{4|(10<<4)},  {15*10.25, 64}, 1}, // FN
     {{4|(12<<4)},  {15*13,    64}, 1}, // Left

keyboards/dztech/dz40rgb/dz40rgb.c

@@ -71,7 +71,7 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
 
 };
 
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
 
     {{0|(11<<4)},   {20.36*11,  0}, 1},
     {{0|(10<<4)},   {20.36*10,  0}, 1},
@@ -90,32 +90,32 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
     {{0|(13<<4)},  {20.36*0,21.33*0.5}, 1},
 
     {{1|(11<<4)},   {20.36*11,  21.33}, 1},
-    {{1|(10<<4)},   {20.36*10,  21.33}, 0},
+    {{1|(10<<4)},   {20.36*10,  21.33}, 4},
-    {{1|(9<<4)},    {20.36*9,  21.33}, 0},
+    {{1|(9<<4)},    {20.36*9,  21.33}, 4},
-    {{1|(8<<4)},    {20.36*8,  21.33}, 0},
+    {{1|(8<<4)},    {20.36*8,  21.33}, 4},
-    {{1|(7<<4)},    {20.36*7,  21.33}, 0},
+    {{1|(7<<4)},    {20.36*7,  21.33}, 4},
-	{{1|(6<<4)},    { 20.36*6,  21.33}, 0},
+    {{1|(6<<4)},    { 20.36*6,  21.33}, 4},
-    {{1|(5<<4)},    { 20.36*5,  21.33}, 0},
+    {{1|(5<<4)},    { 20.36*5,  21.33}, 4},
-    {{1|(4<<4)},    { 20.36*4,  21.33}, 0},
+    {{1|(4<<4)},    { 20.36*4,  21.33}, 4},
-    {{1|(3<<4)},    { 20.36*3,  21.33}, 0},
+    {{1|(3<<4)},    { 20.36*3,  21.33}, 4},
-    {{1|(2<<4)},    { 20.36*2,  21.33}, 0},
+    {{1|(2<<4)},    { 20.36*2,  21.33}, 4},
-    {{1|(1<<4)},    { 20.36*1,  21.33}, 0},
+    {{1|(1<<4)},    { 20.36*1,  21.33}, 4},
     {{1|(0<<4)},    { 20.36*0,  21.33}, 1},
 
     {{1|(12<<4)},   {20.36*11, 21.33*1.5}, 1},
     {{1|(13<<4)},  {20.36*0,21.33*1.5}, 1},
 
     {{2|(11<<4)},   {20.36*11,  21.33*2}, 1},
-    {{2|(10<<4)},   {20.36*10,  21.33*2}, 0},
+    {{2|(10<<4)},   {20.36*10,  21.33*2}, 4},
-    {{2|(9<<4)},    {20.36*9,  21.33*2}, 0},
+    {{2|(9<<4)},    {20.36*9,  21.33*2}, 4},
-    {{2|(8<<4)},    {20.36*8,  21.33*2}, 0},
+    {{2|(8<<4)},    {20.36*8,  21.33*2}, 4},
-    {{2|(7<<4)},    {20.36*7,  21.33*2}, 0},
+    {{2|(7<<4)},    {20.36*7,  21.33*2}, 4},
-	{{2|(6<<4)},    { 20.36*6,  21.33*2}, 0},
+    {{2|(6<<4)},    { 20.36*6,  21.33*2}, 4},
-    {{2|(5<<4)},    { 20.36*5,  21.33*2}, 0},
+    {{2|(5<<4)},    { 20.36*5,  21.33*2}, 4},
-    {{2|(4<<4)},    { 20.36*4,  21.33*2}, 0},
+    {{2|(4<<4)},    { 20.36*4,  21.33*2}, 4},
-    {{2|(3<<4)},    { 20.36*3,  21.33*2}, 0},
+    {{2|(3<<4)},    { 20.36*3,  21.33*2}, 4},
-    {{2|(2<<4)},    { 20.36*2,  21.33*2}, 0},
+    {{2|(2<<4)},    { 20.36*2,  21.33*2}, 4},
-    {{2|(1<<4)},    { 20.36*1,  21.33*2}, 0},
+    {{2|(1<<4)},    { 20.36*1,  21.33*2}, 4},
     {{2|(0<<4)},    { 20.36*0,  21.33*2}, 1},
 
     {{2|(12<<4)},   {20.36*11, 21.33*2.5}, 1},
@@ -205,7 +205,7 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
 
 };
 
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
 
     {{0|(11<<4)},   {20.36*11,  0}, 1},
     {{0|(10<<4)},   {20.36*10,  0}, 1},
@@ -224,32 +224,32 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
     {{0|(13<<4)},  {20.36*0,21.33*0.5}, 1},
 
     {{1|(11<<4)},   {20.36*11,  21.33}, 1},
-    {{1|(10<<4)},   {20.36*10,  21.33}, 0},
+    {{1|(10<<4)},   {20.36*10,  21.33}, 4},
-    {{1|(9<<4)},    {20.36*9,  21.33}, 0},
+    {{1|(9<<4)},    {20.36*9,  21.33}, 4},
-    {{1|(8<<4)},    {20.36*8,  21.33}, 0},
+    {{1|(8<<4)},    {20.36*8,  21.33}, 4},
-    {{1|(7<<4)},    {20.36*7,  21.33}, 0},
+    {{1|(7<<4)},    {20.36*7,  21.33}, 4},
-	{{1|(6<<4)},    { 20.36*6,  21.33}, 0},
+    {{1|(6<<4)},    { 20.36*6,  21.33}, 4},
-    {{1|(5<<4)},    { 20.36*5,  21.33}, 0},
+    {{1|(5<<4)},    { 20.36*5,  21.33}, 4},
-    {{1|(4<<4)},    { 20.36*4,  21.33}, 0},
+    {{1|(4<<4)},    { 20.36*4,  21.33}, 4},
-    {{1|(3<<4)},    { 20.36*3,  21.33}, 0},
+    {{1|(3<<4)},    { 20.36*3,  21.33}, 4},
-    {{1|(2<<4)},    { 20.36*2,  21.33}, 0},
+    {{1|(2<<4)},    { 20.36*2,  21.33}, 4},
-    {{1|(1<<4)},    { 20.36*1,  21.33}, 0},
+    {{1|(1<<4)},    { 20.36*1,  21.33}, 4},
     {{1|(0<<4)},    { 20.36*0,  21.33}, 1},
 
     {{1|(12<<4)},   {20.36*11, 21.33*1.5}, 1},
     {{1|(13<<4)},  {20.36*0,21.33*1.5}, 1},
 
     {{2|(11<<4)},   {20.36*11,  21.33*2}, 1},
-    {{2|(10<<4)},   {20.36*10,  21.33*2}, 0},
+    {{2|(10<<4)},   {20.36*10,  21.33*2}, 4},
-    {{2|(9<<4)},    {20.36*9,  21.33*2}, 0},
+    {{2|(9<<4)},    {20.36*9,  21.33*2}, 4},
-    {{2|(8<<4)},    {20.36*8,  21.33*2}, 0},
+    {{2|(8<<4)},    {20.36*8,  21.33*2}, 4},
-    {{2|(7<<4)},    {20.36*7,  21.33*2}, 0},
+    {{2|(7<<4)},    {20.36*7,  21.33*2}, 4},
-	{{2|(6<<4)},    { 20.36*6,  21.33*2}, 0},
+    {{2|(6<<4)},    { 20.36*6,  21.33*2}, 4},
-    {{2|(5<<4)},    { 20.36*5,  21.33*2}, 0},
+    {{2|(5<<4)},    { 20.36*5,  21.33*2}, 4},
-    {{2|(4<<4)},    { 20.36*4,  21.33*2}, 0},
+    {{2|(4<<4)},    { 20.36*4,  21.33*2}, 4},
-    {{2|(3<<4)},    { 20.36*3,  21.33*2}, 0},
+    {{2|(3<<4)},    { 20.36*3,  21.33*2}, 4},
-    {{2|(2<<4)},    { 20.36*2,  21.33*2}, 0},
+    {{2|(2<<4)},    { 20.36*2,  21.33*2}, 4},
-    {{2|(1<<4)},    { 20.36*1,  21.33*2}, 0},
+    {{2|(1<<4)},    { 20.36*1,  21.33*2}, 4},
     {{2|(0<<4)},    { 20.36*0,  21.33*2}, 1},
 
     {{2|(12<<4)},   {20.36*11, 21.33*2.5}, 1},

keyboards/dztech/dz40rgb/keymaps/default/keymap.c

@@ -35,10 +35,8 @@ void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool def
   rgb_led led;
   for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
     led = g_rgb_leds[i];
-    if (led.matrix_co.raw < 0xFF) {
+    if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) {
-      if (led.modifier) {
+        rgb_matrix_set_color( i, red, green, blue );
-          rgb_matrix_set_color( i, red, green, blue );
-      }
     }
   }
 }

keyboards/dztech/dz40rgb/keymaps/split_space/keymap.c

@@ -58,10 +58,8 @@ void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool def
   rgb_led led;
   for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
     led = g_rgb_leds[i];
-    if (led.matrix_co.raw < 0xFF) {
+    if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) {
-      if (led.modifier) {
+        rgb_matrix_set_color( i, red, green, blue );
-          rgb_matrix_set_color( i, red, green, blue );
-      }
     }
   }
 }

keyboards/dztech/dz60rgb/dz60rgb.c

@@ -64,7 +64,8 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
     {0, H_16,   G_16,   I_16},
     {0, K_16,   J_16,   L_16},
 };
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
     {{0|(13<<4)},   {16*13.5,  0}, 1},
     {{0|(12<<4)},   {16*12,  0}, 1},
     {{0|(11<<4)},   {16*11,  0}, 1},
@@ -80,49 +81,49 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
     {{0|(1<<4)},    {16*1,  0}, 1},
     {{0|(0<<4)},    {16*0,  0}, 1},
 	{{2|(13<<4)},   {16*13.75, 24}, 1},
-    {{1|(12<<4)},   {16*12.5,  16}, 0},
+    {{1|(12<<4)},   {16*12.5,  16}, 4},
-    {{1|(11<<4)},   {16*11.5,  16}, 0},
+    {{1|(11<<4)},   {16*11.5,  16}, 4},
-    {{1|(10<<4)},   {16*10.5,  16}, 0},
+    {{1|(10<<4)},   {16*10.5,  16}, 4},
-    {{1|(9<<4)},    { 16*9.5,  16}, 0},
+    {{1|(9<<4)},    { 16*9.5,  16}, 4},
-    {{1|(8<<4)},    { 16*8.5,  16}, 0},
+    {{1|(8<<4)},    { 16*8.5,  16}, 4},
-    {{1|(7<<4)},    { 16*7.5,  16}, 0},
+    {{1|(7<<4)},    { 16*7.5,  16}, 4},
-	{{1|(6<<4)},    { 16*6.5,  16}, 0},
+	{{1|(6<<4)},    { 16*6.5,  16}, 4},
-    {{1|(5<<4)},    { 16*5.5,  16}, 0},
+    {{1|(5<<4)},    { 16*5.5,  16}, 4},
-    {{1|(4<<4)},    { 16*4.5,  16}, 0},
+    {{1|(4<<4)},    { 16*4.5,  16}, 4},
-    {{1|(3<<4)},    { 16*3.5,  16}, 0},
+    {{1|(3<<4)},    { 16*3.5,  16}, 4},
-    {{1|(2<<4)},    { 16*2.5,  16}, 0},
+    {{1|(2<<4)},    { 16*2.5,  16}, 4},
-    {{1|(1<<4)},    { 16*1.5,  16}, 0},
+    {{1|(1<<4)},    { 16*1.5,  16}, 4},
     {{1|(0<<4)},    { 16*0.25,  16}, 1},
 	{{1|(13<<4)},   {16*12.75,  32}, 1},
-    {{2|(11<<4)},   {16*11.75,  32}, 0},
+    {{2|(11<<4)},   {16*11.75,  32}, 4},
-    {{2|(10<<4)},   {16*10.75,  32}, 0},
+    {{2|(10<<4)},   {16*10.75,  32}, 4},
-    {{2|(9<<4)},    {16*9.75,  32}, 0},
+    {{2|(9<<4)},    {16*9.75,  32}, 4},
-    {{2|(8<<4)},    {16*8.75,  32}, 0},
+    {{2|(8<<4)},    {16*8.75,  32}, 4},
-    {{2|(7<<4)},    {16*7.75,  32}, 0},
+    {{2|(7<<4)},    {16*7.75,  32}, 4},
-	{{2|(6<<4)},    { 16*6.75,  32}, 0},
+	{{2|(6<<4)},    { 16*6.75,  32}, 4},
-    {{2|(5<<4)},    { 16*5.75,  32}, 0},
+    {{2|(5<<4)},    { 16*5.75,  32}, 4},
-    {{2|(4<<4)},    { 16*4.75,  32}, 0},
+    {{2|(4<<4)},    { 16*4.75,  32}, 4},
-    {{2|(3<<4)},    { 16*3.75,  32}, 0},
+    {{2|(3<<4)},    { 16*3.75,  32}, 4},
-    {{2|(2<<4)},    { 16*2.75,  32}, 0},
+    {{2|(2<<4)},    { 16*2.75,  32}, 4},
-    {{2|(1<<4)},    { 16*1.75,  32}, 0},
+    {{2|(1<<4)},    { 16*1.75,  32}, 4},
     {{2|(0<<4)},    { 16*0.375,  32}, 1},
     {{3|(11<<4)},   {16*13.125,  48}, 1},
-    {{3|(10<<4)},   {16*11.25,  48}, 0},
+    {{3|(10<<4)},   {16*11.25,  48}, 4},
-    {{3|(9<<4)},    {16*10.25,  48}, 0},
+    {{3|(9<<4)},    {16*10.25,  48}, 4},
-    {{3|(8<<4)},    {16*9.25,  48}, 0},
+    {{3|(8<<4)},    {16*9.25,  48}, 4},
-    {{3|(7<<4)},    {16*8.25,  48}, 0},
+    {{3|(7<<4)},    {16*8.25,  48}, 4},
-	{{3|(6<<4)},    {16*7.25,  48}, 0},
+	{{3|(6<<4)},    {16*7.25,  48}, 4},
-    {{3|(5<<4)},    {16*6.25,  48}, 0},
+    {{3|(5<<4)},    {16*6.25,  48}, 4},
-    {{3|(4<<4)},    {16*5.25,  48}, 0},
+    {{3|(4<<4)},    {16*5.25,  48}, 4},
-    {{3|(3<<4)},    {16*4.25,  48}, 0},
+    {{3|(3<<4)},    {16*4.25,  48}, 4},
-    {{3|(2<<4)},    {16*3.25,  48}, 0},
+    {{3|(2<<4)},    {16*3.25,  48}, 4},
-    {{3|(1<<4)},    {16*1.25,  48}, 0},
+    {{3|(1<<4)},    {16*1.25,  48}, 4},
     {{3|(0<<4)},    {16*0.625,  48}, 1},
 	{{4|(13<<4)},   {16*13.875,  64}, 1},
     {{4|(11<<4)},   {16*12.625,  64}, 1},
     {{4|(10<<4)},   {16*11.375,  64}, 1},
     {{4|(9<<4)},    {16*10.125,  64}, 1},
-    {{4|(5<<4)},    { 16*6.375,  64}, 0},
+    {{4|(5<<4)},    { 16*6.375,  64}, 4},
     {{4|(2<<4)},    { 16*2.625,  64}, 1},
     {{4|(1<<4)},    { 16*1.375,  64}, 1},
     {{4|(0<<4)},    { 16*0.125,  64}, 1},
@@ -192,7 +193,8 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
     {0, H_16,   G_16,   I_16},
     {0, K_16,   J_16,   L_16},
 };
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
 	{{2|(12<<4)},   {16*14,  0}, 1},
     {{0|(13<<4)},   {16*13,  0}, 1},
     {{0|(12<<4)},   {16*12,  0}, 1},
@@ -209,49 +211,49 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
     {{0|(1<<4)},    {16*1,  0}, 1},
     {{0|(0<<4)},    {16*0,  0}, 1},
 	{{1|(13<<4)},   {16*13.75, 16}, 1},
-    {{1|(12<<4)},   {16*12.5,  16}, 0},
+    {{1|(12<<4)},   {16*12.5,  16}, 4},
-    {{1|(11<<4)},   {16*11.5,  16}, 0},
+    {{1|(11<<4)},   {16*11.5,  16}, 4},
-    {{1|(10<<4)},   {16*10.5,  16}, 0},
+    {{1|(10<<4)},   {16*10.5,  16}, 4},
-    {{1|(9<<4)},    { 16*9.5,  16}, 0},
+    {{1|(9<<4)},    { 16*9.5,  16}, 4},
-    {{1|(8<<4)},    { 16*8.5,  16}, 0},
+    {{1|(8<<4)},    { 16*8.5,  16}, 4},
-    {{1|(7<<4)},    { 16*7.5,  16}, 0},
+    {{1|(7<<4)},    { 16*7.5,  16}, 4},
-	{{1|(6<<4)},    { 16*6.5,  16}, 0},
+	{{1|(6<<4)},    { 16*6.5,  16}, 4},
-    {{1|(5<<4)},    { 16*5.5,  16}, 0},
+    {{1|(5<<4)},    { 16*5.5,  16}, 4},
-    {{1|(4<<4)},    { 16*4.5,  16}, 0},
+    {{1|(4<<4)},    { 16*4.5,  16}, 4},
-    {{1|(3<<4)},    { 16*3.5,  16}, 0},
+    {{1|(3<<4)},    { 16*3.5,  16}, 4},
-    {{1|(2<<4)},    { 16*2.5,  16}, 0},
+    {{1|(2<<4)},    { 16*2.5,  16}, 4},
-    {{1|(1<<4)},    { 16*1.5,  16}, 0},
+    {{1|(1<<4)},    { 16*1.5,  16}, 4},
     {{1|(0<<4)},    { 16*0.25,  16}, 1},
 	{{2|(13<<4)},   {16*12.75,  32}, 1},
-    {{2|(11<<4)},   {16*11.75,  32}, 0},
+    {{2|(11<<4)},   {16*11.75,  32}, 4},
-    {{2|(10<<4)},   {16*10.75,  32}, 0},
+    {{2|(10<<4)},   {16*10.75,  32}, 4},
-    {{2|(9<<4)},    {16*9.75,  32}, 0},
+    {{2|(9<<4)},    {16*9.75,  32}, 4},
-    {{2|(8<<4)},    {16*8.75,  32}, 0},
+    {{2|(8<<4)},    {16*8.75,  32}, 4},
-    {{2|(7<<4)},    {16*7.75,  32}, 0},
+    {{2|(7<<4)},    {16*7.75,  32}, 4},
-	{{2|(6<<4)},    { 16*6.75,  32}, 0},
+	{{2|(6<<4)},    { 16*6.75,  32}, 4},
-    {{2|(5<<4)},    { 16*5.75,  32}, 0},
+    {{2|(5<<4)},    { 16*5.75,  32}, 4},
-    {{2|(4<<4)},    { 16*4.75,  32}, 0},
+    {{2|(4<<4)},    { 16*4.75,  32}, 4},
-    {{2|(3<<4)},    { 16*3.75,  32}, 0},
+    {{2|(3<<4)},    { 16*3.75,  32}, 4},
-    {{2|(2<<4)},    { 16*2.75,  32}, 0},
+    {{2|(2<<4)},    { 16*2.75,  32}, 4},
-    {{2|(1<<4)},    { 16*1.75,  32}, 0},
+    {{2|(1<<4)},    { 16*1.75,  32}, 4},
     {{2|(0<<4)},    { 16*0.375,  32}, 1},
     {{3|(13<<4)},   {16*14,     48}, 1},
-    {{3|(11<<4)},   {16*12.625, 48}, 0},
+    {{3|(11<<4)},   {16*12.625, 48}, 4},
-    {{3|(10<<4)},   {16*11.25,  48}, 0},
+    {{3|(10<<4)},   {16*11.25,  48}, 4},
-    {{3|(9<<4)},    {16*10.25,  48}, 0},
+    {{3|(9<<4)},    {16*10.25,  48}, 4},
-    {{3|(8<<4)},    {16*9.25,  48}, 0},
+    {{3|(8<<4)},    {16*9.25,  48}, 4},
-    {{3|(7<<4)},    {16*8.25,  48}, 0},
+    {{3|(7<<4)},    {16*8.25,  48}, 4},
-	{{3|(6<<4)},    {16*7.25,  48}, 0},
+	{{3|(6<<4)},    {16*7.25,  48}, 4},
-    {{3|(5<<4)},    {16*6.25,  48}, 0},
+    {{3|(5<<4)},    {16*6.25,  48}, 4},
-    {{3|(4<<4)},    {16*5.25,  48}, 0},
+    {{3|(4<<4)},    {16*5.25,  48}, 4},
-    {{3|(3<<4)},    {16*4.25,  48}, 0},
+    {{3|(3<<4)},    {16*4.25,  48}, 4},
-    {{3|(2<<4)},    {16*3.25,  48}, 0},
+    {{3|(2<<4)},    {16*3.25,  48}, 4},
-    {{3|(1<<4)},    {16*1.25,  48}, 0},
+    {{3|(1<<4)},    {16*1.25,  48}, 4},
     {{3|(0<<4)},    {16*0.625,  48}, 1},
 	{{4|(13<<4)},   {16*13.625,  64}, 1},
     {{4|(11<<4)},   {16*12.375,  64}, 1},
     {{4|(10<<4)},   {16*11.125,  64}, 1},
-    {{4|(5<<4)},    { 16*7,      64}, 0},
+    {{4|(5<<4)},    { 16*7,      64}, 4},
     {{4|(2<<4)},    { 16*2.875,  64}, 1},
     {{4|(1<<4)},    { 16*1.625,  64}, 1},
     {{4|(0<<4)},    { 16*0.375,  64}, 1},
@@ -321,7 +323,8 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
     {0, H_16,   G_16,   I_16},
     {0, K_16,   J_16,   L_16},
 };
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
 	{{2|(12<<4)},   {16*14,  0}, 1},
     {{0|(13<<4)},   {16*13,  0}, 1},
     {{0|(12<<4)},   {16*12,  0}, 1},
@@ -338,49 +341,49 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
     {{0|(1<<4)},    {16*1,  0}, 1},
     {{0|(0<<4)},    {16*0,  0}, 1},
 	{{2|(13<<4)},   {16*13.75, 24}, 1},
-    {{1|(12<<4)},   {16*12.5,  16}, 0},
+    {{1|(12<<4)},   {16*12.5,  16}, 4},
-    {{1|(11<<4)},   {16*11.5,  16}, 0},
+    {{1|(11<<4)},   {16*11.5,  16}, 4},
-    {{1|(10<<4)},   {16*10.5,  16}, 0},
+    {{1|(10<<4)},   {16*10.5,  16}, 4},
-    {{1|(9<<4)},    { 16*9.5,  16}, 0},
+    {{1|(9<<4)},    { 16*9.5,  16}, 4},
-    {{1|(8<<4)},    { 16*8.5,  16}, 0},
+    {{1|(8<<4)},    { 16*8.5,  16}, 4},
-    {{1|(7<<4)},    { 16*7.5,  16}, 0},
+    {{1|(7<<4)},    { 16*7.5,  16}, 4},
-	{{1|(6<<4)},    { 16*6.5,  16}, 0},
+	{{1|(6<<4)},    { 16*6.5,  16}, 4},
-    {{1|(5<<4)},    { 16*5.5,  16}, 0},
+    {{1|(5<<4)},    { 16*5.5,  16}, 4},
-    {{1|(4<<4)},    { 16*4.5,  16}, 0},
+    {{1|(4<<4)},    { 16*4.5,  16}, 4},
-    {{1|(3<<4)},    { 16*3.5,  16}, 0},
+    {{1|(3<<4)},    { 16*3.5,  16}, 4},
-    {{1|(2<<4)},    { 16*2.5,  16}, 0},
+    {{1|(2<<4)},    { 16*2.5,  16}, 4},
-    {{1|(1<<4)},    { 16*1.5,  16}, 0},
+    {{1|(1<<4)},    { 16*1.5,  16}, 4},
     {{1|(0<<4)},    { 16*0.25,  16}, 1},
 	{{1|(13<<4)},   {16*12.75,  32}, 1},
-    {{2|(11<<4)},   {16*11.75,  32}, 0},
+    {{2|(11<<4)},   {16*11.75,  32}, 4},
-    {{2|(10<<4)},   {16*10.75,  32}, 0},
+    {{2|(10<<4)},   {16*10.75,  32}, 4},
-    {{2|(9<<4)},    {16*9.75,  32}, 0},
+    {{2|(9<<4)},    {16*9.75,  32}, 4},
-    {{2|(8<<4)},    {16*8.75,  32}, 0},
+    {{2|(8<<4)},    {16*8.75,  32}, 4},
-    {{2|(7<<4)},    {16*7.75,  32}, 0},
+    {{2|(7<<4)},    {16*7.75,  32}, 4},
-	{{2|(6<<4)},    { 16*6.75,  32}, 0},
+	{{2|(6<<4)},    { 16*6.75,  32}, 4},
-    {{2|(5<<4)},    { 16*5.75,  32}, 0},
+    {{2|(5<<4)},    { 16*5.75,  32}, 4},
-    {{2|(4<<4)},    { 16*4.75,  32}, 0},
+    {{2|(4<<4)},    { 16*4.75,  32}, 4},
-    {{2|(3<<4)},    { 16*3.75,  32}, 0},
+    {{2|(3<<4)},    { 16*3.75,  32}, 4},
-    {{2|(2<<4)},    { 16*2.75,  32}, 0},
+    {{2|(2<<4)},    { 16*2.75,  32}, 4},
-    {{2|(1<<4)},    { 16*1.75,  32}, 0},
+    {{2|(1<<4)},    { 16*1.75,  32}, 4},
     {{2|(0<<4)},    { 16*0.375,  32}, 1},
     {{3|(13<<4)},   {16*14,     48}, 1},
-    {{3|(11<<4)},   {16*12.625, 48}, 0},
+    {{3|(11<<4)},   {16*12.625, 48}, 4},
-    {{3|(10<<4)},   {16*11.25,  48}, 0},
+    {{3|(10<<4)},   {16*11.25,  48}, 4},
-    {{3|(9<<4)},    {16*10.25,  48}, 0},
+    {{3|(9<<4)},    {16*10.25,  48}, 4},
-    {{3|(8<<4)},    {16*9.25,  48}, 0},
+    {{3|(8<<4)},    {16*9.25,  48}, 4},
-    {{3|(7<<4)},    {16*8.25,  48}, 0},
+    {{3|(7<<4)},    {16*8.25,  48}, 4},
-	{{3|(6<<4)},    {16*7.25,  48}, 0},
+	{{3|(6<<4)},    {16*7.25,  48}, 4},
-    {{3|(5<<4)},    {16*6.25,  48}, 0},
+    {{3|(5<<4)},    {16*6.25,  48}, 4},
-    {{3|(4<<4)},    {16*5.25,  48}, 0},
+    {{3|(4<<4)},    {16*5.25,  48}, 4},
-    {{3|(3<<4)},    {16*4.25,  48}, 0},
+    {{3|(3<<4)},    {16*4.25,  48}, 4},
-    {{3|(2<<4)},    {16*3.25,  48}, 0},
+    {{3|(2<<4)},    {16*3.25,  48}, 4},
-    {{3|(1<<4)},    {16*1.25,  48}, 0},
+    {{3|(1<<4)},    {16*1.25,  48}, 4},
     {{3|(0<<4)},    {16*0.625,  48}, 1},
 	{{4|(13<<4)},   {16*13.625,  64}, 1},
     {{4|(11<<4)},   {16*12.375,  64}, 1},
     {{4|(10<<4)},   {16*11.125,  64}, 1},
-    {{4|(5<<4)},    { 16*7,      64}, 0},
+    {{4|(5<<4)},    { 16*7,      64}, 4},
     {{4|(2<<4)},    { 16*2.875,  64}, 1},
     {{4|(1<<4)},    { 16*1.625,  64}, 1},
     {{4|(0<<4)},    { 16*0.375,  64}, 1},
@@ -449,7 +452,8 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
     {0, H_16,   G_16,   I_16},
     {0, K_16,   J_16,   L_16},
 };
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
     {{0|(13<<4)},   {16*13.5,  0}, 1},
     {{0|(12<<4)},   {16*12,  0}, 1},
     {{0|(11<<4)},   {16*11,  0}, 1},
@@ -465,49 +469,49 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
     {{0|(1<<4)},    {16*1,  0}, 1},
     {{0|(0<<4)},    {16*0,  0}, 1},
 	{{1|(13<<4)},   {16*13.75, 16}, 1},
-    {{1|(12<<4)},   {16*12.5,  16}, 0},
+    {{1|(12<<4)},   {16*12.5,  16}, 4},
-    {{1|(11<<4)},   {16*11.5,  16}, 0},
+    {{1|(11<<4)},   {16*11.5,  16}, 4},
-    {{1|(10<<4)},   {16*10.5,  16}, 0},
+    {{1|(10<<4)},   {16*10.5,  16}, 4},
-    {{1|(9<<4)},    { 16*9.5,  16}, 0},
+    {{1|(9<<4)},    { 16*9.5,  16}, 4},
-    {{1|(8<<4)},    { 16*8.5,  16}, 0},
+    {{1|(8<<4)},    { 16*8.5,  16}, 4},
-    {{1|(7<<4)},    { 16*7.5,  16}, 0},
+    {{1|(7<<4)},    { 16*7.5,  16}, 4},
-	{{1|(6<<4)},    { 16*6.5,  16}, 0},
+	{{1|(6<<4)},    { 16*6.5,  16}, 4},
-    {{1|(5<<4)},    { 16*5.5,  16}, 0},
+    {{1|(5<<4)},    { 16*5.5,  16}, 4},
-    {{1|(4<<4)},    { 16*4.5,  16}, 0},
+    {{1|(4<<4)},    { 16*4.5,  16}, 4},
-    {{1|(3<<4)},    { 16*3.5,  16}, 0},
+    {{1|(3<<4)},    { 16*3.5,  16}, 4},
-    {{1|(2<<4)},    { 16*2.5,  16}, 0},
+    {{1|(2<<4)},    { 16*2.5,  16}, 4},
-    {{1|(1<<4)},    { 16*1.5,  16}, 0},
+    {{1|(1<<4)},    { 16*1.5,  16}, 4},
     {{1|(0<<4)},    { 16*0.25,  16}, 1},
 	{{2|(13<<4)},   {16*13.375,  24}, 1},
-    {{2|(11<<4)},   {16*11.75,  32}, 0},
+    {{2|(11<<4)},   {16*11.75,  32}, 4},
-    {{2|(10<<4)},   {16*10.75,  32}, 0},
+    {{2|(10<<4)},   {16*10.75,  32}, 4},
-    {{2|(9<<4)},    {16*9.75,  32}, 0},
+    {{2|(9<<4)},    {16*9.75,  32}, 4},
-    {{2|(8<<4)},    {16*8.75,  32}, 0},
+    {{2|(8<<4)},    {16*8.75,  32}, 4},
-    {{2|(7<<4)},    {16*7.75,  32}, 0},
+    {{2|(7<<4)},    {16*7.75,  32}, 4},
-	{{2|(6<<4)},    { 16*6.75,  32}, 0},
+	{{2|(6<<4)},    { 16*6.75,  32}, 4},
-    {{2|(5<<4)},    { 16*5.75,  32}, 0},
+    {{2|(5<<4)},    { 16*5.75,  32}, 4},
-    {{2|(4<<4)},    { 16*4.75,  32}, 0},
+    {{2|(4<<4)},    { 16*4.75,  32}, 4},
-    {{2|(3<<4)},    { 16*3.75,  32}, 0},
+    {{2|(3<<4)},    { 16*3.75,  32}, 4},
-    {{2|(2<<4)},    { 16*2.75,  32}, 0},
+    {{2|(2<<4)},    { 16*2.75,  32}, 4},
-    {{2|(1<<4)},    { 16*1.75,  32}, 0},
+    {{2|(1<<4)},    { 16*1.75,  32}, 4},
     {{2|(0<<4)},    { 16*0.375,  32}, 1},
     {{3|(11<<4)},   {16*13.125,  48}, 1},
-    {{3|(10<<4)},   {16*11.25,  48}, 0},
+    {{3|(10<<4)},   {16*11.25,  48}, 4},
-    {{3|(9<<4)},    {16*10.25,  48}, 0},
+    {{3|(9<<4)},    {16*10.25,  48}, 4},
-    {{3|(8<<4)},    {16*9.25,  48}, 0},
+    {{3|(8<<4)},    {16*9.25,  48}, 4},
-    {{3|(7<<4)},    {16*8.25,  48}, 0},
+    {{3|(7<<4)},    {16*8.25,  48}, 4},
-	{{3|(6<<4)},    {16*7.25,  48}, 0},
+	{{3|(6<<4)},    {16*7.25,  48}, 4},
-    {{3|(5<<4)},    {16*6.25,  48}, 0},
+    {{3|(5<<4)},    {16*6.25,  48}, 4},
-    {{3|(4<<4)},    {16*5.25,  48}, 0},
+    {{3|(4<<4)},    {16*5.25,  48}, 4},
-    {{3|(3<<4)},    {16*4.25,  48}, 0},
+    {{3|(3<<4)},    {16*4.25,  48}, 4},
-    {{3|(2<<4)},    {16*3.25,  48}, 0},
+    {{3|(2<<4)},    {16*3.25,  48}, 4},
-    {{3|(1<<4)},    {16*1.25,  48}, 0},
+    {{3|(1<<4)},    {16*1.25,  48}, 4},
     {{3|(0<<4)},    {16*0.625,  48}, 1},
 	{{4|(13<<4)},   {16*13.875,  64}, 1},
     {{4|(11<<4)},   {16*12.625,  64}, 1},
     {{4|(10<<4)},   {16*11.375,  64}, 1},
     {{4|(9<<4)},    {16*10.125,  64}, 1},
-    {{4|(5<<4)},    { 16*6.375,  64}, 0},
+    {{4|(5<<4)},    { 16*6.375,  64}, 4},
     {{4|(2<<4)},    { 16*2.625,  64}, 1},
     {{4|(1<<4)},    { 16*1.375,  64}, 1},
     {{4|(0<<4)},    { 16*0.125,  64}, 1},
@@ -578,7 +582,8 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
     {0, H_16,   G_16,   I_16},
     {0, K_16,   J_16,   L_16},
 };
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
     {{0|(13<<4)},   {17.23*13,  0}, 1},
     {{0|(12<<4)},   {17.23*12,  0}, 1},
     {{0|(11<<4)},   {17.23*11,  0}, 1},
@@ -594,51 +599,51 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
     {{0|(1<<4)},    { 17.23*1,  0}, 1},
     {{0|(0<<4)},    { 17.23*0,  0}, 1},
 	{{1|(13<<4)},   {17.23*13,  16}, 1},
-    {{1|(12<<4)},   {17.23*12,  16}, 0},
+    {{1|(12<<4)},   {17.23*12,  16}, 4},
-    {{1|(11<<4)},   {17.23*11,  16}, 0},
+    {{1|(11<<4)},   {17.23*11,  16}, 4},
-    {{1|(10<<4)},   {17.23*10,  16}, 0},
+    {{1|(10<<4)},   {17.23*10,  16}, 4},
-    {{1|(9<<4)},    {17.23*9,  16}, 0},
+    {{1|(9<<4)},    {17.23*9,  16}, 4},
-    {{1|(8<<4)},    {17.23*8,  16}, 0},
+    {{1|(8<<4)},    {17.23*8,  16}, 4},
-    {{1|(7<<4)},    {17.23*7,  16}, 0},
+    {{1|(7<<4)},    {17.23*7,  16}, 4},
-	{{1|(6<<4)},    { 17.23*6,  16}, 0},
+	{{1|(6<<4)},    { 17.23*6,  16}, 4},
-    {{1|(5<<4)},    { 17.23*5,  16}, 0},
+    {{1|(5<<4)},    { 17.23*5,  16}, 4},
-    {{1|(4<<4)},    { 17.23*4,  16}, 0},
+    {{1|(4<<4)},    { 17.23*4,  16}, 4},
-    {{1|(3<<4)},    { 17.23*3,  16}, 0},
+    {{1|(3<<4)},    { 17.23*3,  16}, 4},
-    {{1|(2<<4)},    { 17.23*2,  16}, 0},
+    {{1|(2<<4)},    { 17.23*2,  16}, 4},
-    {{1|(1<<4)},    { 17.23*1,  16}, 0},
+    {{1|(1<<4)},    { 17.23*1,  16}, 4},
     {{1|(0<<4)},    { 17.23*0,  16}, 1},
 	{{2|(13<<4)},   {17.23*13,  32}, 1},
-    {{2|(11<<4)},   {17.23*11,  32}, 0},
+    {{2|(11<<4)},   {17.23*11,  32}, 4},
-    {{2|(10<<4)},   {17.23*10,  32}, 0},
+    {{2|(10<<4)},   {17.23*10,  32}, 4},
-    {{2|(9<<4)},    {17.23*9,  32}, 0},
+    {{2|(9<<4)},    {17.23*9,  32}, 4},
-    {{2|(8<<4)},    {17.23*8,  32}, 0},
+    {{2|(8<<4)},    {17.23*8,  32}, 4},
-    {{2|(7<<4)},    {17.23*7,  32}, 0},
+    {{2|(7<<4)},    {17.23*7,  32}, 4},
-	{{2|(6<<4)},    { 17.23*6,  32}, 0},
+	{{2|(6<<4)},    { 17.23*6,  32}, 4},
-    {{2|(5<<4)},    { 17.23*5,  32}, 0},
+    {{2|(5<<4)},    { 17.23*5,  32}, 4},
-    {{2|(4<<4)},    { 17.23*4,  32}, 0},
+    {{2|(4<<4)},    { 17.23*4,  32}, 4},
-    {{2|(3<<4)},    { 17.23*3,  32}, 0},
+    {{2|(3<<4)},    { 17.23*3,  32}, 4},
-    {{2|(2<<4)},    { 17.23*2,  32}, 0},
+    {{2|(2<<4)},    { 17.23*2,  32}, 4},
-    {{2|(1<<4)},    { 17.23*1,  32}, 0},
+    {{2|(1<<4)},    { 17.23*1,  32}, 4},
     {{2|(0<<4)},    { 17.23*0,  32}, 1},
 	{{3|(13<<4)},   {17.23*13,  48}, 1},
-    {{3|(11<<4)},   {17.23*11,  48}, 0},
+    {{3|(11<<4)},   {17.23*11,  48}, 4},
-    {{3|(10<<4)},   {17.23*10,  48}, 0},
+    {{3|(10<<4)},   {17.23*10,  48}, 4},
-    {{3|(9<<4)},    {17.23*9,  48}, 0},
+    {{3|(9<<4)},    {17.23*9,  48}, 4},
-    {{3|(8<<4)},    {17.23*8,  48}, 0},
+    {{3|(8<<4)},    {17.23*8,  48}, 4},
-    {{3|(7<<4)},    {17.23*7,  48}, 0},
+    {{3|(7<<4)},    {17.23*7,  48}, 4},
-	{{3|(6<<4)},    { 17.23*6,  48}, 0},
+	{{3|(6<<4)},    { 17.23*6,  48}, 4},
-    {{3|(5<<4)},    { 17.23*5,  48}, 0},
+    {{3|(5<<4)},    { 17.23*5,  48}, 4},
-    {{3|(4<<4)},    { 17.23*4,  48}, 0},
+    {{3|(4<<4)},    { 17.23*4,  48}, 4},
-    {{3|(3<<4)},    { 17.23*3,  48}, 0},
+    {{3|(3<<4)},    { 17.23*3,  48}, 4},
-    {{3|(2<<4)},    { 17.23*2,  48}, 0},
+    {{3|(2<<4)},    { 17.23*2,  48}, 4},
-    {{3|(1<<4)},    { 17.23*1,  48}, 0},
+    {{3|(1<<4)},    { 17.23*1,  48}, 4},
     {{3|(0<<4)},    { 17.23*0,  48}, 1},
 	{{4|(13<<4)},   {17.23*13,  64}, 1},
     {{4|(11<<4)},   {17.23*11,  64}, 1},
     {{4|(10<<4)},   {17.23*10,  64}, 1},
     {{4|(9<<4)},    {17.23*9,  64}, 1},
     {{4|(8<<4)},    {17.23*8,  64}, 1},
-    {{4|(5<<4)},    { 17.23*5,  64}, 0},
+    {{4|(5<<4)},    { 17.23*5,  64}, 4},
     {{4|(2<<4)},    { 17.23*2,  64}, 1},
     {{4|(1<<4)},    { 17.23*1,  64}, 1},
     {{4|(0<<4)},    { 17.23*0,  64}, 1},

keyboards/dztech/dz60rgb/keymaps/ansi/keymap.c

@@ -42,10 +42,8 @@ void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool def
   rgb_led led;
   for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
     led = g_rgb_leds[i];
-    if (led.matrix_co.raw < 0xFF) {
+    if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) {
-      if (led.modifier) {
+        rgb_matrix_set_color( i, red, green, blue );
-          rgb_matrix_set_color( i, red, green, blue );
-      }
     }
   }
 }

keyboards/dztech/dz60rgb/keymaps/hhkb/keymap.c

@@ -43,10 +43,8 @@ void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool def
   rgb_led led;
   for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
     led = g_rgb_leds[i];
-    if (led.matrix_co.raw < 0xFF) {
+    if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) {
-      if (led.modifier) {
+        rgb_matrix_set_color( i, red, green, blue );
-          rgb_matrix_set_color( i, red, green, blue );
-      }
     }
   }
 }

keyboards/dztech/dz60rgb/keymaps/hhkb_iso/keymap.c

@@ -43,10 +43,8 @@ void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool def
   rgb_led led;
   for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
     led = g_rgb_leds[i];
-    if (led.matrix_co.raw < 0xFF) {
+    if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) {
-      if (led.modifier) {
+        rgb_matrix_set_color( i, red, green, blue );
-          rgb_matrix_set_color( i, red, green, blue );
-      }
     }
   }
 }

keyboards/dztech/dz60rgb/keymaps/iso/keymap.c

@@ -42,10 +42,8 @@ void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool def
   rgb_led led;
   for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
     led = g_rgb_leds[i];
-    if (led.matrix_co.raw < 0xFF) {
+    if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) {
-      if (led.modifier) {
+        rgb_matrix_set_color( i, red, green, blue );
-          rgb_matrix_set_color( i, red, green, blue );
-      }
     }
   }
 }

keyboards/dztech/dz60rgb/keymaps/mekanist/keymap.c

@@ -57,10 +57,8 @@ void rgb_matrix_layer_helper(uint8_t red, uint8_t green, uint8_t blue, bool defa
 	for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
 		led = g_rgb_leds[i];
 
-		if (led.matrix_co.raw < 0xFF) {
+		if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) {
-			if (led.modifier) {
+				rgb_matrix_set_color( i, red, green, blue );
-				rgb_matrix_set_color(i, red, green, blue);
-			}
 		}
 	}
 }

keyboards/ergodox_ez/ergodox_ez.c

@@ -269,64 +269,64 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
 };
 
 
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
 
     /*{row | col << 4}
       |             {x=0..224, y=0..64}
-      |              |                    modifier
+      |              |                    flags
       |              |                    | */
-    {{ 8|(0<<4)},   {17.2* 8, 12.8*0}, 0}, // LED 1 on right > Key 6
+    {{ 8|(0<<4)},   {17.2* 8, 12.8*0}, 4}, // LED 1 on right > Key 6
-    {{ 9|(0<<4)},   {17.2* 9, 12.8*0}, 0}, // LED 2 > Key 7
+    {{ 9|(0<<4)},   {17.2* 9, 12.8*0}, 4}, // LED 2 > Key 7
-    {{10|(0<<4)},   {17.2*10, 12.8*0}, 0}, // LED 3 > Key 8
+    {{10|(0<<4)},   {17.2*10, 12.8*0}, 4}, // LED 3 > Key 8
-    {{11|(0<<4)},   {17.2*11, 12.8*0}, 0}, // LED 4 > Key 9
+    {{11|(0<<4)},   {17.2*11, 12.8*0}, 4}, // LED 4 > Key 9
-    {{12|(0<<4)},   {17.2*12, 12.8*0}, 0}, // LED 5 > Key 0
+    {{12|(0<<4)},   {17.2*12, 12.8*0}, 4}, // LED 5 > Key 0
 
-    {{ 8|(1<<4)},   {17.2* 8, 12.8*1}, 0}, // LED 6
+    {{ 8|(1<<4)},   {17.2* 8, 12.8*1}, 4}, // LED 6
-    {{ 9|(1<<4)},   {17.2* 9, 12.8*1}, 0}, // LED 7
+    {{ 9|(1<<4)},   {17.2* 9, 12.8*1}, 4}, // LED 7
-    {{10|(1<<4)},   {17.2*10, 12.8*1}, 0}, // LED 8
+    {{10|(1<<4)},   {17.2*10, 12.8*1}, 4}, // LED 8
-    {{11|(1<<4)},   {17.2*11, 12.8*1}, 0}, // LED 9
+    {{11|(1<<4)},   {17.2*11, 12.8*1}, 4}, // LED 9
-    {{12|(1<<4)},   {17.2*12, 12.8*1}, 0}, // LED 10
+    {{12|(1<<4)},   {17.2*12, 12.8*1}, 4}, // LED 10
 
-    {{ 8|(2<<4)},   {17.2* 8, 12.8*2}, 0}, // LED 11
+    {{ 8|(2<<4)},   {17.2* 8, 12.8*2}, 4}, // LED 11
-    {{ 9|(2<<4)},   {17.2* 9, 12.8*2}, 0}, // LED 12
+    {{ 9|(2<<4)},   {17.2* 9, 12.8*2}, 4}, // LED 12
-    {{10|(2<<4)},   {17.2*10, 12.8*2}, 0}, // LED 13
+    {{10|(2<<4)},   {17.2*10, 12.8*2}, 4}, // LED 13
-    {{11|(2<<4)},   {17.2*11, 12.8*2}, 0}, // LED 14
+    {{11|(2<<4)},   {17.2*11, 12.8*2}, 4}, // LED 14
-    {{12|(2<<4)},   {17.2*12, 12.8*2}, 0}, // LED 15
+    {{12|(2<<4)},   {17.2*12, 12.8*2}, 4}, // LED 15
 
-    {{ 8|(3<<4)},   {17.2* 8, 12.8*3}, 0}, // LED 16
+    {{ 8|(3<<4)},   {17.2* 8, 12.8*3}, 4}, // LED 16
-    {{ 9|(3<<4)},   {17.2* 9, 12.8*3}, 0}, // LED 17
+    {{ 9|(3<<4)},   {17.2* 9, 12.8*3}, 4}, // LED 17
-    {{10|(3<<4)},   {17.2*10, 12.8*3}, 0}, // LED 18
+    {{10|(3<<4)},   {17.2*10, 12.8*3}, 4}, // LED 18
-    {{11|(3<<4)},   {17.2*11, 12.8*3}, 0}, // LED 19
+    {{11|(3<<4)},   {17.2*11, 12.8*3}, 4}, // LED 19
-    {{12|(3<<4)},   {17.2*12, 12.8*3}, 0}, // LED 20
+    {{12|(3<<4)},   {17.2*12, 12.8*3}, 4}, // LED 20
 
     {{ 9|(4<<4)},   {17.2* 9, 12.8*4}, 1}, // LED 21
     {{10|(4<<4)},   {17.2*10, 12.8*4}, 1}, // LED 22
     {{11|(4<<4)},   {17.2*11, 12.8*4}, 1}, // LED 23
     {{12|(4<<4)},   {17.2*12, 12.8*4}, 1}, // LED 24
 
-    {{ 5|(0<<4)},   {17.2* 5, 12.8*0}, 0}, // LED 1 on left > Key 5
+    {{ 5|(0<<4)},   {17.2* 5, 12.8*0}, 4}, // LED 1 on left > Key 5
-    {{ 4|(0<<4)},   {17.2* 4, 12.8*0}, 0}, // LED 2 > Key 4
+    {{ 4|(0<<4)},   {17.2* 4, 12.8*0}, 4}, // LED 2 > Key 4
-    {{ 3|(0<<4)},   {17.2* 3, 12.8*0}, 0}, // LED 3 > Key 3
+    {{ 3|(0<<4)},   {17.2* 3, 12.8*0}, 4}, // LED 3 > Key 3
-    {{ 2|(0<<4)},   {17.2* 2, 12.8*0}, 0}, // LED 4 > Key 2
+    {{ 2|(0<<4)},   {17.2* 2, 12.8*0}, 4}, // LED 4 > Key 2
-    {{ 1|(0<<4)},   {17.2* 1, 12.8*0}, 0}, // LED 5 > Key 1
+    {{ 1|(0<<4)},   {17.2* 1, 12.8*0}, 4}, // LED 5 > Key 1
 
-    {{ 5|(1<<4)},   {17.2* 5, 12.8*1}, 0}, // LED 6
+    {{ 5|(1<<4)},   {17.2* 5, 12.8*1}, 4}, // LED 6
-    {{ 4|(1<<4)},   {17.2* 4, 12.8*1}, 0}, // LED 7
+    {{ 4|(1<<4)},   {17.2* 4, 12.8*1}, 4}, // LED 7
-    {{ 3|(1<<4)},   {17.2* 3, 12.8*1}, 0}, // LED 8
+    {{ 3|(1<<4)},   {17.2* 3, 12.8*1}, 4}, // LED 8
-    {{ 2|(1<<4)},   {17.2* 2, 12.8*1}, 0}, // LED 9
+    {{ 2|(1<<4)},   {17.2* 2, 12.8*1}, 4}, // LED 9
-    {{ 1|(1<<4)},   {17.2* 1, 12.8*1}, 0}, // LED 10
+    {{ 1|(1<<4)},   {17.2* 1, 12.8*1}, 4}, // LED 10
 
-    {{ 5|(2<<4)},   {17.2* 5, 12.8*2}, 0}, // LED 11
+    {{ 5|(2<<4)},   {17.2* 5, 12.8*2}, 4}, // LED 11
-    {{ 4|(2<<4)},   {17.2* 4, 12.8*2}, 0}, // LED 12
+    {{ 4|(2<<4)},   {17.2* 4, 12.8*2}, 4}, // LED 12
-    {{ 3|(2<<4)},   {17.2* 3, 12.8*2}, 0}, // LED 13
+    {{ 3|(2<<4)},   {17.2* 3, 12.8*2}, 4}, // LED 13
-    {{ 2|(2<<4)},   {17.2* 2, 12.8*2}, 0}, // LED 14
+    {{ 2|(2<<4)},   {17.2* 2, 12.8*2}, 4}, // LED 14
-    {{ 1|(2<<4)},   {17.2* 1, 12.8*2}, 0}, // LED 15
+    {{ 1|(2<<4)},   {17.2* 1, 12.8*2}, 4}, // LED 15
 
-    {{ 5|(3<<4)},   {17.2* 5, 12.8*3}, 0}, // LED 16
+    {{ 5|(3<<4)},   {17.2* 5, 12.8*3}, 4}, // LED 16
-    {{ 4|(3<<4)},   {17.2* 4, 12.8*3}, 0}, // LED 17
+    {{ 4|(3<<4)},   {17.2* 4, 12.8*3}, 4}, // LED 17
-    {{ 3|(3<<4)},   {17.2* 3, 12.8*3}, 0}, // LED 18
+    {{ 3|(3<<4)},   {17.2* 3, 12.8*3}, 4}, // LED 18
-    {{ 2|(3<<4)},   {17.2* 2, 12.8*3}, 0}, // LED 19
+    {{ 2|(3<<4)},   {17.2* 2, 12.8*3}, 4}, // LED 19
-    {{ 1|(3<<4)},   {17.2* 1, 12.8*3}, 0}, // LED 20
+    {{ 1|(3<<4)},   {17.2* 1, 12.8*3}, 4}, // LED 20
 
     {{ 4|(4<<4)},   {17.2* 4, 12.8*4}, 1}, // LED 21
     {{ 3|(4<<4)},   {17.2* 3, 12.8*4}, 1}, // LED 22

keyboards/exclusive/e6_rgb/e6_rgb.c

@@ -114,80 +114,80 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
     {0, E_16,   D_16,   F_16},
     {0, B_16,   A_16,   C_16},
 };
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
 /* {row | col << 4}
  *    |           {x=0..224, y=0..64}
- *    |              |            modifier
+ *    |              |            flags
  *    |              |         | */
 //cs1
     {{0|(0<<4)},    {  0,  0}, 1},
-    {{0|(1<<4)},    { 17,  0}, 0},
+    {{0|(1<<4)},    { 17,  0}, 4},
     {{1|(0<<4)},    {  0, 16}, 1},
     {{2|(0<<4)},    {  0, 32}, 1},
 
 //cs2
-    {{0|(2<<4)},    { 34,  0}, 0},
+    {{0|(2<<4)},    { 34,  0}, 4},
-    {{0|(3<<4)},    { 51,  0}, 0},
+    {{0|(3<<4)},    { 51,  0}, 4},
-    {{1|(1<<4)},    { 17, 16}, 0},
+    {{1|(1<<4)},    { 17, 16}, 4},
-    {{1|(2<<4)},    { 34, 16}, 0},
+    {{1|(2<<4)},    { 34, 16}, 4},
 //cs3
-    {{2|(1<<4)},    { 17, 32}, 0},
+    {{2|(1<<4)},    { 17, 32}, 4},
-    {{2|(2<<4)},    { 34, 32}, 0},
+    {{2|(2<<4)},    { 34, 32}, 4},
-    {{3|(1<<4)},    { 17, 48}, 0},
+    {{3|(1<<4)},    { 17, 48}, 4},
-    {{3|(2<<4)},    { 34, 48}, 0},
+    {{3|(2<<4)},    { 34, 48}, 4},
 //cs4
-    {{0|(4<<4)},    { 68,  0}, 0},
+    {{0|(4<<4)},    { 68,  0}, 4},
-    {{0|(5<<4)},    { 85,  0}, 0},
+    {{0|(5<<4)},    { 85,  0}, 4},
-    {{1|(3<<4)},    { 51, 16}, 0},
+    {{1|(3<<4)},    { 51, 16}, 4},
-    {{1|(4<<4)},    { 68, 16}, 0},
+    {{1|(4<<4)},    { 68, 16}, 4},
 //cs5
-    {{0|(11<<4)},   {187,  0}, 0},
+    {{0|(11<<4)},   {187,  0}, 4},
-    {{0|(12<<4)},   {204,  0}, 0},
+    {{0|(12<<4)},   {204,  0}, 4},
-    {{1|(11<<4)},   {187, 16}, 0},
+    {{1|(11<<4)},   {187, 16}, 4},
-    {{1|(12<<4)},   {204, 16}, 0},
+    {{1|(12<<4)},   {204, 16}, 4},
 //cs6
-    {{0|(7<<4)},    {119,  0}, 0},
+    {{0|(7<<4)},    {119,  0}, 4},
-    {{0|(8<<4)},    {136,  0}, 0},
+    {{0|(8<<4)},    {136,  0}, 4},
-    {{1|(7<<4)},    {119, 16}, 0},
+    {{1|(7<<4)},    {119, 16}, 4},
-    {{1|(8<<4)},    {136, 16}, 0},
+    {{1|(8<<4)},    {136, 16}, 4},
 //cs7
-    {{0|(9<<4)},    {153,  0}, 0},
+    {{0|(9<<4)},    {153,  0}, 4},
-    {{0|(10<<4)},   {170,  0}, 0},
+    {{0|(10<<4)},   {170,  0}, 4},
-    {{1|(9<<4)},    {153, 16}, 0},
+    {{1|(9<<4)},    {153, 16}, 4},
-    {{1|(10<<4)},   {170, 16}, 0},
+    {{1|(10<<4)},   {170, 16}, 4},
 //cs8
-    {{0|(13<<4)},   {221,  0}, 0},
+    {{0|(13<<4)},   {221,  0}, 4},
-    {{0|(14<<4)},   {221,  0}, 0},
+    {{0|(14<<4)},   {221,  0}, 4},
     {{1|(13<<4)},   {221, 32}, 1},
     {{2|(12<<4)},   {221, 16}, 1},
 //cs9
-    {{2|(3<<4)},    { 51, 32}, 0},
+    {{2|(3<<4)},    { 51, 32}, 4},
-    {{2|(4<<4)},    { 68, 32}, 0},
+    {{2|(4<<4)},    { 68, 32}, 4},
-    {{3|(3<<4)},    { 51, 48}, 0},
+    {{3|(3<<4)},    { 51, 48}, 4},
-    {{3|(4<<4)},    { 68, 48}, 0},
+    {{3|(4<<4)},    { 68, 48}, 4},
 //cs10
-    {{0|(6<<4)},    {102,  0}, 0},
+    {{0|(6<<4)},    {102,  0}, 4},
-    {{1|(5<<4)},    { 85, 16}, 0},
+    {{1|(5<<4)},    { 85, 16}, 4},
-    {{1|(6<<4)},    {102, 16}, 0},
+    {{1|(6<<4)},    {102, 16}, 4},
-    {{2|(5<<4)},    { 85, 32}, 0},
+    {{2|(5<<4)},    { 85, 32}, 4},
 //cs11
-    {{2|(6<<4)},    {102, 32}, 0},
+    {{2|(6<<4)},    {102, 32}, 4},
-    {{3|(5<<4)},    { 85, 48}, 0},
+    {{3|(5<<4)},    { 85, 48}, 4},
-    {{3|(6<<4)},    {102, 48}, 0},
+    {{3|(6<<4)},    {102, 48}, 4},
-    {{4|(5<<4)},    {102, 64}, 0},
+    {{4|(5<<4)},    {102, 64}, 4},
 //cs12
-    {{2|(7<<4)},    {119, 32}, 0},
+    {{2|(7<<4)},    {119, 32}, 4},
-    {{2|(8<<4)},    {136, 32}, 0},
+    {{2|(8<<4)},    {136, 32}, 4},
-    {{3|(7<<4)},    {119, 48}, 0},
+    {{3|(7<<4)},    {119, 48}, 4},
-    {{3|(8<<4)},    {136, 48}, 0},
+    {{3|(8<<4)},    {136, 48}, 4},
 //cs13
-    {{2|(9<<4)},    {153, 32}, 0},
+    {{2|(9<<4)},    {153, 32}, 4},
-    {{2|(10<<4)},   {170, 32}, 0},
+    {{2|(10<<4)},   {170, 32}, 4},
-    {{3|(9<<4)},    {153, 48}, 0},
+    {{3|(9<<4)},    {153, 48}, 4},
     {{4|(6<<4)},    {136, 48}, 1},
 //cs14
-    {{2|(11<<4)},   {187, 32}, 0},
+    {{2|(11<<4)},   {187, 32}, 4},
-    {{3|(10<<4)},   {170, 48}, 0},
+    {{3|(10<<4)},   {170, 48}, 4},
     {{3|(11<<4)},   {187, 48}, 1},
     {{4|(7<<4)},    {153, 48}, 1},
 //cs15

keyboards/gergo/keymaps/colemak/keymap.c

@@ -0,0 +1,174 @@
+/* Good on you for modifying your layout! if you don't have
+ * time to read the QMK docs, a list of keycodes can be found at
+ *
+ * https://github.com/qmk/qmk_firmware/blob/master/docs/keycodes.md
+ *
+ * There's also a template for adding new layers at the bottom of this file!
+ */
+
+#include QMK_KEYBOARD_H
+
+#define IGNORE_MOD_TAP_INTERRUPT
+#define BASE 0 // default layer
+#define SYMB 1 // symbols
+#define NUMB 2 // numbers/motion
+
+enum custom_keycodes {
+  M1_STRING = SAFE_RANGE,
+  M2_URL,
+};
+
+// Blank template at the bottom
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Keymap 0: Basic layer
+ *
+ *       ,-------------------------------------------.                         ,-------------------------------------------.
+ *       |  TAB   |   Q  |   W  |   F  |   P  |   G  |                         |   J  |   L  |   U  |   Y  | ; :  |  | \   |
+ *       |--------+------+------+------+------+------|------.           .------|------+------+------+------+------+--------|
+ *       |  Ctrl  |   A  |   R  |  S   |   T  |   D  |O(CMD)|           |O(CTL)|   H  |   N  |   E  |   I  |  O   |  ' "   |
+ *       |--------+------+------+------+------+------|------|           |------|------+------+------+------+------+--------|
+ *       | LShift |   Z  |   X  |   C  |   V  |   B  |O(ALT)|           |      |   K  |   M  | ,  < | . >  | /  ? | RShift |
+ *       `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+ *                          .----------.   .-------.                                 .------.   .--------.
+ *                          | alt/del  |   | BKSP  |                                 | Space|   |cmd/del |
+ *                          '----------'   '-------'                                 `------.   '--------'
+ *                                              ,-------.                      ,-------.
+ *                                              | MMB   |                      |  :    |
+ *                                       ,------|-------|                      |-------|------.
+ *                                       | NUMB | SYMB  |                      | SYMB  | NUMB |
+ *                                       |  Esc |  F13  |                      | F14   | Enter|
+ *                                       |      |       |                      |       |      |
+ *                                       `--------------'                      `--------------'
+ */
+[BASE] = LAYOUT_gergo(
+KC_TAB,               KC_Q,  KC_W,   KC_F,   KC_P, KC_G,                                       KC_J,  KC_L,  KC_U,  KC_Y,KC_SCLN,  KC_BSLS,
+KC_LCTL,              KC_A,  KC_R,   KC_S,   KC_T, KC_D, OSM(MOD_LGUI),       OSM(MOD_LCTL),   KC_H,  KC_N,  KC_E,  KC_I, KC_O, KC_QUOT,
+KC_LSFT,              KC_Z,  KC_X,   KC_C,   KC_V, KC_B, OSM(MOD_LALT),       KC_TRNS,         KC_K, KC_M,  KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+
+                                     ALT_T(KC_DEL), KC_BSPC,                           KC_SPC, CMD_T(KC_DEL),
+
+                                                         KC_BTN3,       KC_COLON,
+                                LT(SYMB, KC_ESC), LT(NUMB, KC_F13),     LT(NUMB, KC_F14), LT(SYMB, KC_ENT)),
+/* Keymap 1: Symbols layer
+ *
+ * ,-------------------------------------------.                         ,-------------------------------------------.
+ * |        |  !   |  @   |  #   |  $   |  %   |                         |   ^  |  &   |  *   |  (   |  )   |  VolUp |
+ * |--------+------+------+------+------+------|------.           .------|------+------+------+------+------+--------|
+ * |        |  [   |  ]   |  {   |  }   |  `   |  M1  |           |      |      |  -   |  _   |  +   |  =   |  VolDn |
+ * |--------+------+------+------+------+------|------|           |------|------+------+------+------+------+--------|
+ * |        |  `   |  ~   |      |      |  ~   |  M2  |           |      |      |      | Prev |Pl/Pau| Next |  Mute  |
+ * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+ *                        .------.   .------.                                 .------.   .-----.
+ *                        |      |   |      |                                 |      |   |     |
+ *                        '------'   '------'                                 `------.   '-----'
+ *                                        ,-------.                     ,-------.
+ *                                        |       |                     |       |
+ *                                 ,------|-------|                     |-------|------.
+ *                                 |      |       |                     |       |      |
+ *                                 |      |       |                     |       |      |
+ *                                 |      |       |                     |       |      |
+ *                                 `--------------'                     `--------------'
+ */
+[SYMB] = LAYOUT_gergo(
+KC_TRNS, KC_EXLM, KC_AT,  KC_HASH,KC_DLR, KC_PERC,                         KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC__VOLUP,
+KC_TRNS, KC_LBRC, KC_RBRC, KC_LCBR,KC_RCBR, KC_PLUS, M1_STRING,             KC_TRNS,  KC_TRNS, KC_MINS, KC_UNDERSCORE, KC_PLUS, KC_EQL, KC__VOLDOWN,
+KC_TRNS, KC_GRV, KC_TILD,KC_TRNS,KC_TRNS, KC_EQL, M2_URL,                 KC_TRNS,  KC_TRNS, KC_TRNS,  KC_MEDIA_REWIND, KC_MEDIA_PLAY_PAUSE,  KC_MEDIA_FAST_FORWARD, KC__MUTE,
+
+                                                  KC_TRNS, KC_TRNS,       KC_TRNS, KC_TRNS,
+
+                                                           KC_TRNS,       KC_TRNS,
+                                             	  KC_TRNS, KC_TRNS,        KC_TRNS, KC_TRNS),
+/* Keymap 2: Pad/Function layer
+ *
+ * ,-------------------------------------------.                         ,-------------------------------------------.
+ * |        |   1  |  2   |  3   |  4   |  5   |                         |  6   |  7   |  8   |  9   |  0   | PgUp   |
+ * |--------+------+------+------+------+------|------.           .------|------+------+------+------+------+--------|
+ * |  F1    |  F2  | F3   | F4   | F5   | F6   | BTN1 |           | Home | LEFT | DOWN |  UP  | RIGHT| End  | PgDn   |
+ * |--------+------+------+------+------+------|------|           |------|------+------+------+------+------+--------|
+ * |  F7    |  F8  | F9   | F10  | F11  | F12  | BTN2 |           |      | MLFT | MDWN | MUP  | MRGHT|      |        |
+ * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+ *                        .------.   .------.                                 .------.   .-----.
+ *                        |      |   |      |                                 |  ALT |   |     |
+ *                        '------'   '------'                                 `------.   '-----'
+ *                                        ,-------.                     ,-------.
+ *                                        |       |                     |       |
+ *                                 ,------|-------|                     |-------|------.
+ *                                 |      |       |                     |       |      |
+ *                                 |      |       |                     |       |      |
+ *                                 |      |       |                     |       |      |
+ *                                 `--------------'                     `--------------'
+ */
+[NUMB] = LAYOUT_gergo(
+KC_TRNS, KC_1, 	  KC_2,    KC_3,    KC_4,    KC_5,                             KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_PGUP,
+KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6, KC_BTN1,         KC_HOME,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_END, KC_PGDN,
+KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, KC_BTN2,        KC_TRNS,  KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_TRNS, KC_TRNS,
+
+                                                  KC_TRNS, KC_TRNS,       KC_RALT, KC_TRNS,
+
+                                                           KC_TRNS,       KC_TRNS,
+                                             	  KC_TRNS, KC_TRNS,       KC_TRNS, KC_TRNS)
+};
+
+/* Keymap template
+ *
+ * ,-------------------------------------------.                         ,-------------------------------------------.
+ * |        |      |      |      |      |      |                         |      |      |      |      |      |        |
+ * |--------+------+------+------+------+------|------.           .------|------+------+------+------+------+--------|
+ * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
+ * |--------+------+------+------+------+------|------|           |------|------+------+------+------+------+--------|
+ * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
+ * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+ *                        .------.   .------.                                 .------.   .-----.
+ *                        |      |   |      |                                 |      |   |     |
+ *                        '------'   '------'                                 `------.   '-----'
+ *                                        ,-------.       ,-------.
+ *                                        |       |       |       |
+ *                                 ,------|-------|       |-------|------.
+ *                                 |      |       |       |       |      |
+ *                                 |      |       |       |       |      |
+ *                                 |      |       |       |       |      |
+ *                                 `--------------'       `--------------'
+[SYMB] = LAYOUT_gergo(
+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, 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),
+ */
+
+// Runs just one time when the keyboard initializes.
+void matrix_init_user(void) {
+
+};
+
+// Runs constantly in the background, in a loop.
+void matrix_scan_user(void) {
+    //uint8_t layer = biton32(layer_state);
+    biton32(layer_state);
+};
+
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case M1_STRING:
+      if (record->event.pressed) {
+        // when keycode QMKBEST is pressed
+        SEND_STRING("Hi!" SS_TAP(X_ENTER));
+      } else {
+        // when keycode QMKBEST is released
+      }
+      break;
+
+    case M2_URL:
+      if (record->event.pressed) {
+          SEND_STRING("https://ddg.gg" SS_TAP(X_ENTER));
+      }
+      break;
+
+  }
+  return true;
+};
+

keyboards/gergo/keymaps/colemak/readme.md

@@ -0,0 +1,16 @@
+# [Gergo! By g Heavy Industries](http://gboards.ca)
+
+![Gergo image](https://4.bp.blogspot.com/-889nMXxgSM0/XCNxwnO5kUI/AAAAAAAA6mI/tZbWgZVCBW0dyZOCGJDkjN06DVax7j8XwCLcBGAs/s1600/48422820_967732713413298_485744639215665152_n.jpg)
+
+This is a [Colemak](https://colemak.com/) mapping for the Gergo, 
+
+Unlike the default mapping, most symbols are at their original place on the number row to ease in the
+learning curve.
+
+You can view this layout over at
+[keyboad-layout-editor.com](http://www.keyboard-layout-editor.com/#/gists/f04d6a3b0cd3db91407c51f7ba36aeb3).
+
+## Settings
+To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/gergo/keymaps/default/rules.mk
+
+Ideally you should copy this directory and make your changes there. If you come up with a good layout submit a PR!

keyboards/gergo/keymaps/colemak/rules.mk

@@ -0,0 +1,36 @@
+#----------------------------------------------------------------------------
+# make gergo:germ:dfu
+# Make sure you have dfu-programmer installed!
+#----------------------------------------------------------------------------
+# Firmware options
+BALLER = no 			# Enable to ball out
+BALLSTEP = 20  			# Multiple in px to move, multiplied by layer number
+SCROLLSTEP = 1 			# Lines to scroll with ball
+MOUSEKEY_ENABLE = yes  		# Mouse keys(+4700), needed for baller
+
+#Debug options
+VERBOSE 		 = no
+DEBUG_MATRIX_SCAN_RATE   = no
+DEBUG_BALLER 		 = no
+DEBUG_MATRIX		 = no
+
+# A bunch of stuff that you shouldn't touch unless you
+# know what you're doing.
+#
+# No touchy, capiche?
+SRC += matrix.c i2c_master.c
+ifneq ($(strip $(BALLSTEP)),)
+    OPT_DEFS += -DTRKSTEP=$(strip $(BALLSTEP))
+endif
+ifneq ($(strip $(SCROLLSTEP)),)
+    OPT_DEFS += -DSCROLLSTEP=$(strip $(SCROLLSTEP))
+endif
+ifeq ($(strip $(BALLER)), yes)
+    OPT_DEFS += -DBALLER
+endif
+ifeq ($(strip $(DEBUG_BALLER)), yes)
+    OPT_DEFS += -DDEBUG_BALLER
+endif
+ifeq ($(strip $(DEBUG_MATRIX)), yes)
+    OPT_DEFS += -DDEBUG_MATRIX
+endif

keyboards/gergo/keymaps/default/rules.mk

@@ -3,7 +3,7 @@
 # Make sure you have dfu-programmer installed!
 #----------------------------------------------------------------------------
 # Firmware options
-BALLER = yes 			# Enable to ball out
+BALLER = no 			# Enable to ball out
 BALLSTEP = 20  			# Multiple in px to move, multiplied by layer number
 SCROLLSTEP = 1 			# Lines to scroll with ball
 MOUSEKEY_ENABLE = yes  		# Mouse keys(+4700), needed for baller
@@ -26,6 +26,7 @@ ifneq ($(strip $(SCROLLSTEP)),)
     OPT_DEFS += -DSCROLLSTEP=$(strip $(SCROLLSTEP))
 endif
 ifeq ($(strip $(BALLER)), yes)
+	POINTING_DEVICE_ENABLE	= yes
     OPT_DEFS += -DBALLER
 endif
 ifeq ($(strip $(DEBUG_BALLER)), yes)

keyboards/gergo/keymaps/germ/rules.mk

@@ -27,6 +27,7 @@ ifneq ($(strip $(SCROLLSTEP)),)
 endif
 ifeq ($(strip $(BALLER)), yes)
     OPT_DEFS += -DBALLER
+	POINTING_DEVICE_ENABLE = yes
 endif
 ifeq ($(strip $(DEBUG_BALLER)), yes)
     OPT_DEFS += -DDEBUG_BALLER

keyboards/gergo/matrix.c

@@ -30,7 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "debug.h"
 #include "util.h"
 #include "debounce.h"
-#include "pointing_device.h"
 #include QMK_KEYBOARD_H
 #ifdef DEBUG_MATRIX_SCAN_RATE
 #   include  "timer.h"
@@ -38,6 +37,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef BALLER
 #include <avr/interrupt.h>
+#include "pointing_device.h"
 #endif
 
 #ifndef DEBOUNCE

keyboards/gergo/rules.mk

@@ -14,7 +14,6 @@ BOOTLOADER = atmel-dfu
 F_USB = $(F_CPU)
 
 CUSTOM_MATRIX 		= yes
-POINTING_DEVICE_ENABLE	= yes
 EXTRAKEY_ENABLE		= yes
 CONSOLE_ENABLE  	= yes
 COMMAND_ENABLE		= yes

keyboards/hadron/ver3/ver3.c

@@ -21,21 +21,21 @@
 #ifdef RGB_MATRIX_ENABLE
 #include "rgblight.h"
 
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
   /*{row | col << 4}
     |             {x=0..224, y=0..64}
     |              |         modifier
     |              |         | */
-  {{1|(13<<4)},   {195, 3},  0},
+  {{1|(13<<4)},   {195, 3},  4},
-  {{4|(13<<4)},   {195, 16}, 0},
+  {{4|(13<<4)},   {195, 16}, 4},
-  {{4|(10<<4)},   {150, 16}, 0},
+  {{4|(10<<4)},   {150, 16}, 4},
-  {{4|(7<<4)},    {105, 16}, 0},
+  {{4|(7<<4)},    {105, 16}, 4},
-  {{4|(4<<4)},    {60,  16}, 0},
+  {{4|(4<<4)},    {60,  16}, 4},
-  {{4|(1<<4)},    {15,  16}, 0},
+  {{4|(1<<4)},    {15,  16}, 4},
-  {{1|(1<<4)},    {15,  3},  0},
+  {{1|(1<<4)},    {15,  3},  4},
-  {{1|(4<<4)},    {60,  3},  0},
+  {{1|(4<<4)},    {60,  3},  4},
-  {{1|(7<<4)},    {105, 3},  0},
+  {{1|(7<<4)},    {105, 3},  4},
-  {{1|(10<<4)},   {150, 3},  0}
+  {{1|(10<<4)},   {150, 3},  4}
 };
 
 #endif

keyboards/hs60/v1/v1.c

@@ -165,7 +165,7 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
     {1, C9_16,  C7_15,  C6_15}  //D16
 };
 
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
 //
 //  C7,  C6,  C5,  C4,  C3,  C2,  C1,  A7,  A6,  A5,  A4,  A3,  A2,  A1,
 //  C8,  C9, C10, C11, C12, C13, C14,  A8,  A9, A10, A11, A12, A13, A15,
@@ -174,70 +174,70 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
 // D16, D15, D14, ---, ---, ---, D13, ---, ---, ---, B14, B13, B12, B11
 /* {row | col << 4}
  *    |           {x=0..224, y=0..64}
- *    |              |            modifier
+ *    |              |            flags
  *    |              |         | */
     {{0|(13<<4)},   {224,  0}, 1}, //A1-A16
-    {{0|(12<<4)},   {204,  0}, 0},
+    {{0|(12<<4)},   {204,  0}, 4},
-    {{0|(11<<4)},   {187,  0}, 0},
+    {{0|(11<<4)},   {187,  0}, 4},
-    {{0|(10<<4)},   {170,  0}, 0},
+    {{0|(10<<4)},   {170,  0}, 4},
-    {{0|(9<<4)},    {153,  0}, 0},
+    {{0|(9<<4)},    {153,  0}, 4},
-    {{0|(8<<4)},    {136,  0}, 0},
+    {{0|(8<<4)},    {136,  0}, 4},
-    {{0|(7<<4)},    {119,  0}, 0},
+    {{0|(7<<4)},    {119,  0}, 4},
-    {{1|(7<<4)},    {119, 16}, 0},
+    {{1|(7<<4)},    {119, 16}, 4},
-    {{1|(8<<4)},    {136, 16}, 0},
+    {{1|(8<<4)},    {136, 16}, 4},
-    {{1|(9<<4)},    {153, 16}, 0},
+    {{1|(9<<4)},    {153, 16}, 4},
-    {{1|(10<<4)},   {170, 16}, 0},
+    {{1|(10<<4)},   {170, 16}, 4},
-    {{1|(11<<4)},   {187, 16}, 0},
+    {{1|(11<<4)},   {187, 16}, 4},
-    {{1|(12<<4)},   {204, 16}, 0},
+    {{1|(12<<4)},   {204, 16}, 4},
     {{2|(13<<4)},   {224, 32}, 1},
-    {{2|(12<<4)},   {224, 16}, 0},
+    {{2|(12<<4)},   {224, 16}, 4},
-    {{2|(11<<4)},   {197, 32}, 0},
+    {{2|(11<<4)},   {197, 32}, 4},
 
-    {{3|(10<<4)},   {170, 48}, 0}, //B1-B14
+    {{3|(10<<4)},   {170, 48}, 4}, //B1-B14
-    {{3|(9<<4)},    {153, 48}, 0},
+    {{3|(9<<4)},    {153, 48}, 4},
-    {{3|(8<<4)},    {136, 48}, 0},
+    {{3|(8<<4)},    {136, 48}, 4},
-    {{3|(7<<4)},    {119, 48}, 0},
+    {{3|(7<<4)},    {119, 48}, 4},
-    {{2|(7<<4)},    {119, 32}, 0},
+    {{2|(7<<4)},    {119, 32}, 4},
-    {{2|(8<<4)},    {136, 32}, 0},
+    {{2|(8<<4)},    {136, 32}, 4},
-    {{2|(9<<4)},    {153, 32}, 0},
+    {{2|(9<<4)},    {153, 32}, 4},
-    {{2|(10<<4)},   {170, 32}, 0},
+    {{2|(10<<4)},   {170, 32}, 4},
-    {{3|(11<<4)},   {187, 48}, 0},
+    {{3|(11<<4)},   {187, 48}, 4},
     {{3|(13<<4)},   {214, 48}, 1},
     {{4|(13<<4)},   {224, 64}, 1},
     {{4|(12<<4)},   {204, 64}, 1},
     {{4|(11<<4)},   {187, 64}, 1},
     {{4|(10<<4)},   {170, 64}, 1},
 
-    {{0|(6<<4)},    {102,  0}, 0}, //C1-C16
+    {{0|(6<<4)},    {102,  0}, 4}, //C1-C16
-    {{0|(5<<4)},    { 85,  0}, 0},
+    {{0|(5<<4)},    { 85,  0}, 4},
-    {{0|(4<<4)},    { 68,  0}, 0},
+    {{0|(4<<4)},    { 68,  0}, 4},
-    {{0|(3<<4)},    { 51,  0}, 0},
+    {{0|(3<<4)},    { 51,  0}, 4},
-    {{0|(2<<4)},    { 34,  0}, 0},
+    {{0|(2<<4)},    { 34,  0}, 4},
-    {{0|(1<<4)},    { 17,  0}, 0},
+    {{0|(1<<4)},    { 17,  0}, 4},
     {{0|(0<<4)},    {  0,  0}, 1},
     {{1|(0<<4)},    {  0, 16}, 1},
-    {{1|(1<<4)},    { 17, 16}, 0},
+    {{1|(1<<4)},    { 17, 16}, 4},
-    {{1|(2<<4)},    { 34, 16}, 0},
+    {{1|(2<<4)},    { 34, 16}, 4},
-    {{1|(3<<4)},    { 51, 16}, 0},
+    {{1|(3<<4)},    { 51, 16}, 4},
-    {{1|(4<<4)},    { 68, 16}, 0},
+    {{1|(4<<4)},    { 68, 16}, 4},
-    {{1|(5<<4)},    { 85, 16}, 0},
+    {{1|(5<<4)},    { 85, 16}, 4},
-    {{1|(6<<4)},    {102, 16}, 0},
+    {{1|(6<<4)},    {102, 16}, 4},
-    {{2|(6<<4)},    {102, 32}, 0},
+    {{2|(6<<4)},    {102, 32}, 4},
-    {{2|(5<<4)},    { 85, 32}, 0},
+    {{2|(5<<4)},    { 85, 32}, 4},
 
-    {{3|(2<<4)},    { 32, 48}, 0}, //D1-D16
+    {{3|(2<<4)},    { 32, 48}, 4}, //D1-D16
     //D2
     {{3|(0<<4)},    { 10, 48}, 1},
     {{2|(0<<4)},    {  0, 32}, 1},
-    {{2|(1<<4)},    { 17, 32}, 0},
+    {{2|(1<<4)},    { 17, 32}, 4},
-    {{2|(2<<4)},    { 34, 32}, 0},
+    {{2|(2<<4)},    { 34, 32}, 4},
-    {{2|(3<<4)},    { 51, 32}, 0},
+    {{2|(3<<4)},    { 51, 32}, 4},
-    {{2|(4<<4)},    { 68, 32}, 0},
+    {{2|(4<<4)},    { 68, 32}, 4},
-    {{3|(3<<4)},    { 51, 48}, 0},
+    {{3|(3<<4)},    { 51, 48}, 4},
-    {{3|(4<<4)},    { 68, 48}, 0},
+    {{3|(4<<4)},    { 68, 48}, 4},
-    {{3|(5<<4)},    { 85, 48}, 0},
+    {{3|(5<<4)},    { 85, 48}, 4},
-    {{3|(6<<4)},    {102, 48}, 0},
+    {{3|(6<<4)},    {102, 48}, 4},
-    {{4|(3<<4)},    {102, 64}, 0},
+    {{4|(3<<4)},    {102, 64}, 4},
     {{4|(2<<4)},    { 34, 68}, 1},
     {{4|(1<<4)},    { 17, 68}, 1},
     {{4|(0<<4)},    {  0, 68}, 1}
@@ -319,7 +319,7 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
     {1, C9_16,  C7_15,  C6_15}  //D16
 };
 
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
 //
 //  C7,  C6,  C5,  C4,  C3,  C2,  C1,  A7,  A6,  A5,  A4,  A3,  A2,  A1,
 //  C8,  C9, C10, C11, C12, C13, C14,  A8,  A9, A10, A11, A12, A13, ---,
@@ -328,70 +328,70 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
 // D16, D15, D14, ---, ---, ---, D13, ---, ---, ---, B14, B13, B12, B11
 /* {row | col << 4}
  *    |           {x=0..224, y=0..64}
- *    |              |            modifier
+ *    |              |            flags
  *    |              |         | */
     {{0|(13<<4)},   {224,  0}, 1}, //A1-A16
-    {{0|(12<<4)},   {204,  0}, 0},
+    {{0|(12<<4)},   {204,  0}, 4},
-    {{0|(11<<4)},   {187,  0}, 0},
+    {{0|(11<<4)},   {187,  0}, 4},
-    {{0|(10<<4)},   {170,  0}, 0},
+    {{0|(10<<4)},   {170,  0}, 4},
-    {{0|(9<<4)},    {153,  0}, 0},
+    {{0|(9<<4)},    {153,  0}, 4},
-    {{0|(8<<4)},    {136,  0}, 0},
+    {{0|(8<<4)},    {136,  0}, 4},
-    {{0|(7<<4)},    {119,  0}, 0},
+    {{0|(7<<4)},    {119,  0}, 4},
-    {{1|(7<<4)},    {119, 16}, 0},
+    {{1|(7<<4)},    {119, 16}, 4},
-    {{1|(8<<4)},    {136, 16}, 0},
+    {{1|(8<<4)},    {136, 16}, 4},
-    {{1|(9<<4)},    {153, 16}, 0},
+    {{1|(9<<4)},    {153, 16}, 4},
-    {{1|(10<<4)},   {170, 16}, 0},
+    {{1|(10<<4)},   {170, 16}, 4},
-    {{1|(11<<4)},   {187, 16}, 0},
+    {{1|(11<<4)},   {187, 16}, 4},
-    {{1|(12<<4)},   {204, 16}, 0},
+    {{1|(12<<4)},   {204, 16}, 4},
     {{2|(13<<4)},   {224,  8}, 1},
-    {{2|(12<<4)},   {204, 32}, 0},
+    {{2|(12<<4)},   {204, 32}, 4},
-    {{2|(11<<4)},   {187, 32}, 0},
+    {{2|(11<<4)},   {187, 32}, 4},
 
-    {{3|(10<<4)},   {170, 48}, 0}, //B1-B14
+    {{3|(10<<4)},   {170, 48}, 4}, //B1-B14
-    {{3|(9<<4)},    {153, 48}, 0},
+    {{3|(9<<4)},    {153, 48}, 4},
-    {{3|(8<<4)},    {136, 48}, 0},
+    {{3|(8<<4)},    {136, 48}, 4},
-    {{3|(7<<4)},    {119, 48}, 0},
+    {{3|(7<<4)},    {119, 48}, 4},
-    {{2|(7<<4)},    {119, 32}, 0},
+    {{2|(7<<4)},    {119, 32}, 4},
-    {{2|(8<<4)},    {136, 32}, 0},
+    {{2|(8<<4)},    {136, 32}, 4},
-    {{2|(9<<4)},    {153, 32}, 0},
+    {{2|(9<<4)},    {153, 32}, 4},
-    {{2|(10<<4)},   {170, 32}, 0},
+    {{2|(10<<4)},   {170, 32}, 4},
-    {{3|(11<<4)},   {187, 48}, 0},
+    {{3|(11<<4)},   {187, 48}, 4},
     {{3|(13<<4)},   {214, 48}, 1},
     {{4|(13<<4)},   {224, 64}, 1},
     {{4|(12<<4)},   {204, 64}, 1},
     {{4|(11<<4)},   {187, 64}, 1},
     {{4|(10<<4)},   {170, 64}, 1},
 
-    {{0|(6<<4)},    {102,  0}, 0}, //C1-C16
+    {{0|(6<<4)},    {102,  0}, 4}, //C1-C16
-    {{0|(5<<4)},    { 85,  0}, 0},
+    {{0|(5<<4)},    { 85,  0}, 4},
-    {{0|(4<<4)},    { 68,  0}, 0},
+    {{0|(4<<4)},    { 68,  0}, 4},
-    {{0|(3<<4)},    { 51,  0}, 0},
+    {{0|(3<<4)},    { 51,  0}, 4},
-    {{0|(2<<4)},    { 34,  0}, 0},
+    {{0|(2<<4)},    { 34,  0}, 4},
-    {{0|(1<<4)},    { 17,  0}, 0},
+    {{0|(1<<4)},    { 17,  0}, 4},
     {{0|(0<<4)},    {  0,  0}, 1},
     {{1|(0<<4)},    {  0, 16}, 1},
-    {{1|(1<<4)},    { 17, 16}, 0},
+    {{1|(1<<4)},    { 17, 16}, 4},
-    {{1|(2<<4)},    { 34, 16}, 0},
+    {{1|(2<<4)},    { 34, 16}, 4},
-    {{1|(3<<4)},    { 51, 16}, 0},
+    {{1|(3<<4)},    { 51, 16}, 4},
-    {{1|(4<<4)},    { 68, 16}, 0},
+    {{1|(4<<4)},    { 68, 16}, 4},
-    {{1|(5<<4)},    { 85, 16}, 0},
+    {{1|(5<<4)},    { 85, 16}, 4},
-    {{1|(6<<4)},    {102, 16}, 0},
+    {{1|(6<<4)},    {102, 16}, 4},
-    {{2|(6<<4)},    {102, 32}, 0},
+    {{2|(6<<4)},    {102, 32}, 4},
-    {{2|(5<<4)},    { 85, 32}, 0},
+    {{2|(5<<4)},    { 85, 32}, 4},
 
-    {{3|(2<<4)},    { 32, 48}, 0}, //D1-D16
+    {{3|(2<<4)},    { 32, 48}, 4}, //D1-D16
-    {{3|(1<<4)},    { 17, 48}, 0},
+    {{3|(1<<4)},    { 17, 48}, 4},
     {{3|(0<<4)},    {  0, 48}, 1},
     {{2|(0<<4)},    {  0, 32}, 1},
-    {{2|(1<<4)},    { 17, 32}, 0},
+    {{2|(1<<4)},    { 17, 32}, 4},
-    {{2|(2<<4)},    { 34, 32}, 0},
+    {{2|(2<<4)},    { 34, 32}, 4},
-    {{2|(3<<4)},    { 51, 32}, 0},
+    {{2|(3<<4)},    { 51, 32}, 4},
-    {{2|(4<<4)},    { 68, 32}, 0},
+    {{2|(4<<4)},    { 68, 32}, 4},
-    {{3|(3<<4)},    { 51, 48}, 0},
+    {{3|(3<<4)},    { 51, 48}, 4},
-    {{3|(4<<4)},    { 68, 48}, 0},
+    {{3|(4<<4)},    { 68, 48}, 4},
-    {{3|(5<<4)},    { 85, 48}, 0},
+    {{3|(5<<4)},    { 85, 48}, 4},
-    {{3|(6<<4)},    {102, 48}, 0},
+    {{3|(6<<4)},    {102, 48}, 4},
-    {{4|(3<<4)},    {102, 64}, 0},
+    {{4|(3<<4)},    {102, 64}, 4},
     {{4|(2<<4)},    { 34, 68}, 1},
     {{4|(1<<4)},    { 17, 68}, 1},
     {{4|(0<<4)},    {  0, 68}, 1}

keyboards/kbdfans/kbd4x/kbd4x.h

@@ -21,13 +21,13 @@
 	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
 	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
 	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-	k30, k31, k32, k33, k34,    k35,   k37, k38, k39, k3a, k3b \
+	k30, k31, k32, k33, k34,    k35,   k37, k38, k39, k3a, k3b  \
 ) \
 { \
 	{ k00, k01, k02, k03, k04, k05, k06,   k07, k08, k09, k0a, k0b }, \
 	{ k10, k11, k12, k13, k14, k15, k16,   k17, k18, k19, k1a, k1b }, \
 	{ k20, k21, k22, k23, k24, k25, k26,   k27, k28, k29, k2a, k2b }, \
-	{ k30, k31, k32, k33, k34, k35, KC_NO, k37, k38, k39, k3a, k3b } \
+	{ k30, k31, k32, k33, k34, k35, KC_NO, k37, k38, k39, k3a, k3b }  \
 }
 
 // The PCB does support a grid layout, but the case does not.
@@ -35,11 +35,24 @@
 	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
 	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
 	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-	k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
+	k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b  \
 ) \
 { \
 	{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
 	{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
 	{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-	{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
+	{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }  \
+}
+
+#define LAYOUT_kc_ortho_4x12( \
+	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
+	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
+	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
+	k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b  \
+) \
+{ \
+	{ KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_##k06, KC_##k07, KC_##k08, KC_##k09, KC_##k0a, KC_##k0b }, \
+	{ KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15, KC_##k16, KC_##k17, KC_##k18, KC_##k19, KC_##k1a, KC_##k1b }, \
+	{ KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25, KC_##k26, KC_##k27, KC_##k28, KC_##k29, KC_##k2a, KC_##k2b }, \
+	{ KC_##k30, KC_##k31, KC_##k32, KC_##k33, KC_##k34, KC_##k35, KC_##k36, KC_##k37, KC_##k38, KC_##k39, KC_##k3a, KC_##k3b }  \
 }

keyboards/kbdfans/kbd4x/rules.mk

@@ -65,7 +65,7 @@ BOOTLOADER = atmel-dfu
 BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = yes        # Console for debug(+400)
+CONSOLE_ENABLE = no        # Console for debug(+400)
 COMMAND_ENABLE = yes        # Commands for debug and configuration
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
@@ -79,3 +79,5 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6
 FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
 HD44780_ENABLE = no 		# Enable support for HD44780 based LCDs (+400)
+
+LAYOUTS = ortho_4x12 planck_mit

keyboards/massdrop/alt/config.h

@@ -123,6 +123,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_LED_PROCESS_LIMIT 15
 #define RGB_MATRIX_LED_FLUSH_LIMIT 10
-#define RGB_MATRIX_EXTRA_TOG
 
 #include "config_led.h"

keyboards/massdrop/alt/config_led.c

@@ -20,122 +20,122 @@
 //
 // There is a quick-and-dirty implementation of this under ledvis.html
 
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
-  /*  0 */ { { (0)|(0  << 4) }, { 8,   56 }, 0 }, // KC_ESC
+  /*  0 */ { { (0)|(0  << 4) }, { 8,   56 }, 4 }, // KC_ESC
-  /*  1 */ { { (0)|(1  << 4) }, { 22,  56 }, 0 }, // KC_1
+  /*  1 */ { { (0)|(1  << 4) }, { 22,  56 }, 4 }, // KC_1
-  /*  2 */ { { (0)|(2  << 4) }, { 35,  56 }, 0 }, // KC_2
+  /*  2 */ { { (0)|(2  << 4) }, { 35,  56 }, 4 }, // KC_2
-  /*  3 */ { { (0)|(3  << 4) }, { 49,  56 }, 0 }, // KC_3
+  /*  3 */ { { (0)|(3  << 4) }, { 49,  56 }, 4 }, // KC_3
-  /*  4 */ { { (0)|(4  << 4) }, { 63,  56 }, 0 }, // KC_4
+  /*  4 */ { { (0)|(4  << 4) }, { 63,  56 }, 4 }, // KC_4
-  /*  5 */ { { (0)|(5  << 4) }, { 77,  56 }, 0 }, // KC_5
+  /*  5 */ { { (0)|(5  << 4) }, { 77,  56 }, 4 }, // KC_5
-  /*  6 */ { { (0)|(6  << 4) }, { 91,  56 }, 0 }, // KC_6
+  /*  6 */ { { (0)|(6  << 4) }, { 91,  56 }, 4 }, // KC_6
-  /*  7 */ { { (0)|(7  << 4) }, { 105, 56 }, 0 }, // KC_7
+  /*  7 */ { { (0)|(7  << 4) }, { 105, 56 }, 4 }, // KC_7
-  /*  8 */ { { (0)|(8  << 4) }, { 118, 56 }, 0 }, // KC_8
+  /*  8 */ { { (0)|(8  << 4) }, { 118, 56 }, 4 }, // KC_8
-  /*  9 */ { { (0)|(9  << 4) }, { 132, 56 }, 0 }, // KC_9
+  /*  9 */ { { (0)|(9  << 4) }, { 132, 56 }, 4 }, // KC_9
-  /* 10 */ { { (0)|(10 << 4) }, { 146, 56 }, 0 }, // KC_0
+  /* 10 */ { { (0)|(10 << 4) }, { 146, 56 }, 4 }, // KC_0
-  /* 11 */ { { (0)|(11 << 4) }, { 160, 56 }, 0 }, // KC_MINS
+  /* 11 */ { { (0)|(11 << 4) }, { 160, 56 }, 4 }, // KC_MINS
-  /* 12 */ { { (0)|(12 << 4) }, { 174, 56 }, 0 }, // KC_EQL
+  /* 12 */ { { (0)|(12 << 4) }, { 174, 56 }, 4 }, // KC_EQL
-  /* 13 */ { { (0)|(13 << 4) }, { 195, 56 }, 0 }, // KC_BSPC
+  /* 13 */ { { (0)|(13 << 4) }, { 195, 56 }, 4 }, // KC_BSPC
-  /* 14 */ { { (0)|(14 << 4) }, { 215, 56 }, 0 }, // KC_DEL
+  /* 14 */ { { (0)|(14 << 4) }, { 215, 56 }, 4 }, // KC_DEL
-  /* 15 */ { { (1)|(0  << 4) }, { 11,  44 }, 0 }, // KC_TAB
+  /* 15 */ { { (1)|(0  << 4) }, { 11,  44 }, 4 }, // KC_TAB
-  /* 16 */ { { (1)|(1  << 4) }, { 28,  44 }, 0 }, // KC_Q
+  /* 16 */ { { (1)|(1  << 4) }, { 28,  44 }, 4 }, // KC_Q
-  /* 17 */ { { (1)|(2  << 4) }, { 42,  44 }, 0 }, // KC_W
+  /* 17 */ { { (1)|(2  << 4) }, { 42,  44 }, 4 }, // KC_W
-  /* 18 */ { { (1)|(3  << 4) }, { 56,  44 }, 0 }, // KC_E
+  /* 18 */ { { (1)|(3  << 4) }, { 56,  44 }, 4 }, // KC_E
-  /* 19 */ { { (1)|(4  << 4) }, { 70,  44 }, 0 }, // KC_R
+  /* 19 */ { { (1)|(4  << 4) }, { 70,  44 }, 4 }, // KC_R
-  /* 20 */ { { (1)|(5  << 4) }, { 84,  44 }, 0 }, // KC_T
+  /* 20 */ { { (1)|(5  << 4) }, { 84,  44 }, 4 }, // KC_T
-  /* 21 */ { { (1)|(6  << 4) }, { 98,  44 }, 0 }, // KC_Y
+  /* 21 */ { { (1)|(6  << 4) }, { 98,  44 }, 4 }, // KC_Y
-  /* 22 */ { { (1)|(7  << 4) }, { 112, 44 }, 0 }, // KC_U
+  /* 22 */ { { (1)|(7  << 4) }, { 112, 44 }, 4 }, // KC_U
-  /* 23 */ { { (1)|(8  << 4) }, { 125, 44 }, 0 }, // KC_I
+  /* 23 */ { { (1)|(8  << 4) }, { 125, 44 }, 4 }, // KC_I
-  /* 24 */ { { (1)|(9  << 4) }, { 139, 44 }, 0 }, // KC_O
+  /* 24 */ { { (1)|(9  << 4) }, { 139, 44 }, 4 }, // KC_O
-  /* 25 */ { { (1)|(10 << 4) }, { 153, 44 }, 0 }, // KC_P
+  /* 25 */ { { (1)|(10 << 4) }, { 153, 44 }, 4 }, // KC_P
-  /* 26 */ { { (1)|(11 << 4) }, { 167, 44 }, 0 }, // KC_LBRC
+  /* 26 */ { { (1)|(11 << 4) }, { 167, 44 }, 4 }, // KC_LBRC
-  /* 27 */ { { (1)|(12 << 4) }, { 181, 44 }, 0 }, // KC_RBRC
+  /* 27 */ { { (1)|(12 << 4) }, { 181, 44 }, 4 }, // KC_RBRC
-  /* 28 */ { { (1)|(13 << 4) }, { 198, 44 }, 0 }, // KC_BSLS
+  /* 28 */ { { (1)|(13 << 4) }, { 198, 44 }, 4 }, // KC_BSLS
-  /* 29 */ { { (1)|(14 << 4) }, { 215, 44 }, 0 }, // KC_HOME
+  /* 29 */ { { (1)|(14 << 4) }, { 215, 44 }, 4 }, // KC_HOME
   /* 30 */ { { (2)|(0  << 4) }, { 13,  32 }, 1 }, // KC_CAPS
-  /* 31 */ { { (2)|(1  << 4) }, { 32,  32 }, 0 }, // KC_A
+  /* 31 */ { { (2)|(1  << 4) }, { 32,  32 }, 4 }, // KC_A
-  /* 32 */ { { (2)|(2  << 4) }, { 46,  32 }, 0 }, // KC_S
+  /* 32 */ { { (2)|(2  << 4) }, { 46,  32 }, 4 }, // KC_S
-  /* 33 */ { { (2)|(3  << 4) }, { 60,  32 }, 0 }, // KC_D
+  /* 33 */ { { (2)|(3  << 4) }, { 60,  32 }, 4 }, // KC_D
-  /* 34 */ { { (2)|(4  << 4) }, { 73,  32 }, 0 }, // KC_F
+  /* 34 */ { { (2)|(4  << 4) }, { 73,  32 }, 4 }, // KC_F
-  /* 35 */ { { (2)|(5  << 4) }, { 87,  32 }, 0 }, // KC_G
+  /* 35 */ { { (2)|(5  << 4) }, { 87,  32 }, 4 }, // KC_G
-  /* 36 */ { { (2)|(6  << 4) }, { 101, 32 }, 0 }, // KC_H
+  /* 36 */ { { (2)|(6  << 4) }, { 101, 32 }, 4 }, // KC_H
-  /* 37 */ { { (2)|(7  << 4) }, { 115, 32 }, 0 }, // KC_J
+  /* 37 */ { { (2)|(7  << 4) }, { 115, 32 }, 4 }, // KC_J
-  /* 38 */ { { (2)|(8  << 4) }, { 129, 32 }, 0 }, // KC_K
+  /* 38 */ { { (2)|(8  << 4) }, { 129, 32 }, 4 }, // KC_K
-  /* 39 */ { { (2)|(9  << 4) }, { 143, 32 }, 0 }, // KC_L
+  /* 39 */ { { (2)|(9  << 4) }, { 143, 32 }, 4 }, // KC_L
-  /* 40 */ { { (2)|(10 << 4) }, { 156, 32 }, 0 }, // KC_SCLN
+  /* 40 */ { { (2)|(10 << 4) }, { 156, 32 }, 4 }, // KC_SCLN
-  /* 41 */ { { (2)|(11 << 4) }, { 170, 32 }, 0 }, // KC_QUOT
+  /* 41 */ { { (2)|(11 << 4) }, { 170, 32 }, 4 }, // KC_QUOT
   /* _________________________________________ */ // ____
-  /* 42 */ { { (2)|(13 << 4) }, { 193, 32 }, 0 }, // KC_ENT
+  /* 42 */ { { (2)|(13 << 4) }, { 193, 32 }, 4 }, // KC_ENT
-  /* 43 */ { { (2)|(14 << 4) }, { 215, 32 }, 0 }, // KC_PGUP
+  /* 43 */ { { (2)|(14 << 4) }, { 215, 32 }, 4 }, // KC_PGUP
-  /* 44 */ { { (3)|(0  << 4) }, { 16,  19 }, 0 }, // KC_LSFT
+  /* 44 */ { { (3)|(0  << 4) }, { 16,  19 }, 4 }, // KC_LSFT
-  /* 45 */ { { (3)|(2  << 4) }, { 39,  19 }, 0 }, // KC_Z
+  /* 45 */ { { (3)|(2  << 4) }, { 39,  19 }, 4 }, // KC_Z
-  /* 46 */ { { (3)|(3  << 4) }, { 53,  19 }, 0 }, // KC_X
+  /* 46 */ { { (3)|(3  << 4) }, { 53,  19 }, 4 }, // KC_X
-  /* 47 */ { { (3)|(4  << 4) }, { 67,  19 }, 0 }, // KC_C
+  /* 47 */ { { (3)|(4  << 4) }, { 67,  19 }, 4 }, // KC_C
-  /* 48 */ { { (3)|(5  << 4) }, { 80,  19 }, 0 }, // KC_V
+  /* 48 */ { { (3)|(5  << 4) }, { 80,  19 }, 4 }, // KC_V
-  /* 49 */ { { (3)|(6  << 4) }, { 94,  19 }, 0 }, // KC_B
+  /* 49 */ { { (3)|(6  << 4) }, { 94,  19 }, 4 }, // KC_B
-  /* 50 */ { { (3)|(7  << 4) }, { 108, 19 }, 0 }, // KC_N
+  /* 50 */ { { (3)|(7  << 4) }, { 108, 19 }, 4 }, // KC_N
-  /* 51 */ { { (3)|(8  << 4) }, { 122, 19 }, 0 }, // KC_M
+  /* 51 */ { { (3)|(8  << 4) }, { 122, 19 }, 4 }, // KC_M
-  /* 52 */ { { (3)|(9  << 4) }, { 136, 19 }, 0 }, // KC_COMM
+  /* 52 */ { { (3)|(9  << 4) }, { 136, 19 }, 4 }, // KC_COMM
-  /* 53 */ { { (3)|(10 << 4) }, { 150, 19 }, 0 }, // KC_DOT
+  /* 53 */ { { (3)|(10 << 4) }, { 150, 19 }, 4 }, // KC_DOT
-  /* 54 */ { { (3)|(11 << 4) }, { 163, 19 }, 0 }, // KC_SLSH
+  /* 54 */ { { (3)|(11 << 4) }, { 163, 19 }, 4 }, // KC_SLSH
-  /* 55 */ { { (3)|(12 << 4) }, { 182, 19 }, 0 }, // KC_RSFT
+  /* 55 */ { { (3)|(12 << 4) }, { 182, 19 }, 4 }, // KC_RSFT
   /* _________________________________________ */ // ____
-  /* 56 */ { { (3)|(13 << 4) }, { 201, 19 }, 0 }, // KC_UP
+  /* 56 */ { { (3)|(13 << 4) }, { 201, 19 }, 4 }, // KC_UP
-  /* 57 */ { { (3)|(14 << 4) }, { 215, 19 }, 0 }, // KC_PGDN
+  /* 57 */ { { (3)|(14 << 4) }, { 215, 19 }, 4 }, // KC_PGDN
-  /* 58 */ { { (4)|(0  << 4) }, { 9,    7 }, 0 }, // KC_LCTL
+  /* 58 */ { { (4)|(0  << 4) }, { 9,    7 }, 4 }, // KC_LCTL
-  /* 59 */ { { (4)|(1  << 4) }, { 27,   7 }, 0 }, // KC_LGUI
+  /* 59 */ { { (4)|(1  << 4) }, { 27,   7 }, 4 }, // KC_LGUI
-  /* 60 */ { { (4)|(2  << 4) }, { 44,   7 }, 0 }, // KC_LALT
+  /* 60 */ { { (4)|(2  << 4) }, { 44,   7 }, 4 }, // KC_LALT
   /* _________________________________________ */ // ____
   /* _________________________________________ */ // ____
   /* _________________________________________ */ // ____
-  /* 61 */ { { (4)|(6  << 4) }, { 96,   7 }, 0 }, // KC_SPC
+  /* 61 */ { { (4)|(6  << 4) }, { 96,   7 }, 4 }, // KC_SPC
   /* _________________________________________ */ // ____
   /* _________________________________________ */ // ____
   /* _________________________________________ */ // ____
-  /* 62 */ { { (4)|(10 << 4) }, { 148,  7 }, 0 }, // KC_RALT
+  /* 62 */ { { (4)|(10 << 4) }, { 148,  7 }, 4 }, // KC_RALT
-  /* 63 */ { { (4)|(11 << 4) }, { 165,  7 }, 0 }, // MO(1)
+  /* 63 */ { { (4)|(11 << 4) }, { 165,  7 }, 4 }, // MO(1)
-  /* 64 */ { { (4)|(12 << 4) }, { 188,  7 }, 0 }, // KC_LEFT
+  /* 64 */ { { (4)|(12 << 4) }, { 188,  7 }, 4 }, // KC_LEFT
-  /* 65 */ { { (4)|(13 << 4) }, { 201,  7 }, 0 }, // KC_DOWN
+  /* 65 */ { { (4)|(13 << 4) }, { 201,  7 }, 4 }, // KC_DOWN
-  /* 66 */ { { (4)|(14 << 4) }, { 215,  7 }, 0 }, // KC_RGHT
+  /* 66 */ { { (4)|(14 << 4) }, { 215,  7 }, 4 }, // KC_RGHT
 
   // Underglow LEDs
-  { { 255 }, { 1,    1 }, 0 },
+  { { 255 }, { 1,    1 }, 2 },
-  { { 255 }, { 15,   0 }, 0 },
+  { { 255 }, { 15,   0 }, 2 },
-  { { 255 }, { 31,   0 }, 0 },
+  { { 255 }, { 31,   0 }, 2 },
-  { { 255 }, { 47,   0 }, 0 },
+  { { 255 }, { 47,   0 }, 2 },
-  { { 255 }, { 63,   0 }, 0 },
+  { { 255 }, { 63,   0 }, 2 },
-  { { 255 }, { 79,   0 }, 0 },
+  { { 255 }, { 79,   0 }, 2 },
-  { { 255 }, { 95,   0 }, 0 },
+  { { 255 }, { 95,   0 }, 2 },
-  { { 255 }, { 112,  0 }, 0 },
+  { { 255 }, { 112,  0 }, 2 },
-  { { 255 }, { 128,  0 }, 0 },
+  { { 255 }, { 128,  0 }, 2 },
-  { { 255 }, { 144,  0 }, 0 },
+  { { 255 }, { 144,  0 }, 2 },
-  { { 255 }, { 160,  0 }, 0 },
+  { { 255 }, { 160,  0 }, 2 },
-  { { 255 }, { 176,  0 }, 0 },
+  { { 255 }, { 176,  0 }, 2 },
-  { { 255 }, { 192,  0 }, 0 },
+  { { 255 }, { 192,  0 }, 2 },
-  { { 255 }, { 208,  0 }, 0 },
+  { { 255 }, { 208,  0 }, 2 },
-  { { 255 }, { 222,  1 }, 0 },
+  { { 255 }, { 222,  1 }, 2 },
-  { { 255 }, { 224, 13 }, 0 },
+  { { 255 }, { 224, 13 }, 2 },
-  { { 255 }, { 224, 25 }, 0 },
+  { { 255 }, { 224, 25 }, 2 },
-  { { 255 }, { 224, 38 }, 0 },
+  { { 255 }, { 224, 38 }, 2 },
-  { { 255 }, { 224, 50 }, 0 },
+  { { 255 }, { 224, 50 }, 2 },
-  { { 255 }, { 222, 62 }, 0 },
+  { { 255 }, { 222, 62 }, 2 },
-  { { 255 }, { 191, 64 }, 0 },
+  { { 255 }, { 191, 64 }, 2 },
-  { { 255 }, { 179, 64 }, 0 },
+  { { 255 }, { 179, 64 }, 2 },
-  { { 255 }, { 167, 64 }, 0 },
+  { { 255 }, { 167, 64 }, 2 },
-  { { 255 }, { 153, 64 }, 0 },
+  { { 255 }, { 153, 64 }, 2 },
-  { { 255 }, { 139, 64 }, 0 },
+  { { 255 }, { 139, 64 }, 2 },
-  { { 255 }, { 125, 64 }, 0 },
+  { { 255 }, { 125, 64 }, 2 },
-  { { 255 }, { 112, 64 }, 0 },
+  { { 255 }, { 112, 64 }, 2 },
-  { { 255 }, { 98,  64 }, 0 },
+  { { 255 }, { 98,  64 }, 2 },
-  { { 255 }, { 84,  64 }, 0 },
+  { { 255 }, { 84,  64 }, 2 },
-  { { 255 }, { 70,  64 }, 0 },
+  { { 255 }, { 70,  64 }, 2 },
-  { { 255 }, { 56,  64 }, 0 },
+  { { 255 }, { 56,  64 }, 2 },
-  { { 255 }, { 42,  64 }, 0 },
+  { { 255 }, { 42,  64 }, 2 },
-  { { 255 }, { 28,  64 }, 0 },
+  { { 255 }, { 28,  64 }, 2 },
-  { { 255 }, { 1,   62 }, 0 },
+  { { 255 }, { 1,   62 }, 2 },
-  { { 255 }, { 0,   50 }, 0 },
+  { { 255 }, { 0,   50 }, 2 },
-  { { 255 }, { 0,   38 }, 0 },
+  { { 255 }, { 0,   38 }, 2 },
-  { { 255 }, { 0,   25 }, 0 },
+  { { 255 }, { 0,   25 }, 2 },
-  { { 255 }, { 0,   13 }, 0 },
+  { { 255 }, { 0,   13 }, 2 },
 };
 
 #ifdef USB_LED_INDICATOR_ENABLE

keyboards/massdrop/alt/keymaps/abishalom/keymap.c

@@ -95,6 +95,32 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                 }
             }
             return false;
+        case RGB_TOG:
+            if (record->event.pressed) {
+              switch (rgb_matrix_get_flags()) {
+                case LED_FLAG_ALL: {
+                    rgb_matrix_set_flags(LED_FLAG_KEYLIGHT);
+                    rgb_matrix_set_color_all(0, 0, 0);
+                  }
+                  break;
+                case LED_FLAG_KEYLIGHT: {
+                    rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
+                    rgb_matrix_set_color_all(0, 0, 0);
+                  }
+                  break;
+                case LED_FLAG_UNDERGLOW: {
+                    rgb_matrix_set_flags(LED_FLAG_NONE);
+                    rgb_matrix_disable_noeeprom();
+                  }
+                  break;
+                default: {
+                    rgb_matrix_set_flags(LED_FLAG_ALL);
+                    rgb_matrix_enable_noeeprom();
+                  }
+                  break;
+              }
+            }
+            return false;
         default:
             return true; //Process all other keycodes normally
     }

keyboards/massdrop/alt/keymaps/default/keymap.c

@@ -95,6 +95,32 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                 }
             }
             return false;
+        case RGB_TOG:
+            if (record->event.pressed) {
+              switch (rgb_matrix_get_flags()) {
+                case LED_FLAG_ALL: {
+                    rgb_matrix_set_flags(LED_FLAG_KEYLIGHT);
+                    rgb_matrix_set_color_all(0, 0, 0);
+                  }
+                  break;
+                case LED_FLAG_KEYLIGHT: {
+                    rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
+                    rgb_matrix_set_color_all(0, 0, 0);
+                  }
+                  break;
+                case LED_FLAG_UNDERGLOW: {
+                    rgb_matrix_set_flags(LED_FLAG_NONE);
+                    rgb_matrix_disable_noeeprom();
+                  }
+                  break;
+                default: {
+                    rgb_matrix_set_flags(LED_FLAG_ALL);
+                    rgb_matrix_enable_noeeprom();
+                  }
+                  break;
+              }
+            }
+            return false;
         default:
             return true; //Process all other keycodes normally
     }

keyboards/massdrop/alt/keymaps/mac/keymap.c

@@ -95,6 +95,32 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                 }
             }
             return false;
+        case RGB_TOG:
+            if (record->event.pressed) {
+              switch (rgb_matrix_get_flags()) {
+                case LED_FLAG_ALL: {
+                    rgb_matrix_set_flags(LED_FLAG_KEYLIGHT);
+                    rgb_matrix_set_color_all(0, 0, 0);
+                  }
+                  break;
+                case LED_FLAG_KEYLIGHT: {
+                    rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
+                    rgb_matrix_set_color_all(0, 0, 0);
+                  }
+                  break;
+                case LED_FLAG_UNDERGLOW: {
+                    rgb_matrix_set_flags(LED_FLAG_NONE);
+                    rgb_matrix_disable_noeeprom();
+                  }
+                  break;
+                default: {
+                    rgb_matrix_set_flags(LED_FLAG_ALL);
+                    rgb_matrix_enable_noeeprom();
+                  }
+                  break;
+              }
+            }
+            return false;
         default:
             return true; //Process all other keycodes normally
     }

keyboards/massdrop/ctrl/config.h

@@ -123,6 +123,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_LED_PROCESS_LIMIT 15
 #define RGB_MATRIX_LED_FLUSH_LIMIT 10
-#define RGB_MATRIX_EXTRA_TOG
 
 #include "config_led.h"

keyboards/massdrop/ctrl/config_led.c

@@ -5,133 +5,133 @@
 #include "rgb_matrix.h"
 #include "config_led.h"
 
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
   // 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
-  { { 0|(0<<4) }, { 7, 5 }, 0 },
+  { { 0|(0<<4) }, { 7, 5 }, 4 },
-  { { 0|(1<<4) }, { 31, 5 }, 0 },
+  { { 0|(1<<4) }, { 31, 5 }, 4 },
-  { { 0|(2<<4) }, { 43, 5 }, 0 },
+  { { 0|(2<<4) }, { 43, 5 }, 4 },
-  { { 0|(3<<4) }, { 55, 5 }, 0 },
+  { { 0|(3<<4) }, { 55, 5 }, 4 },
-  { { 0|(4<<4) }, { 67, 5 }, 0 },
+  { { 0|(4<<4) }, { 67, 5 }, 4 },
-  { { 0|(5<<4) }, { 85, 5 }, 0 },
+  { { 0|(5<<4) }, { 85, 5 }, 4 },
-  { { 0|(6<<4) }, { 97, 5 }, 0 },
+  { { 0|(6<<4) }, { 97, 5 }, 4 },
-  { { 0|(7<<4) }, { 109, 5 }, 0 },
+  { { 0|(7<<4) }, { 109, 5 }, 4 },
-  { { 6|(0<<4) }, { 121, 5 }, 0 },
+  { { 6|(0<<4) }, { 121, 5 }, 4 },
-  { { 6|(1<<4) }, { 139, 5 }, 0 },
+  { { 6|(1<<4) }, { 139, 5 }, 4 },
-  { { 6|(2<<4) }, { 151, 5 }, 0 },
+  { { 6|(2<<4) }, { 151, 5 }, 4 },
-  { { 6|(3<<4) }, { 163, 5 }, 0 },
+  { { 6|(3<<4) }, { 163, 5 }, 4 },
-  { { 6|(4<<4) }, { 175, 5 }, 0 },
+  { { 6|(4<<4) }, { 175, 5 }, 4 },
-  { { 6|(5<<4) }, { 193, 5 }, 0 },
+  { { 6|(5<<4) }, { 193, 5 }, 4 },
   { { 6|(6<<4) }, { 205, 5 }, 1 },
-  { { 6|(7<<4) }, { 217, 5 }, 0 },
+  { { 6|(7<<4) }, { 217, 5 }, 4 },
   // 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
-  { { 1|(0<<4) }, { 7, 20 }, 0 },
+  { { 1|(0<<4) }, { 7, 20 }, 4 },
-  { { 1|(1<<4) }, { 19, 20 }, 0 },
+  { { 1|(1<<4) }, { 19, 20 }, 4 },
-  { { 1|(2<<4) }, { 31, 20 }, 0 },
+  { { 1|(2<<4) }, { 31, 20 }, 4 },
-  { { 1|(3<<4) }, { 43, 20 }, 0 },
+  { { 1|(3<<4) }, { 43, 20 }, 4 },
-  { { 1|(4<<4) }, { 55, 20 }, 0 },
+  { { 1|(4<<4) }, { 55, 20 }, 4 },
-  { { 1|(5<<4) }, { 67, 20 }, 0 },
+  { { 1|(5<<4) }, { 67, 20 }, 4 },
-  { { 1|(6<<4) }, { 79, 20 }, 0 },
+  { { 1|(6<<4) }, { 79, 20 }, 4 },
-  { { 1|(7<<4) }, { 91, 20 }, 0 },
+  { { 1|(7<<4) }, { 91, 20 }, 4 },
-  { { 7|(0<<4) }, { 103, 20 }, 0 },
+  { { 7|(0<<4) }, { 103, 20 }, 4 },
-  { { 7|(1<<4) }, { 115, 20 }, 0 },
+  { { 7|(1<<4) }, { 115, 20 }, 4 },
-  { { 7|(2<<4) }, { 127, 20 }, 0 },
+  { { 7|(2<<4) }, { 127, 20 }, 4 },
-  { { 7|(3<<4) }, { 139, 20 }, 0 },
+  { { 7|(3<<4) }, { 139, 20 }, 4 },
-  { { 7|(4<<4) }, { 151, 20 }, 0 },
+  { { 7|(4<<4) }, { 151, 20 }, 4 },
-  { { 7|(5<<4) }, { 169, 20 }, 0 },
+  { { 7|(5<<4) }, { 169, 20 }, 4 },
-  { { 7|(6<<4) }, { 193, 20 }, 0 },
+  { { 7|(6<<4) }, { 193, 20 }, 4 },
-  { { 7|(7<<4) }, { 205, 20 }, 0 },
+  { { 7|(7<<4) }, { 205, 20 }, 4 },
-  { { 9|(7<<4) }, { 217, 20 }, 0 },
+  { { 9|(7<<4) }, { 217, 20 }, 4 },
   // 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
-  { { 2|(0<<4) }, { 10, 30 }, 0 },
+  { { 2|(0<<4) }, { 10, 30 }, 4 },
-  { { 2|(1<<4) }, { 25, 30 }, 0 },
+  { { 2|(1<<4) }, { 25, 30 }, 4 },
-  { { 2|(2<<4) }, { 37, 30 }, 0 },
+  { { 2|(2<<4) }, { 37, 30 }, 4 },
-  { { 2|(3<<4) }, { 49, 30 }, 0 },
+  { { 2|(3<<4) }, { 49, 30 }, 4 },
-  { { 2|(4<<4) }, { 61, 30 }, 0 },
+  { { 2|(4<<4) }, { 61, 30 }, 4 },
-  { { 2|(5<<4) }, { 73, 30 }, 0 },
+  { { 2|(5<<4) }, { 73, 30 }, 4 },
-  { { 2|(6<<4) }, { 85, 30 }, 0 },
+  { { 2|(6<<4) }, { 85, 30 }, 4 },
-  { { 2|(7<<4) }, { 97, 30 }, 0 },
+  { { 2|(7<<4) }, { 97, 30 }, 4 },
-  { { 8|(0<<4) }, { 109, 30 }, 0 },
+  { { 8|(0<<4) }, { 109, 30 }, 4 },
-  { { 8|(1<<4) }, { 121, 30 }, 0 },
+  { { 8|(1<<4) }, { 121, 30 }, 4 },
-  { { 8|(2<<4) }, { 133, 30 }, 0 },
+  { { 8|(2<<4) }, { 133, 30 }, 4 },
-  { { 8|(3<<4) }, { 145, 30 }, 0 },
+  { { 8|(3<<4) }, { 145, 30 }, 4 },
-  { { 8|(4<<4) }, { 157, 30 }, 0 },
+  { { 8|(4<<4) }, { 157, 30 }, 4 },
-  { { 8|(5<<4) }, { 172, 30 }, 0 },
+  { { 8|(5<<4) }, { 172, 30 }, 4 },
-  { { 8|(6<<4) }, { 193, 30 }, 0 },
+  { { 8|(6<<4) }, { 193, 30 }, 4 },
-  { { 8|(7<<4) }, { 205, 30 }, 0 },
+  { { 8|(7<<4) }, { 205, 30 }, 4 },
-  { { 9|(6<<4) }, { 217, 30 }, 0 },
+  { { 9|(6<<4) }, { 217, 30 }, 4 },
   // 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
   { { 3|(0<<4) }, { 11, 39 }, 1 },
-  { { 3|(1<<4) }, { 28, 39 }, 0 },
+  { { 3|(1<<4) }, { 28, 39 }, 4 },
-  { { 3|(2<<4) }, { 40, 39 }, 0 },
+  { { 3|(2<<4) }, { 40, 39 }, 4 },
-  { { 3|(3<<4) }, { 52, 39 }, 0 },
+  { { 3|(3<<4) }, { 52, 39 }, 4 },
-  { { 3|(4<<4) }, { 64, 39 }, 0 },
+  { { 3|(4<<4) }, { 64, 39 }, 4 },
-  { { 3|(5<<4) }, { 76, 39 }, 0 },
+  { { 3|(5<<4) }, { 76, 39 }, 4 },
-  { { 3|(6<<4) }, { 88, 39 }, 0 },
+  { { 3|(6<<4) }, { 88, 39 }, 4 },
-  { { 3|(7<<4) }, { 100, 39 }, 0 },
+  { { 3|(7<<4) }, { 100, 39 }, 4 },
-  { { 9|(0<<4) }, { 112, 39 }, 0 },
+  { { 9|(0<<4) }, { 112, 39 }, 4 },
-  { { 9|(1<<4) }, { 124, 39 }, 0 },
+  { { 9|(1<<4) }, { 124, 39 }, 4 },
-  { { 9|(2<<4) }, { 136, 39 }, 0 },
+  { { 9|(2<<4) }, { 136, 39 }, 4 },
-  { { 9|(3<<4) }, { 148, 39 }, 0 },
+  { { 9|(3<<4) }, { 148, 39 }, 4 },
-  { { 9|(4<<4) }, { 168, 39 }, 0 },
+  { { 9|(4<<4) }, { 168, 39 }, 4 },
   // 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
-  { { 4|(0<<4) }, { 14, 49 }, 0 },
+  { { 4|(0<<4) }, { 14, 49 }, 4 },
-  { { 4|(1<<4) }, { 34, 49 }, 0 },
+  { { 4|(1<<4) }, { 34, 49 }, 4 },
-  { { 4|(2<<4) }, { 46, 49 }, 0 },
+  { { 4|(2<<4) }, { 46, 49 }, 4 },
-  { { 4|(3<<4) }, { 58, 49 }, 0 },
+  { { 4|(3<<4) }, { 58, 49 }, 4 },
-  { { 4|(4<<4) }, { 70, 49 }, 0 },
+  { { 4|(4<<4) }, { 70, 49 }, 4 },
-  { { 4|(5<<4) }, { 82, 49 }, 0 },
+  { { 4|(5<<4) }, { 82, 49 }, 4 },
-  { { 4|(6<<4) }, { 94, 49 }, 0 },
+  { { 4|(6<<4) }, { 94, 49 }, 4 },
-  { { 4|(7<<4) }, { 106, 49 }, 0 },
+  { { 4|(7<<4) }, { 106, 49 }, 4 },
-  { { 10|(0<<4) }, { 118, 49 }, 0 },
+  { { 10|(0<<4) }, { 118, 49 }, 4 },
-  { { 10|(1<<4) }, { 130, 49 }, 0 },
+  { { 10|(1<<4) }, { 130, 49 }, 4 },
-  { { 10|(2<<4) }, { 142, 49 }, 0 },
+  { { 10|(2<<4) }, { 142, 49 }, 4 },
-  { { 10|(3<<4) }, { 165, 49 }, 0 },
+  { { 10|(3<<4) }, { 165, 49 }, 4 },
-  { { 9|(5<<4) }, { 205, 49 }, 0 },
+  { { 9|(5<<4) }, { 205, 49 }, 4 },
   // KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-  { { 5|(0<<4) }, { 8, 59 }, 0 },
+  { { 5|(0<<4) }, { 8, 59 }, 4 },
-  { { 5|(1<<4) }, { 23, 59 }, 0 },
+  { { 5|(1<<4) }, { 23, 59 }, 4 },
-  { { 5|(2<<4) }, { 38, 59 }, 0 },
+  { { 5|(2<<4) }, { 38, 59 }, 4 },
-  { { 5|(3<<4) }, { 83, 59 }, 0 },
+  { { 5|(3<<4) }, { 83, 59 }, 4 },
-  { { 5|(4<<4) }, { 129, 59 }, 0 },
+  { { 5|(4<<4) }, { 129, 59 }, 4 },
-  { { 5|(5<<4) }, { 144, 59 }, 0 },
+  { { 5|(5<<4) }, { 144, 59 }, 4 },
-  { { 5|(6<<4) }, { 159, 59 }, 0 },
+  { { 5|(6<<4) }, { 159, 59 }, 4 },
-  { { 5|(7<<4) }, { 174, 59 }, 0 },
+  { { 5|(7<<4) }, { 174, 59 }, 4 },
-  { { 10|(4<<4) }, { 193, 59 }, 0 },
+  { { 10|(4<<4) }, { 193, 59 }, 4 },
-  { { 10|(5<<4) }, { 205, 59 }, 0 },
+  { { 10|(5<<4) }, { 205, 59 }, 4 },
-  { { 10|(6<<4) }, { 217, 59 }, 0 },
+  { { 10|(6<<4) }, { 217, 59 }, 4 },
   // Underglow / Border
-  { { 0xFF }, { 222, 64 }, 0 },
+  { { 0xFF }, { 222, 64 }, 2 },
-  { { 0xFF }, { 204, 64 }, 0 },
+  { { 0xFF }, { 204, 64 }, 2 },
-  { { 0xFF }, { 186, 64 }, 0 },
+  { { 0xFF }, { 186, 64 }, 2 },
-  { { 0xFF }, { 167, 64 }, 0 },
+  { { 0xFF }, { 167, 64 }, 2 },
-  { { 0xFF }, { 149, 64 }, 0 },
+  { { 0xFF }, { 149, 64 }, 2 },
-  { { 0xFF }, { 130, 64 }, 0 },
+  { { 0xFF }, { 130, 64 }, 2 },
-  { { 0xFF }, { 112, 64 }, 0 },
+  { { 0xFF }, { 112, 64 }, 2 },
-  { { 0xFF }, { 94, 64 }, 0 },
+  { { 0xFF }, { 94, 64 }, 2 },
-  { { 0xFF }, { 75, 64 }, 0 },
+  { { 0xFF }, { 75, 64 }, 2 },
-  { { 0xFF }, { 57, 64 }, 0 },
+  { { 0xFF }, { 57, 64 }, 2 },
-  { { 0xFF }, { 38, 64 }, 0 },
+  { { 0xFF }, { 38, 64 }, 2 },
-  { { 0xFF }, { 20, 64 }, 0 },
+  { { 0xFF }, { 20, 64 }, 2 },
-  { { 0xFF }, { 0, 64 }, 0 },
+  { { 0xFF }, { 0, 64 }, 2 },
-  { { 0xFF }, { 0, 47 }, 0 },
+  { { 0xFF }, { 0, 47 }, 2 },
-  { { 0xFF }, { 0, 32 }, 0 },
+  { { 0xFF }, { 0, 32 }, 2 },
-  { { 0xFF }, { 0, 17 }, 0 },
+  { { 0xFF }, { 0, 17 }, 2 },
-  { { 0xFF }, { 0, 0 }, 0 },
+  { { 0xFF }, { 0, 0 }, 2 },
-  { { 0xFF }, { 20, 0 }, 0 },
+  { { 0xFF }, { 20, 0 }, 2 },
-  { { 0xFF }, { 38, 0 }, 0 },
+  { { 0xFF }, { 38, 0 }, 2 },
-  { { 0xFF }, { 57, 0 }, 0 },
+  { { 0xFF }, { 57, 0 }, 2 },
-  { { 0xFF }, { 75, 0 }, 0 },
+  { { 0xFF }, { 75, 0 }, 2 },
-  { { 0xFF }, { 94, 0 }, 0 },
+  { { 0xFF }, { 94, 0 }, 2 },
-  { { 0xFF }, { 112, 0 }, 0 },
+  { { 0xFF }, { 112, 0 }, 2 },
-  { { 0xFF }, { 130, 0 }, 0 },
+  { { 0xFF }, { 130, 0 }, 2 },
-  { { 0xFF }, { 149, 0 }, 0 },
+  { { 0xFF }, { 149, 0 }, 2 },
-  { { 0xFF }, { 167, 0 }, 0 },
+  { { 0xFF }, { 167, 0 }, 2 },
-  { { 0xFF }, { 186, 0 }, 0 },
+  { { 0xFF }, { 186, 0 }, 2 },
-  { { 0xFF }, { 204, 0 }, 0 },
+  { { 0xFF }, { 204, 0 }, 2 },
-  { { 0xFF }, { 222, 1 }, 0 },
+  { { 0xFF }, { 222, 1 }, 2 },
-  { { 0xFF }, { 224, 17 }, 0 },
+  { { 0xFF }, { 224, 17 }, 2 },
-  { { 0xFF }, { 224, 32 }, 0 },
+  { { 0xFF }, { 224, 32 }, 2 },
-  { { 0xFF }, { 224, 47 }, 0 },
+  { { 0xFF }, { 224, 47 }, 2 },
 };
 
 #ifdef USB_LED_INDICATOR_ENABLE

keyboards/massdrop/ctrl/keymaps/default/keymap.c

@@ -98,6 +98,32 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                 }
             }
             return false;
+        case RGB_TOG:
+            if (record->event.pressed) {
+              switch (rgb_matrix_get_flags()) {
+                case LED_FLAG_ALL: {
+                    rgb_matrix_set_flags(LED_FLAG_KEYLIGHT);
+                    rgb_matrix_set_color_all(0, 0, 0);
+                  }
+                  break;
+                case LED_FLAG_KEYLIGHT: {
+                    rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
+                    rgb_matrix_set_color_all(0, 0, 0);
+                  }
+                  break;
+                case LED_FLAG_UNDERGLOW: {
+                    rgb_matrix_set_flags(LED_FLAG_NONE);
+                    rgb_matrix_disable_noeeprom();
+                  }
+                  break;
+                default: {
+                    rgb_matrix_set_flags(LED_FLAG_ALL);
+                    rgb_matrix_enable_noeeprom();
+                  }
+                  break;
+              }
+            }
+            return false;
         default:
             return true; //Process all other keycodes normally
     }

keyboards/massdrop/ctrl/keymaps/mac/keymap.c

@@ -98,6 +98,32 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                 }
             }
             return false;
+        case RGB_TOG:
+            if (record->event.pressed) {
+              switch (rgb_matrix_get_flags()) {
+                case LED_FLAG_ALL: {
+                    rgb_matrix_set_flags(LED_FLAG_KEYLIGHT);
+                    rgb_matrix_set_color_all(0, 0, 0);
+                  }
+                  break;
+                case LED_FLAG_KEYLIGHT: {
+                    rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
+                    rgb_matrix_set_color_all(0, 0, 0);
+                  }
+                  break;
+                case LED_FLAG_UNDERGLOW: {
+                    rgb_matrix_set_flags(LED_FLAG_NONE);
+                    rgb_matrix_disable_noeeprom();
+                  }
+                  break;
+                default: {
+                    rgb_matrix_set_flags(LED_FLAG_ALL);
+                    rgb_matrix_enable_noeeprom();
+                  }
+                  break;
+              }
+            }
+            return false;
         default:
             return true; //Process all other keycodes normally
     }

keyboards/model01/leds.c

@@ -46,34 +46,34 @@ void set_led_to(int led, uint8_t r, uint8_t g, uint8_t b) {
 #ifdef RGB_MATRIX_ENABLE
 
 __attribute__ ((weak))
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
-  {{0x73}, {  3, 35}, 0},
+  {{0x73}, {  3, 35}, 4},
-  {{0x72}, {  0, 26}, 0},
+  {{0x72}, {  0, 26}, 4},
-  {{0x71}, {  0, 17}, 0},
+  {{0x71}, {  0, 17}, 4},
-  {{0x70}, {  0,  6}, 0},
+  {{0x70}, {  0,  6}, 4},
-  {{0x60}, { 14,  5}, 0},
+  {{0x60}, { 14,  5}, 4},
-  {{0x61}, { 15, 16}, 0},
+  {{0x61}, { 15, 16}, 4},
-  {{0x62}, { 16, 25}, 0},
+  {{0x62}, { 16, 25}, 4},
-  {{0x63}, { 17, 34}, 0},
+  {{0x63}, { 17, 34}, 4},
-  {{0x53}, { 31, 29}, 0},
+  {{0x53}, { 31, 29}, 4},
-  {{0x52}, { 31, 19}, 0},
+  {{0x52}, { 31, 19}, 4},
-  {{0x51}, { 30, 11}, 0},
+  {{0x51}, { 30, 11}, 4},
-  {{0x50}, { 30,  1}, 0},
+  {{0x50}, { 30,  1}, 4},
-  {{0x40}, { 45,  0}, 0},
+  {{0x40}, { 45,  0}, 4},
-  {{0x41}, { 45,  8}, 0},
+  {{0x41}, { 45,  8}, 4},
-  {{0x42}, { 46, 17}, 0},
+  {{0x42}, { 46, 17}, 4},
-  {{0x43}, { 46, 27}, 0},
+  {{0x43}, { 46, 27}, 4},
-  {{0x33}, { 60, 27}, 0},
+  {{0x33}, { 60, 27}, 4},
-  {{0x32}, { 60, 18}, 0},
+  {{0x32}, { 60, 18}, 4},
-  {{0x31}, { 60,  9}, 0},
+  {{0x31}, { 60,  9}, 4},
-  {{0x30}, { 60,  0}, 0},
+  {{0x30}, { 60,  0}, 4},
-  {{0x20}, { 74,  2}, 0},
+  {{0x20}, { 74,  2}, 4},
-  {{0x21}, { 74, 11}, 0},
+  {{0x21}, { 74, 11}, 4},
-  {{0x22}, { 75, 20}, 0},
+  {{0x22}, { 75, 20}, 4},
-  {{0x23}, { 74, 28}, 0},
+  {{0x23}, { 74, 28}, 4},
-  {{0x12}, { 89, 30}, 0},
+  {{0x12}, { 89, 30}, 4},
-  {{0x11}, { 89, 19}, 0},
+  {{0x11}, { 89, 19}, 4},
-  {{0x10}, { 89,  7}, 0},
+  {{0x10}, { 89,  7}, 4},
   {{0x00}, { 70, 38}, 1},
   {{0x01}, { 82, 41}, 1},
   {{0x02}, { 93, 45}, 1},
@@ -84,33 +84,33 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
   {{0x76}, {130, 45}, 1},
   {{0x75}, {141, 41}, 1},
   {{0x74}, {153, 38}, 1},
-  {{0x64}, {134,  7}, 0},
+  {{0x64}, {134,  7}, 4},
-  {{0x65}, {134, 19}, 0},
+  {{0x65}, {134, 19}, 4},
-  {{0x66}, {134, 30}, 0},
+  {{0x66}, {134, 30}, 4},
-  {{0x57}, {149, 28}, 0},
+  {{0x57}, {149, 28}, 4},
-  {{0x56}, {148, 20}, 0},
+  {{0x56}, {148, 20}, 4},
-  {{0x55}, {149, 11}, 0},
+  {{0x55}, {149, 11}, 4},
-  {{0x54}, {149,  2}, 0},
+  {{0x54}, {149,  2}, 4},
-  {{0x44}, {163,  0}, 0},
+  {{0x44}, {163,  0}, 4},
-  {{0x45}, {163,  9}, 0},
+  {{0x45}, {163,  9}, 4},
-  {{0x46}, {163, 18}, 0},
+  {{0x46}, {163, 18}, 4},
-  {{0x47}, {163, 27}, 0},
+  {{0x47}, {163, 27}, 4},
-  {{0x37}, {177, 27}, 0},
+  {{0x37}, {177, 27}, 4},
-  {{0x36}, {177, 17}, 0},
+  {{0x36}, {177, 17}, 4},
-  {{0x35}, {178,  8}, 0},
+  {{0x35}, {178,  8}, 4},
-  {{0x34}, {178,  0}, 0},
+  {{0x34}, {178,  0}, 4},
-  {{0x24}, {193,  1}, 0},
+  {{0x24}, {193,  1}, 4},
-  {{0x25}, {193, 11}, 0},
+  {{0x25}, {193, 11}, 4},
-  {{0x26}, {192, 19}, 0},
+  {{0x26}, {192, 19}, 4},
-  {{0x27}, {192, 29}, 0},
+  {{0x27}, {192, 29}, 4},
-  {{0x17}, {206, 34}, 0},
+  {{0x17}, {206, 34}, 4},
-  {{0x16}, {207, 25}, 0},
+  {{0x16}, {207, 25}, 4},
-  {{0x15}, {208, 16}, 0},
+  {{0x15}, {208, 16}, 4},
-  {{0x14}, {209,  5}, 0},
+  {{0x14}, {209,  5}, 4},
-  {{0x04}, {224,  6}, 0},
+  {{0x04}, {224,  6}, 4},
-  {{0x05}, {223, 17}, 0},
+  {{0x05}, {223, 17}, 4},
-  {{0x06}, {223, 26}, 0},
+  {{0x06}, {223, 26}, 4},
-  {{0x07}, {220, 35}, 0},
+  {{0x07}, {220, 35}, 4},
 };
 
 static struct {

keyboards/planck/ez/ez.c

@@ -79,49 +79,49 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
 
 };
 
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
 
     /*{row | col << 4}
       |             {x=0..224, y=0..64}
-      |              |                 modifier
+      |              |                 flags
       |              |                 | */
     {{0|(0<<4)},   {20.36*0, 21.33*0}, 1},
-    {{0|(1<<4)},   {20.36*1, 21.33*0}, 0},
+    {{0|(1<<4)},   {20.36*1, 21.33*0}, 4},
-    {{0|(2<<4)},   {20.36*2, 21.33*0}, 0},
+    {{0|(2<<4)},   {20.36*2, 21.33*0}, 4},
-    {{0|(3<<4)},   {20.36*3, 21.33*0}, 0},
+    {{0|(3<<4)},   {20.36*3, 21.33*0}, 4},
-    {{0|(4<<4)},   {20.36*4, 21.33*0}, 0},
+    {{0|(4<<4)},   {20.36*4, 21.33*0}, 4},
-    {{0|(5<<4)},   {20.36*5, 21.33*0}, 0},
+    {{0|(5<<4)},   {20.36*5, 21.33*0}, 4},
-    {{4|(0<<4)},   {20.36*6, 21.33*0}, 0},
+    {{4|(0<<4)},   {20.36*6, 21.33*0}, 4},
-    {{4|(1<<4)},   {20.36*7, 21.33*0}, 0},
+    {{4|(1<<4)},   {20.36*7, 21.33*0}, 4},
-    {{4|(2<<4)},   {20.36*8, 21.33*0}, 0},
+    {{4|(2<<4)},   {20.36*8, 21.33*0}, 4},
-    {{4|(3<<4)},   {20.36*9, 21.33*0}, 0},
+    {{4|(3<<4)},   {20.36*9, 21.33*0}, 4},
-    {{4|(4<<4)},  {20.36*10,21.33*0}, 0},
+    {{4|(4<<4)},  {20.36*10,21.33*0}, 4},
     {{4|(5<<4)},  {20.36*11,21.33*0}, 1},
 
     {{1|(0<<4)},   {20.36*0, 21.33*1}, 1},
-    {{1|(1<<4)},   {20.36*1, 21.33*1}, 0},
+    {{1|(1<<4)},   {20.36*1, 21.33*1}, 4},
-    {{1|(2<<4)},   {20.36*2, 21.33*1}, 0},
+    {{1|(2<<4)},   {20.36*2, 21.33*1}, 4},
-    {{1|(3<<4)},   {20.36*3, 21.33*1}, 0},
+    {{1|(3<<4)},   {20.36*3, 21.33*1}, 4},
-    {{1|(4<<4)},   {20.36*4, 21.33*1}, 0},
+    {{1|(4<<4)},   {20.36*4, 21.33*1}, 4},
-    {{1|(5<<4)},   {20.36*5, 21.33*1}, 0},
+    {{1|(5<<4)},   {20.36*5, 21.33*1}, 4},
-    {{5|(0<<4)},   {20.36*6, 21.33*1}, 0},
+    {{5|(0<<4)},   {20.36*6, 21.33*1}, 4},
-    {{5|(1<<4)},   {20.36*7, 21.33*1}, 0},
+    {{5|(1<<4)},   {20.36*7, 21.33*1}, 4},
-    {{5|(2<<4)},   {20.36*8, 21.33*1}, 0},
+    {{5|(2<<4)},   {20.36*8, 21.33*1}, 4},
-    {{5|(3<<4)},   {20.36*9, 21.33*1}, 0},
+    {{5|(3<<4)},   {20.36*9, 21.33*1}, 4},
-    {{5|(4<<4)},  {20.36*10,21.33*1}, 0},
+    {{5|(4<<4)},  {20.36*10,21.33*1}, 4},
     {{5|(5<<4)},  {20.36*11,21.33*1}, 1},
 
     {{2|(0<<4)},   {20.36*0, 21.33*2}, 1},
-    {{2|(1<<4)},   {20.36*1, 21.33*2}, 0},
+    {{2|(1<<4)},   {20.36*1, 21.33*2}, 4},
-    {{2|(2<<4)},   {20.36*2, 21.33*2}, 0},
+    {{2|(2<<4)},   {20.36*2, 21.33*2}, 4},
-    {{2|(3<<4)},   {20.36*3, 21.33*2}, 0},
+    {{2|(3<<4)},   {20.36*3, 21.33*2}, 4},
-    {{2|(4<<4)},   {20.36*4, 21.33*2}, 0},
+    {{2|(4<<4)},   {20.36*4, 21.33*2}, 4},
-    {{2|(5<<4)},   {20.36*5, 21.33*2}, 0},
+    {{2|(5<<4)},   {20.36*5, 21.33*2}, 4},
-    {{6|(0<<4)},   {20.36*6, 21.33*2}, 0},
+    {{6|(0<<4)},   {20.36*6, 21.33*2}, 4},
-    {{6|(1<<4)},   {20.36*7, 21.33*2}, 0},
+    {{6|(1<<4)},   {20.36*7, 21.33*2}, 4},
-    {{6|(2<<4)},   {20.36*8, 21.33*2}, 0},
+    {{6|(2<<4)},   {20.36*8, 21.33*2}, 4},
-    {{6|(3<<4)},   {20.36*9, 21.33*2}, 0},
+    {{6|(3<<4)},   {20.36*9, 21.33*2}, 4},
-    {{6|(4<<4)},  {20.36*10,21.33*2}, 0},
+    {{6|(4<<4)},  {20.36*10,21.33*2}, 4},
     {{6|(5<<4)},  {20.36*11,21.33*2}, 1},
 
     {{3|(0<<4)},   {20.36*0, 21.33*3}, 1},
@@ -129,7 +129,7 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
     {{3|(2<<4)},   {20.36*2, 21.33*3}, 1},
     {{7|(3<<4)},   {20.36*3, 21.33*3}, 1},
     {{7|(4<<4)},   {20.36*4, 21.33*3}, 1},
-    {{7|(5<<4)},   {20.36*5.5,21.33*3}, 0},
+    {{7|(5<<4)},   {20.36*5.5,21.33*3}, 4},
     {{7|(0<<4)},   {20.36*7, 21.33*3}, 1},
     {{7|(1<<4)},   {20.36*8, 21.33*3}, 1},
     {{7|(2<<4)},   {20.36*9, 21.33*3}, 1},

keyboards/planck/keymaps/motform/config.h

@@ -0,0 +1,39 @@
+#pragma once
+
+#ifdef AUDIO_ENABLE
+    #define STARTUP_SONG SONG(PLANCK_SOUND)
+    // #define STARTUP_SONG SONG(NO_SOUND)
+
+    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
+                                  SONG(COLEMAK_SOUND), \
+                                  SONG(DVORAK_SOUND) \
+                                }
+#endif
+
+/*
+ * 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 2
+
+// Most tactile encoders have detents every 4 stages
+#define ENCODER_RESOLUTION 4
+

keyboards/planck/keymaps/motform/keymap.c

@@ -0,0 +1,211 @@
+/* Copyright 2015-2017 Jack Humbert
+ *
+ * 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
+#include "muse.h"
+#include "keymap_swedish.h"
+
+extern keymap_config_t keymap_config;
+
+enum planck_layers {
+                    _COLEMAK,
+                    _LOWER,
+                    _RAISE,
+                    _ADJUST
+};
+
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
+
+/* These definitions can be removed once keymap_swe is properly vetted against MacOS */
+#define NO_DLR_MAC_V  ALGR(LALT(KC_4))
+#define NO_AT_MAC_V   ALGR(LALT(KC_2))
+
+/* Esc when pressed, ctrl when used as a modifier */
+#define KC_ECTL MT(MOD_LCTL, KC_ESC)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Colemak_se
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   Ö  |  Å   |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | ECTR |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  Ä   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | SCSHE|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   -  |SCSHE |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | esc  | CTRL | Alt  | CMD  |Lower |Space |Bksp  |Raise | CMD  | RALT | HYPER| MEH  |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_COLEMAK] = LAYOUT_planck_grid
+(
+ KC_TAB,    KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    NO_OSLH, NO_AA,
+ KC_ECTL,   KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    NO_AE,
+ KC_SFTENT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  NO_MINS, KC_SFTENT,
+ KC_ESC,    KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_BSPC, RAISE,   KC_RGUI, KC_RALT, KC_HYPR, KC_MEH
+ ),
+
+/* Lower
+* ,-----------------------------------------------------------------------------------.
+* |      | PIPE |   '  |   @  |   &  |      | DOWN |      | RIGHT|   `  |   ´  |  ~   |
+* |------+------+------+------+------+-------------+------+------+------+------+------|
+* |      |   !  |   "  |   #  |   ?  |   %  | LEFT |   /  |   \  |   =  |   +  |  *   |
+* |------+------+------+------+------+------|------+------+------+------+------+------|
+* |      |      |      |   [  |   {  |      | UP   |   }  |   ]  |      |      |      |
+* |------+------+------+------+------+------+------+------+------+------+------+------|
+* |      |      |      |      |      |      | DEL  |      | Next | Vol- | Vol+ | Play |
+* `-----------------------------------------------------------------------------------'
+*/
+[_LOWER] = LAYOUT_planck_grid
+(
+ _______, NO_PIPE_MAC, NO_APOS, NO_AT_MAC_V, NO_AMPR,     _______, KC_DOWN, KC_NO,       KC_RGHT,     NO_GRV,  NO_GRV,  NO_TILD,
+ _______, KC_EXLM,     NO_QUO2, KC_HASH,     NO_QUES,     KC_PERC, KC_LEFT, NO_SLSH,     NO_BSLS_MAC, NO_EQL,  KC_PPLS, KC_PAST,
+ _______, KC_NO,       KC_NO,   NO_LBRC,     NO_LCBR_MAC, KC_NO,   KC_UP,   NO_RCBR_MAC, NO_RBRC,     KC_NO,   KC_NO,   _______,
+ _______, _______,     _______, _______,     _______,     _______, KC_DEL,  _______,     KC_MNXT,     KC_VOLD, KC_VOLU, KC_MPLY
+ ),
+
+/* Raise
+* ,-----------------------------------------------------------------------------------.
+* |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 | F11  | F12  |
+* |------+------+------+------+------+-------------+------+------+------+------+------|
+* |   ^  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |  $   |
+* |------+------+------+------+------+------|------+------+------+------+------+------|
+* |      |      |      |   <  |   (  |      |      |  )   |   >  |Pg Up |Pg Dn |      |
+* |------+------+------+------+------+------+------+------+------+------+------+------|
+* |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
+* `-----------------------------------------------------------------------------------'
+*/
+[_RAISE] = LAYOUT_planck_grid
+(
+ KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,       KC_F10,  KC_F11,  KC_F12,
+ NO_CIRC, KC_1,    KC_2,    KC_3,        KC_4,    KC_5,    KC_6,    KC_7,    KC_8,        KC_9,    KC_0,    NO_DLR_MAC_V,
+ _______, KC_NO,   KC_NO,   NO_LESS_MAC, NO_LPRN, KC_NO,   KC_NO,   NO_RPRN, NO_GRTR_MAC, KC_PGUP, KC_PGDN, KC_NO,
+ _______, _______, _______, _______,     _______, _______, _______, _______, KC_MNXT,     KC_VOLD, KC_VOLU, KC_MPLY
+ ),
+
+/* Adjust (Lower + Raise)
+ * ,-----------------------------------------------------------------------------------.
+ * |      | Reset| Debug|      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |      |      |Aud on|Audoff|AGnorm|AGswap|      |      |      |      |      |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|TRMon |TRMoff|      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      |      |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_ADJUST] = LAYOUT_planck_grid
+(
+ _______, RESET,   DEBUG,   _______, _______, _______, _______, _______, _______,  _______, _______, _______,
+ _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______,  _______, _______, _______,
+ _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
+ )
+
+};
+
+uint32_t layer_state_set_user(uint32_t state) {
+  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
+
+bool muse_mode = false;
+uint8_t last_muse_note = 0;
+uint16_t muse_counter = 0;
+uint8_t muse_offset = 70;
+uint16_t muse_tempo = 50;
+
+void encoder_update(bool clockwise) {
+  if (muse_mode) {
+    if (IS_LAYER_ON(_RAISE)) {
+      if (clockwise) {
+        muse_offset++;
+      } else {
+        muse_offset--;
+      }
+    } else {
+      if (clockwise) {
+        muse_tempo+=1;
+      } else {
+        muse_tempo-=1;
+      }
+    }
+  } else {
+    if (clockwise) {
+      #ifdef MOUSEKEY_ENABLE
+        register_code(KC_MS_WH_DOWN);
+        unregister_code(KC_MS_WH_DOWN);
+      #else
+        register_code(KC_PGDN);
+        unregister_code(KC_PGDN);
+      #endif
+    } else {
+      #ifdef MOUSEKEY_ENABLE
+        register_code(KC_MS_WH_UP);
+        unregister_code(KC_MS_WH_UP);
+      #else
+        register_code(KC_PGUP);
+        unregister_code(KC_PGUP);
+      #endif
+    }
+  }
+}
+
+void dip_update(uint8_t index, bool active) {
+  switch (index) {
+    case 0:
+      if (active) {
+        layer_on(_ADJUST);
+      } else {
+        layer_off(_ADJUST);
+      }
+      break;
+    case 1:
+      if (active) {
+        muse_mode = true;
+      } else {
+        muse_mode = false;
+        #ifdef AUDIO_ENABLE
+          stop_all_notes();
+        #endif
+      }
+   }
+}
+
+void matrix_scan_user(void) {
+  #ifdef AUDIO_ENABLE
+    if (muse_mode) {
+      if (muse_counter == 0) {
+        uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
+        if (muse_note != last_muse_note) {
+          stop_note(compute_freq_for_midi_note(last_muse_note));
+          play_note(compute_freq_for_midi_note(muse_note), 0xF);
+          last_muse_note = muse_note;
+        }
+      }
+      muse_counter = (muse_counter + 1) % muse_tempo;
+    }
+  #endif
+}
+
+bool music_mask_user(uint16_t keycode) {
+  switch (keycode) {
+    case RAISE:
+    case LOWER:
+      return false;
+    default:
+      return true;
+  }
+}

keyboards/planck/keymaps/motform/readme.md

@@ -0,0 +1,11 @@
+# Motform Planck Layout
+
+This layout is based off the [colemak-se](github.com/motform/colemak-se)
+layout and features many tweaks to make working with Emacs and
+evil-mode more ergonomi. As with the colemak layout itself, the idea
+is to concentrate as much movement as possible to the home row.
+
+To properly use the layout in Emacs, set Super to LGUI and Meta to RGUI.
+Unless you are running a permutation of the MacOS Swedish QWERTY-layout,
+modifiers will probably not work. For future develoment, I’m planning
+to add support for MS Windows SE-QWERTY in the form of a secondary layer.

keyboards/planck/keymaps/motform/rules.mk

@@ -0,0 +1 @@
+SRC += muse.c

keyboards/planck/keymaps/tom/keymap.c

@@ -231,7 +231,7 @@ void rgb_matrix_indicators_user(void) {
     case _RAISE:
       for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
         led = g_rgb_leds[i];
-        if ( led.modifier ) {
+        if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) {
           rgb_matrix_set_color(i, 0x6B, 0x00, 0x80);
         } else {
           rgb_matrix_set_color(i, 0x00, 0xFF, 0x00);
@@ -242,7 +242,7 @@ void rgb_matrix_indicators_user(void) {
     case _LOWER:
       for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
         led = g_rgb_leds[i];
-        if ( led.modifier ) {
+        if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) {
           rgb_matrix_set_color(i, 0xFF, 0xA5, 0x00);
         } else {
           rgb_matrix_set_color(i, 0x00, 0x67, 0xC7);

keyboards/planck/light/light.c

@@ -77,49 +77,49 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
     {1, C9_14, C8_14, C7_14}
 };
 
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
 
     /*{row | col << 4}
       |             {x=0..224, y=0..64}
-      |              |                 modifier
+      |              |                 flags
       |              |                 | */
     {{0|(0<<4)},   {20.36*0, 21.33*0}, 1},
-    {{0|(1<<4)},   {20.36*1, 21.33*0}, 0},
+    {{0|(1<<4)},   {20.36*1, 21.33*0}, 4},
-    {{0|(2<<4)},   {20.36*2, 21.33*0}, 0},
+    {{0|(2<<4)},   {20.36*2, 21.33*0}, 4},
-    {{0|(3<<4)},   {20.36*3, 21.33*0}, 0},
+    {{0|(3<<4)},   {20.36*3, 21.33*0}, 4},
-    {{0|(4<<4)},   {20.36*4, 21.33*0}, 0},
+    {{0|(4<<4)},   {20.36*4, 21.33*0}, 4},
-    {{0|(5<<4)},   {20.36*5, 21.33*0}, 0},
+    {{0|(5<<4)},   {20.36*5, 21.33*0}, 4},
-    {{0|(6<<4)},   {20.36*6, 21.33*0}, 0},
+    {{0|(6<<4)},   {20.36*6, 21.33*0}, 4},
-    {{0|(7<<4)},   {20.36*7, 21.33*0}, 0},
+    {{0|(7<<4)},   {20.36*7, 21.33*0}, 4},
-    {{0|(8<<4)},   {20.36*8, 21.33*0}, 0},
+    {{0|(8<<4)},   {20.36*8, 21.33*0}, 4},
-    {{0|(9<<4)},   {20.36*9, 21.33*0}, 0},
+    {{0|(9<<4)},   {20.36*9, 21.33*0}, 4},
-    {{0|(10<<4)},  {20.36*10,21.33*0}, 0},
+    {{0|(10<<4)},  {20.36*10,21.33*0}, 4},
     {{0|(11<<4)},  {20.36*11,21.33*0}, 1},
 
     {{1|(0<<4)},   {20.36*0, 21.33*1}, 1},
-    {{1|(1<<4)},   {20.36*1, 21.33*1}, 0},
+    {{1|(1<<4)},   {20.36*1, 21.33*1}, 4},
-    {{1|(2<<4)},   {20.36*2, 21.33*1}, 0},
+    {{1|(2<<4)},   {20.36*2, 21.33*1}, 4},
-    {{1|(3<<4)},   {20.36*3, 21.33*1}, 0},
+    {{1|(3<<4)},   {20.36*3, 21.33*1}, 4},
-    {{1|(4<<4)},   {20.36*4, 21.33*1}, 0},
+    {{1|(4<<4)},   {20.36*4, 21.33*1}, 4},
-    {{1|(5<<4)},   {20.36*5, 21.33*1}, 0},
+    {{1|(5<<4)},   {20.36*5, 21.33*1}, 4},
-    {{1|(6<<4)},   {20.36*6, 21.33*1}, 0},
+    {{1|(6<<4)},   {20.36*6, 21.33*1}, 4},
-    {{1|(7<<4)},   {20.36*7, 21.33*1}, 0},
+    {{1|(7<<4)},   {20.36*7, 21.33*1}, 4},
-    {{1|(8<<4)},   {20.36*8, 21.33*1}, 0},
+    {{1|(8<<4)},   {20.36*8, 21.33*1}, 4},
-    {{1|(9<<4)},   {20.36*9, 21.33*1}, 0},
+    {{1|(9<<4)},   {20.36*9, 21.33*1}, 4},
-    {{1|(10<<4)},  {20.36*10,21.33*1}, 0},
+    {{1|(10<<4)},  {20.36*10,21.33*1}, 4},
     {{1|(11<<4)},  {20.36*11,21.33*1}, 1},
 
     {{2|(0<<4)},   {20.36*0, 21.33*2}, 1},
-    {{2|(1<<4)},   {20.36*1, 21.33*2}, 0},
+    {{2|(1<<4)},   {20.36*1, 21.33*2}, 4},
-    {{2|(2<<4)},   {20.36*2, 21.33*2}, 0},
+    {{2|(2<<4)},   {20.36*2, 21.33*2}, 4},
-    {{2|(3<<4)},   {20.36*3, 21.33*2}, 0},
+    {{2|(3<<4)},   {20.36*3, 21.33*2}, 4},
-    {{2|(4<<4)},   {20.36*4, 21.33*2}, 0},
+    {{2|(4<<4)},   {20.36*4, 21.33*2}, 4},
-    {{2|(5<<4)},   {20.36*5, 21.33*2}, 0},
+    {{2|(5<<4)},   {20.36*5, 21.33*2}, 4},
-    {{2|(6<<4)},   {20.36*6, 21.33*2}, 0},
+    {{2|(6<<4)},   {20.36*6, 21.33*2}, 4},
-    {{2|(7<<4)},   {20.36*7, 21.33*2}, 0},
+    {{2|(7<<4)},   {20.36*7, 21.33*2}, 4},
-    {{2|(8<<4)},   {20.36*8, 21.33*2}, 0},
+    {{2|(8<<4)},   {20.36*8, 21.33*2}, 4},
-    {{2|(9<<4)},   {20.36*9, 21.33*2}, 0},
+    {{2|(9<<4)},   {20.36*9, 21.33*2}, 4},
-    {{2|(10<<4)},  {20.36*10,21.33*2}, 0},
+    {{2|(10<<4)},  {20.36*10,21.33*2}, 4},
     {{2|(11<<4)},  {20.36*11,21.33*2}, 1},
 
     {{3|(0<<4)},   {20.36*0, 21.33*3}, 1},
@@ -127,9 +127,9 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
     {{3|(2<<4)},   {20.36*2, 21.33*3}, 1},
     {{3|(3<<4)},   {20.36*3, 21.33*3}, 1},
     {{3|(4<<4)},   {20.36*4, 21.33*3}, 1},
-    {{3|(5<<4)},   {20.36*5, 21.33*3}, 0},
+    {{3|(5<<4)},   {20.36*5, 21.33*3}, 4},
-    {{3|(5<<4)},   {20.36*5.5,21.33*3}, 0},
+    {{3|(5<<4)},   {20.36*5.5,21.33*3}, 4},
-    {{3|(6<<4)},   {20.36*6, 21.33*3}, 0},
+    {{3|(6<<4)},   {20.36*6, 21.33*3}, 4},
     {{3|(7<<4)},   {20.36*7, 21.33*3}, 1},
     {{3|(8<<4)},   {20.36*8, 21.33*3}, 1},
     {{3|(9<<4)},   {20.36*9, 21.33*3}, 1},

keyboards/preonic/keymaps/mikethetiger/config.h

@@ -0,0 +1,38 @@
+#pragma once
+
+#ifdef AUDIO_ENABLE
+    #define STARTUP_SONG SONG(PREONIC_SOUND)
+    // #define STARTUP_SONG SONG(NO_SOUND)
+
+    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
+                                  SONG(COLEMAK_SOUND), \
+                                  SONG(DVORAK_SOUND) \
+                                }
+#endif
+
+#define MUSIC_MASK (keycode != KC_NO)
+
+/*
+ * 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
+#define TAP_CODE_DELAY 10
+
+/* 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 2

keyboards/preonic/keymaps/mikethetiger/keymap.c

@@ -0,0 +1,289 @@
+/* Copyright 2015-2017 Jack Humbert
+ *
+ * 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
+#include "muse.h"
+
+enum preonic_layers {
+  _QWERTY,
+  _COLEMAK,
+  _DVORAK,
+  _LOWER,
+  _RAISE,
+  _ADJUST
+};
+
+enum preonic_keycodes {
+  QWERTY = SAFE_RANGE,
+  COLEMAK,
+  DVORAK,
+  LOWER,
+  RAISE,
+  BACKLIT
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Qwerty
+ * ,-----------------------------------------------------------------------------------.
+ * | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |  \   |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Caps |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_QWERTY] = LAYOUT_preonic_grid( 
+  KC_ESC,  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_BSLS,  \
+  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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,  \
+  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
+),
+
+/* Colemak
+ * ,-----------------------------------------------------------------------------------.
+ * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Del  |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_COLEMAK] = LAYOUT_preonic_grid( 
+  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_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_DEL,  \
+  KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT, \
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,  \
+  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
+),
+
+/* Dvorak
+ * ,-----------------------------------------------------------------------------------.
+ * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Del  |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_DVORAK] = LAYOUT_preonic_grid( 
+  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_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_DEL,  \
+  KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH, \
+  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT,  \
+  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
+),
+
+/* Lower
+ * ,-----------------------------------------------------------------------------------.
+ * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_LOWER] = LAYOUT_preonic_grid( 
+  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \
+  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,  \
+  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \
+  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,S(KC_NUHS),S(KC_NUBS),KC_HOME, KC_END, _______, \
+  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
+),
+
+/* Raise
+ * ,-----------------------------------------------------------------------------------.
+ * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_RAISE] = LAYOUT_preonic_grid( 
+  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_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,  \
+  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, \
+  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______, \
+  _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY  \
+),
+
+/* Adjust (Lower + Raise)
+ * ,-----------------------------------------------------------------------------------.
+ * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |      |      |Aud on|AudOff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff|      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      |      |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_ADJUST] = LAYOUT_preonic_grid( 
+  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
+  _______, RESET,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,  \
+  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
+  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
+)
+
+
+};
+
+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;
+          break;
+        case COLEMAK:
+          if (record->event.pressed) {
+            set_single_persistent_default_layer(_COLEMAK);
+          }
+          return false;
+          break;
+        case DVORAK:
+          if (record->event.pressed) {
+            set_single_persistent_default_layer(_DVORAK);
+          }
+          return false;
+          break;
+        case LOWER:
+          if (record->event.pressed) {
+            layer_on(_LOWER);
+            update_tri_layer(_LOWER, _RAISE, _ADJUST);
+          } else {
+            layer_off(_LOWER);
+            update_tri_layer(_LOWER, _RAISE, _ADJUST);
+          }
+          return false;
+          break;
+        case RAISE:
+          if (record->event.pressed) {
+            layer_on(_RAISE);
+            update_tri_layer(_LOWER, _RAISE, _ADJUST);
+          } else {
+            layer_off(_RAISE);
+            update_tri_layer(_LOWER, _RAISE, _ADJUST);
+          }
+          return false;
+          break;
+        case BACKLIT:
+          if (record->event.pressed) {
+            register_code(KC_RSFT);
+            #ifdef BACKLIGHT_ENABLE
+              backlight_step();
+            #endif
+            #ifdef __AVR__
+            PORTE &= ~(1<<6);
+            #endif
+          } else {
+            unregister_code(KC_RSFT);
+            #ifdef __AVR__
+            PORTE |= (1<<6);
+            #endif
+          }
+          return false;
+          break;
+      }
+    return true;
+};
+
+bool muse_mode = false;
+uint8_t last_muse_note = 0;
+uint16_t muse_counter = 0;
+uint8_t muse_offset = 70;
+uint16_t muse_tempo = 50;
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+  if (clockwise) {
+      tap_code(KC_VOLU);
+    } else {
+      tap_code(KC_VOLD);
+    }
+  }
+
+void dip_update(uint8_t index, bool active) {
+  switch (index) {
+    case 0:
+      if (active) {
+        layer_on(_ADJUST);
+      } else {
+        layer_off(_ADJUST);
+      }
+      break;
+    case 1:
+      if (active) {
+        muse_mode = true;
+      } else {
+        muse_mode = false;
+        #ifdef AUDIO_ENABLE
+          stop_all_notes();
+        #endif
+      }
+   }
+}
+
+void matrix_scan_user(void) {
+  #ifdef AUDIO_ENABLE
+    if (muse_mode) {
+      if (muse_counter == 0) {
+        uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
+        if (muse_note != last_muse_note) {
+          stop_note(compute_freq_for_midi_note(last_muse_note));
+          play_note(compute_freq_for_midi_note(muse_note), 0xF);
+          last_muse_note = muse_note;
+        }
+      }
+      muse_counter = (muse_counter + 1) % muse_tempo;
+    }
+  #endif
+}
+
+bool music_mask_user(uint16_t keycode) {
+  switch (keycode) {
+    case RAISE:
+    case LOWER:
+      return false;
+    default:
+      return true;
+  }
+}

keyboards/preonic/keymaps/mikethetiger/readme.md

@@ -0,0 +1 @@
+# mikethetiger's Preonic layout - largely based on the Planck's

keyboards/preonic/keymaps/mikethetiger/rules.mk

@@ -0,0 +1 @@
+SRC += muse.c

keyboards/signum/3_0/elitec/info.json

@@ -2,74 +2,64 @@
     "keyboard_name": "Signum 3.0",
     "url": "http://troyfletcher.net/",
     "maintainer": "jceb",
-    "width": 17,
+    "width": 15,
-    "height": 8,
+    "height": 6,
     "layouts": {
         "LAYOUT_ortho_4x12": {
             "key_count": 48,
             "layout": [
 
-                { "x": 1.25, "y": 0.75, "r": 15 },
+                { "x": 0, "y": 0.5, "r": 15 },
-                { "x": 1.25, "y": 1.75, "r": 15 },
+                { "x": 1, "y": 0.5, "r": 15 },
-                { "x": 1.25, "y": 2.75, "r": 15 },
+                { "x": 2, "y": 0.25, "r": 15 },
-                { "x": 1.25, "y": 4.25, "r": 15 },
+                { "x": 3, "y": 0, "r": 15 },
+                { "x": 4, "y": 0.25, "r": 15 },
+                { "x": 5, "y": 0.5, "r": 15 },
+                { "x": 9, "y": 0.5, "r": -15 },
+                { "x": 10, "y": 0.25, "r": -15 },
+                { "x": 11, "y": 0, "r": -15 },
+                { "x": 12, "y": 0.25, "r": -15 },
+                { "x": 13, "y": 0.5, "r": -15 },
+                { "x": 14, "y": 0.5, "r": -15 },
 
-                { "x": 2.25, "y": 0.75, "r": 15 },
+                { "x": 0, "y": 1.5, "r": 15 },
-                { "x": 2.25, "y": 1.75, "r": 15 },
+                { "x": 1, "y": 1.5, "r": 15 },
-                { "x": 2.25, "y": 2.75, "r": 15 },
+                { "x": 2, "y": 1.25, "r": 15 },
-                { "x": 2.25, "y": 3.75, "r": 15 },
+                { "x": 3, "y": 1, "r": 15 },
+                { "x": 4, "y": 1.25, "r": 15 },
+                { "x": 5, "y": 1.5, "r": 15 },
+                { "x": 9, "y": 1.5, "r": -15 },
+                { "x": 10, "y": 1.25, "r": -15 },
+                { "x": 11, "y": 1, "r": -15 },
+                { "x": 12, "y": 1.25, "r": -15 },
+                { "x": 13, "y": 1.5, "r": -15 },
+                { "x": 14, "y": 1.5, "r": -15 },
 
-                { "x": 3.25, "y": 0.5, "r": 15 },
+                { "x": 0, "y": 2.5, "r": 15 },
-                { "x": 3.25, "y": 1.5, "r": 15 },
+                { "x": 1, "y": 2.5, "r": 15 },
-                { "x": 3.25, "y": 2.5, "r": 15 },
+                { "x": 2, "y": 2.25, "r": 15 },
-                { "x": 3.25, "y": 3.5, "r": 15 },
+                { "x": 3, "y": 2, "r": 15 },
+                { "x": 4, "y": 2.25, "r": 15 },
+                { "x": 5, "y": 2.5, "r": 15 },
+                { "x": 9, "y": 2.5, "r": -15 },
+                { "x": 10, "y": 2.25, "r": -15 },
+                { "x": 11, "y": 2, "r": -15 },
+                { "x": 12, "y": 2.25, "r": -15 },
+                { "x": 13, "y": 2.5, "r": -15 },
+                { "x": 14, "y": 2.5, "r": -15 },
 
-                { "x": 4.25, "y": 0.25, "r": 15 },
+                { "x": 0, "y": 4, "r": 15 },
-                { "x": 4.25, "y": 1.25, "r": 15 },
+                { "x": 1, "y": 3.5, "r": 15 },
-                { "x": 4.25, "y": 2.25, "r": 15 },
+                { "x": 2, "y": 3.25, "r": 15 },
-
+                { "x": 4, "y": 4.25, "r": 15, "h": 1.5 },
-                { "x": 5.25, "y": 0.5, "r": 15 },
+                { "x": 5, "y": 4, "r": 15, "h": 2 },
-                { "x": 5.25, "y": 1.5, "r": 15 },
+                { "x": 6, "y": 4.25, "r": 15, "h": 1.5 },
-                { "x": 5.25, "y": 2.5, "r": 15 },
+                { "x": 8, "y": 4.25, "r": -15, "h": 1.5 },
-                { "x": 5.25, "y": 4.5, "r": 15, "h": 1.5 },
+                { "x": 9, "y": 4, "r": -15, "h": 2 },
-
+                { "x": 10, "y": 4.25, "r": -15, "h": 1.5 },
-                { "x": 6.25, "y": 0.75, "r": 15 },
+                { "x": 12, "y": 3.25, "r": -15 },
-                { "x": 6.25, "y": 1.75, "r": 15 },
+                { "x": 13, "y": 3.5, "r": -15 },
-                { "x": 6.25, "y": 2.75, "r": 15 },
+                { "x": 14, "y": 4, "r": -15 }
-                { "x": 6.25, "y": 4.25, "r": 15, "h": 2  },
-
-                { "x": 7.25, "y": 4.5, "r": 15, "h": 1.5 },
-
-                { "x": 8.25, "y": 4.5, "r": -15, "h": 1.5 },
-
-                { "x": 9.25, "y": 0.75, "r": -15 },
-                { "x": 9.25, "y": 1.75, "r": -15 },
-                { "x": 9.25, "y": 2.75, "r": -15 },
-                { "x": 9.25, "y": 4.25, "r": -15, "h": 2 },
-
-                { "x": 10.25, "y": 0.5, "r": -15 },
-                { "x": 10.25, "y": 1.5, "r": -15 },
-                { "x": 10.25, "y": 2.5, "r": -15 },
-                { "x": 10.25, "y": 4.5, "r": -15, "h": 1.5 },
-
-                { "x": 11.25, "y": 0.25, "r": -15 },
-                { "x": 11.25, "y": 1.25, "r": -15 },
-                { "x": 11.25, "y": 2.25, "r": -15 },
-
-                { "x": 12.25, "y": 0.5, "r": -15 },
-                { "x": 12.25, "y": 1.5, "r": -15 },
-                { "x": 12.25, "y": 2.5, "r": -15 },
-                { "x": 12.25, "y": 3.5, "r": -15 },
-
-                { "x": 13.25, "y": 0.75, "r": -15 },
-                { "x": 13.25, "y": 1.75, "r": -15 },
-                { "x": 13.25, "y": 2.75, "r": -15 },
-                { "x": 13.25, "y": 3.75, "r": -15 },
-
-                { "x": 14.25, "y": 0.75, "r": -15 },
-                { "x": 14.25, "y": 1.75, "r": -15 },
-                { "x": 14.25, "y": 2.75, "r": -15 },
-                { "x": 14.25, "y": 4.25, "r": -15 }
 
             ]
         }

keyboards/signum/3_0/elitec/keymaps/default/generate_km.py

@@ -1,17 +1,15 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-from sortedcontainers import SortedDict
+import json
 import layout
+import os
 import re
 
-# TODO: auto-generate mutex layers
-# TODO: auto-generate update_tri_layer (_state)
-
 
 def gen_uc_iter():
     length = len(layout.uc_dict)
-    for key, value in layout.uc_dict.items():
+    for key, value in sorted(layout.uc_dict.items()):
         length -= 1
         if length:
             yield (key, value, False)
@@ -19,7 +17,7 @@ def gen_uc_iter():
             yield (key, value, True)
 
 
-def translate(s):
+def _translate(s):
     if re.match("^[0-9]$", s):
         return ("KC_{0}".format(s), "   {0}   ".format(s))
     elif re.match("^[a-z]$", s):
@@ -51,80 +49,115 @@ def translate(s):
 
 
 def toKC(s):
-    (kc, lgd) = translate(s)
+    return _translate(s)[0]
-    return kc
 
 
 def toLgd(s):
-    (kc, lgd) = translate(s)
+    return _translate(s)[1]
-    return lgd
 
 
-if __name__ == "__main__":
+def writeKeymap(f_template, f_keymap, columns, rows):
-
-    template = open("km_template.txt", mode="r")
-    output = open("keymap.c", mode="w", encoding='utf-8')
-
     doCopy = False
 
-    for line in template:
+    for line in f_template:
         doCopy = True
         if line.startswith("//<enum/>"):
             doCopy = False
-#            output.write(str(layout.uc_dict))
+            # f_keymap.write(str(layout.uc_dict))
             for k, v, isLast in gen_uc_iter():
                 if isLast:
-                    output.write(k + "\n")
+                    f_keymap.write(k + "\n")
                 else:
-                    output.write(k + ",\n")
+                    f_keymap.write(k + ",\n")
-        if line.startswith("//<uc_map/>"):
+        elif line.startswith("//<uc_map/>"):
             doCopy = False
             for k, v, isLast in gen_uc_iter():
                 if isLast:
-                    output.write(u"\t[{0}] = {1}  // {2}\n".format(k, v, chr(int(v, 0))))
+                    f_keymap.write(u"\t[{0}] = {1}  // {2}\n".format(k, v, chr(int(v, 0))))
                 else:
-                    output.write(u"\t[{0}] = {1},  // {2}\n".format(k, v, chr(int(v, 0))))
+                    f_keymap.write(u"\t[{0}] = {1},  // {2}\n".format(k, v, chr(int(v, 0))))
-        if line.startswith("//<keymaps/>"):
+        elif line.startswith("//<keymaps/>"):
             doCopy = False
-            counter = len(layout.layers)
+            for layer, L in enumerate(layout.layers):
-            layer = 0
+                r_counter = rows
-            S = layout.static
+                f_keymap.write("/* Layer %d\n" % layer)
-            for L in layout.layers:
+                f_keymap.write(" * -------------------------------------------------               -------------------------------------------------\n")
-                counter -= 1
+                f_keymap.write(" * |{0}|{1}|{2}|{3}|{4}|{5}|               |{6}|{7}|{8}|{9}|{10}|{11}|\n".format(*map(toLgd, L[:12])))
-                r_counter = 4
+                f_keymap.write(" * -------------------------------------------------               -------------------------------------------------\n")
-                output.write("/* Layer %d\n" % layer)
+                f_keymap.write(" * |{0}|{1}|{2}|{3}|{4}|{5}|               |{6}|{7}|{8}|{9}|{10}|{11}|\n".format(*map(toLgd, L[12:24])))
-                output.write(" * -------------------------------------------------               -------------------------------------------------\n")
+                f_keymap.write(" * -------------------------------------------------               -------------------------------------------------\n")
-                output.write(" * |{0}|{1}|{2}|{3}|{4}|{5}|               |{6}|{7}|{8}|{9}|{10}|{11}|\n".format(toLgd(L[0][0]), toLgd(L[0][1]), toLgd(L[0][2]), toLgd(L[0][3]), toLgd(L[0][4]), toLgd(L[0][5]), toLgd(L[0][6]), toLgd(L[0][7]), toLgd(L[0][8]), toLgd(L[0][9]), toLgd(L[0][10]), toLgd(L[0][11])))
+                f_keymap.write(" * |{0}|{1}|{2}|{3}|{4}|{5}|               |{6}|{7}|{8}|{9}|{10}|{11}|\n".format(*map(toLgd, L[24:36])))
-                output.write(" * -------------------------------------------------               -------------------------------------------------\n")
+                f_keymap.write(" * -----------------------------------------------------------------------------------------------------------------\n")
-                output.write(" * |{0}|{1}|{2}|{3}|{4}|{5}|               |{6}|{7}|{8}|{9}|{10}|{11}|\n".format(toLgd(L[1][0]), toLgd(L[1][1]), toLgd(L[1][2]), toLgd(L[1][3]), toLgd(L[1][4]), toLgd(L[1][5]), toLgd(L[1][6]), toLgd(L[1][7]), toLgd(L[1][8]), toLgd(L[1][9]), toLgd(L[1][10]), toLgd(L[1][11])))
+                f_keymap.write(" *  {0} {1} {2}        |{3}|{4}|{5}|{6}|{7}|{8}|        {9} {10} {11}".format(*map(toLgd, L[36:48])).rstrip()+"\n")
-                output.write(" * -------------------------------------------------               -------------------------------------------------\n")
+                f_keymap.write(" *                                 -------------------------------------------------\n")
-                output.write(" * |{0}|{1}|{2}|{3}|{4}|{5}|               |{6}|{7}|{8}|{9}|{10}|{11}|\n".format(toLgd(L[2][0]), toLgd(L[2][1]), toLgd(L[2][2]), toLgd(L[2][3]), toLgd(L[2][4]), toLgd(L[2][5]), toLgd(L[2][6]), toLgd(L[2][7]), toLgd(L[2][8]), toLgd(L[2][9]), toLgd(L[2][10]), toLgd(L[2][11])))
+                f_keymap.write(" */\n")
-                output.write(" * -----------------------------------------------------------------------------------------------------------------\n")
-                output.write(" *  {0} {1} {2}        |{3}|{4}|{5}|{6}|{7}|{8}|        {9} {10} {11}".format(toLgd(L[3][0]), toLgd(L[3][1]), toLgd(L[3][2]), toLgd(L[3][3]), toLgd(L[3][4]), toLgd(L[3][5]), toLgd(L[3][6]), toLgd(L[3][7]), toLgd(L[3][8]), toLgd(L[3][9]), toLgd(L[3][10]), toLgd(L[3][11])).rstrip()+"\n")
-                output.write(" *                                 -------------------------------------------------\n")
-                output.write(" */\n")
 
                 l_code = '\tLAYOUT_ortho_4x12(\n'
                 for r in range(r_counter):
                     r_counter -= 1
-                    c_counter = 12
+                    c_counter = columns
                     l_code += '\t\t'
                     for c in range(c_counter):
                         c_counter -= 1
                         if c != 0:
                             l_code += " "
-                        l_code += "%s" % toKC(L[r][c])
+                        l_code += "%s" % toKC(L[r*columns + columns-c_counter-1])
                         if r_counter or c_counter:
                             l_code += ","
                     l_code += '\n'
-                if counter:
+                if layer + 1 != len(layout.layers):
                     l_code += "\t),\n\n"
                 else:
                     l_code += "\t)\n"
-                output.write(l_code)
+                f_keymap.write(l_code)
-                layer += 1
         if doCopy:
-            output.write(line)
+            f_keymap.write(line)
 
-    template.close()
+
-    output.close()
+def getKeymapJSON(keyboard, keymap, layout, layers):
+    return json.dumps({
+        'keyboard': keyboard,
+        'keymap': keymap,
+        'layout': layout,
+        'layers': layers
+        }, sort_keys=True, indent=4)
+
+
+def layersToKC(layers):
+    return [list(map(toKC, layer)) for layer in layers]
+
+
+def pathToKeymap(path):
+    head, keymap = os.path.split(path)
+    _, keymapsdir = os.path.split(head)
+    if keymapsdir == 'keymaps':
+        return keymap
+
+
+def pathToKeyboard(path):
+    head, keymap = os.path.split(path)
+    head, keymapsdir = os.path.split(head)
+    if keymapsdir == 'keymaps':
+        head, dir = os.path.split(head)
+        while dir not in ('/', 'keyboards'):
+            yield dir
+            head, dir = os.path.split(head)
+
+
+if __name__ == "__main__":
+    with open("km_template.txt", mode="r") as f_template:
+        with open("keymap.c", mode="w", encoding='utf-8') as f_keymap:
+            writeKeymap(f_template, f_keymap, columns=12, rows=4)
+
+    abspath = os.path.dirname(os.path.abspath(__file__))
+    keyboard = list(reversed(list(pathToKeyboard(abspath))))
+    keymap = pathToKeymap(abspath)
+    keyboard_layout = 'LAYOUT_ortho_4x12'
+    with open("%s_%s.json" % ('_'.join(keyboard), keymap), mode="w") as f_keymapjson:
+        f_keymapjson.write(
+                getKeymapJSON(
+                    '/'.join(keyboard),
+                    keymap,
+                    keyboard_layout,
+                    layersToKC(layout.layers))
+                )

keyboards/signum/3_0/elitec/keymaps/default/keymap.c

@@ -672,8 +672,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 	LAYOUT_ortho_4x12(
 		KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_RBRC,
-		KC_TRNS, DF(0), DF(1), XXXXXXX, XXXXXXX, MO(3), KC_4, KC_4, KC_5, KC_6, KC_MINS, KC_EQL,
+		KC_TRNS, DF(0), DF(1), KC_NO, KC_NO, MO(3), KC_4, KC_4, KC_5, KC_6, KC_MINS, KC_EQL,
-		KC_TRNS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MO(5), KC_1, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS,
+		KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, MO(5), KC_1, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS,
 		TG(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS, KC_BSPC, KC_0, KC_TRNS, KC_TRNS, KC_TRNS
 	),
 
@@ -689,9 +689,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 -------------------------------------------------
  */
 	LAYOUT_ortho_4x12(
-		KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX,
+		KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_NO,
-		KC_TRNS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MO(3), KC_F4, KC_F4, KC_F5, KC_F6, XXXXXXX, XXXXXXX,
+		KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, MO(3), KC_F4, KC_F4, KC_F5, KC_F6, KC_NO, KC_NO,
-		KC_TRNS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F1, KC_F1, KC_F2, KC_F3, XXXXXXX, KC_TRNS,
+		KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_F1, KC_F1, KC_F2, KC_F3, KC_NO, KC_TRNS,
 		TG(3), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS
 	),
 
@@ -709,7 +709,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	LAYOUT_ortho_4x12(
 		KC_ESC, KC_ESC, LCTL(KC_W), LCTL(KC_T), CTL_T(KC_PGDN), CTL_T(KC_PGDN), KC_PGDN, KC_HOME, KC_UP, KC_INS, LSFT(KC_INS), KC_ESC,
 		KC_TRNS, KC_CAPS, LGUI_T(KC_LEFT), LGUI_T(KC_TAB), LGUI_T(KC_RIGHT), LGUI_T(KC_RIGHT), KC_LEFT, KC_LEFT, KC_DOWN, KC_RIGHT, KC_END, KC_PSCR,
-		KC_TRNS, XXXXXXX, XXXXXXX, XXXXXXX, CTL_T(KC_PGUP), CTL_T(KC_PGUP), KC_PGUP, XXXXXXX, KC_DOWN, XXXXXXX, KC_APP, KC_TRNS,
+		KC_TRNS, KC_NO, KC_NO, KC_NO, CTL_T(KC_PGUP), CTL_T(KC_PGUP), KC_PGUP, KC_NO, KC_DOWN, KC_NO, KC_APP, KC_TRNS,
 		TG(4), KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
 	),
 
@@ -725,9 +725,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 -------------------------------------------------
  */
 	LAYOUT_ortho_4x12(
-		KC_TRNS, XXXXXXX, KC_MPLY, KC_VOLU, KC_VOLU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET, KC_PWR,
+		KC_TRNS, KC_NO, KC_MPLY, KC_VOLU, KC_VOLU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RESET, KC_PWR,
-		KC_TRNS, XXXXXXX, KC_MPRV, KC_MUTE, KC_MNXT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SLEP,
+		KC_TRNS, KC_NO, KC_MPRV, KC_MUTE, KC_MNXT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SLEP,
-		KC_TRNS, XXXXXXX, XXXXXXX, KC_VOLD, KC_VOLD, MO(5), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+		KC_TRNS, KC_NO, KC_NO, KC_VOLD, KC_VOLD, MO(5), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
 		TG(5), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
 	),
 
@@ -743,9 +743,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 -------------------------------------------------
  */
 	LAYOUT_ortho_4x12(
-		KC_TRNS, KC_ACL1, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_WH_U, KC_WH_L, KC_MS_U, KC_WH_R, XXXXXXX, XXXXXXX,
+		KC_TRNS, KC_ACL1, KC_NO, KC_NO, KC_NO, KC_NO, KC_WH_U, KC_WH_L, KC_MS_U, KC_WH_R, KC_NO, KC_NO,
-		KC_TRNS, KC_ACL2, KC_BTN3, KC_BTN2, KC_BTN1, KC_BTN1, KC_MS_L, KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX, XXXXXXX,
+		KC_TRNS, KC_ACL2, KC_BTN3, KC_BTN2, KC_BTN1, KC_BTN1, KC_MS_L, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO, KC_NO,
-		KC_TRNS, KC_ACL0, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_WH_D, XXXXXXX, KC_MS_D, XXXXXXX, XXXXXXX, KC_TRNS,
+		KC_TRNS, KC_ACL0, KC_NO, KC_NO, KC_NO, KC_NO, KC_WH_D, KC_NO, KC_MS_D, KC_NO, KC_NO, KC_TRNS,
 		TG(6), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
 	)
 };

keyboards/signum/3_0/elitec/keymaps/default/layout.py

@@ -1,11 +1,11 @@
-from sortedcontainers import SortedDict
+# -*- coding: utf-8 -*-
 
 # Add all used Unicode symbols to this list.
 # The key (e.g. "SNEK") is used in keymap.c for "enum", "unicode_map" and "keymaps", so it needs to be a valid C variable name.
 # The key is also used in this file to define the layout, so use recognizeable names.
 # The value (e.g. "0x1f40d") is used in keymap.c for "unicode_map" and to automatically generate the "ASCII"-art comments.
 # When adding new Unicode names, use "0x1f40d" until you looked up the correct Unicode code point.
-uc_dict = SortedDict({
+uc_dict = {
     "SNEK": "0x1f40d", ## Error
     ## qwertz
     "ACUTE": "0x00b4",
@@ -329,7 +329,7 @@ uc_dict = SortedDict({
     "NOT_PARA": "0x2226",
     "TIMES_OP": "0x2297",
     "NOT_DIV": "0x2224"
-})
+}
 
 # Add all used Keycodes to this list.
 # The key (e.g. "a") is used in keymap.c to automatically generate the comments. The first 7 chars will show as a keycap legend.
@@ -338,7 +338,7 @@ qmk_dict = {
     # If you find "BAD" in your keymaps, then something went wrong.)
     "a": "BAD", "A": "BAD", "0": "BAD",
     # Basic Keycodes
-    "XXX": "XXXXXXX", "": "KC_TRNS",
+    "XXX": "KC_NO", "": "KC_TRNS",
     "!": "S(KC_1)", "@": "S(KC_2)", "#": "S(KC_3)", "$": "S(KC_4)", "%": "S(KC_5)",
     "^": "S(KC_6)", "&": "S(KC_7)", "*": "S(KC_8)", "(": "S(KC_9)", ")": "S(KC_0)",
     "Enter": "KC_ENT", "Esc": "KC_ESC", "BSpace": "KC_BSPC", "Tab": "KC_TAB",
@@ -428,58 +428,58 @@ static = ["NEO", "GREEK", "GREEK", "GREEK", "GREEK", "MOUSE"]
 
 # 0
 qwerty = [
-    ["Tab",     "q",    "w",       "e",       "r",       "t",       "y",       "u",       "i",       "o",       "p",       "["],
+    "Tab",     "q",    "w",       "e",       "r",       "t",       "y",       "u",       "i",       "o",       "p",       "[",
-    ["LCtrl",   "a",    "s",       "d",       "f",       "g",       "h",       "j",       "k",       "l",       ";",       "'"],
+    "LCtrl",   "a",    "s",       "d",       "f",       "g",       "h",       "j",       "k",       "l",       ";",       "'",
-    ["LShift(", "z",    "x",       "c",       "v",       "b",       "n",       "m",       ",",       ".",       "/",       "RShift)"],
+    "LShift(", "z",    "x",       "c",       "v",       "b",       "n",       "m",       ",",       ".",       "/",       "RShift)",
-    ["MO2",     "LGui", "LAlt",    "TT2",     "LT6_SPC", "TT4",     "Enter",   "Space",   "TT2",     "RAlt",    "RGui",    "RCtrl"],
+    "MO2",     "LGui", "LAlt",    "TT2",     "LT6_SPC", "TT4",     "Enter",   "Space",   "TT2",     "RAlt",    "RGui",    "RCtrl",
     ]
 
 # 1
 colemak = [
-    ["Tab",     "q",    "w",       "f",       "p",       "g",       "j",       "l",       "u",       "y",       ";",       "["],
+    "Tab",     "q",    "w",       "f",       "p",       "g",       "j",       "l",       "u",       "y",       ";",       "[",
-    ["LCtrl",   "a",    "r",       "s",       "t",       "d",       "h",       "n",       "e",       "i",       "o",       "'"],
+    "LCtrl",   "a",    "r",       "s",       "t",       "d",       "h",       "n",       "e",       "i",       "o",       "'",
-    ["LShift(", "z",    "x",       "c",       "v",       "b",       "k",       "m",       ",",       ".",       "/",       "RShift)"],
+    "LShift(", "z",    "x",       "c",       "v",       "b",       "k",       "m",       ",",       ".",       "/",       "RShift)",
-    ["MO2",     "LGui", "LAlt",    "TT2",     "LT6_SPC", "TT4",     "Enter",   "Space",   "TT2",     "RAlt",    "RGui",    "RCtrl"],
+    "MO2",     "LGui", "LAlt",    "TT2",     "LT6_SPC", "TT4",     "Enter",   "Space",   "TT2",     "RAlt",    "RGui",    "RCtrl",
     ]
 
 # 2
 numpad = [
-    ["`",       "1",    "2",       "3",       "4",       "5",       "6",       "7",       "8",       "9",       "0",       "]"],
+    "`",       "1",    "2",       "3",       "4",       "5",       "6",       "7",       "8",       "9",       "0",       "]",
-    ["",        "DF0",  "DF1",     "XXX",     "XXX",     "MO3",     "4",       "4",       "5",       "6",       "-",       "="],
+    "",        "DF0",  "DF1",     "XXX",     "XXX",     "MO3",     "4",       "4",       "5",       "6",       "-",       "=",
-    ["",        "XXX",  "XXX",     "XXX",     "XXX",     "MO5",     "1",       "1",       "2",       "3",       "\\",      ""],
+    "",        "XXX",  "XXX",     "XXX",     "XXX",     "MO5",     "1",       "1",       "2",       "3",       "\\",      "",
-    ["TG2",     "",     "",        "",        "Del",     "",        "",        "BSpace",  "0",       "",        "",        ""],
+    "TG2",     "",     "",        "",        "Del",     "",        "",        "BSpace",  "0",       "",        "",        "",
     ]
 
 # 3
 fpad = [
-    ["",        "F1",   "F2",      "F3",      "F4",      "F5",      "F6",      "F7",      "F8",      "F9",      "F10",     "XXX"],
+    "",        "F1",   "F2",      "F3",      "F4",      "F5",      "F6",      "F7",      "F8",      "F9",      "F10",     "XXX",
-    ["",        "XXX",  "XXX",     "XXX",     "XXX",     "MO3",     "F4",      "F4",      "F5",      "F6",      "XXX",     "XXX"],
+    "",        "XXX",  "XXX",     "XXX",     "XXX",     "MO3",     "F4",      "F4",      "F5",      "F6",      "XXX",     "XXX",
-    ["",        "XXX",  "XXX",     "XXX",     "XXX",     "XXX",     "F1",      "F1",      "F2",      "F3",      "XXX",     ""],
+    "",        "XXX",  "XXX",     "XXX",     "XXX",     "XXX",     "F1",      "F1",      "F2",      "F3",      "XXX",     "",
-    ["TG3",     "",     "",        "",        "",        "",        "F10",     "F11",     "F12",     "",        "",        ""],
+    "TG3",     "",     "",        "",        "",        "",        "F10",     "F11",     "F12",     "",        "",        "",
     ]
 
 # 4
 movement = [
-    ["Esc",     "Esc",  "Tab x",   "Tab n",   "CPg Dn",  "CPg Dn",  "Pg Down", "Home",    "^ Arrow", "Insert",  "SInsert", "Esc"],
+    "Esc",     "Esc",  "Tab x",   "Tab n",   "CPg Dn",  "CPg Dn",  "Pg Down", "Home",    "^ Arrow", "Insert",  "SInsert", "Esc",
-    ["",        "Caps", "< Gui",   "Gui Tab", "> Gui",   "> Gui",   "< Arrow", "< Arrow", "v Arrow", "> Arrow", "End",     "Pr Scr"],
+    "",        "Caps", "< Gui",   "Gui Tab", "> Gui",   "> Gui",   "< Arrow", "< Arrow", "v Arrow", "> Arrow", "End",     "Pr Scr",
-    ["",        "XXX",  "XXX",     "XXX",     "CPg Up",  "CPg Up",  "Pg Up",   "XXX",     "v Arrow", "XXX",     "App",     ""],
+    "",        "XXX",  "XXX",     "XXX",     "CPg Up",  "CPg Up",  "Pg Up",   "XXX",     "v Arrow", "XXX",     "App",     "",
-    ["TG4",     "",     "",        "",        "Del",     "",        "",        "BSpace",  "",        "",        "",        ""],
+    "TG4",     "",     "",        "",        "Del",     "",        "",        "BSpace",  "",        "",        "",        "",
     ]
 
 # 5
 media = [
-    ["",        "XXX",  "play/ps", "Vol +",   "Vol +",   "XXX",     "XXX",     "XXX",     "XXX",     "XXX",     "_reset",  "Power"],
+    "",        "XXX",  "play/ps", "Vol +",   "Vol +",   "XXX",     "XXX",     "XXX",     "XXX",     "XXX",     "_reset",  "Power",
-    ["",        "XXX",  "|<<",     "Vol 0",   ">>|",     "XXX",     "XXX",     "XXX",     "XXX",     "XXX",     "XXX",     "Sleep"],
+    "",        "XXX",  "|<<",     "Vol 0",   ">>|",     "XXX",     "XXX",     "XXX",     "XXX",     "XXX",     "XXX",     "Sleep",
-    ["",        "XXX",  "XXX",     "Vol -",   "Vol -",   "MO5",     "XXX",     "XXX",     "XXX",     "XXX",     "XXX",     "XXX"],
+    "",        "XXX",  "XXX",     "Vol -",   "Vol -",   "MO5",     "XXX",     "XXX",     "XXX",     "XXX",     "XXX",     "XXX",
-    ["TG5",     "",     "",        "",        "",        "",        "",        "",        "",        "",        "",        ""],
+    "TG5",     "",     "",        "",        "",        "",        "",        "",        "",        "",        "",        "",
     ]
 
 # 6
 mouse = [
-    ["",        "acc1", "XXX",     "XXX",     "XXX",     "XXX",     "^ Wheel", "< Wheel", "^ Mouse", "> Wheel", "XXX",     "XXX"],
+    "",        "acc1", "XXX",     "XXX",     "XXX",     "XXX",     "^ Wheel", "< Wheel", "^ Mouse", "> Wheel", "XXX",     "XXX",
-    ["",        "acc2", "Mouse 3", "Mouse 2", "Mouse 1", "Mouse 1", "< Mouse", "< Mouse", "v Mouse", "> Mouse", "XXX",     "XXX"],
+    "",        "acc2", "Mouse 3", "Mouse 2", "Mouse 1", "Mouse 1", "< Mouse", "< Mouse", "v Mouse", "> Mouse", "XXX",     "XXX",
-    ["",        "acc0", "XXX",     "XXX",     "XXX",     "XXX",     "v Wheel", "XXX",     "v Mouse", "XXX",     "XXX",     ""],
+    "",        "acc0", "XXX",     "XXX",     "XXX",     "XXX",     "v Wheel", "XXX",     "v Mouse", "XXX",     "XXX",     "",
-    ["TG6",     "",     "",        "",        "",        "",        "",        "",        "",        "",        "",        ""],
+    "TG6",     "",     "",        "",        "",        "",        "",        "",        "",        "",        "",        "",
     ]
 
 layers = [

keyboards/signum/3_0/elitec/keymaps/default/readme.md

@@ -11,10 +11,6 @@ starting point to create your own layouts for the Signum 3.0 with
 
 # Customization
 
-- Install `python3` and [Sorted Containers
-  Library](http://www.grantjenks.com/docs/sortedcontainers/), `pip
-  install sortedcontainers`.
-
 - Customize `layout.py` to your liking.
     - Attention 1: keycodes are either translated into symbols and
       function calls via the `translate()` function in `generate_km.py`
@@ -24,4 +20,5 @@ starting point to create your own layouts for the Signum 3.0 with
     - Attention 2: additional C functions need to be put into
       `km_template.txt`
 
-Run `./generate_km.py` to regenerate `keymap.c`.
+Run `./generate_km.py` to regenerate `keymap.c` and the JSON keymap
+definition that should be copied to `qmk_configurator/public/keymaps`.

keyboards/sol/keymaps/xulkal/keymap.c

@@ -92,15 +92,29 @@ static void render_logo(void) {
   oled_write_P(sol_logo, false);
 }
 
+extern rgb_config_t rgb_matrix_config;
+
 static void render_status(void) {
   // Render to mode icon
-  static const char PROGMEM mode_logo[2][4] = {
+  static const char PROGMEM mode_logo[2][3] = {
-    {0x97,0x98,0x0a,0},
+    {0x97,0x98,0},
-    {0xb7,0xb8,0x0a,0} };
+    {0xb7,0xb8,0} };
 
     oled_write_P(mode_logo[0], false);
+
+#if defined(RGB_MATRIX_ENABLE)
+    static char buffer[20] = {0};
+    snprintf(buffer, sizeof(buffer), "    h%3d s%3d v%3d\n", rgb_matrix_config.hue, rgb_matrix_config.sat, rgb_matrix_config.val);
+    oled_write(buffer, false);
+#endif
+
     oled_write_P(mode_logo[1], false);
 
+#if defined(RGB_MATRIX_ENABLE)
+    snprintf(buffer, sizeof(buffer), "         s%3d m%3d\n", rgb_matrix_config.speed, rgb_matrix_config.mode);
+    oled_write(buffer, false);
+#endif
+
   // Define layers here, Have not worked out how to have text displayed for each layer. Copy down the number you see and add a case for it below
   oled_write_P(PSTR("Layer: "), false);
   switch (biton32(layer_state)) {

keyboards/sol/rev1/rev1.c

@@ -1,35 +1,35 @@
 #include "sol.h"
 
 #ifdef RGB_MATRIX_ENABLE
-  const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+  rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
 	// Left Hand Mapped Left to Right
     { {  0 | (0 << 4) }, {   0,  0 }, 1},
-    { {  0 | (1 << 4) }, {  22,  0 }, 0},
+    { {  0 | (1 << 4) }, {  22,  0 }, 4},
-    { {  0 | (2 << 4) }, {  37,  0 }, 0},
+    { {  0 | (2 << 4) }, {  37,  0 }, 4},
-    { {  0 | (3 << 4) }, {  37,  0 }, 0},
+    { {  0 | (3 << 4) }, {  37,  0 }, 4},
-    { {  0 | (4 << 4) }, {  67,  0 }, 0},
+    { {  0 | (4 << 4) }, {  67,  0 }, 4},
-    { {  0 | (5 << 4) }, {  82,  0 }, 0},
+    { {  0 | (5 << 4) }, {  82,  0 }, 4},
     { {  0 | (6 << 4) }, { 104,  0 }, 1},
     { {  1 | (0 << 4) }, {   0, 16 }, 1},
-    { {  1 | (1 << 4) }, {  22, 16 }, 0},
+    { {  1 | (1 << 4) }, {  22, 16 }, 4},
-    { {  1 | (2 << 4) }, {  37, 16 }, 0},
+    { {  1 | (2 << 4) }, {  37, 16 }, 4},
-    { {  1 | (3 << 4) }, {  37, 16 }, 0},
+    { {  1 | (3 << 4) }, {  37, 16 }, 4},
-    { {  1 | (4 << 4) }, {  67, 16 }, 0},
+    { {  1 | (4 << 4) }, {  67, 16 }, 4},
-    { {  1 | (5 << 4) }, {  82, 16 }, 0},
+    { {  1 | (5 << 4) }, {  82, 16 }, 4},
     { {  1 | (6 << 4) }, { 104, 16 }, 1},
     { {  2 | (0 << 4) }, {   0, 32 }, 1},
-    { {  2 | (1 << 4) }, {  22, 32 }, 0},
+    { {  2 | (1 << 4) }, {  22, 32 }, 4},
-    { {  2 | (2 << 4) }, {  37, 32 }, 0},
+    { {  2 | (2 << 4) }, {  37, 32 }, 4},
-    { {  2 | (3 << 4) }, {  37, 32 }, 0},
+    { {  2 | (3 << 4) }, {  37, 32 }, 4},
-    { {  2 | (4 << 4) }, {  67, 32 }, 0},
+    { {  2 | (4 << 4) }, {  67, 32 }, 4},
-    { {  2 | (5 << 4) }, {  82, 32 }, 0},
+    { {  2 | (5 << 4) }, {  82, 32 }, 4},
     { {  2 | (6 << 4) }, { 104, 32 }, 1},
     { {  3 | (0 << 4) }, {   0, 48 }, 1},
-    { {  3 | (1 << 4) }, {  22, 48 }, 0},
+    { {  3 | (1 << 4) }, {  22, 48 }, 4},
-    { {  3 | (2 << 4) }, {  37, 48 }, 0},
+    { {  3 | (2 << 4) }, {  37, 48 }, 4},
-    { {  3 | (3 << 4) }, {  37, 48 }, 0},
+    { {  3 | (3 << 4) }, {  37, 48 }, 4},
-    { {  3 | (4 << 4) }, {  67, 48 }, 0},
+    { {  3 | (4 << 4) }, {  67, 48 }, 4},
-    { {  3 | (5 << 4) }, {  82, 48 }, 0},
+    { {  3 | (5 << 4) }, {  82, 48 }, 4},
     { {  3 | (6 << 4) }, { 104, 48 }, 1},
     { {  4 | (0 << 4) }, {   0, 64 }, 1},
     { {  4 | (1 << 4) }, {  22, 64 }, 1},
@@ -42,32 +42,32 @@
     { {  5 | (6 << 4) }, {  97, 55 }, 1},
 	// Left Hand Mapped Right to Left
     { {  6 | (0 << 4) }, { 224,  0 }, 1},
-    { {  6 | (1 << 4) }, { 202,  0 }, 0},
+    { {  6 | (1 << 4) }, { 202,  0 }, 4},
-    { {  6 | (2 << 4) }, { 187,  0 }, 0},
+    { {  6 | (2 << 4) }, { 187,  0 }, 4},
-    { {  6 | (3 << 4) }, { 172,  0 }, 0},
+    { {  6 | (3 << 4) }, { 172,  0 }, 4},
-    { {  6 | (4 << 4) }, { 157,  0 }, 0},
+    { {  6 | (4 << 4) }, { 157,  0 }, 4},
-    { {  6 | (5 << 4) }, { 142,  0 }, 0},
+    { {  6 | (5 << 4) }, { 142,  0 }, 4},
     { {  6 | (6 << 4) }, { 120,  0 }, 1},
     { {  7 | (0 << 4) }, { 224, 16 }, 1},
-    { {  7 | (1 << 4) }, { 202, 16 }, 0},
+    { {  7 | (1 << 4) }, { 202, 16 }, 4},
-    { {  7 | (2 << 4) }, { 187, 16 }, 0},
+    { {  7 | (2 << 4) }, { 187, 16 }, 4},
-    { {  7 | (3 << 4) }, { 172, 16 }, 0},
+    { {  7 | (3 << 4) }, { 172, 16 }, 4},
-    { {  7 | (4 << 4) }, { 157, 16 }, 0},
+    { {  7 | (4 << 4) }, { 157, 16 }, 4},
-    { {  7 | (5 << 4) }, { 142, 16 }, 0},
+    { {  7 | (5 << 4) }, { 142, 16 }, 4},
     { {  7 | (6 << 4) }, { 120, 16 }, 1},
     { {  8 | (0 << 4) }, { 224, 32 }, 1},
-    { {  8 | (1 << 4) }, { 202, 32 }, 0},
+    { {  8 | (1 << 4) }, { 202, 32 }, 4},
-    { {  8 | (2 << 4) }, { 187, 32 }, 0},
+    { {  8 | (2 << 4) }, { 187, 32 }, 4},
-    { {  8 | (3 << 4) }, { 172, 32 }, 0},
+    { {  8 | (3 << 4) }, { 172, 32 }, 4},
-    { {  8 | (4 << 4) }, { 157, 32 }, 0},
+    { {  8 | (4 << 4) }, { 157, 32 }, 4},
-    { {  8 | (5 << 4) }, { 142, 32 }, 0},
+    { {  8 | (5 << 4) }, { 142, 32 }, 4},
     { {  8 | (6 << 4) }, { 120, 32 }, 1},
     { {  9 | (0 << 4) }, { 224, 48 }, 1},
-    { {  9 | (1 << 4) }, { 202, 48 }, 0},
+    { {  9 | (1 << 4) }, { 202, 48 }, 4},
-    { {  9 | (2 << 4) }, { 187, 48 }, 0},
+    { {  9 | (2 << 4) }, { 187, 48 }, 4},
-    { {  9 | (3 << 4) }, { 172, 48 }, 0},
+    { {  9 | (3 << 4) }, { 172, 48 }, 4},
-    { {  9 | (4 << 4) }, { 157, 48 }, 0},
+    { {  9 | (4 << 4) }, { 157, 48 }, 4},
-    { {  9 | (5 << 4) }, { 142, 48 }, 0},
+    { {  9 | (5 << 4) }, { 142, 48 }, 4},
     { {  9 | (6 << 4) }, { 120, 48 }, 1},
     { { 10 | (0 << 4) }, { 224, 64 }, 1},
     { { 10 | (1 << 4) }, { 202, 64 }, 1},

keyboards/sol/sol.c

@@ -1 +1,20 @@
 #include "sol.h"
+
+#if defined(RGB_MATRIX_ENABLE)
+uint8_t rgb_matrix_map_row_column_to_led_kb(uint8_t row, uint8_t column, uint8_t *led_i) {
+  if (row == 4 && column == 5) {
+    led_i[0] = 33;
+    return 1;
+  } else if (row == 4 && column == 6) {
+    led_i[0] = 34;
+    return 1;
+  } else if (row == 10 && column == 5) {
+    led_i[0] = 68;
+    return 1;
+  } else if (row == 10 && column == 6) {
+    led_i[0] = 69;
+    return 1;
+  }
+  return 0;
+}
+#endif

layouts/community/ergodox/drashna/keymap.c

@@ -405,10 +405,8 @@ void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue) {
   rgb_led led;
   for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
     led = g_rgb_leds[i];
-    if (led.matrix_co.raw < 0xFF) {
+    if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) {
-      if (led.modifier) {
+        rgb_matrix_set_color( i, red, green, blue );
-          rgb_matrix_set_color( i, red, green, blue );
-      }
     }
   }
 }

layouts/community/ortho_4x12/drashna/keymap.c

@@ -179,10 +179,8 @@ void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool def
   rgb_led led;
   for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
     led = g_rgb_leds[i];
-    if (led.matrix_co.raw < 0xFF) {
+    if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) {
-      if (led.modifier) {
+        rgb_matrix_set_color( i, red, green, blue );
-          rgb_matrix_set_color( i, red, green, blue );
-      }
     }
   }
 }

lib/lib8tion/lib8tion.h

@@ -167,8 +167,8 @@ Lib8tion is pronounced like 'libation': lie-BAY-shun
 
 #include <stdint.h>
 
-#define LIB8STATIC __attribute__ ((unused)) static inline
+#define LIB8STATIC static inline
-#define LIB8STATIC_ALWAYS_INLINE __attribute__ ((always_inline)) static inline
+#define LIB8STATIC_ALWAYS_INLINE static inline
 
 #if !defined(__AVR__)
 #include <string.h>

lib/lib8tion/trig8.h

@@ -147,7 +147,7 @@ LIB8STATIC int16_t cos16( uint16_t theta)
 #endif
 
 
-const uint8_t b_m16_interleave[] = { 0, 49, 49, 41, 90, 27, 117, 10 };
+static const uint8_t b_m16_interleave[8] = { 0, 49, 49, 41, 90, 27, 117, 10 };
 
 /// Fast 8-bit approximation of sin(x). This approximation never varies more than
 /// 2% from the floating point value you'd get by doing

quantum/process_keycode/process_space_cadet.c

@@ -0,0 +1,146 @@
+/* Copyright 2019 Jack Humbert
+ *
+ * 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 "process_space_cadet.h"
+
+#ifndef TAPPING_TERM
+  #define TAPPING_TERM 200
+#endif
+
+// ********** OBSOLETE DEFINES, STOP USING! (pls?) **********
+// Shift / paren setup
+#ifndef LSPO_KEY
+  #define LSPO_KEY KC_9
+#endif
+#ifndef RSPC_KEY
+  #define RSPC_KEY KC_0
+#endif
+
+// Shift / Enter setup
+#ifndef SFTENT_KEY
+  #define SFTENT_KEY KC_ENT
+#endif
+
+#ifdef DISABLE_SPACE_CADET_MODIFIER
+  #ifndef LSPO_MOD
+    #define LSPO_MOD KC_TRNS
+  #endif
+  #ifndef RSPC_MOD
+    #define RSPC_MOD KC_TRNS
+  #endif
+#else
+  #ifndef LSPO_MOD
+    #define LSPO_MOD KC_LSFT
+  #endif
+  #ifndef RSPC_MOD
+    #define RSPC_MOD KC_RSFT
+  #endif
+#endif
+// **********************************************************
+
+// Shift / paren setup
+#ifndef LSPO_KEYS
+  #define LSPO_KEYS KC_LSFT, LSPO_MOD, LSPO_KEY
+#endif
+#ifndef RSPC_KEYS
+  #define RSPC_KEYS KC_RSFT, RSPC_MOD, RSPC_KEY
+#endif
+
+// Control / paren setup
+#ifndef LCPO_KEYS
+  #define LCPO_KEYS KC_LCTL, KC_LCTL, KC_9
+#endif
+#ifndef RCPO_KEYS
+  #define RCPO_KEYS KC_RCTL, KC_RCTL, KC_0
+#endif
+
+// Alt / paren setup
+#ifndef LAPO_KEYS
+  #define LAPO_KEYS KC_LALT, KC_LALT, KC_9
+#endif
+#ifndef RAPO_KEYS
+  #define RAPO_KEYS KC_RALT, KC_RALT, KC_0
+#endif
+
+// Shift / Enter setup
+#ifndef SFTENT_KEYS
+  #define SFTENT_KEYS KC_RSFT, KC_TRNS, SFTENT_KEY
+#endif
+
+static uint8_t sc_last = 0;
+static uint16_t sc_timer = 0;
+
+void perform_space_cadet(keyrecord_t *record, uint8_t normalMod, uint8_t tapMod, uint8_t keycode) {
+  if (record->event.pressed) {
+    sc_last = normalMod;
+    sc_timer = timer_read ();
+    if (IS_MOD(normalMod)) {
+      register_mods(MOD_BIT(normalMod));
+    }
+  }
+  else {
+    if (IS_MOD(normalMod)) {
+      unregister_mods(MOD_BIT(normalMod));
+    }
+
+    if (sc_last == normalMod && timer_elapsed(sc_timer) < TAPPING_TERM) {
+      if (IS_MOD(tapMod)) {
+        register_mods(MOD_BIT(tapMod));
+      }
+      tap_code(keycode);
+      if (IS_MOD(tapMod)) {
+        unregister_mods(MOD_BIT(tapMod));
+      }
+    }
+  }
+}
+
+bool process_space_cadet(uint16_t keycode, keyrecord_t *record) {
+  switch(keycode) {
+    case KC_LSPO: {
+      perform_space_cadet(record, LSPO_KEYS);
+      return false;
+    }
+    case KC_RSPC: {
+      perform_space_cadet(record, RSPC_KEYS);
+      return false;
+    }
+    case KC_LCPO: {
+      perform_space_cadet(record, LCPO_KEYS);
+      return false;
+    }
+    case KC_RCPC: {
+      perform_space_cadet(record, RCPO_KEYS);
+      return false;
+    }
+    case KC_LAPO: {
+      perform_space_cadet(record, LAPO_KEYS);
+      return false;
+    }
+    case KC_RAPC: {
+      perform_space_cadet(record, RAPO_KEYS);
+      return false;
+    }
+    case KC_SFTENT: {
+      perform_space_cadet(record, SFTENT_KEYS);
+      return false;
+    }
+    default: {
+      sc_last = 0;
+      break;
+    }
+  }
+  return true;
+}

quantum/process_keycode/process_space_cadet.h

@@ -0,0 +1,21 @@
+/* Copyright 2019 Jack Humbert
+ *
+ * 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"
+
+void perform_space_cadet(keyrecord_t *record, uint8_t normalMod, uint8_t tapMod, uint8_t keycode);
+bool process_space_cadet(uint16_t keycode, keyrecord_t *record);

quantum/quantum.c

@@ -24,10 +24,6 @@
 #include "outputselect.h"
 #endif
 
-#ifndef TAPPING_TERM
-#define TAPPING_TERM 200
-#endif
-
 #ifndef BREATHING_PERIOD
 #define BREATHING_PERIOD 6
 #endif
@@ -196,30 +192,6 @@ void reset_keyboard(void) {
   bootloader_jump();
 }
 
-// Shift / paren setup
-
-#ifndef LSPO_KEY
-  #define LSPO_KEY KC_9
-#endif
-#ifndef RSPC_KEY
-  #define RSPC_KEY KC_0
-#endif
-
-#ifndef LSPO_MOD
-  #define LSPO_MOD KC_LSFT
-#endif
-#ifndef RSPC_MOD
-  #define RSPC_MOD KC_RSFT
-#endif
-
-// Shift / Enter setup
-#ifndef SFTENT_KEY
-  #define SFTENT_KEY KC_ENT
-#endif
-
-static bool shift_interrupted[2] = {0, 0};
-static uint16_t scs_timer[2] = {0, 0};
-
 /* true if the last press of GRAVE_ESC was shifted (i.e. GUI or SHIFT were pressed), false otherwise.
  * Used to ensure that the correct keycode is released if the key is released.
  */
@@ -328,6 +300,9 @@ bool process_record_quantum(keyrecord_t *record) {
   #endif
   #ifdef TERMINAL_ENABLE
     process_terminal(keycode, record) &&
+  #endif
+  #ifdef SPACE_CADET_ENABLE
+    process_space_cadet(keycode, record) &&
   #endif
       true)) {
     return false;
@@ -685,92 +660,6 @@ bool process_record_quantum(keyrecord_t *record) {
         return false;
       }
       break;
-    case KC_LSPO: {
-      if (record->event.pressed) {
-        shift_interrupted[0] = false;
-        scs_timer[0] = timer_read ();
-        register_mods(MOD_BIT(KC_LSFT));
-      }
-      else {
-        #ifdef DISABLE_SPACE_CADET_ROLLOVER
-          if (get_mods() & MOD_BIT(RSPC_MOD)) {
-            shift_interrupted[0] = true;
-            shift_interrupted[1] = true;
-          }
-        #endif
-        if (!shift_interrupted[0] && timer_elapsed(scs_timer[0]) < TAPPING_TERM) {
-          #ifdef DISABLE_SPACE_CADET_MODIFIER
-            unregister_mods(MOD_BIT(KC_LSFT));
-          #else
-            if( LSPO_MOD != KC_LSFT ){
-              unregister_mods(MOD_BIT(KC_LSFT));
-              register_mods(MOD_BIT(LSPO_MOD));
-            }
-          #endif
-          register_code(LSPO_KEY);
-          unregister_code(LSPO_KEY);
-          #ifndef DISABLE_SPACE_CADET_MODIFIER
-            if( LSPO_MOD != KC_LSFT ){
-              unregister_mods(MOD_BIT(LSPO_MOD));
-            }
-          #endif
-        }
-        unregister_mods(MOD_BIT(KC_LSFT));
-      }
-      return false;
-    }
-
-    case KC_RSPC: {
-      if (record->event.pressed) {
-        shift_interrupted[1] = false;
-        scs_timer[1] = timer_read ();
-        register_mods(MOD_BIT(KC_RSFT));
-      }
-      else {
-        #ifdef DISABLE_SPACE_CADET_ROLLOVER
-          if (get_mods() & MOD_BIT(LSPO_MOD)) {
-            shift_interrupted[0] = true;
-            shift_interrupted[1] = true;
-          }
-        #endif
-        if (!shift_interrupted[1] && timer_elapsed(scs_timer[1]) < TAPPING_TERM) {
-          #ifdef DISABLE_SPACE_CADET_MODIFIER
-            unregister_mods(MOD_BIT(KC_RSFT));
-          #else
-            if( RSPC_MOD != KC_RSFT ){
-              unregister_mods(MOD_BIT(KC_RSFT));
-              register_mods(MOD_BIT(RSPC_MOD));
-            }
-          #endif
-          register_code(RSPC_KEY);
-          unregister_code(RSPC_KEY);
-          #ifndef DISABLE_SPACE_CADET_MODIFIER
-            if ( RSPC_MOD != KC_RSFT ){
-              unregister_mods(MOD_BIT(RSPC_MOD));
-            }
-          #endif
-        }
-        unregister_mods(MOD_BIT(KC_RSFT));
-      }
-      return false;
-    }
-
-    case KC_SFTENT: {
-      if (record->event.pressed) {
-        shift_interrupted[1] = false;
-        scs_timer[1] = timer_read ();
-        register_mods(MOD_BIT(KC_RSFT));
-      }
-      else if (!shift_interrupted[1] && timer_elapsed(scs_timer[1]) < TAPPING_TERM) {
-        unregister_mods(MOD_BIT(KC_RSFT));
-        register_code(SFTENT_KEY);
-        unregister_code(SFTENT_KEY);
-      }
-      else {
-        unregister_mods(MOD_BIT(KC_RSFT));
-      }
-      return false;
-    }
 
     case GRAVE_ESC: {
       uint8_t shifted = get_mods() & ((MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)
@@ -825,12 +714,6 @@ bool process_record_quantum(keyrecord_t *record) {
       return false;
     }
 #endif
-
-    default: {
-      shift_interrupted[0] = true;
-      shift_interrupted[1] = true;
-      break;
-    }
   }
 
   return process_action_kb(record);

quantum/quantum.h

@@ -131,6 +131,10 @@ extern uint32_t default_layer_state;
     #include "process_terminal_nop.h"
 #endif
 
+#ifdef SPACE_CADET_ENABLE
+  #include "process_space_cadet.h"
+#endif
+
 #ifdef HD44780_ENABLE
     #include "hd44780.h"
 #endif

quantum/quantum_keycodes.h

@@ -475,6 +475,18 @@ enum quantum_keycodes {
     HPT_DWLI,
     HPT_DWLD,
 
+    // Left control, open paren
+    KC_LCPO,
+
+    // Right control, close paren
+    KC_RCPC,
+
+    // Left control, open paren
+    KC_LAPO,
+
+    // Right control, close paren
+    KC_RAPC,
+
     // always leave at the end
     SAFE_RANGE
 };

quantum/rgb_matrix.c

@@ -144,9 +144,14 @@ void eeconfig_debug_rgb_matrix(void) {
   dprintf("rgb_matrix_config.speed = %d\n", rgb_matrix_config.speed);
 }
 
+__attribute__ ((weak))
+uint8_t rgb_matrix_map_row_column_to_led_kb(uint8_t row, uint8_t column, uint8_t *led_i) {
+  return 0;
+}
+
 uint8_t rgb_matrix_map_row_column_to_led(uint8_t row, uint8_t column, uint8_t *led_i) {
   // TODO: This is kinda expensive, fix this soonish
-  uint8_t led_count = 0;
+  uint8_t led_count = rgb_matrix_map_row_column_to_led_kb(row, column, led_i);
   for (uint8_t i = 0; i < DRIVER_LED_TOTAL && led_count < LED_HITS_TO_REMEMBER; i++) {
     matrix_co_t matrix_co = g_rgb_leds[i].matrix_co;
     if (row == matrix_co.row && column == matrix_co.col) {
@@ -162,28 +167,11 @@ void rgb_matrix_update_pwm_buffers(void) {
 }
 
 void rgb_matrix_set_color( int index, uint8_t red, uint8_t green, uint8_t blue ) {
-#ifdef RGB_MATRIX_EXTRA_TOG
-  const bool is_key = g_rgb_leds[index].matrix_co.raw != 0xff;
-  if (
-    (rgb_matrix_config.enable == RGB_ZONE_KEYS && !is_key) ||
-    (rgb_matrix_config.enable == RGB_ZONE_UNDER && is_key)
-  ) {
-    rgb_matrix_driver.set_color(index, 0, 0, 0);
-    return;
-  }
-#endif
-
   rgb_matrix_driver.set_color(index, red, green, blue);
 }
 
 void rgb_matrix_set_color_all( uint8_t red, uint8_t green, uint8_t blue ) {
-#ifdef RGB_MATRIX_EXTRA_TOG
-  for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
-      rgb_matrix_set_color(i, red, green, blue);
-  }
-#else
   rgb_matrix_driver.set_color_all(red, green, blue);
-#endif
 }
 
 bool process_rgb_matrix(uint16_t keycode, keyrecord_t *record) {
@@ -262,7 +250,7 @@ static bool rgb_matrix_none(effect_params_t* params) {
 
 static uint8_t rgb_last_enable = UINT8_MAX;
 static uint8_t rgb_last_effect = UINT8_MAX;
-static effect_params_t rgb_effect_params = { 0, 0 };
+static effect_params_t rgb_effect_params = { 0, 0xFF };
 static rgb_task_states rgb_task_state = SYNCING;
 
 static void rgb_task_timers(void) {
@@ -575,29 +563,31 @@ void rgb_matrix_set_suspend_state(bool state) {
 }
 
 void rgb_matrix_toggle(void) {
-  rgb_matrix_config.enable++;
+  rgb_matrix_config.enable ^= 1;
-  if (!rgb_matrix_config.enable) {
+  rgb_task_state = STARTING;
-    rgb_task_state = STARTING;
-  }
   eeconfig_update_rgb_matrix(rgb_matrix_config.raw);
 }
 
 void rgb_matrix_enable(void) {
-	rgb_matrix_config.enable = 1;
+  rgb_matrix_enable_noeeprom();
   eeconfig_update_rgb_matrix(rgb_matrix_config.raw);
 }
 
 void rgb_matrix_enable_noeeprom(void) {
-	rgb_matrix_config.enable = 1;
+  if (!rgb_matrix_config.enable)
+    rgb_task_state = STARTING;
+  rgb_matrix_config.enable = 1;
 }
 
 void rgb_matrix_disable(void) {
-	rgb_matrix_config.enable = 0;
+  rgb_matrix_disable_noeeprom();
   eeconfig_update_rgb_matrix(rgb_matrix_config.raw);
 }
 
 void rgb_matrix_disable_noeeprom(void) {
-	rgb_matrix_config.enable = 0;
+  if (rgb_matrix_config.enable)
+    rgb_task_state = STARTING;
+  rgb_matrix_config.enable = 0;
 }
 
 void rgb_matrix_step(void) {
@@ -658,6 +648,14 @@ void rgb_matrix_decrease_speed(void) {
   eeconfig_update_rgb_matrix(rgb_matrix_config.raw);//EECONFIG needs to be increased to support this
 }
 
+led_flags_t rgb_matrix_get_flags(void) {
+  return rgb_effect_params.flags;
+}
+
+void rgb_matrix_set_flags(led_flags_t flags) {
+  rgb_effect_params.flags = flags;
+}
+
 void rgb_matrix_mode(uint8_t mode) {
   rgb_matrix_config.mode = mode;
   rgb_task_state = STARTING;

quantum/rgb_matrix.h

@@ -54,7 +54,9 @@
   uint8_t max = DRIVER_LED_TOTAL;
 #endif
 
-extern const rgb_led g_rgb_leds[DRIVER_LED_TOTAL];
+#define RGB_MATRIX_TEST_LED_FLAGS() if (!HAS_ANY_FLAGS(g_rgb_leds[i].flags, params->flags)) continue
+
+extern rgb_led g_rgb_leds[DRIVER_LED_TOTAL];
 
 typedef struct
 {
@@ -209,6 +211,8 @@ void rgb_matrix_increase_val(void);
 void rgb_matrix_decrease_val(void);
 void rgb_matrix_increase_speed(void);
 void rgb_matrix_decrease_speed(void);
+led_flags_t rgb_matrix_get_flags(void);
+void rgb_matrix_set_flags(led_flags_t flags);
 void rgb_matrix_mode(uint8_t mode);
 void rgb_matrix_mode_noeeprom(uint8_t mode);
 uint8_t rgb_matrix_get_mode(void);

quantum/rgb_matrix_animations/alpha_mods_anim.h

@@ -1,7 +1,7 @@
 #pragma once
 #ifndef DISABLE_RGB_MATRIX_ALPHAS_MODS
 
-extern const rgb_led g_rgb_leds[DRIVER_LED_TOTAL];
+extern rgb_led g_rgb_leds[DRIVER_LED_TOTAL];
 extern rgb_config_t rgb_matrix_config;
 
 // alphas = color1, mods = color2
@@ -14,7 +14,8 @@ bool rgb_matrix_alphas_mods(effect_params_t* params) {
   RGB rgb2 = hsv_to_rgb(hsv);
 
   for (uint8_t i = led_min; i < led_max; i++) {
-    if (g_rgb_leds[i].modifier) {
+    RGB_MATRIX_TEST_LED_FLAGS();
+    if (HAS_FLAGS(g_rgb_leds[i].flags, LED_FLAG_MODIFIER)) {
       rgb_matrix_set_color(i, rgb2.r, rgb2.g, rgb2.b);
     } else {
       rgb_matrix_set_color(i, rgb1.r, rgb1.g, rgb1.b);

quantum/rgb_matrix_animations/breathing_anim.h

@@ -12,6 +12,7 @@ bool rgb_matrix_breathing(effect_params_t* params) {
   HSV hsv = { rgb_matrix_config.hue, rgb_matrix_config.sat, val };
   RGB rgb = hsv_to_rgb(hsv);
   for (uint8_t i = led_min; i < led_max; i++) {
+    RGB_MATRIX_TEST_LED_FLAGS();
     rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
   }
   return led_max < DRIVER_LED_TOTAL;

quantum/rgb_matrix_animations/cycle_all_anim.h

@@ -2,16 +2,16 @@
 #ifndef DISABLE_RGB_MATRIX_CYCLE_ALL
 
 extern rgb_counters_t g_rgb_counters;
-extern const rgb_led g_rgb_leds[DRIVER_LED_TOTAL];
+extern rgb_led g_rgb_leds[DRIVER_LED_TOTAL];
 extern rgb_config_t rgb_matrix_config;
 
 bool rgb_matrix_cycle_all(effect_params_t* params) {
   RGB_MATRIX_USE_LIMITS(led_min, led_max);
 
   HSV hsv = { 0, rgb_matrix_config.sat, rgb_matrix_config.val };
-  uint8_t time = scale16by8(g_rgb_counters.tick, rgb_matrix_config.speed / 4);
+  hsv.h = scale16by8(g_rgb_counters.tick, rgb_matrix_config.speed / 4);
   for (uint8_t i = led_min; i < led_max; i++) {
-    hsv.h = time;
+    RGB_MATRIX_TEST_LED_FLAGS();
     RGB rgb = hsv_to_rgb(hsv);
     rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
   }