Merge remote-tracking branch 'upstream/develop'

4 files changed, 11 insertions, 18 deletions

diff --git a/keyboards/dumbpad/v1x_right/config.h b/keyboards/dumbpad/v1x_right/config.h
index 8d57b6a837..82f308f651 100644
--- a/keyboards/dumbpad/v1x_right/config.h
+++ b/keyboards/dumbpad/v1x_right/config.h
@@ -16,23 +16,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-#include "config_common.h"
 
 /* Column/Row IO definitions */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 5
 #define MATRIX_ROW_PINS { F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { B5, B4, E6, D7, C6 }
 
-/* Single rotary encoder */
-#define ENCODERS_PAD_A { D4 }
-#define ENCODERS_PAD_B { B2 }
-
 /* Onboard LEDs - reversed */
 #define LED_00 B3
 #define LED_01 B1
 #define LED_02 B6
-
-/* Bootmagic - hold down rotary encoder pushbutton while plugging in to enter bootloader */
-#define BOOTMAGIC_LITE_ROW 3
-#define BOOTMAGIC_LITE_COLUMN 4
diff --git a/keyboards/dumbpad/v1x_right/info.json b/keyboards/dumbpad/v1x_right/info.json
index 44b7abacff..6cef09807b 100644
--- a/keyboards/dumbpad/v1x_right/info.json
+++ b/keyboards/dumbpad/v1x_right/info.json
@@ -2,6 +2,16 @@
     "usb": {
         "device_version": "0.1.0"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D4", "pin_b": "B2"}
+        ]
+    },
+    "bootmagic": {
+        "matrix": [3, 4]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/dumbpad/v1x_right/rules.mk b/keyboards/dumbpad/v1x_right/rules.mk
index af19256136..7816aab001 100644
--- a/keyboards/dumbpad/v1x_right/rules.mk
+++ b/keyboards/dumbpad/v1x_right/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/dumbpad/v1x_right/v1x_right.c b/keyboards/dumbpad/v1x_right/v1x_right.c
index b0b3f473df..2a2da68d5c 100644
--- a/keyboards/dumbpad/v1x_right/v1x_right.c
+++ b/keyboards/dumbpad/v1x_right/v1x_right.c
@@ -23,7 +23,7 @@ void keyboard_pre_init_kb(void) {
     keyboard_pre_init_user();
 }
 
-void shutdown_user() {
+void shutdown_user(void) {
     // Shutdown LEDs
     writePinLow(LED_00);
     writePinLow(LED_01);