[Keyboard] Capsunlocked CU80 Squish and Refactor (#12193)

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Erovia <Erovia@users.noreply.github.com>

10 files changed, 214 insertions, 146 deletions

diff --git a/keyboards/capsunlocked/cu80/v2_iso/config.h b/keyboards/capsunlocked/cu80/v2_iso/config.h
index d757fd33a3..7980837acf 100644
--- a/keyboards/capsunlocked/cu80/v2_iso/config.h
+++ b/keyboards/capsunlocked/cu80/v2_iso/config.h
@@ -19,37 +19,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4355
-#define PRODUCT_ID      0x0080
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    CapsUnlocked
-#define PRODUCT         CU80 v2 ISO
-
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 17
-
-#define MATRIX_ROW_PINS { D3, D2, B7, F1, C7, D5 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, F4, F5, F6, F7, B6, B5, D7, B4, D6, F0, D1, C6, D4 }
-#define UNUSED_PINS
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
 
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
-    #define RGBLIGHT_ANIMATIONS
-    #define RGBLED_NUM 88
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #define RGBLIGHT_LIMIT_VAL 50
-#endif
+/* Define RGB */
+#define DRIVER_LED_TOTAL 88
+#define RGBLIGHT_ANIMATIONS
diff --git a/keyboards/capsunlocked/cu80/v2_iso/info.json b/keyboards/capsunlocked/cu80/v2_iso/info.json
index 746e3ae7c8..fd572704d9 100644
--- a/keyboards/capsunlocked/cu80/v2_iso/info.json
+++ b/keyboards/capsunlocked/cu80/v2_iso/info.json
@@ -1,101 +1,143 @@
 {
-    "keyboard_name": "CapsUnlocked CU80 v2 ISO",
-    "maintainer": "rys",
-    "url": "https://caps-unlocked.com/cu80-round-2/",
-    "width": 18.25,
-    "height": 6.5,
-    "layouts": {
-        "LAYOUT_tkl_iso": {
-            "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-                {"label":"\u00ac", "x":0, "y":1.5},
-                {"label":"!", "x":1, "y":1.5},
-                {"label":"\"", "x":2, "y":1.5},
-                {"label":"£", "x":3, "y":1.5},
-                {"label":"$", "x":4, "y":1.5},
-                {"label":"%", "x":5, "y":1.5},
-                {"label":"^", "x":6, "y":1.5},
-                {"label":"&", "x":7, "y":1.5},
-                {"label":"*", "x":8, "y":1.5},
-                {"label":"(", "x":9, "y":1.5},
-                {"label":")", "x":10, "y":1.5},
-                {"label":"_", "x":11, "y":1.5},
-                {"label":"+", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "y":1.5},
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"{", "x":11.5, "y":2.5},
-                {"label":"}", "x":12.5, "y":2.5},
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":":", "x":10.75, "y":3.5},
-                {"label":"@", "x":11.75, "y":3.5},
-                {"label":"~", "x":12.75, "y":3.5},
-                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-                {"label":"|", "x":1.25, "y":4.5},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":"<", "x":9.25, "y":4.5},
-                {"label":">", "x":10.25, "y":4.5},
-                {"label":"?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"Up", "x":16.25, "y":4.5},
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Win", "x":2.5, "y":5.5, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.5, "w":6.25},
-                {"label":"Win", "x":10, "y":5.5, "w":1.25},
-                {"label":"AltGr", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Fn", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"Left", "x":15.25, "y":5.5},
-                {"label":"Down", "x":16.25, "y":5.5},
-                {"label":"Right", "x":17.25, "y":5.5}
-            ]
-        }
+  "manufacturer": "CapsUnlocked",
+  "keyboard_name": "CapsUnlocked CU80 v2 ISO",
+  "maintainer": "rys / maz0r",
+  "height": 6.5,
+  "width": 18.25,
+  "bootloader": "atmel-dfu",
+  "debounce": 5,
+  "diode_direction": "COL2ROW",
+  "features": {
+    "audio": false,
+    "backlight": false,
+    "bluetooth": false,
+    "bootmagic_lite": true,
+    "command": false,
+    "console": false,
+    "extrakey": true,
+    "mousekey": false,
+    "nkro": true,
+    "rgblight": true,
+    "sleep_led": false,
+    "unicode": false
+  },
+  "matrix_pins": {
+    "cols": ["B0", "B1", "B2", "B3", "F4", "F5", "F6", "F7", "B6", "B5", "D7", "B4", "D6", "F0", "D1", "C6", "D4"],
+    "rows": ["D3", "D2", "B7", "F1", "C7", "D5"]
+  },
+  "processor": "atmega32u4",
+  "rgblight": {
+    "animations": {
+      "all": false
+    },
+    "brightness_steps": 8,
+    "hue_steps": 8,
+    "led_count": 88,
+    "max_brightness": 50,
+    "pin": "E6",
+    "saturation_steps": 8
+  },
+  "url": "https://caps-unlocked.com/cu80-round-2/",
+  "usb": {
+    "device_ver": "0x0001",
+    "pid": "0x0080",
+    "vid": "0x4355"
+  },
+  "community_layouts": ["tkl_iso"],
+  "layouts": {
+    "LAYOUT_tkl_iso": {
+      "c_macro": true,
+      "filename": "keyboards/capsunlocked/cu80/v2_iso/v2_iso.h",
+      "layout": [
+        { "label": "Esc", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+        { "label": "F1", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+        { "label": "F2", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+        { "label": "F3", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
+        { "label": "F4", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
+        { "label": "F5", "matrix": [0, 6], "w": 1, "x": 6.5, "y": 0 },
+        { "label": "F6", "matrix": [0, 7], "w": 1, "x": 7.5, "y": 0 },
+        { "label": "F7", "matrix": [0, 8], "w": 1, "x": 8.5, "y": 0 },
+        { "label": "F8", "matrix": [0, 9], "w": 1, "x": 9.5, "y": 0 },
+        { "label": "F9", "matrix": [0, 10], "w": 1, "x": 11, "y": 0 },
+        { "label": "F10", "matrix": [0, 11], "w": 1, "x": 12, "y": 0 },
+        { "label": "F11", "matrix": [0, 12], "w": 1, "x": 13, "y": 0 },
+        { "label": "F12", "matrix": [0, 13], "w": 1, "x": 14, "y": 0 },
+        { "label": "PrtSc", "matrix": [0, 14], "w": 1, "x": 15.25, "y": 0 },
+        { "label": "Scroll Lock", "matrix": [0, 15], "w": 1, "x": 16.25, "y": 0 },
+        { "label": "Pause", "matrix": [0, 16], "w": 1, "x": 17.25, "y": 0 },
+        { "label": "\u00ac", "matrix": [1, 0], "w": 1, "x": 0, "y": 1.5 },
+        { "label": "!", "matrix": [1, 1], "w": 1, "x": 1, "y": 1.5 },
+        { "label": "\"", "matrix": [1, 2], "w": 1, "x": 2, "y": 1.5 },
+        { "label": "\u00a3", "matrix": [1, 3], "w": 1, "x": 3, "y": 1.5 },
+        { "label": "$", "matrix": [1, 4], "w": 1, "x": 4, "y": 1.5 },
+        { "label": "%", "matrix": [1, 5], "w": 1, "x": 5, "y": 1.5 },
+        { "label": "^", "matrix": [1, 6], "w": 1, "x": 6, "y": 1.5 },
+        { "label": "&", "matrix": [1, 7], "w": 1, "x": 7, "y": 1.5 },
+        { "label": "*", "matrix": [1, 8], "w": 1, "x": 8, "y": 1.5 },
+        { "label": "(", "matrix": [1, 9], "w": 1, "x": 9, "y": 1.5 },
+        { "label": ")", "matrix": [1, 10], "w": 1, "x": 10, "y": 1.5 },
+        { "label": "_", "matrix": [1, 11], "w": 1, "x": 11, "y": 1.5 },
+        { "label": "+", "matrix": [1, 12], "w": 1, "x": 12, "y": 1.5 },
+        { "label": "Backspace", "matrix": [1, 13], "w": 2, "x": 13, "y": 1.5 },
+        { "label": "Insert", "matrix": [1, 14], "w": 1, "x": 15.25, "y": 1.5 },
+        { "label": "Home", "matrix": [1, 15], "w": 1, "x": 16.25, "y": 1.5 },
+        { "label": "PgUp", "matrix": [1, 16], "w": 1, "x": 17.25, "y": 1.5 },
+        { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.5 },
+        { "label": "Q", "matrix": [2, 1], "w": 1, "x": 1.5, "y": 2.5 },
+        { "label": "W", "matrix": [2, 2], "w": 1, "x": 2.5, "y": 2.5 },
+        { "label": "E", "matrix": [2, 3], "w": 1, "x": 3.5, "y": 2.5 },
+        { "label": "R", "matrix": [2, 4], "w": 1, "x": 4.5, "y": 2.5 },
+        { "label": "T", "matrix": [2, 5], "w": 1, "x": 5.5, "y": 2.5 },
+        { "label": "Y", "matrix": [2, 6], "w": 1, "x": 6.5, "y": 2.5 },
+        { "label": "U", "matrix": [2, 7], "w": 1, "x": 7.5, "y": 2.5 },
+        { "label": "I", "matrix": [2, 8], "w": 1, "x": 8.5, "y": 2.5 },
+        { "label": "O", "matrix": [2, 9], "w": 1, "x": 9.5, "y": 2.5 },
+        { "label": "P", "matrix": [2, 10], "w": 1, "x": 10.5, "y": 2.5 },
+        { "label": "{", "matrix": [2, 11], "w": 1, "x": 11.5, "y": 2.5 },
+        { "label": "}", "matrix": [2, 12], "w": 1, "x": 12.5, "y": 2.5 },
+        { "label": "Delete", "matrix": [2, 14], "w": 1, "x": 15.25, "y": 2.5 },
+        { "label": "End", "matrix": [2, 15], "w": 1, "x": 16.25, "y": 2.5 },
+        { "label": "PgDn", "matrix": [2, 16], "w": 1, "x": 17.25, "y": 2.5 },
+        { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.5 },
+        { "label": "A", "matrix": [3, 1], "w": 1, "x": 1.75, "y": 3.5 },
+        { "label": "S", "matrix": [3, 2], "w": 1, "x": 2.75, "y": 3.5 },
+        { "label": "D", "matrix": [3, 3], "w": 1, "x": 3.75, "y": 3.5 },
+        { "label": "F", "matrix": [3, 4], "w": 1, "x": 4.75, "y": 3.5 },
+        { "label": "G", "matrix": [3, 5], "w": 1, "x": 5.75, "y": 3.5 },
+        { "label": "H", "matrix": [3, 6], "w": 1, "x": 6.75, "y": 3.5 },
+        { "label": "J", "matrix": [3, 7], "w": 1, "x": 7.75, "y": 3.5 },
+        { "label": "K", "matrix": [3, 8], "w": 1, "x": 8.75, "y": 3.5 },
+        { "label": "L", "matrix": [3, 9], "w": 1, "x": 9.75, "y": 3.5 },
+        { "label": ":", "matrix": [3, 10], "w": 1, "x": 10.75, "y": 3.5 },
+        { "label": "@", "matrix": [3, 11], "w": 1, "x": 11.75, "y": 3.5 },
+        { "label": "~", "matrix": [3, 12], "w": 1, "x": 12.75, "y": 3.5 },
+        { "h": 2, "label": "Enter", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 2.5 },
+        { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.5 },
+        { "label": "|", "matrix": [4, 1], "w": 1, "x": 1.25, "y": 4.5 },
+        { "label": "Z", "matrix": [4, 2], "w": 1, "x": 2.25, "y": 4.5 },
+        { "label": "X", "matrix": [4, 3], "w": 1, "x": 3.25, "y": 4.5 },
+        { "label": "C", "matrix": [4, 4], "w": 1, "x": 4.25, "y": 4.5 },
+        { "label": "V", "matrix": [4, 5], "w": 1, "x": 5.25, "y": 4.5 },
+        { "label": "B", "matrix": [4, 6], "w": 1, "x": 6.25, "y": 4.5 },
+        { "label": "N", "matrix": [4, 7], "w": 1, "x": 7.25, "y": 4.5 },
+        { "label": "M", "matrix": [4, 8], "w": 1, "x": 8.25, "y": 4.5 },
+        { "label": "<", "matrix": [4, 9], "w": 1, "x": 9.25, "y": 4.5 },
+        { "label": ">", "matrix": [4, 10], "w": 1, "x": 10.25, "y": 4.5 },
+        { "label": "?", "matrix": [4, 11], "w": 1, "x": 11.25, "y": 4.5 },
+        { "label": "Shift", "matrix": [4, 12], "w": 2.75, "x": 12.25, "y": 4.5 },
+        { "label": "Up", "matrix": [4, 15], "w": 1, "x": 16.25, "y": 4.5 },
+        { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.5 },
+        { "label": "Alt", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.5 },
+        { "label": "Win", "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.5 },
+        { "label": "Space", "matrix": [5, 5], "w": 6.25, "x": 3.75, "y": 5.5 },
+        { "label": "Win", "matrix": [5, 9], "w": 1.25, "x": 10, "y": 5.5 },
+        { "label": "AltGr", "matrix": [5, 10], "w": 1.25, "x": 11.25, "y": 5.5 },
+        { "label": "Ctrl", "matrix": [5, 11], "w": 1.25, "x": 12.5, "y": 5.5 },
+        { "label": "Fn", "matrix": [5, 12], "w": 1.25, "x": 13.75, "y": 5.5 },
+        { "label": "Left", "matrix": [5, 13], "w": 1, "x": 15.25, "y": 5.5 },
+        { "label": "Down", "matrix": [5, 15], "w": 1, "x": 16.25, "y": 5.5 },
+        { "label": "Right", "matrix": [5, 16], "w": 1, "x": 17.25, "y": 5.5 }
+      ]
     }
+  }
 }
diff --git a/keyboards/capsunlocked/cu80/v2_iso/keymaps/default/keymap.c b/keyboards/capsunlocked/cu80/v2_iso/keymaps/default/keymap.c
index 2438a9ebc9..1b1caa8776 100644
--- a/keyboards/capsunlocked/cu80/v2_iso/keymaps/default/keymap.c
+++ b/keyboards/capsunlocked/cu80/v2_iso/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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_DEL,  KC_END,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
     KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,          KC_UP,
-    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_APP,  KC_RCTL, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),   KC_APP,  KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
   ),
   [1] = LAYOUT_tkl_iso(
     RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_M_P, RGB_M_B, RGB_M_R,
diff --git a/keyboards/capsunlocked/cu80/v2_iso/keymaps/via/keymap.c b/keyboards/capsunlocked/cu80/v2_iso/keymaps/via/keymap.c
index 3f6c28abb2..f63ab5a53c 100644
--- a/keyboards/capsunlocked/cu80/v2_iso/keymaps/via/keymap.c
+++ b/keyboards/capsunlocked/cu80/v2_iso/keymaps/via/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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_DEL,  KC_END,  KC_PGDN,
     KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
     KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,          KC_UP,
-    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_APP,  KC_RCTL, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),   KC_APP,  KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
   ),
   [1] = LAYOUT_tkl_iso(
     RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_M_P, RGB_M_B, RGB_M_R,
diff --git a/keyboards/capsunlocked/cu80/v2_iso/readme.md b/keyboards/capsunlocked/cu80/v2_iso/readme.md
index bcdbfaa627..cf8c5fc6fa 100644
--- a/keyboards/capsunlocked/cu80/v2_iso/readme.md
+++ b/keyboards/capsunlocked/cu80/v2_iso/readme.md
@@ -4,12 +4,13 @@ The CU80 v2 ISO is the PCB for round 2 of the CU80 TKL keyboard, with fixed layo
 
 To place the keyboard into bootloader mode in order to flash it, hold the ESC key while plugging the board in, or use the reset button on the back of the PCB.
 
-* Keyboard maintainer: [rys](https://github.com/rys)
+* Keyboard maintainer: [rys](https://github.com/rys) & [maz0r](https://github.com/maz0r)
 * Hardware supported: [CU80 v2 ISO](https://imgur.com/yMZMt6j)
 * Hardware availability: [CapsUnlocked](https://caps-unlocked.com/cu80-round-2/)
 
 Make and flash example for this keyboard (after setting up your build environment):
 
     make capsunlocked/cu80/v2_iso:default:flash
+    make capsunlocked/cu80/v2_iso/rgb:default:flash
     
 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).
diff --git a/keyboards/capsunlocked/cu80/v2_iso/rgb/config.h b/keyboards/capsunlocked/cu80/v2_iso/rgb/config.h
new file mode 100644
index 0000000000..1936150aba
--- /dev/null
+++ b/keyboards/capsunlocked/cu80/v2_iso/rgb/config.h
@@ -0,0 +1,36 @@
+/*
+Copyright 2021 CapsUnlocked
+
+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/>.
+*/
+
+/* enable RGB matrix */
+#define CU80_RGB
+
+/* update the product for RGB Matrix variant in VIA/VIAL and Remap-keys.app */
+#undef PRODUCT_ID
+#undef PRODUCT
+#define PRODUCT_ID      0x0083
+#define PRODUCT         CU80 v2 ISO RGB
+
+/* moved to RGB specific */
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
+
+/* RGB firmware override */
+#undef RGBLIGHT_ANIMATIONS
+#undef RGBLIGHT_HUE_STEP
+#undef RGBLIGHT_SAT_STEP
+#undef RGBLIGHT_VAL_STEP
+#undef RGBLIGHT_LIMIT_VAL
diff --git a/keyboards/capsunlocked/cu80/v2_iso/rgb/readme.md b/keyboards/capsunlocked/cu80/v2_iso/rgb/readme.md
new file mode 100644
index 0000000000..c53bf74078
--- /dev/null
+++ b/keyboards/capsunlocked/cu80/v2_iso/rgb/readme.md
@@ -0,0 +1,3 @@
+# CU80 v2 ISO RGB
+
+Overrides
\ No newline at end of file
diff --git a/keyboards/capsunlocked/cu80/v2_iso/rgb/rules.mk b/keyboards/capsunlocked/cu80/v2_iso/rgb/rules.mk
new file mode 100644
index 0000000000..d4e53eda16
--- /dev/null
+++ b/keyboards/capsunlocked/cu80/v2_iso/rgb/rules.mk
@@ -0,0 +1,3 @@
+RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
+RGB_MATRIX_ENABLE = yes     # Enable RGB matrix
+RGB_MATRIX_DRIVER = WS2812  # Set Driver to WS2812
diff --git a/keyboards/capsunlocked/cu80/v2_iso/rules.mk b/keyboards/capsunlocked/cu80/v2_iso/rules.mk
index 5650414182..7c5554a087 100644
--- a/keyboards/capsunlocked/cu80/v2_iso/rules.mk
+++ b/keyboards/capsunlocked/cu80/v2_iso/rules.mk
@@ -7,19 +7,4 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = yes           # USB Nkey Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth
-AUDIO_ENABLE = no           # Audio output
-
-LAYOUTS = tkl_iso
+NO_USB_STARTUP_CHECK = yes  # resolve possible sleep issue
diff --git a/keyboards/capsunlocked/cu80/v2_iso/v2_iso.c b/keyboards/capsunlocked/cu80/v2_iso/v2_iso.c
index 748deb1086..2caef36bc7 100644
--- a/keyboards/capsunlocked/cu80/v2_iso/v2_iso.c
+++ b/keyboards/capsunlocked/cu80/v2_iso/v2_iso.c
@@ -16,3 +16,27 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "v2_iso.h"
+#ifdef CU80_RGB
+
+void matrix_init_kb(void) {
+    setPinOutput(E6);
+    matrix_init_user();
+}
+
+/* Set LED 62 (Caps Lock) and LED 14 (Scroll Lock) when key active */
+void rgb_matrix_indicators_kb(void) {
+    if (host_keyboard_led_state().caps_lock) {
+        rgb_matrix_set_color(62, 255, 255, 255);
+    }
+    if (host_keyboard_led_state().scroll_lock) {
+        rgb_matrix_set_color(14, 255, 255, 255);
+    }
+}
+
+/* Leds on the CU80 go ltr > rtl > ltr > rlt > Ltr > rtl */
+led_config_t g_led_config = {{{0, NO_LED, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}, {32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16}, {33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49}, {62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50}, {63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, NO_LED, NO_LED, 76}, {87, 86, 85, NO_LED, NO_LED, 84, NO_LED, NO_LED, NO_LED, 83, 82, 81, 80, 79, NO_LED, 78, 77}},
+                             /*board layout accounting for led directions */
+                             {{0, 0}, {28, 0}, {42, 0}, {56, 0}, {71, 0}, {85, 0}, {99, 0}, {113, 0}, {127, 0}, {141, 0}, {155, 0}, {169, 0}, {184, 0}, {198, 0}, {212, 0}, {226, 0}, {226, 26}, {212, 26}, {198, 26}, {184, 26}, {169, 26}, {155, 26}, {141, 26}, {127, 26}, {113, 26}, {99, 26}, {85, 26}, {71, 26}, {56, 26}, {42, 26}, {28, 26}, {14, 26}, {0, 26}, {0, 26}, {14, 26}, {28, 26}, {42, 26}, {56, 26}, {71, 26}, {85, 26}, {99, 26}, {113, 26}, {127, 26}, {141, 26}, {155, 26}, {169, 26}, {184, 26}, {198, 26}, {212, 26}, {226, 26}, {169, 38}, {155, 38}, {141, 38}, {127, 38}, {113, 38}, {99, 38}, {85, 38}, {71, 38}, {56, 38}, {42, 38}, {28, 38}, {14, 38}, {0, 38}, {0, 51}, {14, 51}, {28, 51}, {42, 51}, {56, 51}, {71, 51}, {85, 51}, {99, 51}, {113, 51}, {127, 51}, {141, 51}, {155, 51}, {169, 51}, {212, 51}, {226, 64}, {212, 64}, {184, 64}, {169, 64}, {155, 64}, {141, 64}, {127, 64}, {71, 64}, {28, 64}, {14, 64}, {0, 64}},
+                             /* marks scroll and caps as function modifiers for led effects */
+                             {4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 8, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 4, 4, 4, 4, 1, 1, 1, 1, 4, 1, 1, 1}};
+#endif