3 files changed, 7 insertions, 63 deletions
diff --git a/keyboards/metamechs/timberwolf/config.h b/keyboards/metamechs/timberwolf/config.h
deleted file mode 100644
index 916b315725..0000000000
--- a/keyboards/metamechs/timberwolf/config.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2020 Croktopus
-
-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
-
-
-/*
- * 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_COL_PINS { B2, D1, D2, C7, F5, F6, F7, F0, E6 }
-#define MATRIX_ROW_PINS { B6, B5, B4, D7, D6, D4, D5, D3, F4, F1, B1, B0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/metamechs/timberwolf/info.json b/keyboards/metamechs/timberwolf/info.json
index ae12912f00..cc5aca28d6 100644
--- a/keyboards/metamechs/timberwolf/info.json
+++ b/keyboards/metamechs/timberwolf/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5754",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B2", "D1", "D2", "C7", "F5", "F6", "F7", "F0", "E6"],
+        "rows": ["B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "F4", "F1", "B1", "B0"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "C6",
         "levels": 16
@@ -119,9 +124,9 @@
                 {"label":"Win", "x":2.75, "y":5.25},
                 {"label":"Alt", "x":3.75, "y":5.25, "w":1.5},
                 {"x":5.25, "y":5.25, "w":5.5},
-                {"label":"Alt", "x":10.75, "y":5.25, "w":1},
+                {"label":"Alt", "x":10.75, "y":5.25},
                 {"label":"Win", "x":11.75, "y":5.25},
-                {"label":"Ctrl", "x":12.75, "y":5.25, "w":1},
+                {"label":"Ctrl", "x":12.75, "y":5.25},
                 {"label":"Left", "x":13.75, "y":5.5},
                 {"label":"Left", "x":14.75, "y":5.5},
                 {"label":"Down", "x":15.75, "y":5.5},
diff --git a/keyboards/metamechs/timberwolf/timberwolf.c b/keyboards/metamechs/timberwolf/timberwolf.c
index ff50851247..f21c0daa07 100644
--- a/keyboards/metamechs/timberwolf/timberwolf.c
+++ b/keyboards/metamechs/timberwolf/timberwolf.c
@@ -23,13 +23,3 @@ void led_update_ports(led_t led_state) {
         backlight_set(0);
     }
 }
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) return false;
-	if (clockwise) {
-		tap_code(KC_VOLU);
-	} else {
-		tap_code(KC_VOLD);
-	}
-    return true;
-}