diff options
Diffstat (limited to 'keyboards/contra/keymaps')
-rw-r--r-- | keyboards/contra/keymaps/alper/keymap.c | 6 | ||||
-rw-r--r-- | keyboards/contra/keymaps/basic_qwerty/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/contra/keymaps/default/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/contra/keymaps/maxr1998/config.h | 11 | ||||
-rw-r--r-- | keyboards/contra/keymaps/maxr1998/keymap.c | 4 | ||||
-rw-r--r-- | keyboards/contra/keymaps/ryanm101/keymap.c | 32 | ||||
-rw-r--r-- | keyboards/contra/keymaps/via/keymap.c | 2 |
7 files changed, 34 insertions, 25 deletions
diff --git a/keyboards/contra/keymaps/alper/keymap.c b/keyboards/contra/keymaps/alper/keymap.c index af81040b58..6cfe83ffe6 100644 --- a/keyboards/contra/keymaps/alper/keymap.c +++ b/keyboards/contra/keymaps/alper/keymap.c @@ -122,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______, - LGUI(KC_GRAVE), LGUI(LSFT(KC_LBRACKET)), LGUI(LSFT(KC_RBRACKET)), _______, _______, _______, _______, KC_MFFD, KC_VOLD, KC_VOLU, KC_MPLY + LGUI(KC_GRAVE), LGUI(LSFT(KC_LBRC)), LGUI(LSFT(KC_RBRC)), _______, _______, _______, _______, KC_MFFD, KC_VOLD, KC_VOLU, KC_MPLY ), /* Adjust (Lower + Raise) @@ -137,9 +137,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_ADJUST] = LAYOUT_planck_mit( - _______, QK_BOOT, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL , + _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL , _______, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, - _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, TERM_ON, TERM_OFF, _______, _______, _______, + _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) diff --git a/keyboards/contra/keymaps/basic_qwerty/keymap.c b/keyboards/contra/keymaps/basic_qwerty/keymap.c index 7cb947b5f6..db41d1d5b1 100644 --- a/keyboards/contra/keymaps/basic_qwerty/keymap.c +++ b/keyboards/contra/keymaps/basic_qwerty/keymap.c @@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_QUOT, - KC_CAPSLOCK, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, RAISE, KC_LEFT, KC_RGHT, KC_UP, KC_DOWN + KC_CAPS, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, RAISE, KC_LEFT, KC_RGHT, KC_UP, KC_DOWN ), /* Lower diff --git a/keyboards/contra/keymaps/default/keymap.c b/keyboards/contra/keymaps/default/keymap.c index 1a365c9a6d..60fbe4ba8b 100644 --- a/keyboards/contra/keymaps/default/keymap.c +++ b/keyboards/contra/keymaps/default/keymap.c @@ -161,7 +161,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_ADJUST] = LAYOUT_planck_mit( - _______, QK_BOOT, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL , + _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL , _______, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, PLOVER, _______, _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/contra/keymaps/maxr1998/config.h b/keyboards/contra/keymaps/maxr1998/config.h index b384a2fd34..1ab74676d4 100644 --- a/keyboards/contra/keymaps/maxr1998/config.h +++ b/keyboards/contra/keymaps/maxr1998/config.h @@ -6,7 +6,16 @@ #define TAPPING_TOGGLE 2 #define RGB_DI_PIN F7 // pin the DI on the WS2812B is hooked-up to -#define RGBLIGHT_ANIMATIONS // run RGB animations +#define RGBLIGHT_EFFECT_BREATHING +#define RGBLIGHT_EFFECT_RAINBOW_MOOD +#define RGBLIGHT_EFFECT_RAINBOW_SWIRL +#define RGBLIGHT_EFFECT_SNAKE +#define RGBLIGHT_EFFECT_KNIGHT +#define RGBLIGHT_EFFECT_CHRISTMAS +#define RGBLIGHT_EFFECT_STATIC_GRADIENT +#define RGBLIGHT_EFFECT_RGB_TEST +#define RGBLIGHT_EFFECT_ALTERNATING +#define RGBLIGHT_EFFECT_TWINKLE #define RGBLED_NUM 12 // number of LEDs #define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue #define RGBLIGHT_SAT_STEP 25 // units to step when in/decresing saturation diff --git a/keyboards/contra/keymaps/maxr1998/keymap.c b/keyboards/contra/keymaps/maxr1998/keymap.c index 044ed0c0cb..df3f7ea591 100644 --- a/keyboards/contra/keymaps/maxr1998/keymap.c +++ b/keyboards/contra/keymaps/maxr1998/keymap.c @@ -179,7 +179,7 @@ void update_tri_layer_user(void) { void led_set_user(uint8_t usb_led) { // Force-enable Numlock if (!(usb_led & (1<<USB_LED_NUM_LOCK))) { - register_code(KC_NUMLOCK); - unregister_code(KC_NUMLOCK); + register_code(KC_NUM_LOCK); + unregister_code(KC_NUM_LOCK); } } diff --git a/keyboards/contra/keymaps/ryanm101/keymap.c b/keyboards/contra/keymaps/ryanm101/keymap.c index 721a9a06ea..27c12bfa44 100644 --- a/keyboards/contra/keymaps/ryanm101/keymap.c +++ b/keyboards/contra/keymaps/ryanm101/keymap.c @@ -114,10 +114,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_L2] = LAYOUT_ortho_4x12( - KC_SYSREQ, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, KC_NLCK, KC_P7, KC_P8, KC_P9, KC_PAST, KC_BSPC, - XXXXXXX, KC_F5, KC_F6, KC_F7, KC_F8, XXXXXXX, XXXXXXX, KC_P4, KC_P5, KC_P6, KC_PSLS, _______, - XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, XXXXXXX, XXXXXXX, KC_P1, KC_P2, KC_P3, KC_PPLS, KC_PENT, - _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC, XXXXXXX, KC_P0, KC_PDOT, KC_PMNS, _______ + KC_SYRQ, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, KC_NUM, KC_P7, KC_P8, KC_P9, KC_PAST, KC_BSPC, + XXXXXXX, KC_F5, KC_F6, KC_F7, KC_F8, XXXXXXX, XXXXXXX, KC_P4, KC_P5, KC_P6, KC_PSLS, _______, + XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, XXXXXXX, XXXXXXX, KC_P1, KC_P2, KC_P3, KC_PPLS, KC_PENT, + _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC, XXXXXXX, KC_P0, KC_PDOT, KC_PMNS, _______ ), /* L3 @@ -185,21 +185,21 @@ void tmux_dance (qk_tap_dance_state_t *state, void *user_data) { if (state->count == 1) { SEND_STRING("tmux"); register_code(KC_ENT); unregister_code(KC_ENT); } else if (state->count == 2) { - register_mods(MOD_BIT(KC_LCTRL)); + register_mods(MOD_BIT(KC_LCTL)); register_code(KC_B); unregister_code(KC_B); - unregister_mods(MOD_BIT(KC_LCTRL)); - register_mods(MOD_BIT(KC_LSHIFT)); + unregister_mods(MOD_BIT(KC_LCTL)); + register_mods(MOD_BIT(KC_LSFT)); register_code(KC_5); unregister_code(KC_5); - unregister_mods(MOD_BIT(KC_LSHIFT)); + unregister_mods(MOD_BIT(KC_LSFT)); } } void cmd_dance (qk_tap_dance_state_t *state, void *user_data) { if (state->count == 1) { - register_mods(MOD_BIT(KC_LCTRL)); + register_mods(MOD_BIT(KC_LCTL)); register_mods(MOD_BIT(KC_LALT)); register_code(KC_DELETE); - unregister_mods(MOD_BIT(KC_LCTRL)); + unregister_mods(MOD_BIT(KC_LCTL)); unregister_mods(MOD_BIT(KC_LALT)); unregister_code(KC_DELETE); } else if (state->count == 2) { @@ -211,10 +211,10 @@ void cmd_dance (qk_tap_dance_state_t *state, void *user_data) { unregister_code(KC_ESC); } else if (state->count == 3) { register_mods(MOD_BIT(KC_LGUI)); - register_mods(MOD_BIT(KC_LSHIFT)); + register_mods(MOD_BIT(KC_LSFT)); register_code(KC_4); unregister_mods(MOD_BIT(KC_LGUI)); - unregister_mods(MOD_BIT(KC_LSHIFT)); + unregister_mods(MOD_BIT(KC_LSFT)); unregister_code(KC_4); } } @@ -222,13 +222,13 @@ void cmd_dance (qk_tap_dance_state_t *state, void *user_data) { void cmd_sft_slash_pipe_down (qk_tap_dance_state_t *state, void *user_data) { if (state->count == 1) { if (state->interrupted || state->pressed==0) { - register_code (KC_NONUS_BSLASH); + register_code (KC_NONUS_BACKSLASH); } else { register_code (KC_LSFT); } } else if (state->count == 2) { register_mods(MOD_BIT(KC_LSFT)); - register_code(KC_NONUS_BSLASH); + register_code(KC_NONUS_BACKSLASH); } } @@ -237,11 +237,11 @@ void cmd_sft_slash_pipe_up (qk_tap_dance_state_t *state, void *user_data) { if (keyboard_report->mods & MOD_BIT(KC_LSFT)) { unregister_code (KC_LSFT); } else { - unregister_code (KC_NONUS_BSLASH); + unregister_code (KC_NONUS_BACKSLASH); } } else if (state->count == 2) { unregister_mods(MOD_BIT(KC_LSFT)); - unregister_code(KC_NONUS_BSLASH); + unregister_code(KC_NONUS_BACKSLASH); } } diff --git a/keyboards/contra/keymaps/via/keymap.c b/keyboards/contra/keymaps/via/keymap.c index 88c9d470b2..aac25422d6 100644 --- a/keyboards/contra/keymaps/via/keymap.c +++ b/keyboards/contra/keymaps/via/keymap.c @@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_ADJUST] = LAYOUT_planck_mit( - _______, QK_BOOT, DEBUG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL , + _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ |