11 files changed, 32 insertions, 57 deletions
diff --git a/keyboards/tkw/grandiceps/config.h b/keyboards/tkw/grandiceps/config.h
index bba77cfcd4..16d91b69a2 100644
--- a/keyboards/tkw/grandiceps/config.h
+++ b/keyboards/tkw/grandiceps/config.h
@@ -15,11 +15,6 @@
  */
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 6
 
 #define MATRIX_COL_PINS { B0, A7, A3, A5, A4, A2 }
 #define MATRIX_ROW_PINS { B12, A6, B13, B9, B8 }
@@ -28,15 +23,11 @@
 
 #define DIODE_DIRECTION COL2ROW
 
-#define SOFT_SERIAL_PIN A15
 #define SELECT_SOFT_SERIAL_SPEED 1
 
 #define MATRIX_IO_DELAY 5
 #define TAP_CODE_DELAY 10
 
-#define ENCODERS_PAD_A { B14 }
-#define ENCODERS_PAD_B { B15 }
-
 #define RGB_DI_PIN B1
 #define RGBLED_NUM 16
 #define RGBLED_SPLIT { 8,8 }
@@ -57,6 +48,3 @@
 #define WS2812_PWM_PAL_MODE 2
 #define WS2812_DMA_STREAM STM32_DMA1_STREAM2
 #define WS2812_DMA_CHANNEL 5
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
diff --git a/keyboards/tkw/grandiceps/info.json b/keyboards/tkw/grandiceps/info.json
index dc4cf5a0ee..4d91a00c84 100644
--- a/keyboards/tkw/grandiceps/info.json
+++ b/keyboards/tkw/grandiceps/info.json
@@ -6,6 +6,17 @@
         "vid": "0xFEED",
         "pid": "0x7812"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B14", "pin_b": "B15"}
+        ]
+    },
+    "split": {
+        "soft_serial_pin": "A15"
+    },
+    "processor": "STM32F411",
+    "bootloader": "stm32-dfu",
+    "board": "BLACKPILL_STM32_F411",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/tkw/grandiceps/rules.mk b/keyboards/tkw/grandiceps/rules.mk
index 2220b16252..1b481a9e1e 100644
--- a/keyboards/tkw/grandiceps/rules.mk
+++ b/keyboards/tkw/grandiceps/rules.mk
@@ -1,10 +1,3 @@
-# MCU name
-MCU = STM32F411
-BOARD = BLACKPILL_STM32_F411
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/tkw/stoutgat/v1/config.h b/keyboards/tkw/stoutgat/v1/config.h
index 787c927039..1eda8feab4 100644
--- a/keyboards/tkw/stoutgat/v1/config.h
+++ b/keyboards/tkw/stoutgat/v1/config.h
@@ -16,17 +16,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
 
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
 #define TAP_CODE_DELAY 10
 
 #define MATRIX_ROW_PINS { D1, D0, A0, A1, A2 }
 #define MATRIX_COL_PINS { D6, D5, D7, C0, C1, C2, C3, C4, C5, C6, C7, A7, A6, A5, A4 }
-#define ENCODERS_PAD_A { B4, B0 }
-#define ENCODERS_PAD_B { B3, B1 }
-
 
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/tkw/stoutgat/v1/info.json b/keyboards/tkw/stoutgat/v1/info.json
index 22be9b3ae2..e94e896858 100644
--- a/keyboards/tkw/stoutgat/v1/info.json
+++ b/keyboards/tkw/stoutgat/v1/info.json
@@ -8,6 +8,15 @@
         "pid": "0x7811",
         "device_version": "0.0.1"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B4", "pin_b": "B3"},
+            {"pin_a": "B0", "pin_b": "B1"}
+        ]
+    },
+    "processor": "atmega32a",
+    "bootloader": "usbasploader",
+    "community_layouts": ["65_iso", "65_ansi"],
     "layouts": {
         "LAYOUT_encoder": {
             "layout": [
diff --git a/keyboards/tkw/stoutgat/v1/rules.mk b/keyboards/tkw/stoutgat/v1/rules.mk
index a763c0f8bb..8dca0665f7 100644
--- a/keyboards/tkw/stoutgat/v1/rules.mk
+++ b/keyboards/tkw/stoutgat/v1/rules.mk
@@ -1,12 +1,6 @@
-# MCU name
-MCU = atmega32a
-
 # Processor frequency
 F_CPU = 16000000
 
-# Bootloader selection
-BOOTLOADER = usbasploader
-
 # Build Options
 #   change yes to no to disable
 #
@@ -20,4 +14,3 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE  = yes
-LAYOUTS = 65_iso 65_ansi
diff --git a/keyboards/tkw/stoutgat/v2/config.h b/keyboards/tkw/stoutgat/v2/config.h
index dd145ccf42..8161a873e5 100644
--- a/keyboards/tkw/stoutgat/v2/config.h
+++ b/keyboards/tkw/stoutgat/v2/config.h
@@ -15,13 +15,6 @@
  */
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
-
 
 #define MATRIX_COL_PINS { B0, A7, A6, A5, A4, A3, A1, A0, C15, C14, C13, A15, B3, B4, B5}
 #define MATRIX_ROW_PINS { B6, A2, B7, B9, B8 }
@@ -31,9 +24,6 @@
 #define MATRIX_IO_DELAY 5
 #define TAP_CODE_DELAY 10
 
-#define ENCODERS_PAD_A { B14, B12}
-#define ENCODERS_PAD_B { B15, B13 }
-
 #define RGB_DI_PIN B1
 #define RGBLED_NUM 13
 #define RGBLIGHT_LIMIT_VAL 120
@@ -54,14 +44,7 @@
 #define WS2812_DMA_STREAM STM32_DMA1_STREAM2
 #define WS2812_DMA_CHANNEL 5
 
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/tkw/stoutgat/v2/f411/info.json b/keyboards/tkw/stoutgat/v2/f411/info.json
new file mode 100644
index 0000000000..2517a82403
--- /dev/null
+++ b/keyboards/tkw/stoutgat/v2/f411/info.json
@@ -0,0 +1,5 @@
+{
+    "processor": "STM32F411",
+    "bootloader": "stm32-dfu",
+    "board": "BLACKPILL_STM32_F411"
+}
diff --git a/keyboards/tkw/stoutgat/v2/f411/rules.mk b/keyboards/tkw/stoutgat/v2/f411/rules.mk
index c25a64f4b3..e69de29bb2 100644
--- a/keyboards/tkw/stoutgat/v2/f411/rules.mk
+++ b/keyboards/tkw/stoutgat/v2/f411/rules.mk
@@ -1,6 +0,0 @@
-# MCU name
-MCU = STM32F411
-BOARD = BLACKPILL_STM32_F411
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
diff --git a/keyboards/tkw/stoutgat/v2/info.json b/keyboards/tkw/stoutgat/v2/info.json
index bafe4d6fc1..0b0877b38b 100644
--- a/keyboards/tkw/stoutgat/v2/info.json
+++ b/keyboards/tkw/stoutgat/v2/info.json
@@ -8,6 +8,13 @@
         "pid": "0x7811",
         "device_version": "0.0.2"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B14", "pin_b": "B15"},
+            {"pin_a": "B12", "pin_b": "B13"}
+        ]
+    },
+    "community_layouts": ["65_iso", "65_ansi"],
     "layouts": {
         "LAYOUT_encoder": {
             "layout": [
diff --git a/keyboards/tkw/stoutgat/v2/rules.mk b/keyboards/tkw/stoutgat/v2/rules.mk
index 1b76936d50..6dc2e4a634 100644
--- a/keyboards/tkw/stoutgat/v2/rules.mk
+++ b/keyboards/tkw/stoutgat/v2/rules.mk
@@ -17,4 +17,3 @@ WS2812_DRIVER = pwm
 OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE
 
 DEFAULT_FOLDER = tkw/stoutgat/v2/f411
-LAYOUTS = 65_iso 65_ansi