Merge remote-tracking branch 'upstream/develop'

6 files changed, 7 insertions, 29 deletions

diff --git a/keyboards/ogre/ergo_single/config.h b/keyboards/ogre/ergo_single/config.h
index eb57bab4c2..8069bd427b 100644
--- a/keyboards/ogre/ergo_single/config.h
+++ b/keyboards/ogre/ergo_single/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 7
 
 /* Keyboard Matrix Assignments */
 #define MATRIX_ROW_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5 }
@@ -43,5 +38,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-
-#define DEBOUNCE 5
diff --git a/keyboards/ogre/ergo_single/info.json b/keyboards/ogre/ergo_single/info.json
index fd446099f5..04db9ff8d5 100644
--- a/keyboards/ogre/ergo_single/info.json
+++ b/keyboards/ogre/ergo_single/info.json
@@ -8,6 +8,8 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/ogre/ergo_single/rules.mk b/keyboards/ogre/ergo_single/rules.mk
index 99f9befa53..a3964a74c0 100644
--- a/keyboards/ogre/ergo_single/rules.mk
+++ b/keyboards/ogre/ergo_single/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/ogre/ergo_split/config.h b/keyboards/ogre/ergo_split/config.h
index f7e0ba93a6..017d4792ff 100644
--- a/keyboards/ogre/ergo_split/config.h
+++ b/keyboards/ogre/ergo_split/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 7
 
 /* Keyboard Matrix Assignments */
 #define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
@@ -30,10 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-/*
- * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
- */
-#define SOFT_SERIAL_PIN D3
 #define SPLIT_HAND_PIN D1
 
 #define RGB_DI_PIN B6
@@ -50,4 +41,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define DEBOUNCE 5
diff --git a/keyboards/ogre/ergo_split/info.json b/keyboards/ogre/ergo_split/info.json
index 2e3e2f73a8..42cc158acf 100644
--- a/keyboards/ogre/ergo_split/info.json
+++ b/keyboards/ogre/ergo_split/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "split": {
+        "soft_serial_pin": "D3"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/ogre/ergo_split/rules.mk b/keyboards/ogre/ergo_split/rules.mk
index 9920cd3aa3..ce485aeb0a 100644
--- a/keyboards/ogre/ergo_split/rules.mk
+++ b/keyboards/ogre/ergo_split/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #