Update keymap for newer QMK version

This commit is contained in:
Sheldon 2025-11-21 09:55:14 +08:00
parent 3e5244aa91
commit 35cf8b1bc7
3 changed files with 11 additions and 11 deletions

View File

@ -32,9 +32,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define USE_SERIAL_PD2 #define USE_SERIAL_PD2
#define TAPPING_FORCE_HOLD
#define TAPPING_TERM 200 #define TAPPING_TERM 200
#define PERMISSIVE_HOLD #define QUICK_TAP_TERM 0
#define HOLD_ON_OTHER_KEY_PRESS
#ifdef RGBLIGHT_ENABLE #ifdef RGBLIGHT_ENABLE
#undef RGBLED_NUM #undef RGBLED_NUM

View File

@ -23,7 +23,7 @@ enum tap_dance{
GUI_ALT GUI_ALT
}; };
qk_tap_dance_action_t tap_dance_actions[] = { tap_dance_action_t tap_dance_actions[] = {
[GUI_ALT] = ACTION_TAP_DANCE_DOUBLE(KC_LGUI, KC_LALT) [GUI_ALT] = ACTION_TAP_DANCE_DOUBLE(KC_LGUI, KC_LALT)
}; };
@ -110,12 +110,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
_______, KC_UNDS, KC_LBRC, KC_LCBR, KC_LPRN,KC_MINUS, KC_PLUS, KC_RPRN, KC_RCBR, KC_RBRC, KC_EQL, KC_DEL, _______, KC_UNDS, KC_LBRC, KC_LCBR, KC_LPRN,KC_MINUS, KC_PLUS, KC_RPRN, KC_RCBR, KC_RBRC, KC_EQL, KC_DEL,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PIPE, KC_BSLS, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PIPE, KC_BSLS, _______,
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
_______, _______, _______, MO(L3), OS_CTRL, OS_ALT _______, _______, _______, MO(L3), OS_CTRL, OS_ALT
//`--------------------------' `--------------------------' //`--------------------------' `--------------------------'
), ),
/* /*
* Navigation layer. * Navigation layer.
*/ */
@ -134,9 +134,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[L3] = LAYOUT_split_3x6_3( [L3] = LAYOUT_split_3x6_3(
//,-----------------------------------------------------. ,-----------------------------------------------------. //,-----------------------------------------------------. ,-----------------------------------------------------.
RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX, QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
XXXXXXX, DL_COLE, DL_QWER, DL_GAME, XXXXXXX, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, XXXXXXX, XXXXXXX, XXXXXXX, DL_COLE, DL_QWER, DL_GAME, XXXXXXX, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, XXXXXXX, XXXXXXX,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
XXXXXXX, XXXXXXX, OS_CTRL, OS_ALT, OS_SHFT, XXXXXXX, XXXXXXX, OS_SHFT, OS_ALT, OS_CTRL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, OS_CTRL, OS_ALT, OS_SHFT, XXXXXXX, XXXXXXX, OS_SHFT, OS_ALT, OS_CTRL, XXXXXXX, XXXXXXX,
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
@ -148,7 +148,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// Callum's one shot functionality // Callum's one shot functionality
bool is_oneshot_cancel_key(uint16_t keycode) { bool is_oneshot_cancel_key(uint16_t keycode) {
switch (keycode) { switch (keycode) {
case KC_ESC : case KC_ESC :
return true; return true;
default: default:
return false; return false;
@ -178,7 +178,7 @@ oneshot_state os_alt_state = os_up_unqueued;
oneshot_state os_cmd_state = os_up_unqueued; oneshot_state os_cmd_state = os_up_unqueued;
// function prototype // function prototype
void set_keylog(uint16_t keycode, keyrecord_t *record); void set_keylog(uint16_t keycode, keyrecord_t *record);
bool process_record_user(uint16_t keycode, keyrecord_t *record) { bool process_record_user(uint16_t keycode, keyrecord_t *record) {
update_oneshot( update_oneshot(
@ -321,7 +321,7 @@ void oled_task_user(void) {
} }
} }
#else #else
// stub so process_record_user() works without enabling OLED_DRIVER_ENABLE // stub so process_record_user() works without enabling OLED_DRIVER_ENABLE
void set_keylog(uint16_t keycode, keyrecord_t *record) { void set_keylog(uint16_t keycode, keyrecord_t *record) {
return; return;
} }

View File

@ -1,5 +1,5 @@
SRC += oneshot.c SRC += oneshot.c
OLED_DRIVER_ENABLE = yes OLED_DRIVER_ENABLE = yes
TAP_DANCE_ENABLE = yes TAP_DANCE_ENABLE = yes
# Bootloader selection # Bootloader selection
BOOTLOADER = atmel-dfu BOOTLOADER = atmel-dfu