Merge branch 'develop'

5 files changed, 21 insertions, 53 deletions

diff --git a/keyboards/yncognito/batpad/batpad.c b/keyboards/yncognito/batpad/batpad.c
index caafd57278..d5eef4246d 100644
--- a/keyboards/yncognito/batpad/batpad.c
+++ b/keyboards/yncognito/batpad/batpad.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 "batpad.h"
+#include "quantum.h"
 
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/yncognito/batpad/batpad.h b/keyboards/yncognito/batpad/batpad.h
deleted file mode 100644
index e3391881bc..0000000000
--- a/keyboards/yncognito/batpad/batpad.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2020 Yncognito
- *
- * 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_ortho_2x4( \
-    K00, K01, K02, K03,   \
-    K10, K11, K12, K13    \
-) { \
-    { K00,   K01,   K02,   K03   }, \
-    { K10,   K11,   K12,   K13   }, \
-}
diff --git a/keyboards/yncognito/batpad/config.h b/keyboards/yncognito/batpad/config.h
index fb4155c48d..d44817cae9 100644
--- a/keyboards/yncognito/batpad/config.h
+++ b/keyboards/yncognito/batpad/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, C7 }
-#define MATRIX_COL_PINS { F1, F0, D5, D3 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B5
 #define RGB_MATRIX_LED_COUNT 8
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_KEYRELEASES
diff --git a/keyboards/yncognito/batpad/info.json b/keyboards/yncognito/batpad/info.json
index 01d2032d2e..ec57403a66 100644
--- a/keyboards/yncognito/batpad/info.json
+++ b/keyboards/yncognito/batpad/info.json
@@ -8,19 +8,31 @@
         "pid": "0x6602",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "B5"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "matrix_pins": {
+        "cols": ["F1", "F0", "D5", "D3"],
+        "rows": ["F4", "C7"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_ortho_2x4": {
             "layout": [
-                {"label":"K00 (F4,F1)", "x":0, "y":0},
-                {"label":"K01 (F4,F0)", "x":1, "y":0},
-                {"label":"K02 (F4,D5)", "x":2, "y":0},
-                {"label":"K03 (F4,D3)", "x":3, "y":0},
-                {"label":"K10 (C7,F1)", "x":0, "y":1},
-                {"label":"K11 (C7,F0)", "x":1, "y":1},
-                {"label":"K12 (C7,D5)", "x":2, "y":1},
-                {"label":"K13 (C7,D3)", "x":3, "y":1}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1}
             ]
         }
     }
diff --git a/keyboards/yncognito/batpad/rules.mk b/keyboards/yncognito/batpad/rules.mk
index 8009de294e..a72bbe128b 100644
--- a/keyboards/yncognito/batpad/rules.mk
+++ b/keyboards/yncognito/batpad/rules.mk
@@ -9,5 +9,4 @@ COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no        # Enable keyboard backlight functionality
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 AUDIO_ENABLE = no            # Audio output