diff options
Diffstat (limited to 'keyboards/mechwild/mercutio')
4 files changed, 9 insertions, 9 deletions
diff --git a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/keymap.c b/keyboards/mechwild/mercutio/keymaps/fearless_spiff/keymap.c index 50b1b6471c..53e0566005 100644 --- a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/keymap.c +++ b/keyboards/mechwild/mercutio/keymaps/fearless_spiff/keymap.c @@ -76,14 +76,14 @@ static const encoder_key PROGMEM encoder_keys[] = { {"Teams", "Toggle", "Mic", KC_TEAMS_MUTE}, {"Teams", "Toggle", "Cam", KC_TEAMS_CAM}, {"Ctrl", "Alt", "Del", KC_CAD}, - {"Caps", "Lock", "", KC_CAPSLOCK}, + {"Caps", "Lock", "", KC_CAPS_LOCK}, {"Pause", "", "", KC_PAUSE}, {"PrtScr", "", "", KC_PSCR}, {"Insert", "", "", KC_INS}, {"Play", "", "", KC_MEDIA_PLAY_PAUSE} }; -#define NUMBER_OF_ENCODER_KEYS sizeof(encoder_keys)/sizeof(encoder_keys[0]) +#define NUMBER_OF_ENCODER_KEYS ARRAY_SIZE(encoder_keys) static uint8_t selected_encoder_key_id = 0; static encoder_key selected_encoder_key; @@ -143,7 +143,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { set_selected_encoder_key(selected_encoder_key_id); } if (IS_LAYER_ON(FN_1)) { - tap_code16(KC_PGDOWN); + tap_code16(KC_PGDN); } if (IS_LAYER_ON(FN_2)) { tap_code(KC_VOLU); diff --git a/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/keymap.c b/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/keymap.c index 267d3add14..73bc282a7e 100644 --- a/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/keymap.c +++ b/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/keymap.c @@ -75,14 +75,14 @@ static const encoder_key PROGMEM encoder_keys[] = { {"Teams", "Toggle", "Mic", KC_TEAMS_MUTE}, {"Teams", "Toggle", "Cam", KC_TEAMS_CAM}, {"Ctrl", "Alt", "Del", KC_CAD}, - {"Caps", "Lock", "", KC_CAPSLOCK}, + {"Caps", "Lock", "", KC_CAPS_LOCK}, {"Pause", "", "", KC_PAUSE}, {"PrtScr", "", "", KC_PSCR}, {"Insert", "", "", KC_INS}, {"Play", "", "", KC_MEDIA_PLAY_PAUSE} }; -#define NUMBER_OF_ENCODER_KEYS sizeof(encoder_keys)/sizeof(encoder_keys[0]) +#define NUMBER_OF_ENCODER_KEYS ARRAY_SIZE(encoder_keys) static uint8_t selected_encoder_key_id = 0; static encoder_key selected_encoder_key; @@ -108,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [QWERT] = LAYOUT_all( KC_ENC, TD(TD_TAB_ESC), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, - LT(1,KC_CAPSLOCK), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_PLUS, KC_ENT, + LT(1,KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_PLUS, KC_ENT, KC_LSFT, KC_LABK, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, KC_LCTL, KC_LGUI, LT(2,KC_LALT), KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(2), KC_RCTL ), @@ -135,7 +135,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { set_selected_encoder_key(selected_encoder_key_id); } if (IS_LAYER_ON(FN_1)) { - tap_code16(KC_PGDOWN); + tap_code16(KC_PGDN); } if (IS_LAYER_ON(FN_2)) { tap_code(KC_VOLU); diff --git a/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c b/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c index 5c22abee3f..a8f1d488d4 100755 --- a/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c +++ b/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c @@ -71,7 +71,7 @@ static const keycodedescType PROGMEM keyselection[] = { {"FLASH", QK_BOOT}, // firmware flash mode }; -#define MAX_KEYSELECTION sizeof(keyselection)/sizeof(keyselection[0]) +#define MAX_KEYSELECTION ARRAY_SIZE(keyselection) static uint8_t selectedkey_idx = 0; static keycodedescType selectedkey_rec; diff --git a/keyboards/mechwild/mercutio/keymaps/jonavin/readme.md b/keyboards/mechwild/mercutio/keymaps/jonavin/readme.md index 6255dadd05..ed1395ede6 100644 --- a/keyboards/mechwild/mercutio/keymaps/jonavin/readme.md +++ b/keyboards/mechwild/mercutio/keymaps/jonavin/readme.md @@ -30,7 +30,7 @@ Features {"C-A-D", KC_CAD}, // Ctrl-Alt-Del {"AltF4", KC_AF4}, {"PLAY", KC_MEDIA_PLAY_PAUSE}, - {"RESET", RESET}, // firmware flash mode + {"RESET", QK_BOOT}, // firmware flash mode }; - Additional encoder functionality |