Merge remote-tracking branch 'upstream/develop'

4 files changed, 6 insertions, 49 deletions

diff --git a/keyboards/adkb96/config.h b/keyboards/adkb96/config.h
deleted file mode 100644
index 93fd2261b1..0000000000
--- a/keyboards/adkb96/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-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
-
-#include "config_common.h"
-
diff --git a/keyboards/adkb96/info.json b/keyboards/adkb96/info.json
index 13fc7e8ccf..e86480d7d7 100644
--- a/keyboards/adkb96/info.json
+++ b/keyboards/adkb96/info.json
@@ -8,6 +8,11 @@
 		"pid": "0xAD96",
 		"device_version": "0.0.1"
 	},
+	"split": {
+		"soft_serial_pin": "D0"
+	},
+	"processor": "atmega32u4",
+	"bootloader": "caterina",
 	"layouts": {
 		"LAYOUT_ortho_6x16": {
 			"layout": [
diff --git a/keyboards/adkb96/rev1/config.h b/keyboards/adkb96/rev1/config.h
index c9e95b7af0..c5a9673671 100644
--- a/keyboards/adkb96/rev1/config.h
+++ b/keyboards/adkb96/rev1/config.h
@@ -16,10 +16,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 8
+#pragma once
 
 // wiring of each half
 #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 }
@@ -27,31 +24,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define DIODE_DIRECTION COL2ROW
 
-#define SOFT_SERIAL_PIN D0
-
 /* define tapping term */
 #define TAPPING_TERM 100
 
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
-/* number of backlight levels */
-// #define BACKLIGHT_LEVELS 3
-
-/* Set 0 if debouncing isn't 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
 
-/* ws2812 RGB LED */
-/*
-#define RGB_DI_PIN D3
-
-#define RGBLED_NUM 12    // Number of LEDs
-*/
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/adkb96/rules.mk b/keyboards/adkb96/rules.mk
index 723dc134c9..2b74eb4183 100644
--- a/keyboards/adkb96/rules.mk
+++ b/keyboards/adkb96/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #