Merge remote-tracking branch 'upstream/develop'

4 files changed, 21 insertions, 43 deletions

diff --git a/keyboards/sergiopoverony/creator_pro/config.h b/keyboards/sergiopoverony/creator_pro/config.h
index d83cc7c635..f1a5385a3c 100644
--- a/keyboards/sergiopoverony/creator_pro/config.h
+++ b/keyboards/sergiopoverony/creator_pro/config.h
@@ -15,26 +15,8 @@
  */
 
 #pragma once
-#include "config_common.h"
-
-/* key matrix size pins */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 9
-#define DIRECT_PINS {   \
-    { D1, D4, C6, D7, \
-	                 E6, \
-	  B2, B3, B1, F7  } \
-}
-
 
 /*led layout indication pins*/
 #define RED_LED D0
 #define BLUE_LED B5
 #define GREEN_LED B6
-
-/* encoder pins*/
-#define ENCODERS_PAD_A { D2 }
-#define ENCODERS_PAD_B { D3 }
-#define ENCODER_RESOLUTION 1
-
-
diff --git a/keyboards/sergiopoverony/creator_pro/creator_pro.h b/keyboards/sergiopoverony/creator_pro/creator_pro.h
index 566e94a77a..b5c7c37870 100644
--- a/keyboards/sergiopoverony/creator_pro/creator_pro.h
+++ b/keyboards/sergiopoverony/creator_pro/creator_pro.h
@@ -17,16 +17,6 @@
 #pragma once
 #include "quantum.h"
 
-#define LAYOUT( \
-K01, K02, K03, K04,	\
-                   K05, \
-K06, K07, K08, K09 \
-) { { \
-K01, K02, K03, K04,	\
-                   K05, \
-K06, K07, K08, K09 \
-} }
-
 /*led work*/
 void turn_off_leds(void);
 void turn_on_led(pin_t pin);
diff --git a/keyboards/sergiopoverony/creator_pro/info.json b/keyboards/sergiopoverony/creator_pro/info.json
index 71d82a85bb..9ac1a0a20c 100644
--- a/keyboards/sergiopoverony/creator_pro/info.json
+++ b/keyboards/sergiopoverony/creator_pro/info.json
@@ -8,18 +8,30 @@
     "pid": "0x0C00",
     "device_version": "0.0.1"
   },
+  "encoder": {
+    "rotary": [
+      {"pin_a": "D2", "pin_b": "D3", "resolution": 1}
+    ]
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "matrix_pins": {
+    "direct": [
+      ["D1", "D4", "C6", "D7", "E6", "B2", "B3", "B1", "F7"]
+    ]
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x":0, "y":0},
-        {"x":1, "y":0},
-        {"x":2, "y":0},
-        {"x":3, "y":0},
-        {"x":4.5, "y":0.5},
-        {"x":0, "y":1},
-        {"x":1, "y":1},
-        {"x":2, "y":1},
-        {"x":3, "y":1}
+        {"x":0, "y":0, "matrix": [0, 0]},
+        {"x":1, "y":0, "matrix": [0, 1]},
+        {"x":2, "y":0, "matrix": [0, 2]},
+        {"x":3, "y":0, "matrix": [0, 3]},
+        {"x":4.5, "y":0.5, "matrix": [0, 4]},
+        {"x":0, "y":1, "matrix": [0, 5]},
+        {"x":1, "y":1, "matrix": [0, 6]},
+        {"x":2, "y":1, "matrix": [0, 7]},
+        {"x":3, "y":1, "matrix": [0, 8]}
       ]
     }
   }
diff --git a/keyboards/sergiopoverony/creator_pro/rules.mk b/keyboards/sergiopoverony/creator_pro/rules.mk
index 1599639564..a7fd1110b2 100644
--- a/keyboards/sergiopoverony/creator_pro/rules.mk
+++ b/keyboards/sergiopoverony/creator_pro/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #