8 files changed, 18 insertions, 66 deletions
diff --git a/keyboards/redox/config.h b/keyboards/redox/config.h
deleted file mode 100644
index 79316dd083..0000000000
--- a/keyboards/redox/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright 2018 Mattia Dal Ben <matthewdibi@gmail.com>
-
-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"
-\ No newline at end of file
diff --git a/keyboards/redox/keymaps/finex/keymap.c b/keyboards/redox/keymaps/finex/keymap.c
index 6470addb27..9057dee074 100644
--- a/keyboards/redox/keymaps/finex/keymap.c
+++ b/keyboards/redox/keymaps/finex/keymap.c
@@ -47,7 +47,7 @@ enum tap_dance{
 };
 
 // Semicolon to Colon
-void dance_scln_finished (qk_tap_dance_state_t *state, void *user_data) {
+void dance_scln_finished (tap_dance_state_t *state, void *user_data) {
   if (state->count == 1) {
     register_code (KC_SCLN);
   } else {
@@ -55,7 +55,7 @@ void dance_scln_finished (qk_tap_dance_state_t *state, void *user_data) {
     register_code (KC_SCLN);
   }
 }
-void dance_scln_reset (qk_tap_dance_state_t *state, void *user_data) {
+void dance_scln_reset (tap_dance_state_t *state, void *user_data) {
   if (state->count == 1) {
     unregister_code (KC_SCLN);
   } else {
@@ -65,7 +65,7 @@ void dance_scln_reset (qk_tap_dance_state_t *state, void *user_data) {
 }
 
 // Square braket to curly bracket (left)
-void dance_lbrc_finished (qk_tap_dance_state_t *state, void *user_data) {
+void dance_lbrc_finished (tap_dance_state_t *state, void *user_data) {
   if (state->count == 1) {
     register_code (KC_LBRC);
   } else {
@@ -73,7 +73,7 @@ void dance_lbrc_finished (qk_tap_dance_state_t *state, void *user_data) {
     register_code (KC_LBRC);
   }
 }
-void dance_lbrc_reset (qk_tap_dance_state_t *state, void *user_data) {
+void dance_lbrc_reset (tap_dance_state_t *state, void *user_data) {
   if (state->count == 1) {
     unregister_code (KC_LBRC);
   } else {
@@ -83,7 +83,7 @@ void dance_lbrc_reset (qk_tap_dance_state_t *state, void *user_data) {
 }
 
 // Square braket to curly bracket (right)
-void dance_rbrc_finished (qk_tap_dance_state_t *state, void *user_data) {
+void dance_rbrc_finished (tap_dance_state_t *state, void *user_data) {
   if (state->count == 1) {
     register_code (KC_RBRC);
   } else {
@@ -91,7 +91,7 @@ void dance_rbrc_finished (qk_tap_dance_state_t *state, void *user_data) {
     register_code (KC_RBRC);
   }
 }
-void dance_rbrc_reset (qk_tap_dance_state_t *state, void *user_data) {
+void dance_rbrc_reset (tap_dance_state_t *state, void *user_data) {
   if (state->count == 1) {
     unregister_code (KC_RBRC);
   } else {
@@ -102,7 +102,7 @@ void dance_rbrc_reset (qk_tap_dance_state_t *state, void *user_data) {
 
 
 //Tap Dance Definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
   [TD_SCLN]  = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_scln_finished, dance_scln_reset),
   [TD_LBRC]  = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_lbrc_finished, dance_lbrc_reset),
   [TD_RBRC]  = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_rbrc_finished, dance_rbrc_reset)
diff --git a/keyboards/redox/rev1/base/info.json b/keyboards/redox/rev1/base/info.json
index ad889c2304..d65f0e2b1b 100644
--- a/keyboards/redox/rev1/base/info.json
+++ b/keyboards/redox/rev1/base/info.json
@@ -1,5 +1,10 @@
 {
     "usb": {
         "device_version": "1.0.0"
-    }
+    },
+    "split": {
+        "soft_serial_pin": "D0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina"
 }
diff --git a/keyboards/redox/rev1/config.h b/keyboards/redox/rev1/config.h
index 72874b66f5..b768d2f19f 100644
--- a/keyboards/redox/rev1/config.h
+++ b/keyboards/redox/rev1/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 7
 
 // wiring of each half
 #define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 }
@@ -32,18 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* 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
-
-/* serial.c configuration for split keyboard */
-#define SOFT_SERIAL_PIN D0
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/redox/rev1/proton_c/config.h b/keyboards/redox/rev1/proton_c/config.h
index 56cdb88126..71d3470569 100644
--- a/keyboards/redox/rev1/proton_c/config.h
+++ b/keyboards/redox/rev1/proton_c/config.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include "config_common.h"
 
 // wiring of each half
 #undef MATRIX_ROW_PINS
@@ -15,15 +14,9 @@
 
 /* serial.c configuration for split keyboard */
 #define SERIAL_USART_FULL_DUPLEX   // Enable full duplex operation mode.
-/* 
-   Because the rev1 config defines SOFT_SERIAL_PIN, we need to undef it, redefine it, and also assign 
-   it to avoid a redefine error.
- */
-#undef SOFT_SERIAL_PIN
-#define SOFT_SERIAL_PIN B6     // USART TX pin
 
 #define SERIAL_USART_RX_PIN B7     // USART RX pin
-#define SERIAL_USART_TX_PIN SOFT_SERIAL_PIN     // USART TX pin
+#define SERIAL_USART_TX_PIN B6     // USART TX pin
 
 #define SERIAL_USART_PIN_SWAP    // Swap TX and RX pins if keyboard is master halve.
                                    // Check if this feature is necessary with your keyboard design and available on the mcu.
diff --git a/keyboards/redox/rev1/proton_c/info.json b/keyboards/redox/rev1/proton_c/info.json
index 62a27157ad..4f6bae6891 100644
--- a/keyboards/redox/rev1/proton_c/info.json
+++ b/keyboards/redox/rev1/proton_c/info.json
@@ -1,5 +1,8 @@
 {
     "usb": {
         "device_version": "1.0.1"
-    }
+    },
+    "processor": "STM32F303",
+    "bootloader": "stm32-dfu",
+    "board": "QMK_PROTON_C"
 }
diff --git a/keyboards/redox/rev1/proton_c/rules.mk b/keyboards/redox/rev1/proton_c/rules.mk
index 829c8365ef..d45b778a1a 100644
--- a/keyboards/redox/rev1/proton_c/rules.mk
+++ b/keyboards/redox/rev1/proton_c/rules.mk
@@ -1,7 +1,2 @@
-# Proton C
-MCU = STM32F303
-BOARD = QMK_PROTON_C
-BOOTLOADER = stm32-dfu
-
 # specific to using the serial serial driver
 SERIAL_DRIVER = usart
diff --git a/keyboards/redox/rules.mk b/keyboards/redox/rules.mk
index 181027c417..29ad3b9404 100644
--- a/keyboards/redox/rules.mk
+++ b/keyboards/redox/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #