diff options
| author | Danny <nooges@users.noreply.github.com> | 2017-09-25 13:21:27 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2017-09-25 13:21:27 -0400 |
| commit | 5dab2ef12a5a7f244b9f381df7773cd6e46b35a5 (patch) | |
| tree | c453f65f7c445ce6012788fe7ebf030e3fb78d19 | |
| parent | a67c930e9e7b44c6fa7f73516f8410da8de6cb15 (diff) | |
| download | qmk_firmware-5dab2ef12a5a7f244b9f381df7773cd6e46b35a5.tar.gz qmk_firmware-5dab2ef12a5a7f244b9f381df7773cd6e46b35a5.zip | |
Update Viterbi default layout (#1753)
* Implement sticky modifiers
* Change underglow based on sticky mod status
* Set RGB lights based on which mods are stickied
* Add controls for dimming RGB LEDs
* Only update RGB lights if modifiers have changed
* Use all LEDs to show modifier state
* Create default keymap for Viterbi
| -rw-r--r-- | keyboards/viterbi/keymaps/default/keymap.c | 232 | ||||
| -rw-r--r-- | keyboards/viterbi/keymaps/dwallace/keymap.c | 159 |
2 files changed, 236 insertions, 155 deletions
diff --git a/keyboards/viterbi/keymaps/default/keymap.c b/keyboards/viterbi/keymaps/default/keymap.c index 4b9e605dc..b5215f929 100644 --- a/keyboards/viterbi/keymaps/default/keymap.c +++ b/keyboards/viterbi/keymaps/default/keymap.c | |||
| @@ -9,160 +9,120 @@ extern keymap_config_t keymap_config; | |||
| 9 | // Layer names don't all need to be of the same length, obviously, and you can also skip them | 9 | // Layer names don't all need to be of the same length, obviously, and you can also skip them |
| 10 | // entirely and just use numbers. | 10 | // entirely and just use numbers. |
| 11 | #define _QWERTY 0 | 11 | #define _QWERTY 0 |
| 12 | #define _COLEMAK 1 | 12 | #define _LOWER 1 |
| 13 | #define _DVORAK 2 | 13 | #define _RAISE 2 |
| 14 | #define _LOWER 3 | ||
| 15 | #define _RAISE 4 | ||
| 16 | #define _ADJUST 16 | 14 | #define _ADJUST 16 |
| 17 | 15 | ||
| 18 | enum custom_keycodes { | 16 | enum custom_keycodes { |
| 19 | QWERTY = SAFE_RANGE, | 17 | QWERTY = SAFE_RANGE, |
| 20 | COLEMAK, | ||
| 21 | DVORAK, | ||
| 22 | LOWER, | 18 | LOWER, |
| 23 | RAISE, | 19 | RAISE, |
| 24 | ADJUST, | 20 | ADJUST, |
| 25 | }; | 21 | }; |
| 26 | 22 | ||
| 27 | // Fillers to make layering more clear | 23 | // Fillers to make layering more clear |
| 24 | #define KC_ KC_TRNS | ||
| 28 | #define _______ KC_TRNS | 25 | #define _______ KC_TRNS |
| 29 | #define XXXXXXX KC_NO | 26 | #define XXXXXXX KC_NO |
| 27 | #define KC_AJST ADJUST | ||
| 28 | #define KC_LOWR LOWER | ||
| 29 | #define KC_RASE RAISE | ||
| 30 | 30 | ||
| 31 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 31 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 32 | 32 | ||
| 33 | /* Qwerty | 33 | /* QWERTY |
| 34 | * ,-----------------------------------------------------------------------------------. | 34 | * ,------------------------------------------------. ,------------------------------------------------. |
| 35 | * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | | 35 | * | Ins | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Bksp | Del | |
| 36 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 36 | * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| |
| 37 | * | Tab | Q | W | E | R | T | Y | U | I | O | P | Del | | 37 | * | - | Tab | Q | W | E | R | T | | Y | U | I | O | P | [ | ] | |
| 38 | * |------+------+------+------+------+-------------+------+------+------+------+------| | 38 | * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| |
| 39 | * | Esc | A | S | D | F | G | H | J | K | L | ; | " | | 39 | * | = | Esc | A | S | D | F | G | | H | J | K | L | ; | " |Enter | |
| 40 | * |------+------+------+------+------+------|------+------+------+------+------+------| | 40 | * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| |
| 41 | * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | | 41 | * | Pg Up| Shift| Z | X | C | V | B | | N | M | , | . | / | Home | End | |
| 42 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 42 | * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| |
| 43 | * |Adjust| Ctrl | Alt | GUI |Lower |Space |Space |Raise | Left | Down | Up |Right | | 43 | * | Pg Dn|Adjust| Ctrl | Alt | GUI |Lower |Space | |Space |Raise | Left | Down | Up | Right| \ | |
| 44 | * `-----------------------------------------------------------------------------------' | 44 | * `------------------------------------------------' `------------------------------------------------' |
| 45 | */ | 45 | */ |
| 46 | [_QWERTY] = KEYMAP( \ | 46 | [_QWERTY] = KC_KEYMAP( |
| 47 | KC_GRV, 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_BSPC, \ | 47 | //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----. |
| 48 | KC_TAB, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_DEL, \ | 48 | INS, GRV , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 ,BSPC,DEL , |
| 49 | KC_ESC, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_QUOT, \ | 49 | //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| |
| 50 | KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , KC_ENT, \ | 50 | MINS,TAB , Q , W , E , R , T , Y , U , I , O , P ,LBRC,RBRC, |
| 51 | ADJUST, ADJUST, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______ \ | 51 | //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| |
| 52 | ), | 52 | EQL, ESC , A , S , D , F , G , H , J , K , L ,SCLN,QUOT,ENT , |
| 53 | 53 | //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| | |
| 54 | /* Colemak | 54 | PGUP,LSFT, Z , X , C , V , B , N , M ,COMM,DOT ,SLSH,HOME,END , |
| 55 | * ,-----------------------------------------------------------------------------------. | 55 | //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| |
| 56 | * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | | 56 | PGDN,AJST,LCTL,LALT,LGUI,LOWR,SPC , SPC ,RASE,LEFT,DOWN, UP ,RGHT,BSLS |
| 57 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 57 | //`----+----+----+----+----+----+----' `----+----+----+----+----+----+----' |
| 58 | * | Tab | Q | W | F | P | G | J | L | U | Y | ; | Del | | 58 | ), |
| 59 | * |------+------+------+------+------+-------------+------+------+------+------+------| | ||
| 60 | * | Esc | A | R | S | T | D | H | N | E | I | O | " | | ||
| 61 | * |------+------+------+------+------+------|------+------+------+------+------+------| | ||
| 62 | * | Shift| Z | X | C | V | B | K | M | , | . | / |Enter | | ||
| 63 | * |------+------+------+------+------+------+------+------+------+------+------+------| | ||
| 64 | * |Adjust| Ctrl | Alt | GUI |Lower |Space |Space |Raise | Left | Down | Up |Right | | ||
| 65 | * `-----------------------------------------------------------------------------------' | ||
| 66 | */ | ||
| 67 | [_COLEMAK] = KEYMAP( \ | ||
| 68 | KC_GRV, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, _______, \ | ||
| 69 | KC_TAB, KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_DEL, _______, \ | ||
| 70 | KC_ESC, KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, _______, \ | ||
| 71 | KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , _______, \ | ||
| 72 | ADJUST, ADJUST, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______ \ | ||
| 73 | ), | ||
| 74 | |||
| 75 | /* Dvorak | ||
| 76 | * ,-----------------------------------------------------------------------------------. | ||
| 77 | * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | | ||
| 78 | * |------+------+------+------+------+------+------+------+------+------+------+------| | ||
| 79 | * | Tab | " | , | . | P | Y | F | G | C | R | L | Del | | ||
| 80 | * |------+------+------+------+------+-------------+------+------+------+------+------| | ||
| 81 | * | Esc | A | O | E | U | I | D | H | T | N | S | / | | ||
| 82 | * |------+------+------+------+------+------|------+------+------+------+------+------| | ||
| 83 | * | Shift| ; | Q | J | K | X | B | M | W | V | Z |Enter | | ||
| 84 | * |------+------+------+------+------+------+------+------+------+------+------+------| | ||
| 85 | * |Adjust| Ctrl | Alt | GUI |Lower |Space |Space |Raise | Left | Down | Up |Right | | ||
| 86 | * `-----------------------------------------------------------------------------------' | ||
| 87 | */ | ||
| 88 | [_DVORAK] = KEYMAP( \ | ||
| 89 | KC_GRV, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, _______, \ | ||
| 90 | KC_TAB, KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_DEL, _______, \ | ||
| 91 | KC_ESC, KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, _______, \ | ||
| 92 | KC_LSFT, KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT , _______, \ | ||
| 93 | ADJUST, ADJUST, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______ \ | ||
| 94 | ), | ||
| 95 | 59 | ||
| 96 | /* Lower | 60 | /* Lower |
| 97 | * ,-----------------------------------------------------------------------------------. | 61 | * ,------------------------------------------------. ,------------------------------------------------. |
| 98 | * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp | | 62 | * | | ~ | F1 | F3 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 | F12 | |
| 99 | * |------+------+------+------+------+-------------+------+------+------+------+------| | 63 | * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| |
| 100 | * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Del | | 64 | * | _ | | ! | @ | # | $ | % | | ^ | & | * | ( | ) | { | } | |
| 101 | * |------+------+------+------+------+-------------+------+------+------+------+------| | 65 | * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| |
| 102 | * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | | \ | | | | 66 | * | + | | F1 | F2 | F3 | F4 | F5 | | F6 | _ | + | { | } | | | |
| 103 | * |------+------+------+------+------+------|------+------+------+------+------+------| | 67 | * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| |
| 104 | * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO ~ |ISO | | | |Enter | | 68 | * | | | F7 | F8 | F9 | F10 | F11 | | F12 | | | | | | | |
| 105 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 69 | * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| |
| 106 | * | | | | | | | | Next | Vol- | Vol+ | Play | | 70 | * | | | | | | | | | | | Next | Vol- | Vol+ | Play | | |
| 107 | * `-----------------------------------------------------------------------------------' | 71 | * `------------------------------------------------' `------------------------------------------------' |
| 108 | */ | 72 | */ |
| 109 | [_LOWER] = KEYMAP( \ | 73 | [_LOWER] = KC_KEYMAP( |
| 110 | _______, KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, _______, \ | 74 | //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----. |
| 111 | _______, KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, _______, \ | 75 | ,TILD, F1 , F2 , F3 , F4 , F5 , F6 , F7 , F8 , F9 ,F10 ,F11 ,F12 , |
| 112 | _______, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, _______, \ | 76 | //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| |
| 113 | _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______, _______, \ | 77 | UNDS, ,EXLM, AT ,HASH,DLR ,PERC, CIRC,AMPR,ASTR,LPRN,RPRN,LCBR,RCBR, |
| 114 | _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______ \ | 78 | //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| |
| 115 | ), | 79 | PLUS, , F1 , F2 , F3 , F4 , F5 , F6 ,MINS,PLUS,LCBR,RCBR, , , |
| 80 | //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| | ||
| 81 | , , F7 , F8 , F9 ,F10 ,F11 , F12 , , , , , , , | ||
| 82 | //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| | ||
| 83 | , , , , , , , , ,MNXT,VOLD,VOLU,MPLY,MUTE | ||
| 84 | //`----+----+----+----+----+----+----' `----+----+----+----+----+----+----' | ||
| 85 | ), | ||
| 116 | 86 | ||
| 117 | /* Raise | 87 | /* Raise |
| 118 | * ,-----------------------------------------------------------------------------------. | 88 | * ,------------------------------------------------. ,------------------------------------------------. |
| 119 | * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | | 89 | * | | ~ | F1 | F3 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 | F12 | |
| 120 | * |------+------+------+------+------+-------------+------+------+------+------+------| | 90 | * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| |
| 121 | * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Del | | 91 | * | _ | | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | { | } | |
| 122 | * |------+------+------+------+------+-------------+------+------+------+------+------| | 92 | * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| |
| 123 | * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | | 93 | * | + | | F1 | F2 | F3 | F4 | F5 | | F6 | - | = | [ | ] | | | |
| 124 | * |------+------+------+------+------+------|------+------+------+------+------+------| | 94 | * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| |
| 125 | * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO # |ISO / | | |Enter | | 95 | * | | | F7 | F8 | F9 | F10 | F11 | | F12 |ISO # |ISO / | | | | | |
| 126 | * |------+------+------+------+------+------+------+------+------+------+------+------| | 96 | * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| |
| 127 | * | | | | | | | | Next | Vol- | Vol+ | Play | | 97 | * | | | | | | | | | | | Next | Vol- | Vol+ | Play | | |
| 128 | * `-----------------------------------------------------------------------------------' | 98 | * `------------------------------------------------' `------------------------------------------------' |
| 129 | */ | ||
| 130 | [_RAISE] = KEYMAP( \ | ||
| 131 | _______, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, _______, \ | ||
| 132 | _______, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, _______, \ | ||
| 133 | _______, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, _______, \ | ||
| 134 | _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______, _______, \ | ||
| 135 | _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______ \ | ||
| 136 | ), | ||
| 137 | |||
| 138 | /* Adjust (Lower + Raise) | ||
| 139 | * ,-----------------------------------------------------------------------------------. | ||
| 140 | * | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | | ||
| 141 | * |------+------+------+------+------+------+------+------+------+------+------+------| | ||
| 142 | * | | Reset|RGB Tg|RGB Md|Hue Up|Hue Dn|Sat Up|Sat Dn|Val Up|Val Dn| | Del | | ||
| 143 | * |------+------+------+------+------+-------------+------+------+------+------+------| | ||
| 144 | * | | | |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak| | | | ||
| 145 | * |------+------+------+------+------+------|------+------+------+------+------+------| | ||
| 146 | * | | | | | | | | | | | | | | ||
| 147 | * |------+------+------+------+------+------+------+------+------+------+------+------| | ||
| 148 | * | | | | | | | | | | | | | ||
| 149 | * `-----------------------------------------------------------------------------------' | ||
| 150 | */ | 99 | */ |
| 151 | [_ADJUST] = KEYMAP( \ | 100 | [_RAISE] = KC_KEYMAP( |
| 152 | _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, \ | 101 | //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----. |
| 153 | _______, _______, RESET , RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, KC_DEL, _______, \ | 102 | ,TILD, F1 , F2 , F3 , F4 , F5 , F6 , F7 , F8 , F9 ,F10 ,F11 ,F12 , |
| 154 | _______, _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, _______, \ | 103 | //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| |
| 155 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ | 104 | UNDS, , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 ,LCBR,RCBR, |
| 156 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ | 105 | //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| |
| 157 | ) | 106 | PLUS, , F1 , F2 , F3 , F4 , F5 , F6 ,MINS,PLUS,LBRC,RBRC, , , |
| 158 | 107 | //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| | |
| 108 | , , F7 , F8 , F9 ,F10 ,F11 , F12 ,NUHS,NUBS, , , , , | ||
| 109 | //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| | ||
| 110 | , , , , , , , , ,MNXT,VOLD,VOLU,MPLY,MUTE | ||
| 111 | //`----+----+----+----+----+----+----' `----+----+----+----+----+----+----' | ||
| 112 | ), | ||
| 113 | |||
| 114 | [_ADJUST] = KEYMAP( | ||
| 115 | _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, \ | ||
| 116 | _______, _______, RESET , RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, KC_DEL, _______, \ | ||
| 117 | _______, _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, _______, _______, _______, _______, _______, \ | ||
| 118 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ | ||
| 119 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ | ||
| 120 | ) | ||
| 159 | 121 | ||
| 160 | }; | 122 | }; |
| 161 | 123 | ||
| 162 | #ifdef AUDIO_ENABLE | 124 | #ifdef AUDIO_ENABLE |
| 163 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); | 125 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); |
| 164 | float tone_dvorak[][2] = SONG(DVORAK_SOUND); | ||
| 165 | float tone_colemak[][2] = SONG(COLEMAK_SOUND); | ||
| 166 | #endif | 126 | #endif |
| 167 | 127 | ||
| 168 | void persistent_default_layer_set(uint16_t default_layer) { | 128 | void persistent_default_layer_set(uint16_t default_layer) { |
| @@ -181,24 +141,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 181 | } | 141 | } |
| 182 | return false; | 142 | return false; |
| 183 | break; | 143 | break; |
| 184 | case COLEMAK: | ||
| 185 | if (record->event.pressed) { | ||
| 186 | #ifdef AUDIO_ENABLE | ||
| 187 | PLAY_NOTE_ARRAY(tone_colemak, false, 0); | ||
| 188 | #endif | ||
| 189 | persistent_default_layer_set(1UL<<_COLEMAK); | ||
| 190 | } | ||
| 191 | return false; | ||
| 192 | break; | ||
| 193 | case DVORAK: | ||
| 194 | if (record->event.pressed) { | ||
| 195 | #ifdef AUDIO_ENABLE | ||
| 196 | PLAY_NOTE_ARRAY(tone_dvorak, false, 0); | ||
| 197 | #endif | ||
| 198 | persistent_default_layer_set(1UL<<_DVORAK); | ||
| 199 | } | ||
| 200 | return false; | ||
| 201 | break; | ||
| 202 | case LOWER: | 144 | case LOWER: |
| 203 | if (record->event.pressed) { | 145 | if (record->event.pressed) { |
| 204 | layer_on(_LOWER); | 146 | layer_on(_LOWER); |
diff --git a/keyboards/viterbi/keymaps/dwallace/keymap.c b/keyboards/viterbi/keymaps/dwallace/keymap.c index 38d63ffaa..d8f2479d5 100644 --- a/keyboards/viterbi/keymaps/dwallace/keymap.c +++ b/keyboards/viterbi/keymaps/dwallace/keymap.c | |||
| @@ -1,6 +1,9 @@ | |||
| 1 | #include "viterbi.h" | 1 | #include "viterbi.h" |
| 2 | #include "action_layer.h" | 2 | #include "action_layer.h" |
| 3 | #include "eeconfig.h" | 3 | #include "eeconfig.h" |
| 4 | #ifdef RGBLIGHT_ENABLE | ||
| 5 | #include "rgblight.h" | ||
| 6 | #endif | ||
| 4 | 7 | ||
| 5 | extern keymap_config_t keymap_config; | 8 | extern keymap_config_t keymap_config; |
| 6 | 9 | ||
| @@ -9,7 +12,14 @@ extern keymap_config_t keymap_config; | |||
| 9 | 12 | ||
| 10 | enum custom_keycodes { | 13 | enum custom_keycodes { |
| 11 | QWERTY = SAFE_RANGE, | 14 | QWERTY = SAFE_RANGE, |
| 12 | FN, | 15 | STK_SHIFT, |
| 16 | STK_CTRL, | ||
| 17 | STK_ALT, | ||
| 18 | STK_GUI, | ||
| 19 | STK_META, | ||
| 20 | STK_CLEAR, | ||
| 21 | RGB_LEVEL_UP, | ||
| 22 | RGB_LEVEL_DOWN, | ||
| 13 | }; | 23 | }; |
| 14 | 24 | ||
| 15 | #define KC_ KC_TRNS | 25 | #define KC_ KC_TRNS |
| @@ -20,13 +30,15 @@ enum custom_keycodes { | |||
| 20 | #define KC_FN1 MO(_FN) | 30 | #define KC_FN1 MO(_FN) |
| 21 | #define KC_LCAG LCAG(KC_NO) | 31 | #define KC_LCAG LCAG(KC_NO) |
| 22 | #define KC_RTOG RGB_TOG | 32 | #define KC_RTOG RGB_TOG |
| 23 | #define KC_RMOD RGB_MOD | 33 | #define KC_RGUP RGB_LEVEL_UP |
| 24 | #define KC_RVAD RGB_VAD | 34 | #define KC_RGDN RGB_LEVEL_DOWN |
| 25 | #define KC_RVAI RGB_VAI | ||
| 26 | #define KC_CLRM KC_NO // TODO: Clear sticky modifiers | ||
| 27 | #define KC_RST RESET | 35 | #define KC_RST RESET |
| 28 | 36 | #define KC_SSFT STK_SHIFT | |
| 29 | // TODO: Make modifiers sticky | 37 | #define KC_SCTL STK_CTRL |
| 38 | #define KC_SALT STK_ALT | ||
| 39 | #define KC_SGUI STK_GUI | ||
| 40 | #define KC_SMTA STK_META | ||
| 41 | #define KC_SCLR STK_CLEAR | ||
| 30 | 42 | ||
| 31 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 43 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 32 | 44 | ||
| @@ -38,9 +50,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 38 | //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| | 50 | //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| |
| 39 | ESC , A , S , D , F , G ,RBRC, H , J , K , L ,SCLN,QUOT,ENT , | 51 | ESC , A , S , D , F , G ,RBRC, H , J , K , L ,SCLN,QUOT,ENT , |
| 40 | //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| | 52 | //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| |
| 41 | LSFT, Z , X , C , V , B ,SWIN, N , M ,COMM,DOT , UP ,SLSH,RSFT, | 53 | SSFT, Z , X , C , V , B ,SWIN, N , M ,COMM,DOT , UP ,SLSH,RSFT, |
| 42 | //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| | 54 | //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| |
| 43 | LCTL,LCAG,LALT,LGUI,SPC ,CLRM,SAPP, FN1 ,SPC ,RGUI,LEFT,DOWN,RGHT,PGDN | 55 | SCTL,SMTA,SALT,SGUI,SPC ,SCLR,SAPP, FN1 ,SPC ,RGUI,LEFT,DOWN,RGHT,PGDN |
| 44 | //`----+----+----+----+----+----+----' `----+----+----+----+----+----+----' | 56 | //`----+----+----+----+----+----+----' `----+----+----+----+----+----+----' |
| 45 | ), | 57 | ), |
| 46 | 58 | ||
| @@ -50,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 50 | //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| | 62 | //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| |
| 51 | , , , ,RST , , , , , , , , , , | 63 | , , , ,RST , , , , , , , , , , |
| 52 | //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| | 64 | //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| |
| 53 | , , , , , , , RTOG,RMOD,RVAD,RVAI, , , , | 65 | , , , , , , , RTOG, ,RGDN,RGUP, , , , |
| 54 | //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| | 66 | //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| |
| 55 | , , , , , , , ,MUTE,VOLD,VOLU, , , , | 67 | , , , , , , , ,MUTE,VOLD,VOLU, , , , |
| 56 | //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| | 68 | //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| |
| @@ -69,6 +81,76 @@ void persistent_default_layer_set(uint16_t default_layer) { | |||
| 69 | default_layer_set(default_layer); | 81 | default_layer_set(default_layer); |
| 70 | } | 82 | } |
| 71 | 83 | ||
| 84 | bool modifier_already_applied = false; | ||
| 85 | uint8_t physically_held_modifiers = 0; | ||
| 86 | uint8_t last_mods = 0xFF; | ||
| 87 | uint8_t rgb_dimming = 0; | ||
| 88 | #define SET_LED_RGB(val, led_num) setrgb(((val >> 16) & 0xFF) >> rgb_dimming, ((val >> 8) & 0xFF) >> rgb_dimming, (val & 0xFF) >> rgb_dimming, (LED_TYPE *)&led[led_num]) | ||
| 89 | |||
| 90 | void update_underglow_level(void) { | ||
| 91 | if (get_mods() == last_mods) | ||
| 92 | return; | ||
| 93 | |||
| 94 | last_mods = get_mods(); | ||
| 95 | |||
| 96 | if (get_mods() == 0) { | ||
| 97 | uint8_t level = 0x10 >> rgb_dimming; | ||
| 98 | rgblight_setrgb(level, level, level); | ||
| 99 | return; | ||
| 100 | } | ||
| 101 | |||
| 102 | uint32_t mod_colors[4] = {0}; | ||
| 103 | uint8_t mod_count = 0; | ||
| 104 | rgblight_setrgb(0x00, 0x00, 0x00); | ||
| 105 | |||
| 106 | if (get_mods() & MOD_BIT(KC_LSFT)) | ||
| 107 | mod_colors[mod_count++] = 0xFF0000; | ||
| 108 | if (get_mods() & MOD_BIT(KC_LCTL)) | ||
| 109 | mod_colors[mod_count++] = 0x00FF00; | ||
| 110 | if (get_mods() & MOD_BIT(KC_LALT)) | ||
| 111 | mod_colors[mod_count++] = 0x0000FF; | ||
| 112 | if (get_mods() & MOD_BIT(KC_LGUI)) | ||
| 113 | mod_colors[mod_count++] = 0xFFFF00; | ||
| 114 | |||
| 115 | uint8_t led_num = 0; | ||
| 116 | for (int m = 0; m < mod_count; m++) { | ||
| 117 | for (; led_num < RGBLED_NUM*(m+1)/mod_count; led_num++) { | ||
| 118 | SET_LED_RGB(mod_colors[m], led_num); | ||
| 119 | } | ||
| 120 | } | ||
| 121 | rgblight_set(); | ||
| 122 | } | ||
| 123 | |||
| 124 | void add_sticky_modifier(uint16_t keycode) { | ||
| 125 | add_mods(MOD_BIT(keycode)); | ||
| 126 | register_code(keycode); | ||
| 127 | modifier_already_applied = false; | ||
| 128 | } | ||
| 129 | |||
| 130 | void clear_sticky_modifiers(void) { | ||
| 131 | unregister_code(KC_LSFT); | ||
| 132 | unregister_code(KC_LCTL); | ||
| 133 | unregister_code(KC_LALT); | ||
| 134 | unregister_code(KC_LGUI); | ||
| 135 | update_underglow_level(); | ||
| 136 | } | ||
| 137 | |||
| 138 | void handle_sticky_modifier_event(uint16_t keycode, bool pressed) { | ||
| 139 | if (pressed) { | ||
| 140 | add_sticky_modifier(keycode); | ||
| 141 | physically_held_modifiers |= MOD_BIT(keycode); | ||
| 142 | } else { | ||
| 143 | del_mods(MOD_BIT(keycode)); | ||
| 144 | physically_held_modifiers &= ~MOD_BIT(keycode); | ||
| 145 | if (modifier_already_applied) { | ||
| 146 | clear_sticky_modifiers(); | ||
| 147 | } else { | ||
| 148 | add_sticky_modifier(keycode); | ||
| 149 | } | ||
| 150 | } | ||
| 151 | update_underglow_level(); | ||
| 152 | } | ||
| 153 | |||
| 72 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | 154 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
| 73 | switch (keycode) { | 155 | switch (keycode) { |
| 74 | case QWERTY: | 156 | case QWERTY: |
| @@ -80,6 +162,63 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 80 | } | 162 | } |
| 81 | return false; | 163 | return false; |
| 82 | break; | 164 | break; |
| 165 | case STK_SHIFT: | ||
| 166 | handle_sticky_modifier_event(KC_LSFT, record->event.pressed); | ||
| 167 | return false; | ||
| 168 | break; | ||
| 169 | case STK_CTRL: | ||
| 170 | handle_sticky_modifier_event(KC_LCTL, record->event.pressed); | ||
| 171 | return false; | ||
| 172 | break; | ||
| 173 | case STK_ALT: | ||
| 174 | handle_sticky_modifier_event(KC_LALT, record->event.pressed); | ||
| 175 | return false; | ||
| 176 | break; | ||
| 177 | case STK_GUI: | ||
| 178 | handle_sticky_modifier_event(KC_LGUI, record->event.pressed); | ||
| 179 | return false; | ||
| 180 | break; | ||
| 181 | case STK_META: | ||
| 182 | handle_sticky_modifier_event(KC_LCTL, record->event.pressed); | ||
| 183 | handle_sticky_modifier_event(KC_LALT, record->event.pressed); | ||
| 184 | handle_sticky_modifier_event(KC_LGUI, record->event.pressed); | ||
| 185 | return false; | ||
| 186 | break; | ||
| 187 | case STK_CLEAR: | ||
| 188 | if (record->event.pressed) { | ||
| 189 | clear_sticky_modifiers(); | ||
| 190 | } | ||
| 191 | return false; | ||
| 192 | break; | ||
| 193 | case RGB_LEVEL_DOWN: | ||
| 194 | if (record->event.pressed && rgb_dimming < 8) { | ||
| 195 | rgb_dimming++; | ||
| 196 | } | ||
| 197 | return false; | ||
| 198 | break; | ||
| 199 | case RGB_LEVEL_UP: | ||
| 200 | if (record->event.pressed && rgb_dimming > 0) { | ||
| 201 | rgb_dimming--; | ||
| 202 | } | ||
| 203 | return false; | ||
| 204 | break; | ||
| 205 | } | ||
| 206 | if (!record->event.pressed && IS_KEY(keycode)) { | ||
| 207 | modifier_already_applied = true; | ||
| 208 | if (physically_held_modifiers == 0) | ||
| 209 | clear_sticky_modifiers(); | ||
| 83 | } | 210 | } |
| 84 | return true; | 211 | return true; |
| 85 | } | 212 | } |
| 213 | |||
| 214 | void matrix_init_user(void) { | ||
| 215 | #ifdef RGBLIGHT_ENABLE | ||
| 216 | rgblight_enable(); | ||
| 217 | #endif //RGBLIGHT_ENABLE | ||
| 218 | } | ||
| 219 | |||
| 220 | void matrix_scan_user(void) { | ||
| 221 | #ifdef RGBLIGHT_ENABLE | ||
| 222 | update_underglow_level(); | ||
| 223 | #endif //RGBLIGHT_ENABLE | ||
| 224 | } | ||
