5 files changed, 40 insertions, 57 deletions
diff --git a/keyboards/deng/djam/config.h b/keyboards/deng/djam/config.h
index 8193eae02f..39ea6d6e90 100644
--- a/keyboards/deng/djam/config.h
+++ b/keyboards/deng/djam/config.h
@@ -15,13 +15,7 @@
  */
 #pragma once
 
-
-#define MATRIX_ROW_PINS { F0, F1, F4 }
-#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4 }
-#define DIODE_DIRECTION COL2ROW
-
 #ifdef RGB_MATRIX_ENABLE
-#define RGB_DI_PIN D5
 #define RGB_MATRIX_LED_COUNT 31
 #define RGB_MATRIX_KEYPRESSES
 #define ENABLE_RGB_MATRIX_BREATHING
diff --git a/keyboards/deng/djam/djam.c b/keyboards/deng/djam/djam.c
index c7b986cf9e..3514ff050c 100644
--- a/keyboards/deng/djam/djam.c
+++ b/keyboards/deng/djam/djam.c
@@ -13,7 +13,7 @@
  * 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 "djam.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = {
diff --git a/keyboards/deng/djam/djam.h b/keyboards/deng/djam/djam.h
deleted file mode 100644
index bf740f736a..0000000000
--- a/keyboards/deng/djam/djam.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2022 Leo Deng (@myst729)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-          K000, K001, K002,                   K005, K006, K007, \
-    K100, K101, K102, K103,                   K104, K105, K106, K107, \
-    K200, K201,             K202, K203, K204,             K205, K206  \
-) { \
-    { K000,  K001,  K002,  KC_NO, KC_NO, K005,  K006,  K007 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107 }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  KC_NO } \
-}
diff --git a/keyboards/deng/djam/info.json b/keyboards/deng/djam/info.json
index abf18685b2..7257ebabb8 100644
--- a/keyboards/deng/djam/info.json
+++ b/keyboards/deng/djam/info.json
@@ -8,37 +8,55 @@
         "pid": "0x7325",
         "device_version": "0.0.1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+        "rows": ["F0", "F1", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B7",
         "levels": 5
     },
+    "ws2812": {
+        "pin": "D5"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "x": 1, "y": 0 },
-                { "x": 2, "y": 0 },
-                { "x": 3, "y": 0 },
-                { "x": 7, "y": 0 },
-                { "x": 8, "y": 0 },
-                { "x": 9, "y": 0 },
-                { "x": 0, "y": 0.5, "h": 2 },
-                { "x": 1, "y": 1 },
-                { "x": 2, "y": 1 },
-                { "x": 3, "y": 1 },
-                { "x": 7, "y": 1 },
-                { "x": 8, "y": 1 },
-                { "x": 9, "y": 1 },
-                { "x": 10, "y": 0.5, "h": 2 },
-                { "x": 0, "y": 3 },
-                { "x": 1, "y": 3 },
-                { "x": 3, "y": 3, "w": 2 },
-                { "x": 5, "y": 3 },
-                { "x": 6, "y": 3, "w": 2 },
-                { "x": 9, "y": 3 },
-                { "x": 10, "y": 3 }
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+
+                {"matrix": [0, 5], "x": 7, "y": 0},
+                {"matrix": [0, 6], "x": 8, "y": 0},
+                {"matrix": [0, 7], "x": 9, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 0.5, "h": 2},
+
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+
+                {"matrix": [1, 4], "x": 7, "y": 1},
+                {"matrix": [1, 5], "x": 8, "y": 1},
+                {"matrix": [1, 6], "x": 9, "y": 1},
+
+                {"matrix": [1, 7], "x": 10, "y": 0.5, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+                {"matrix": [2, 2], "x": 3, "y": 3, "w": 2},
+                {"matrix": [2, 3], "x": 5, "y": 3},
+                {"matrix": [2, 4], "x": 6, "y": 3, "w": 2},
+                {"matrix": [2, 5], "x": 9, "y": 3},
+                {"matrix": [2, 6], "x": 10, "y": 3}
             ]
         }
     }
+
 }
diff --git a/keyboards/deng/djam/rules.mk b/keyboards/deng/djam/rules.mk
index 42a6d2bd1b..150b7c690d 100644
--- a/keyboards/deng/djam/rules.mk
+++ b/keyboards/deng/djam/rules.mk
@@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812