Merge remote-tracking branch 'upstream/develop'

3 files changed, 9 insertions, 27 deletions

diff --git a/keyboards/planck/thk/config.h b/keyboards/planck/thk/config.h
index 8ee347d284..bd93164345 100644
--- a/keyboards/planck/thk/config.h
+++ b/keyboards/planck/thk/config.h
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
 
 // THK has a different pin-out
 #undef MATRIX_ROW_PINS
@@ -27,9 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { A7, A6, A5, A4 }
 #define MATRIX_COL_PINS { D7, C2, C3, C4, C5, C6, C7, A3, A2, A1, A0, B0 }
 
-#define ENCODERS_PAD_A { B4, B2 }
-#define ENCODERS_PAD_B { B3, B1 }
-
 #define TAPPING_TOGGLE 3
 
 #define DIP_SWITCH_PINS { D0, D1, D4, D6 }
diff --git a/keyboards/planck/thk/info.json b/keyboards/planck/thk/info.json
index c8689737c0..50ee36da3b 100644
--- a/keyboards/planck/thk/info.json
+++ b/keyboards/planck/thk/info.json
@@ -8,10 +8,19 @@
     "pid": "0x25A7",
     "device_version": "0.0.1"
   },
+  "encoder": {
+    "rotary": [
+      {"pin_a": "B4", "pin_b": "B3"},
+      {"pin_a": "B2", "pin_b": "B1"}
+    ]
+  },
+  "processor": "atmega32a",
+  "bootloader": "usbasploader",
   "layout_aliases": {
     "LAYOUT_planck_grid": "LAYOUT_ortho_4x12",
     "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC"
   },
+  "community_layouts": ["ortho_4x12", "planck_mit"],
   "layouts": {
     "LAYOUT_ortho_4x12": {
       "layout": [
diff --git a/keyboards/planck/thk/rules.mk b/keyboards/planck/thk/rules.mk
index 714ed9b109..417fb95129 100644
--- a/keyboards/planck/thk/rules.mk
+++ b/keyboards/planck/thk/rules.mk
@@ -1,27 +1,6 @@
-# Copyright 2021 Erovia
-#
-# 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/>.
-
-# MCU name
-MCU = atmega32a
-
 # Processor frequency
 F_CPU = 16000000
 
-# Bootloader selection
-BOOTLOADER = usbasploader
-
 # Build Options
 #   change yes to no to disable
 #
@@ -36,5 +15,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 DIP_SWITCH_ENABLE = yes
-
-LAYOUTS = ortho_4x12 planck_mit