3 files changed, 34 insertions, 80 deletions
diff --git a/keyboards/42keebs/discipline/config.h b/keyboards/42keebs/discipline/config.h
deleted file mode 100644
index 79e9e6bbd4..0000000000
--- a/keyboards/42keebs/discipline/config.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*Copyright 2019 coseyfannitutti
-
-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
-
-#define VENDOR_ID       0x6B62
-#define PRODUCT_ID      0x6869
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    "coseyfannitutti"
-#define PRODUCT         "DISCIPLINE"
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
-#define MATRIX_ROW_PINS { B2, A1, B1, A0, B0 }
-#define MATRIX_COL_PINS { A2, B3, A3, B4, A4, D5, D6, C6, C5, C4, C3, C2, C1, C0, D7 }
-#define UNUSED_PINS
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define USB_MAX_POWER_CONSUMPTION 100
-
-#define ENCODER_A_PINS { D0 }
-#define ENCODER_B_PINS { D1 }
-#define ENCODER_DIRECTION_FLIP
-#define ENCODER_RESOLUTION 4
-#define TAP_CODE_DELAY 10
-
-/* 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/42keebs/discipline/info.json b/keyboards/42keebs/discipline/keyboard.json
index 847af786d1..72ad4b1b1f 100644
--- a/keyboards/42keebs/discipline/info.json
+++ b/keyboards/42keebs/discipline/keyboard.json
@@ -1,7 +1,38 @@
 {
-    "keyboard_name": "DISCIPLINE",
-    "url": "https://github.com/coseyfannitutti/discipline",
-    "maintainer": "coseyfannitutti",
+    "keyboard_name": "Discipline",
+    "manufacturer": "42. Keebs",
+    "url": "https://github.com/piit79/discipline",
+    "maintainer": "piit79",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "encoder": true,
+        "nkro": false
+    },
+    "processor": "atmega32a",
+    "bootloader": "usbasploader",
+    "usb": {
+        "vid": "0x6B62",
+        "pid": "0x6869",
+        "device_version": "1.0.5",
+        "max_power": 100
+    },
+    "matrix_pins": {
+        "cols": ["A2", "B3", "A3", "B4", "A4", "D5", "D6", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "D7"],
+        "rows": ["B2", "A1", "B1", "A0", "B0"]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D0", "pin_b": "D1", "resolution": 2}
+        ]
+    },
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [
diff --git a/keyboards/42keebs/discipline/rules.mk b/keyboards/42keebs/discipline/rules.mk
index 83088ff0a8..c2ee0bc86f 100644
--- a/keyboards/42keebs/discipline/rules.mk
+++ b/keyboards/42keebs/discipline/rules.mk
@@ -1,24 +1,2 @@
-# MCU name
-MCU = atmega32a
-
 # Processor frequency
 F_CPU = 16000000
-
-# Bootloader selection
-BOOTLOADER = usbasploader
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
-
-LAYOUTS = 65_ansi 65_iso