mirrors/keychron_qmk_firmware
mirrors/keychron_qmk_firmware
0
0
Fork 0
mirror of https://github.com/Keychron/qmk_firmware.git synced 2024-11-25 01:47:10 +06:00
Code Issues Packages Projects Releases Wiki Activity

Update q2

Browse Source
This commit is contained in:
lalalademaxiya1 2023-04-22 16:29:01 +08:00
parent eae897fee1
commit 8770893f95
9 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
keyboards/keychron/common/keychron_common.c
View File

@ -194,7 +194,7 @@ static void encoder_pad_cb(void *param) {
encoder_inerrupt_read((uint32_t)param & 0XFF); encoder_inerrupt_read((uint32_t)param & 0XFF);
} }
void keyboard_post_init_kb(void) { __attribute__((weak)) void keyboard_post_init_kb(void) {
pin_t encoders_pad_a[NUM_ENCODERS] = ENCODERS_PAD_A; pin_t encoders_pad_a[NUM_ENCODERS] = ENCODERS_PAD_A;
pin_t encoders_pad_b[NUM_ENCODERS] = ENCODERS_PAD_B; pin_t encoders_pad_b[NUM_ENCODERS] = ENCODERS_PAD_B;
for (uint32_t i = 0; i < NUM_ENCODERS; i++) { for (uint32_t i = 0; i < NUM_ENCODERS; i++) {

2
keyboards/keychron/q2/ansi_encoder/info.json
View File

@ -29,7 +29,7 @@
"diode_direction": "ROW2COL", "diode_direction": "ROW2COL",
"encoder": { "encoder": {
"rotary": [ "rotary": [
{"pin_a": "A10", "pin_b": "B8"} {"pin_a": "A10", "pin_b": "B5"}
] ]
}, },
"processor": "STM32L432", "processor": "STM32L432",

2
keyboards/keychron/q2/iso_encoder/info.json
View File

@ -29,7 +29,7 @@
"diode_direction": "ROW2COL", "diode_direction": "ROW2COL",
"encoder": { "encoder": {
"rotary": [ "rotary": [
{"pin_a": "A10", "pin_b": "B8"} {"pin_a": "A10", "pin_b": "B5"}
] ]
}, },
"processor": "STM32L432", "processor": "STM32L432",

3
keyboards/keychron/q2/jis_encoder/info.json
View File

@ -14,6 +14,7 @@
"console": false, "console": false,
"dip_switch": true, "dip_switch": true,
"encoder": true, "encoder": true,
"encoder_map": true,
"extrakey": true, "extrakey": true,
"mousekey": true, "mousekey": true,
"nkro": true, "nkro": true,
@ -29,7 +30,7 @@
"diode_direction": "ROW2COL", "diode_direction": "ROW2COL",
"encoder": { "encoder": {
"rotary": [ "rotary": [
{"pin_a": "A10", "pin_b": "B8"} {"pin_a": "A10", "pin_b": "B5"}
] ]
}, },
"processor": "STM32L432", "processor": "STM32L432",

1
keyboards/keychron/q2/jis_encoder/keymaps/default/rules.mk
View File

@ -1 +0,0 @@
ENCODER_MAP_ENABLE = yes

12
keyboards/keychron/q2/jis_encoder/keymaps/keychron/keymap.c
View File

@ -65,12 +65,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
}; };
// clang-format on
#if defined(ENCODER_MAP_ENABLE) #if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {[MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [MAC_FN1] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, [WIN_FN1] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, [_FN2] = {ENCODER_CCW_CW(_______, _______)}}; const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
[MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
[WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
[MAC_FN1] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
[WIN_FN1] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
[_FN2] = {ENCODER_CCW_CW(_______, _______)}
};
#endif // ENCODER_MAP_ENABLE #endif // ENCODER_MAP_ENABLE
// clang-format on
void housekeeping_task_user(void) { void housekeeping_task_user(void) {
housekeeping_task_keychron(); housekeeping_task_keychron();
housekeeping_task_keychron_ft(); housekeeping_task_keychron_ft();

1
keyboards/keychron/q2/jis_encoder/keymaps/keychron/rules.mk
View File

@ -1,5 +1,4 @@
VIA_ENABLE = yes VIA_ENABLE = yes
ENCODER_MAP_ENABLE = yes
VPATH += keyboards/keychron/common VPATH += keyboards/keychron/common
SRC += keychron_common.c keychron_ft_common.c SRC += keychron_common.c keychron_ft_common.c

1
keyboards/keychron/q2/jis_encoder/keymaps/via/rules.mk
View File

@ -1,2 +1 @@
VIA_ENABLE = yes VIA_ENABLE = yes
ENCODER_MAP_ENABLE = yes

1
keyboards/keychron/v6/iso/rules.mk
View File

@ -1,7 +1,6 @@
# Build Options # Build Options
# change yes to no to disable. # change yes to no to disable.
# #
RGB_MATRIX_DRIVER = CKLED2001
EEPROM_DRIVER = wear_leveling EEPROM_DRIVER = wear_leveling
WEAR_LEVELING_DRIVER = embedded_flash WEAR_LEVELING_DRIVER = embedded_flash