diff options
| author | Max Rumpf <max.rumpf1998@gmail.com> | 2018-08-01 02:58:52 +0200 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2018-07-31 17:58:52 -0700 |
| commit | 9d016767e8af094a4c1b88e96af143a427fb0d30 (patch) | |
| tree | 3c43632119e31c0a9b45833b9e17e1ea3b93fa1c | |
| parent | bb86d8a00c117759cd5b71b20d5974d41ffb455c (diff) | |
| download | qmk_firmware-9d016767e8af094a4c1b88e96af143a427fb0d30.tar.gz qmk_firmware-9d016767e8af094a4c1b88e96af143a427fb0d30.zip | |
Keymap: Improvements to Maxr1998's Contra keymap (#3535)
* Add image
* Improvements to my Contra layout
* Quick fix for Level3 layer
| -rw-r--r-- | keyboards/contra/keymaps/maxr1998/keymap.c | 59 | ||||
| -rw-r--r-- | keyboards/contra/keymaps/maxr1998/readme.md | 3 | ||||
| -rw-r--r-- | keyboards/contra/keymaps/maxr1998/rules.mk | 7 |
3 files changed, 20 insertions, 49 deletions
diff --git a/keyboards/contra/keymaps/maxr1998/keymap.c b/keyboards/contra/keymaps/maxr1998/keymap.c index cbd8a99fc..afdd3d94a 100644 --- a/keyboards/contra/keymaps/maxr1998/keymap.c +++ b/keyboards/contra/keymaps/maxr1998/keymap.c | |||
| @@ -20,19 +20,13 @@ | |||
| 20 | enum contra_layers { | 20 | enum contra_layers { |
| 21 | _QWERTZ, | 21 | _QWERTZ, |
| 22 | _FUNC, | 22 | _FUNC, |
| 23 | _NUMPAD, | ||
| 24 | _NUMROW | 23 | _NUMROW |
| 25 | }; | 24 | }; |
| 26 | 25 | ||
| 26 | #define KC_I3 LM(_NUMROW, MOD_LALT) | ||
| 27 | #define KC_NR MO(_NUMROW) | ||
| 28 | #define NR_L3 SAFE_RANGE | ||
| 27 | #define FUN MO(_FUNC) | 29 | #define FUN MO(_FUNC) |
| 28 | #define NPK TT(_NUMPAD) | ||
| 29 | //#define SPEC_S LM(_NUMROW, (KC_LSFT)) | ||
| 30 | //#define SPEC_L3 LM(_NUMROW, (DE_ALGR)) | ||
| 31 | |||
| 32 | enum custom_keycodes { | ||
| 33 | SPEC_S = SAFE_RANGE, | ||
| 34 | SPEC_L3 | ||
| 35 | }; | ||
| 36 | 30 | ||
| 37 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 31 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 38 | 32 | ||
| @@ -44,21 +38,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 44 | * |------+------+------+------+------+------|------+------+------+------+------+------| | 38 | * |------+------+------+------+------+------|------+------+------+------+------+------| |
| 45 | * | Shift| Y | X | C | V | B | N | M | , | . | Up | Shift| | 39 | * | Shift| Y | X | C | V | B | N | M | , | . | Up | Shift| |
| 46 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 40 | * |------+------+------+------+------+------+------+------+------+------+------+------| |
| 47 | * | Ctrl | Sup | Alt | NumP | Spec | Space | Sp_A | Fun | Left | Down | Right| | 41 | * | Ctrl | Sup | Alt | i3 | NumR | Space | Spec | Fun | Left | Down | Right| |
| 48 | * `-----------------------------------------------------------------------------------' | 42 | * `-----------------------------------------------------------------------------------' |
| 49 | */ | 43 | */ |
| 50 | [_QWERTZ] = { | 44 | [_QWERTZ] = { |
| 51 | {KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC}, | 45 | {KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC}, |
| 52 | {KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, DE_PLUS, KC_ENT }, | 46 | {KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, DE_PLUS, KC_ENT }, |
| 53 | {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_RSFT}, | 47 | {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_RSFT}, |
| 54 | {KC_LCTL, KC_LGUI, KC_LALT, NPK, SPEC_S, KC_SPC, KC_SPC, SPEC_L3, FUN, KC_LEFT, KC_DOWN, KC_RGHT} | 48 | {KC_LCTL, KC_LGUI, KC_LALT, KC_I3, KC_NR, KC_SPC, KC_SPC, NR_L3, FUN, KC_LEFT, KC_DOWN, KC_RGHT} |
| 55 | }, | 49 | }, |
| 56 | 50 | ||
| 57 | /* Function layer | 51 | /* Function layer |
| 58 | * ,-----------------------------------------------------------------------------------. | 52 | * ,-----------------------------------------------------------------------------------. |
| 59 | * | | | | | | | | Ü | | Ö | | Del | | 53 | * | | | | | | | | Ü | | Ö | | Del | |
| 60 | * |------+------+------+------+------+-------------+------+------+------+------+------| | 54 | * |------+------+------+------+------+-------------+------+------+------+------+------| |
| 61 | * | Lock | Ä | | | | | | RGBS | RGBB | RGBS | | | | 55 | * | Lock | Ä | ß | | | | | RGBS | RGBB | RGBS | | | |
| 62 | * |------+------+------+------+------+------|------+------+------+------+------+------| | 56 | * |------+------+------+------+------+------|------+------+------+------+------+------| |
| 63 | * | | | | | | | | RGBH-| RGBT | RGBH+| PgUp | | | 57 | * | | | | | | | | RGBH-| RGBT | RGBH+| PgUp | | |
| 64 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 58 | * |------+------+------+------+------+------+------+------+------+------+------+------| |
| @@ -67,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 67 | */ | 61 | */ |
| 68 | [_FUNC] = { | 62 | [_FUNC] = { |
| 69 | {_______, _______, _______, _______, _______, _______, _______, DE_UE, _______, DE_OE, _______, KC_DEL }, | 63 | {_______, _______, _______, _______, _______, _______, _______, DE_UE, _______, DE_OE, _______, KC_DEL }, |
| 70 | {KC_LOCK, DE_AE, _______, _______, _______, _______, _______, RGB_M_P, RGB_M_B, RGB_M_SW,_______, _______}, | 64 | {KC_LOCK, DE_AE, DE_SS, _______, _______, _______, _______, RGB_M_P, RGB_M_B, RGB_M_SW,_______, _______}, |
| 71 | {_______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_TOG, RGB_HUI, KC_PGUP, _______}, | 65 | {_______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_TOG, RGB_HUI, KC_PGUP, _______}, |
| 72 | {_______, _______, _______, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, KC_HOME, KC_PGDN, KC_END } | 66 | {_______, _______, _______, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, KC_HOME, KC_PGDN, KC_END } |
| 73 | }, | 67 | }, |
| @@ -76,51 +70,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 76 | * ,-----------------------------------------------------------------------------------. | 70 | * ,-----------------------------------------------------------------------------------. |
| 77 | * | | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | ß | | 71 | * | | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | ß | |
| 78 | * |------+------+------+------+------+-------------+------+------+------+------+------| | 72 | * |------+------+------+------+------+-------------+------+------+------+------+------| |
| 79 | * | | | | | | | | | | | | | | 73 | * | | | | | | | | | | | #' | | |
| 80 | * |------+------+------+------+------+------|------+------+------+------+------+------| | 74 | * |------+------+------+------+------+------|------+------+------+------+------+------| |
| 81 | * | | ><| | | | | | | | | | _ - | | | 75 | * | | <> | | | | | | | | | | -_ | | |
| 82 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 76 | * |------+------+------+------+------+------+------+------+------+------+------+------| |
| 83 | * | | | | ---- | ---- | | | ---- | ---- | | | | | 77 | * | | | | ---- | ---- | | | ---- | ---- | | | | |
| 84 | * `-----------------------------------------------------------------------------------' | 78 | * `-----------------------------------------------------------------------------------' |
| 85 | */ | 79 | */ |
| 86 | [_NUMROW] = { | 80 | [_NUMROW] = { |
| 87 | {_______, DE_1, DE_2, DE_3, DE_4, DE_5, DE_6, DE_7, DE_8, DE_9, DE_0, DE_SS }, | 81 | {_______, DE_1, DE_2, DE_3, DE_4, DE_5, DE_6, DE_7, DE_8, DE_9, DE_0, DE_SS }, |
| 88 | {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}, | 82 | {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DE_HASH, _______}, |
| 89 | {_______, DE_LESS, _______, _______, _______, _______, _______, _______, _______, _______, DE_MINS, _______}, | 83 | {_______, DE_LESS, _______, _______, _______, _______, _______, _______, _______, _______, DE_MINS, _______}, |
| 90 | {_______, _______, _______, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, _______, _______, _______} | 84 | {_______, _______, _______, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, _______, _______, _______} |
| 91 | }, | ||
| 92 | |||
| 93 | /* Numpad layer | ||
| 94 | * ,-----------------------------------------------------------------------------------. | ||
| 95 | * | | + | 7 | 8 | 9 | | | | | | | | | ||
| 96 | * |------+------+------+------+------+-------------+------+------+------+------+------| | ||
| 97 | * | | - | 4 | 5 | 6 | | | | | | | | | ||
| 98 | * |------+------+------+------+------+------|------+------+------+------+------+------| | ||
| 99 | * | | * | 1 | 2 | 3 | | | | | | | | | ||
| 100 | * |------+------+------+------+------+------+------+------+------+------+------+------| | ||
| 101 | * | | / | 0 | ---- | ---- | | | ---- | ---- | | | | | ||
| 102 | * `-----------------------------------------------------------------------------------' | ||
| 103 | */ | ||
| 104 | [_NUMPAD] = { | ||
| 105 | {DEBUG, KC_PPLS, KC_P7, KC_P8, KC_P9, _______, _______, _______, _______, _______, _______, _______}, | ||
| 106 | {_______, KC_PMNS, KC_P4, KC_P5, KC_P6, _______, _______, _______, _______, _______, _______, _______}, | ||
| 107 | {_______, KC_PAST, KC_P1, KC_P2, KC_P3, _______, _______, _______, _______, _______, _______, _______}, | ||
| 108 | {_______, KC_PSLS, KC_P0, _______, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, _______, _______, _______} | ||
| 109 | } | 85 | } |
| 110 | }; | 86 | }; |
| 111 | 87 | ||
| 112 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | 88 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
| 113 | switch (keycode) { | 89 | if (keycode == NR_L3) { |
| 114 | case SPEC_S: | ||
| 115 | if (record->event.pressed) { | ||
| 116 | register_code(KC_LSFT); | ||
| 117 | layer_on(_NUMROW); | ||
| 118 | } else { | ||
| 119 | layer_off(_NUMROW); | ||
| 120 | unregister_code(KC_LSFT); | ||
| 121 | } | ||
| 122 | return false; | ||
| 123 | case SPEC_L3: | ||
| 124 | if (record->event.pressed) { | 90 | if (record->event.pressed) { |
| 125 | register_code(DE_ALGR); | 91 | register_code(DE_ALGR); |
| 126 | layer_on(_NUMROW); | 92 | layer_on(_NUMROW); |
| @@ -129,9 +95,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 129 | unregister_code(DE_ALGR); | 95 | unregister_code(DE_ALGR); |
| 130 | } | 96 | } |
| 131 | return false; | 97 | return false; |
| 132 | default: | ||
| 133 | return true; | ||
| 134 | } | 98 | } |
| 99 | return true; | ||
| 135 | } | 100 | } |
| 136 | 101 | ||
| 137 | void led_set_user(uint8_t usb_led) { | 102 | void led_set_user(uint8_t usb_led) { |
diff --git a/keyboards/contra/keymaps/maxr1998/readme.md b/keyboards/contra/keymaps/maxr1998/readme.md index c18140aca..18d57e2cb 100644 --- a/keyboards/contra/keymaps/maxr1998/readme.md +++ b/keyboards/contra/keymaps/maxr1998/readme.md | |||
| @@ -1 +1,2 @@ | |||
| 1 | # Contra Layout by Maxr1998 \ No newline at end of file | 1 | # Contra Layout by Maxr1998 |
| 2 |  \ No newline at end of file | ||
diff --git a/keyboards/contra/keymaps/maxr1998/rules.mk b/keyboards/contra/keymaps/maxr1998/rules.mk index bd395e10f..75a476114 100644 --- a/keyboards/contra/keymaps/maxr1998/rules.mk +++ b/keyboards/contra/keymaps/maxr1998/rules.mk | |||
| @@ -1,8 +1,13 @@ | |||
| 1 | RGBLIGHT_ENABLE = yes | 1 | RGBLIGHT_ENABLE = yes |
| 2 | KEY_LOCK_ENABLE = yes | 2 | KEY_LOCK_ENABLE = yes |
| 3 | 3 | ||
| 4 | EXTRAFLAGS += -flto | ||
| 5 | UNICODE_ENABLE = no | ||
| 6 | MOUSEKEY_ENABLE = no | ||
| 7 | |||
| 4 | ### Debugging ### | 8 | ### Debugging ### |
| 5 | #CONSOLE_ENABLE = yes | 9 | CONSOLE_ENABLE = no # yes |
| 10 | COMMAND_ENABLE = no | ||
| 6 | 11 | ||
| 7 | ifndef QUANTUM_DIR | 12 | ifndef QUANTUM_DIR |
| 8 | include ../../../../Makefile | 13 | include ../../../../Makefile |
