Merge remote-tracking branch 'upstream/develop'

7 files changed, 30 insertions, 36 deletions

diff --git a/keyboards/keychron/q0/config.h b/keyboards/keychron/q0/config.h
index 252d2d6cce..28e942da07 100644
--- a/keyboards/keychron/q0/config.h
+++ b/keyboards/keychron/q0/config.h
@@ -19,9 +19,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
 #define CKLED2001_CURRENT_TUNE { 0xFF, 0xFF, 0x70, 0xFF, 0xFF, 0x70, 0xFF, 0xFF, 0x70, 0xFF, 0xFF, 0x70 }
 
 /* NKRO */
diff --git a/keyboards/keychron/q0/rev_0130/info.json b/keyboards/keychron/q0/rev_0130/info.json
index e5f25f62ac..334f879d3b 100644
--- a/keyboards/keychron/q0/rev_0130/info.json
+++ b/keyboards/keychron/q0/rev_0130/info.json
@@ -8,6 +8,8 @@
         "pid": "0x0130",
         "device_version": "1.0.2"
     },
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_numpad_6x4": {
             "layout": [
diff --git a/keyboards/keychron/q0/rev_0130/rules.mk b/keyboards/keychron/q0/rev_0130/rules.mk
index 5a04c755cd..3a31dbc81a 100644
--- a/keyboards/keychron/q0/rev_0130/rules.mk
+++ b/keyboards/keychron/q0/rev_0130/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = STM32L432
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 # Build Options
 #   change yes to no to disable.
 #
diff --git a/keyboards/keychron/q0/rev_0131/config.h b/keyboards/keychron/q0/rev_0131/config.h
index 4ed6f0e4e7..f94517ebb4 100644
--- a/keyboards/keychron/q0/rev_0131/config.h
+++ b/keyboards/keychron/q0/rev_0131/config.h
@@ -35,11 +35,4 @@
 #define NUM_LOCK_LED_INDEX 5
 
 /* Encoder Configuration */
-#define ENCODERS_PAD_A { A3 }
-#define ENCODERS_PAD_B { A4 }
-#define ENCODER_RESOLUTION 4
 #define ENCODER_DEFAULT_POS 0x3
-
-/* Specify (0,1) which programmed as "Fn" key on this keyboard as bootmagic key */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 1
diff --git a/keyboards/keychron/q0/rev_0131/info.json b/keyboards/keychron/q0/rev_0131/info.json
index 9fbbe7d206..94808bd9c4 100644
--- a/keyboards/keychron/q0/rev_0131/info.json
+++ b/keyboards/keychron/q0/rev_0131/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0131",
         "device_version": "1.0.0"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A3", "pin_b": "A4"}
+        ]
+    },
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/q0/rev_0131/keymaps/keychron/keymap.c b/keyboards/keychron/q0/rev_0131/keymaps/keychron/keymap.c
index 5d73b5733f..fc618cdba9 100644
--- a/keyboards/keychron/q0/rev_0131/keymaps/keychron/keymap.c
+++ b/keyboards/keychron/q0/rev_0131/keymaps/keychron/keymap.c
@@ -29,19 +29,19 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [BASE] = LAYOUT_numpad_6x5(
         KC_MUTE,   MO(FUNC), KC_ESC,  KC_BSPC,  KC_TAB,
-        MACRO01,   KC_NUM,   KC_PSLS, KC_PAST,  KC_PMNS,
-        MACRO02,   KC_P7,    KC_P8,   KC_P9,    KC_PPLS,
-        MACRO03,   KC_P4,    KC_P5,   KC_P6,
-        MACRO04,   KC_P1,    KC_P2,   KC_P3,    KC_PENT,
-        MACRO05,   KC_P0,             KC_PDOT),
+        MC_1,   KC_NUM,   KC_PSLS, KC_PAST,  KC_PMNS,
+        MC_2,   KC_P7,    KC_P8,   KC_P9,    KC_PPLS,
+        MC_3,   KC_P4,    KC_P5,   KC_P6,
+        MC_4,   KC_P1,    KC_P2,   KC_P3,    KC_PENT,
+        MC_5,   KC_P0,             KC_PDOT),
 
     [FUNC] = LAYOUT_numpad_6x5(
         RGB_TOG,   _______,  KC_MUTE, KC_VOLD,  KC_VOLU,
-        MACRO01,   RGB_MOD,  RGB_VAI, RGB_HUI,  KC_DEL,
-        MACRO02,   RGB_RMOD, RGB_VAD, RGB_HUD,  _______,
-        MACRO03,   RGB_SAI,  RGB_SPI, KC_MPRV,
-        MACRO04,   RGB_SAD,  RGB_SPD, KC_MPLY,  _______,
-        MACRO05,   RGB_TOG,           KC_MNXT),
+        MC_1,   RGB_MOD,  RGB_VAI, RGB_HUI,  KC_DEL,
+        MC_2,   RGB_RMOD, RGB_VAD, RGB_HUD,  _______,
+        MC_3,   RGB_SAI,  RGB_SPI, KC_MPRV,
+        MC_4,   RGB_SAD,  RGB_SPD, KC_MPLY,  _______,
+        MC_5,   RGB_TOG,           KC_MNXT),
 
     [L2] = LAYOUT_numpad_6x5(
         _______, _______,  _______, _______,  _______,
diff --git a/keyboards/keychron/q0/rev_0131/keymaps/via/keymap.c b/keyboards/keychron/q0/rev_0131/keymaps/via/keymap.c
index 58070ecd27..91b838d3f2 100644
--- a/keyboards/keychron/q0/rev_0131/keymaps/via/keymap.c
+++ b/keyboards/keychron/q0/rev_0131/keymaps/via/keymap.c
@@ -28,19 +28,19 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [BASE] = LAYOUT_numpad_6x5(
         KC_MUTE,   MO(FUNC), KC_ESC,  KC_BSPC,  KC_TAB,
-        MACRO01,   KC_NUM,   KC_PSLS, KC_PAST,  KC_PMNS,
-        MACRO02,   KC_P7,    KC_P8,   KC_P9,    KC_PPLS,
-        MACRO03,   KC_P4,    KC_P5,   KC_P6,
-        MACRO04,   KC_P1,    KC_P2,   KC_P3,    KC_PENT,
-        MACRO05,   KC_P0,             KC_PDOT),
+        MC_0,   KC_NUM,   KC_PSLS, KC_PAST,  KC_PMNS,
+        MC_2,   KC_P7,    KC_P8,   KC_P9,    KC_PPLS,
+        MC_3,   KC_P4,    KC_P5,   KC_P6,
+        MC_4,   KC_P1,    KC_P2,   KC_P3,    KC_PENT,
+        MC_5,   KC_P0,             KC_PDOT),
 
     [FUNC] = LAYOUT_numpad_6x5(
         RGB_TOG,   _______,  KC_MUTE, KC_VOLD,  KC_VOLU,
-        MACRO01,   RGB_MOD,  RGB_VAI, RGB_HUI,  KC_DEL,
-        MACRO02,   RGB_RMOD, RGB_VAD, RGB_HUD,  _______,
-        MACRO03,   RGB_SAI,  RGB_SPI, KC_MPRV,
-        MACRO04,   RGB_SAD,  RGB_SPD, KC_MPLY,  _______,
-        MACRO05,   RGB_TOG,           KC_MNXT),
+        MC_1,   RGB_MOD,  RGB_VAI, RGB_HUI,  KC_DEL,
+        MC_2,   RGB_RMOD, RGB_VAD, RGB_HUD,  _______,
+        MC_3,   RGB_SAI,  RGB_SPI, KC_MPRV,
+        MC_4,   RGB_SAD,  RGB_SPD, KC_MPLY,  _______,
+        MC_5,   RGB_TOG,           KC_MNXT),
 
     [L2] = LAYOUT_numpad_6x5(
         _______, _______,  _______, _______,  _______,