Merge remote-tracking branch 'upstream/develop'

5 files changed, 11 insertions, 37 deletions

diff --git a/keyboards/jiran/config.h b/keyboards/jiran/config.h
index 0579f44a77..39ed4bb0c7 100644
--- a/keyboards/jiran/config.h
+++ b/keyboards/jiran/config.h
@@ -17,12 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 6
 
 // wiring of each half
 #define MATRIX_ROW_PINS { B4, B5, F4, F5, F6 }
@@ -32,9 +26,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-/* serial.c configuration for split keyboard */
-#define SOFT_SERIAL_PIN D1
 #define MASTER_LEFT
diff --git a/keyboards/jiran/info.json b/keyboards/jiran/info.json
index 93b8ad11ce..9f04243278 100644
--- a/keyboards/jiran/info.json
+++ b/keyboards/jiran/info.json
@@ -8,6 +8,11 @@
          "pid": "0x3735",
          "device_version": "3.0.0"
      },
+     "split": {
+        "soft_serial_pin": "D1"
+     },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/jiran/rev1/config.h b/keyboards/jiran/rev1/config.h
deleted file mode 100644
index d676c4b6b0..0000000000
--- a/keyboards/jiran/rev1/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@keeb.io>
-
-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 BACKLIGHT_PIN B6
-#define BACKLIGHT_LEVELS 5
diff --git a/keyboards/jiran/rev1/info.json b/keyboards/jiran/rev1/info.json
new file mode 100644
index 0000000000..830440f4f6
--- /dev/null
+++ b/keyboards/jiran/rev1/info.json
@@ -0,0 +1,6 @@
+{
+    "backlight": {
+        "pin": "B6",
+        "levels": 5
+    }
+}
diff --git a/keyboards/jiran/rules.mk b/keyboards/jiran/rules.mk
index f7ee8a2214..b4c74a089d 100644
--- a/keyboards/jiran/rules.mk
+++ b/keyboards/jiran/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #