gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-07-16 04:41:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source
This commit is contained in:
QMK Bot 2025-05-07 17:38:45 +00:00
commit 1bc3494494
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
keyboards/cxt_studio/12e3/keyboard.json
View File

@ -21,8 +21,8 @@
}, },
"encoder": { "encoder": {
"rotary": [ "rotary": [
{"pin_a": "F5", "pin_b": "F6"}, {"pin_a": "F5", "pin_b": "F6", "resolution": 4},
{"pin_a": "E6", "pin_b": "F0"}, {"pin_a": "E6", "pin_b": "F0", "resolution": 4},
{"pin_a": "B3", "pin_b": "B2", "resolution": 2} {"pin_a": "B3", "pin_b": "B2", "resolution": 2}
] ]
}, },

8
keyboards/cxt_studio/12e3/keymaps/default/keymap.c
View File

@ -11,14 +11,14 @@ enum my_layers {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = LAYOUT( [_BASE] = LAYOUT(
KC_PSCR, KC_CUT, KC_COPY, KC_PSTE, MS_BTN3, RM_TOGG, KC_ESC, C(KC_X), C(KC_C), C(KC_V), MS_BTN3, RM_TOGG,
KC_CALC, KC_UNDO, KC_MPLY, KC_MNXT, KC_MUTE, KC_PSCR,C(KC_Z), KC_CALC, KC_MNXT, KC_MPLY,
MO(1), KC_LGUI, KC_DEL, KC_APP MO(1), KC_LGUI, KC_DEL, KC_APP
), ),
[_RGBL] = LAYOUT( [_RGBL] = LAYOUT(
RM_NEXT, RM_SATU, KC_INS, KC_DEL, _______, _______, RM_NEXT, RM_SATU, KC_INS, KC_DEL, _______, _______,
RM_PREV, RM_SATD, KC_PGUP, KC_HOME, _______, RM_PREV, RM_SATD, KC_PGUP, KC_HOME, KC_MUTE,
_______, QK_BOOT, KC_PGDN, KC_END _______, QK_BOOT, KC_PGDN, KC_END
), ),
}; };