merge upstream 713427c

7 files changed, 2 insertions, 2 deletions

diff --git a/keyboards/keychron/k6_pro/jis/rgb/config.h b/keyboards/keychron/k6_pro/jis/rgb/config.h
index cae428a714..cae428a714 100755..100644
--- a/keyboards/keychron/k6_pro/jis/rgb/config.h
+++ b/keyboards/keychron/k6_pro/jis/rgb/config.h
diff --git a/keyboards/keychron/k6_pro/jis/rgb/info.json b/keyboards/keychron/k6_pro/jis/rgb/info.json
index fde6618319..fde6618319 100755..100644
--- a/keyboards/keychron/k6_pro/jis/rgb/info.json
+++ b/keyboards/keychron/k6_pro/jis/rgb/info.json
diff --git a/keyboards/keychron/k6_pro/jis/rgb/keymaps/default/keymap.c b/keyboards/keychron/k6_pro/jis/rgb/keymaps/default/keymap.c
index 573314c824..884d028ca1 100755..100644
--- a/keyboards/keychron/k6_pro/jis/rgb/keymaps/default/keymap.c
+++ b/keyboards/keychron/k6_pro/jis/rgb/keymaps/default/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,  KC_LGUI,  KC_LALT,  KC_INT5,                      KC_SPC,                       KC_INT4,  MO(WIN_FN1),MO(FN2), KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT),
 
     [MAC_FN1] = LAYOUT(
-        KC_GRV,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LNPD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_TRNS, KC_TRNS, RGB_TOG,
+        KC_GRV,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_TRNS, KC_TRNS, RGB_TOG,
         KC_TRNS,  BT_HST1,  BT_HST2,  BT_HST3,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                    KC_TRNS,
         RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,          KC_TRNS,
         KC_TRNS,            RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  NK_TOGG,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,          KC_TRNS,
diff --git a/keyboards/keychron/k6_pro/jis/rgb/keymaps/via/keymap.c b/keyboards/keychron/k6_pro/jis/rgb/keymaps/via/keymap.c
index 34101f9c8a..41c63855cd 100755..100644
--- a/keyboards/keychron/k6_pro/jis/rgb/keymaps/via/keymap.c
+++ b/keyboards/keychron/k6_pro/jis/rgb/keymaps/via/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,  KC_LGUI,  KC_LALT,  KC_INT5,                      KC_SPC,                       KC_INT4,  MO(WIN_FN1),MO(FN2), KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT),
 
     [MAC_FN1] = LAYOUT(
-        KC_GRV,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LNPD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_TRNS, KC_TRNS, RGB_TOG,
+        KC_GRV,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_TRNS, KC_TRNS, RGB_TOG,
         KC_TRNS,  BT_HST1,  BT_HST2,  BT_HST3,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                    KC_TRNS,
         RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,          KC_TRNS,
         KC_TRNS,            RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  NK_TOGG,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,          KC_TRNS,
diff --git a/keyboards/keychron/k6_pro/jis/rgb/keymaps/via/rules.mk b/keyboards/keychron/k6_pro/jis/rgb/keymaps/via/rules.mk
index 4eae6e776c..4eae6e776c 100755..100644
--- a/keyboards/keychron/k6_pro/jis/rgb/keymaps/via/rules.mk
+++ b/keyboards/keychron/k6_pro/jis/rgb/keymaps/via/rules.mk
diff --git a/keyboards/keychron/k6_pro/jis/rgb/rgb.c b/keyboards/keychron/k6_pro/jis/rgb/rgb.c
index edf78e538c..edf78e538c 100755..100644
--- a/keyboards/keychron/k6_pro/jis/rgb/rgb.c
+++ b/keyboards/keychron/k6_pro/jis/rgb/rgb.c
diff --git a/keyboards/keychron/k6_pro/jis/rgb/rules.mk b/keyboards/keychron/k6_pro/jis/rgb/rules.mk
index f5f4192470..f5f4192470 100755..100644
--- a/keyboards/keychron/k6_pro/jis/rgb/rules.mk
+++ b/keyboards/keychron/k6_pro/jis/rgb/rules.mk