6 files changed, 84 insertions, 36 deletions
diff --git a/keyboards/uzu42/rev1/config.h b/keyboards/uzu42/rev1/config.h
index 815442ed21..d8f474257e 100644
--- a/keyboards/uzu42/rev1/config.h
+++ b/keyboards/uzu42/rev1/config.h
@@ -18,13 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x3060
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    nrtkbb
-#define PRODUCT         uzu42
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 8
@@ -54,10 +47,24 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
 
-#ifdef RGBLIGHT_ENABLE
-#   define RGBLED_NUM 54    // Number of LEDs
-#   define RGBLED_SPLIT { 27, 27 }
-#endif
+#define RGBLED_NUM 54    // Number of LEDs
+#define RGBLED_SPLIT { 27, 27 }
+
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+// #define RGBLIGHT_EFFECT_RGB_TEST
+// #define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+
+#define RGBLIGHT_LIMIT_VAL 120
+#define RGBLIGHT_HUE_STEP 10
+#define RGBLIGHT_SAT_STEP 17
+#define RGBLIGHT_VAL_STEP 17
 
 /*
  * Feature disable options
diff --git a/keyboards/uzu42/rev1/info.json b/keyboards/uzu42/rev1/info.json
new file mode 100644
index 0000000000..f96564f36b
--- /dev/null
+++ b/keyboards/uzu42/rev1/info.json
@@ -0,0 +1,59 @@
+{
+  "keyboard_name": "uzu42",
+  "manufacturer": "nrtkbb",
+  "url": "https://github.com/nrtkbb/Keyboards/tree/master/uzu42",
+  "maintainer": "nrtkbb",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x3060",
+    "device_version": "0.0.1"
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"label":"Q", "x":0.375, "y":0},
+        {"label":"W", "x":1.375, "y":0},
+        {"label":"E", "x":2.375, "y":0},
+        {"label":"R", "x":3.375, "y":0.125},
+        {"label":"T", "x":4.375, "y":0.25},
+        {"label":"Y", "x":7.625, "y":0.25},
+        {"label":"U", "x":8.625, "y":0.125},
+        {"label":"I", "x":9.625, "y":0},
+        {"label":"O", "x":10.625, "y":0},
+        {"label":"P", "x":11.625, "y":0},
+        {"label":"A", "x":0.25, "y":1},
+        {"label":"S", "x":1.25, "y":1},
+        {"label":"D", "x":2.25, "y":1},
+        {"label":"F", "x":3.25, "y":1.125},
+        {"label":"G", "x":4.25, "y":1.25},
+        {"label":"H", "x":7.75, "y":1.25},
+        {"label":"J", "x":8.75, "y":1.125},
+        {"label":"K", "x":9.75, "y":1},
+        {"label":"L", "x":10.75, "y":1},
+        {"label":"Ent", "x":11.75, "y":1},
+        {"label":"Z", "x":0.125, "y":2},
+        {"label":"X", "x":1.125, "y":2},
+        {"label":"C", "x":2.125, "y":2},
+        {"label":"V", "x":3.125, "y":2.125},
+        {"label":"B", "x":4.125, "y":2.25},
+        {"label":"N", "x":7.875, "y":2.25},
+        {"label":"M", "x":8.875, "y":2.125},
+        {"label":",", "x":9.875, "y":2},
+        {"label":".", "x":10.875, "y":2},
+        {"label":"/", "x":11.875, "y":2},
+        {"label":"Shift", "x":0, "y":3},
+        {"label":"Space", "x":1, "y":3},
+        {"label":"Alt", "x":2, "y":3.05},
+        {"label":"GUI", "x":3, "y":3.18},
+        {"label":"Lower", "x":4, "y":3.3},
+        {"label":"Esc", "x":5, "y":3.43},
+        {"label":"Space", "x":7, "y":3.43},
+        {"label":"Raise", "x":8, "y":3.3},
+        {"label":"BkSpc", "x":9, "y":3.18},
+        {"label":"Ctrl", "x":10, "y":3.05},
+        {"label":"GUI", "x":11, "y":3},
+        {"label":"No", "x":12, "y":3}
+      ]
+    }
+  }
+}
diff --git a/keyboards/uzu42/rev1/rev1.c b/keyboards/uzu42/rev1/rev1.c
index 0bfac6bd93..e22860d04b 100644
--- a/keyboards/uzu42/rev1/rev1.c
+++ b/keyboards/uzu42/rev1/rev1.c
@@ -1,2 +1,4 @@
-#include "uzu42.h"
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "uzu42.h"
diff --git a/keyboards/uzu42/rev1/rev1.h b/keyboards/uzu42/rev1/rev1.h
index 7b9c7d5991..e4aba8b79b 100644
--- a/keyboards/uzu42/rev1/rev1.h
+++ b/keyboards/uzu42/rev1/rev1.h
@@ -1,22 +1,12 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #pragma once
 
-#include "../uzu42.h"
+#include "uzu42.h"
 
 #include "quantum.h"
 
-#ifdef RGBLIGHT_ENABLE
-//rgb led driver
-#include "ws2812.h"
-#endif
-
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-	#include <avr/io.h>
-	#include <avr/interrupt.h>
-#endif
-#endif
-
 #define LAYOUT( \
   L00, L01, L02, L03, L04,           R00, R01, R02, R03, R04, \
   L10, L11, L12, L13, L14,           R10, R11, R12, R13, R14, \
@@ -33,4 +23,3 @@
     { R24, R23, R22, R21, R20 }, \
     { R35, R34, R33, R32, R31, R30 } \
   }
-
diff --git a/keyboards/uzu42/rev1/serial_config.h b/keyboards/uzu42/rev1/serial_config.h
deleted file mode 100644
index 4fab8e8ddf..0000000000
--- a/keyboards/uzu42/rev1/serial_config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef SOFT_SERIAL_PIN
-#define SOFT_SERIAL_PIN D2
-#define SERIAL_USE_MULTI_TRANSACTION
-#endif
diff --git a/keyboards/uzu42/rev1/serial_config_simpleapi.h b/keyboards/uzu42/rev1/serial_config_simpleapi.h
deleted file mode 100644
index 0e1dd9e4ac..0000000000
--- a/keyboards/uzu42/rev1/serial_config_simpleapi.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#undef SERIAL_USE_MULTI_TRANSACTION
-#define SERIAL_SLAVE_BUFFER_LENGTH MATRIX_ROWS/2
-#define SERIAL_MASTER_BUFFER_LENGTH MATRIX_ROWS/2