Merge remote-tracking branch 'upstream/develop'

6 files changed, 17 insertions, 44 deletions

diff --git a/keyboards/qpockets/space_space/rev1/config.h b/keyboards/qpockets/space_space/rev1/config.h
index 0b87d47767..22c2bc73de 100644
--- a/keyboards/qpockets/space_space/rev1/config.h
+++ b/keyboards/qpockets/space_space/rev1/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 11
 
 #define MATRIX_ROW_PINS \
     { F1, F4, F5, C7 }
@@ -31,16 +26,4 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-/* ROTARY ENCODERS */
-#define ENCODERS_PAD_A \
-    { B3, D6 }
-#define ENCODERS_PAD_B \
-    { B2, D7 }
-
-#define ENCODER_RESOLUTIONS \
-    { 3, 4 }
-//#define ENCODER_DIRECTION_FLIP
-
-#define DEBOUNCE 7
-
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/qpockets/space_space/rev1/info.json b/keyboards/qpockets/space_space/rev1/info.json
index f882474efe..cd9dcb56a8 100644
--- a/keyboards/qpockets/space_space/rev1/info.json
+++ b/keyboards/qpockets/space_space/rev1/info.json
@@ -8,6 +8,15 @@
   	"pid": "0x7373",
   	"device_version": "30.0.0"
   },
+  "encoder": {
+  	"rotary": [
+  		{"pin_a": "B3", "pin_b": "B2", "resolution": 3},
+  		{"pin_a": "D6", "pin_b": "D7"}
+  	]
+  },
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "debounce": 7,
   "layouts": {
     "LAYOUT_default": {
 	  "layout": [
diff --git a/keyboards/qpockets/space_space/rev1/rules.mk b/keyboards/qpockets/space_space/rev1/rules.mk
index 5f58c5684b..131aa72aeb 100644
--- a/keyboards/qpockets/space_space/rev1/rules.mk
+++ b/keyboards/qpockets/space_space/rev1/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/qpockets/space_space/rev2/config.h b/keyboards/qpockets/space_space/rev2/config.h
index a1ad4fc021..26b85360c4 100644
--- a/keyboards/qpockets/space_space/rev2/config.h
+++ b/keyboards/qpockets/space_space/rev2/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 11
 
 #define MATRIX_ROW_PINS \
     { B1, B0, D5, B6 }
@@ -31,16 +26,6 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-/* ROTARY ENCODERS */
-#define ENCODERS_PAD_A \
-    { B4, C7 }
-#define ENCODERS_PAD_B \
-    { D7, F7 }
-
-#define ENCODER_RESOLUTION 3
-
-#define DEBOUNCE 5
-
 #define LOCKING_SUPPORT_ENABLE
 
 #define RGB_DI_PIN F0
diff --git a/keyboards/qpockets/space_space/rev2/info.json b/keyboards/qpockets/space_space/rev2/info.json
index a6cad3665e..580ab0a4d5 100644
--- a/keyboards/qpockets/space_space/rev2/info.json
+++ b/keyboards/qpockets/space_space/rev2/info.json
@@ -8,6 +8,14 @@
   	"pid": "0x7373",
   	"device_version": "30.0.2"
   },
+  "encoder": {
+  	"rotary": [
+  		{"pin_a": "B4", "pin_b": "D7", "resolution": 3},
+  		{"pin_a": "C7", "pin_b": "F7", "resolution": 3}
+  	]
+  },
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
   "layouts": {
     "LAYOUT_default": {
 	  "layout": [
diff --git a/keyboards/qpockets/space_space/rev2/rules.mk b/keyboards/qpockets/space_space/rev2/rules.mk
index 8876a45881..ebe0d0e0e3 100644
--- a/keyboards/qpockets/space_space/rev2/rules.mk
+++ b/keyboards/qpockets/space_space/rev2/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #