Merge remote-tracking branch 'upstream/develop'

10 files changed, 30 insertions, 40 deletions

diff --git a/keyboards/ymdk/ymd75/config.h b/keyboards/ymdk/ymd75/config.h
index e86902789e..5807ae4d8d 100644
--- a/keyboards/ymdk/ymd75/config.h
+++ b/keyboards/ymdk/ymd75/config.h
@@ -19,12 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
-
-#define BACKLIGHT_LEVELS 12
-
-#define LED_CAPS_LOCK_PIN D1
-
 #define RGB_DI_PIN E2
 #define RGBLED_NUM 16
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/ymdk/ymd75/rev1/config.h b/keyboards/ymdk/ymd75/rev1/config.h
index e538ba0609..d46c3bc010 100644
--- a/keyboards/ymdk/ymd75/rev1/config.h
+++ b/keyboards/ymdk/ymd75/rev1/config.h
@@ -19,10 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 15
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
 #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
-#define BACKLIGHT_PIN D4
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ymdk/ymd75/rev1/info.json b/keyboards/ymdk/ymd75/rev1/info.json
index ad889c2304..967dd3de95 100644
--- a/keyboards/ymdk/ymd75/rev1/info.json
+++ b/keyboards/ymdk/ymd75/rev1/info.json
@@ -1,5 +1,14 @@
 {
     "usb": {
         "device_version": "1.0.0"
-    }
+    },
+    "backlight": {
+        "pin": "D4",
+        "levels": 12
+    },
+    "indicators": {
+        "caps_lock": "D1"
+    },
+    "processor": "atmega32a",
+    "bootloader": "bootloadhid"
 }
diff --git a/keyboards/ymdk/ymd75/rev1/rules.mk b/keyboards/ymdk/ymd75/rev1/rules.mk
index 816b0060c9..17cd0cd890 100644
--- a/keyboards/ymdk/ymd75/rev1/rules.mk
+++ b/keyboards/ymdk/ymd75/rev1/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32a
-
-# Bootloader selection
-BOOTLOADER = bootloadhid
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/ymdk/ymd75/rev2/config.h b/keyboards/ymdk/ymd75/rev2/config.h
index 201213c40e..83e075b290 100644
--- a/keyboards/ymdk/ymd75/rev2/config.h
+++ b/keyboards/ymdk/ymd75/rev2/config.h
@@ -1,9 +1,5 @@
 #pragma once
 
-/* matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 15
 #define MATRIX_ROW_PINS { B7, B6, B5, B4, B3, B0 }
 #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
-#define BACKLIGHT_PIN D4
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ymdk/ymd75/rev2/info.json b/keyboards/ymdk/ymd75/rev2/info.json
index 3bdd63ee28..56435d5b27 100644
--- a/keyboards/ymdk/ymd75/rev2/info.json
+++ b/keyboards/ymdk/ymd75/rev2/info.json
@@ -1,5 +1,14 @@
 {
     "usb": {
         "device_version": "2.0.0"
-    }
+    },
+    "backlight": {
+        "pin": "D4",
+        "levels": 12
+    },
+    "indicators": {
+        "caps_lock": "D1"
+    },
+    "processor": "atmega32a",
+    "bootloader": "bootloadhid"
 }
diff --git a/keyboards/ymdk/ymd75/rev2/rules.mk b/keyboards/ymdk/ymd75/rev2/rules.mk
index 816b0060c9..17cd0cd890 100644
--- a/keyboards/ymdk/ymd75/rev2/rules.mk
+++ b/keyboards/ymdk/ymd75/rev2/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32a
-
-# Bootloader selection
-BOOTLOADER = bootloadhid
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/ymdk/ymd75/rev3/config.h b/keyboards/ymdk/ymd75/rev3/config.h
index 9e54c7acdd..e3a31b5116 100644
--- a/keyboards/ymdk/ymd75/rev3/config.h
+++ b/keyboards/ymdk/ymd75/rev3/config.h
@@ -1,11 +1,6 @@
 #pragma once
 
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 9
 #define MATRIX_ROW_PINS { B7, B3, B2, B1, B0, E6, F0, F1, F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
-#define BACKLIGHT_PIN B6 // change the backlight pin that has since changed in Rev 3
 #define DIODE_DIRECTION ROW2COL
 #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 4
-#undef LED_CAPS_LOCK_PIN // CapsLock pin changed in Rev 3
-#define LED_CAPS_LOCK_PIN C7
diff --git a/keyboards/ymdk/ymd75/rev3/info.json b/keyboards/ymdk/ymd75/rev3/info.json
index 775a9740ca..ce0db873cf 100644
--- a/keyboards/ymdk/ymd75/rev3/info.json
+++ b/keyboards/ymdk/ymd75/rev3/info.json
@@ -1,5 +1,14 @@
 {
     "usb": {
         "device_version": "3.0.0"
-    }
+    },
+    "backlight": {
+        "pin": "B6",
+        "levels": 12
+    },
+    "indicators": {
+        "caps_lock": "C7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/ymdk/ymd75/rev3/rules.mk b/keyboards/ymdk/ymd75/rev3/rules.mk
index 14d8f08c35..e3b96df9c2 100644
--- a/keyboards/ymdk/ymd75/rev3/rules.mk
+++ b/keyboards/ymdk/ymd75/rev3/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #