Merge remote-tracking branch 'upstream/develop'

8 files changed, 4 insertions, 28 deletions

diff --git a/keyboards/quarkeys/z60/hotswap/config.h b/keyboards/quarkeys/z60/hotswap/config.h
index 1478ca142e..b23030ad5c 100644
--- a/keyboards/quarkeys/z60/hotswap/config.h
+++ b/keyboards/quarkeys/z60/hotswap/config.h
@@ -13,17 +13,12 @@
 */
 
 #pragma once
-#include "config_common.h"
 
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
 #define DIODE_DIRECTION COL2ROW
 
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
 #define MATRIX_COL_PINS { E6, F0, F7, F1, F6, F5, F4, C7, B7, D5, C6, B6, B5, D7, D4 }
 
-#define DEBOUNCE 5
-
 #define RGB_DI_PIN D6
 #define RGBLED_NUM 80
 #define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/quarkeys/z60/hotswap/info.json b/keyboards/quarkeys/z60/hotswap/info.json
index 3109622d3b..c142c01b7e 100644
--- a/keyboards/quarkeys/z60/hotswap/info.json
+++ b/keyboards/quarkeys/z60/hotswap/info.json
@@ -8,6 +8,8 @@
         "pid": "0x3C02",
         "device_version": "0.0.1"
     },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "layout_aliases": {
         "LAYOUT": "LAYOUT_60_ansi_tsangan_split_rshift"
     },
diff --git a/keyboards/quarkeys/z60/hotswap/rules.mk b/keyboards/quarkeys/z60/hotswap/rules.mk
index 1049ac1af7..36b8dd4d44 100644
--- a/keyboards/quarkeys/z60/hotswap/rules.mk
+++ b/keyboards/quarkeys/z60/hotswap/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 BOOTMAGIC_ENABLE = yes		# Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes		# Mouse keys
 EXTRAKEY_ENABLE = yes		# Audio control and System control
diff --git a/keyboards/quarkeys/z60/solder/config.h b/keyboards/quarkeys/z60/solder/config.h
index b500a4c18f..a66ebdd550 100644
--- a/keyboards/quarkeys/z60/solder/config.h
+++ b/keyboards/quarkeys/z60/solder/config.h
@@ -14,17 +14,12 @@
 
 #pragma once
 
-#include "config_common.h"
 
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
 #define DIODE_DIRECTION COL2ROW
 
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
 #define MATRIX_COL_PINS { E6, F0, F7, F1, F6, F5, F4, C7, B7, D5, C6, B6, B5, D7, D4 }
 
-#define DEBOUNCE 5
-
 #define RGB_DI_PIN D6
 #define RGBLED_NUM 77
 #define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/quarkeys/z60/solder/info.json b/keyboards/quarkeys/z60/solder/info.json
index f4ad797462..e5ec227c7e 100644
--- a/keyboards/quarkeys/z60/solder/info.json
+++ b/keyboards/quarkeys/z60/solder/info.json
@@ -8,6 +8,8 @@
         "pid": "0x3C01",
         "device_version": "0.0.1"
     },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "layout_aliases": {
         "LAYOUT": "LAYOUT_all"
     },
diff --git a/keyboards/quarkeys/z60/solder/rules.mk b/keyboards/quarkeys/z60/solder/rules.mk
index 181a434529..54bbea4e62 100644
--- a/keyboards/quarkeys/z60/solder/rules.mk
+++ b/keyboards/quarkeys/z60/solder/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 BOOTMAGIC_ENABLE = yes     # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes        # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
diff --git a/keyboards/quarkeys/z67/hotswap/config.h b/keyboards/quarkeys/z67/hotswap/config.h
index c6edde3abf..3e3ce2b0a2 100644
--- a/keyboards/quarkeys/z67/hotswap/config.h
+++ b/keyboards/quarkeys/z67/hotswap/config.h
@@ -13,15 +13,12 @@
 */
 
 #pragma once
-#include "config_common.h"
 
 #define DIODE_DIRECTION COL2ROW
 
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, F7 }
 #define MATRIX_COL_PINS { C7, F6, F5, F4, F1, B7, D5, D1, D2, D3, D4, D0, D6, D7, B4 }
 
-#define DEBOUNCE 5
-
 #define RGB_DI_PIN F0
 #define RGBLED_NUM 77
 #define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/quarkeys/z67/solder/config.h b/keyboards/quarkeys/z67/solder/config.h
index 55815364fc..18ed997500 100644
--- a/keyboards/quarkeys/z67/solder/config.h
+++ b/keyboards/quarkeys/z67/solder/config.h
@@ -13,15 +13,12 @@
 */
 
 #pragma once
-#include "config_common.h"
 
 #define DIODE_DIRECTION COL2ROW
 
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, F7 }
 #define MATRIX_COL_PINS { C7, F6, F5, F4, F1, E6, D0, D1, D2, D3, D4, D5, D6, D7, B5, B4 }
 
-#define DEBOUNCE 5
-
 #define RGB_DI_PIN F0
 #define RGBLED_NUM 18
 #define RGBLIGHT_HUE_STEP 8