From e4f4ceaf3f2e3d25fb282273a81f9b58790fc427 Mon Sep 17 00:00:00 2001 From: lokher Date: Wed, 26 Apr 2023 16:32:15 +0800 Subject: merge upstream 713427c --- keyboards/keychron/q2_pro/ansi_encoder/ansi_encoder.c | 0 keyboards/keychron/q2_pro/ansi_encoder/config.h | 0 keyboards/keychron/q2_pro/ansi_encoder/info.json | 0 keyboards/keychron/q2_pro/ansi_encoder/keymaps/default/keymap.c | 2 +- keyboards/keychron/q2_pro/ansi_encoder/keymaps/default/rules.mk | 0 keyboards/keychron/q2_pro/ansi_encoder/keymaps/via/keymap.c | 2 +- keyboards/keychron/q2_pro/ansi_encoder/keymaps/via/rules.mk | 0 keyboards/keychron/q2_pro/ansi_encoder/rules.mk | 0 8 files changed, 2 insertions(+), 2 deletions(-) mode change 100755 => 100644 keyboards/keychron/q2_pro/ansi_encoder/ansi_encoder.c mode change 100755 => 100644 keyboards/keychron/q2_pro/ansi_encoder/config.h mode change 100755 => 100644 keyboards/keychron/q2_pro/ansi_encoder/info.json mode change 100755 => 100644 keyboards/keychron/q2_pro/ansi_encoder/keymaps/default/keymap.c mode change 100755 => 100644 keyboards/keychron/q2_pro/ansi_encoder/keymaps/default/rules.mk mode change 100755 => 100644 keyboards/keychron/q2_pro/ansi_encoder/keymaps/via/keymap.c mode change 100755 => 100644 keyboards/keychron/q2_pro/ansi_encoder/keymaps/via/rules.mk mode change 100755 => 100644 keyboards/keychron/q2_pro/ansi_encoder/rules.mk (limited to 'keyboards/keychron/q2_pro/ansi_encoder') diff --git a/keyboards/keychron/q2_pro/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q2_pro/ansi_encoder/ansi_encoder.c old mode 100755 new mode 100644 diff --git a/keyboards/keychron/q2_pro/ansi_encoder/config.h b/keyboards/keychron/q2_pro/ansi_encoder/config.h old mode 100755 new mode 100644 diff --git a/keyboards/keychron/q2_pro/ansi_encoder/info.json b/keyboards/keychron/q2_pro/ansi_encoder/info.json old mode 100755 new mode 100644 diff --git a/keyboards/keychron/q2_pro/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q2_pro/ansi_encoder/keymaps/default/keymap.c old mode 100755 new mode 100644 index aa51c14c72..f8ad9414fb --- a/keyboards/keychron/q2_pro/ansi_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/q2_pro/ansi_encoder/keymaps/default/keymap.c @@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN1),MO(FN2), KC_LEFT, KC_DOWN, KC_RGHT), [MAC_FN1] = LAYOUT_ansi_knob_67( - 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, _______, 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, _______, RGB_TOG, _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/keychron/q2_pro/ansi_encoder/keymaps/default/rules.mk b/keyboards/keychron/q2_pro/ansi_encoder/keymaps/default/rules.mk old mode 100755 new mode 100644 diff --git a/keyboards/keychron/q2_pro/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q2_pro/ansi_encoder/keymaps/via/keymap.c old mode 100755 new mode 100644 index 042586ad94..7dbd727462 --- a/keyboards/keychron/q2_pro/ansi_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/q2_pro/ansi_encoder/keymaps/via/keymap.c @@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN1),MO(FN2), KC_LEFT, KC_DOWN, KC_RGHT), [MAC_FN1] = LAYOUT_ansi_knob_67( - 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, _______, 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, _______, RGB_TOG, _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/keychron/q2_pro/ansi_encoder/keymaps/via/rules.mk b/keyboards/keychron/q2_pro/ansi_encoder/keymaps/via/rules.mk old mode 100755 new mode 100644 diff --git a/keyboards/keychron/q2_pro/ansi_encoder/rules.mk b/keyboards/keychron/q2_pro/ansi_encoder/rules.mk old mode 100755 new mode 100644 -- cgit v1.2.3