diff options
| author | Rossman360 <53881724+Rossman360@users.noreply.github.com> | 2020-01-13 12:40:00 -0500 |
|---|---|---|
| committer | James Young <18669334+noroadsleft@users.noreply.github.com> | 2020-01-13 09:40:00 -0800 |
| commit | 390a4fdc9d9a7c65c202d69eb40fbfcfcb070bb0 (patch) | |
| tree | 23abbb8d841747bae69467df5e4883648a83914a | |
| parent | 1034df577d2931292802e00c61dc9133c67dcabd (diff) | |
| download | qmk_firmware-390a4fdc9d9a7c65c202d69eb40fbfcfcb070bb0.tar.gz qmk_firmware-390a4fdc9d9a7c65c202d69eb40fbfcfcb070bb0.zip | |
[Keymap] fixed conflicts and made sure keymaps compiled, and some newer (older) keymaps snuck in (#7828)
* hope this works
* Some new things crept in
* remove nonsense config file
* spacing fix
* more spacing
* quick revert of mysterious file
* file revert take two
* take three
* take four
* deleted unneeded lines
* brought back not-unneeded line
* whitespace delete
| -rw-r--r-- | keyboards/keebio/tragicforce68/keymaps/rossman360/rules.mk | 1 | ||||
| -rw-r--r-- | keyboards/keebio/viterbi/keymaps/met/keymap.c | 321 | ||||
| -rw-r--r-- | keyboards/keebio/viterbi/keymaps/met/rules.mk | 1 | ||||
| -rw-r--r-- | users/rossman360/rossman360.h | 1 |
4 files changed, 323 insertions, 1 deletions
diff --git a/keyboards/keebio/tragicforce68/keymaps/rossman360/rules.mk b/keyboards/keebio/tragicforce68/keymaps/rossman360/rules.mk index 4c2b0289a..d10eda0fb 100644 --- a/keyboards/keebio/tragicforce68/keymaps/rossman360/rules.mk +++ b/keyboards/keebio/tragicforce68/keymaps/rossman360/rules.mk | |||
| @@ -1 +1,2 @@ | |||
| 1 | MACROS_ENABLED = yes | ||
| 1 | BOOTLOADER = atmel-dfu | 2 | BOOTLOADER = atmel-dfu |
diff --git a/keyboards/keebio/viterbi/keymaps/met/keymap.c b/keyboards/keebio/viterbi/keymaps/met/keymap.c new file mode 100644 index 000000000..45427018a --- /dev/null +++ b/keyboards/keebio/viterbi/keymaps/met/keymap.c | |||
| @@ -0,0 +1,321 @@ | |||
| 1 | #include QMK_KEYBOARD_H | ||
| 2 | |||
| 3 | // Each layer gets a name for readability, which is then used in the keymap matrix below. | ||
| 4 | // The underscores don't mean anything - you can have a layer called STUFF or any other name. | ||
| 5 | // Layer names don't all need to be of the same length, obviously, and you can also skip them | ||
| 6 | // entirely and just use numbers. | ||
| 7 | |||
| 8 | #define CANCEL LCTL(KC_C) | ||
| 9 | #define TERM LCTL(LALT(KC_T)) | ||
| 10 | #define ALPHAMOD LT(_ALPHA, KC_VOLD) | ||
| 11 | #define CTLBSP MT(MOD_LCTL, KC_BSPC) | ||
| 12 | #define GUIDEL MT(MOD_LGUI, KC_DEL) | ||
| 13 | #define ALTSPC MT(MOD_LALT, KC_SPACE) | ||
| 14 | #define SPCMOD LT(_MOD, KC_SPACE) | ||
| 15 | #define JUMPBACK LSFT(KC_TAB) | ||
| 16 | #define NTAB LCTL(KC_T) | ||
| 17 | #define CTAB LCTL(KC_W) | ||
| 18 | #define TAB1 LCTL(KC_1) | ||
| 19 | #define TAB2 LCTL(KC_2) | ||
| 20 | #define TAB3 LCTL(KC_3) | ||
| 21 | #define TAB4 LCTL(KC_4) | ||
| 22 | #define BWORD LCTL(KC_BSPC) | ||
| 23 | #define LWORD LCTL(KC_LEFT) | ||
| 24 | #define RWORD LCTL(KC_RIGHT) | ||
| 25 | #define TABMOD LT(_MOD, KC_TAB) | ||
| 26 | #define ENTMOD LT(_ENT, KC_ENTER) | ||
| 27 | |||
| 28 | enum layer_names { | ||
| 29 | _BASE, | ||
| 30 | _PLAYING, | ||
| 31 | _PLAYED, | ||
| 32 | _NUMS, | ||
| 33 | _FN, | ||
| 34 | _TEST, | ||
| 35 | _ALPHA, | ||
| 36 | _QWERTY, | ||
| 37 | _REV, | ||
| 38 | _DEL, | ||
| 39 | _MOD, | ||
| 40 | _ENT | ||
| 41 | }; | ||
| 42 | |||
| 43 | enum custom_keycodes { | ||
| 44 | MET = SAFE_RANGE, | ||
| 45 | SET, | ||
| 46 | GO, | ||
| 47 | STOP, | ||
| 48 | RESUME, | ||
| 49 | NEWRESUME, | ||
| 50 | SYNC, | ||
| 51 | SHUTDOWN, | ||
| 52 | REBOOT, | ||
| 53 | SOURCE, | ||
| 54 | PUSH, | ||
| 55 | TEST, | ||
| 56 | TST, | ||
| 57 | ENAME, | ||
| 58 | SNAME, | ||
| 59 | LNAME, | ||
| 60 | BUS, | ||
| 61 | PMERGE, | ||
| 62 | CSPEAK | ||
| 63 | }; | ||
| 64 | |||
| 65 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||
| 66 | switch (keycode) { | ||
| 67 | case SET: | ||
| 68 | if (record->event.pressed) { | ||
| 69 | layer_on(_NUMS); | ||
| 70 | SEND_STRING("met "); | ||
| 71 | } | ||
| 72 | break; | ||
| 73 | case GO: | ||
| 74 | if (record->event.pressed) { | ||
| 75 | layer_off(_NUMS); | ||
| 76 | layer_off(_ALPHA); | ||
| 77 | layer_off(_PLAYED); | ||
| 78 | layer_on(_PLAYING); | ||
| 79 | SEND_STRING(SS_TAP(X_ENTER)); | ||
| 80 | } | ||
| 81 | break; | ||
| 82 | case STOP: | ||
| 83 | if (record->event.pressed) { | ||
| 84 | layer_off(_PLAYING); | ||
| 85 | layer_on(_PLAYED); | ||
| 86 | layer_off(_NUMS); | ||
| 87 | layer_off(_ALPHA); | ||
| 88 | SEND_STRING(SS_TAP(X_N)); | ||
| 89 | SEND_STRING(SS_TAP(X_N)); | ||
| 90 | SEND_STRING(SS_LCTRL(SS_TAP(X_C))); | ||
| 91 | } | ||
| 92 | break; | ||
| 93 | case RESUME: | ||
| 94 | if (record->event.pressed) { | ||
| 95 | layer_off(_PLAYED); | ||
| 96 | layer_on(_PLAYING); | ||
| 97 | SEND_STRING(SS_LCTRL(SS_TAP(X_C))); | ||
| 98 | SEND_STRING(SS_TAP(X_UP)); | ||
| 99 | SEND_STRING(SS_TAP(X_ENTER)); | ||
| 100 | } | ||
| 101 | break; | ||
| 102 | case NEWRESUME: | ||
| 103 | if (record->event.pressed) { | ||
| 104 | layer_off(_NUMS); | ||
| 105 | layer_off(_ALPHA); | ||
| 106 | layer_off(_PLAYED); | ||
| 107 | layer_on(_PLAYING); | ||
| 108 | SEND_STRING(SS_TAP(X_R)); | ||
| 109 | SEND_STRING(SS_TAP(X_ENTER)); | ||
| 110 | } | ||
| 111 | break; | ||
| 112 | case SYNC: | ||
| 113 | if (record->event.pressed) { | ||
| 114 | SEND_STRING(SS_TAP(X_N)); | ||
| 115 | } | ||
| 116 | break; | ||
| 117 | case SHUTDOWN: | ||
| 118 | if (record->event.pressed) { | ||
| 119 | SEND_STRING(SS_LCTRL(SS_TAP(X_C))); | ||
| 120 | SEND_STRING("shutdown now"); | ||
| 121 | SEND_STRING(SS_TAP(X_ENTER)); | ||
| 122 | } | ||
| 123 | break; | ||
| 124 | case REBOOT: | ||
| 125 | if (record->event.pressed) { | ||
| 126 | SEND_STRING(SS_LCTRL(SS_TAP(X_C))); | ||
| 127 | SEND_STRING("reboot"); | ||
| 128 | SEND_STRING(SS_TAP(X_ENTER)); | ||
| 129 | } | ||
| 130 | break; | ||
| 131 | case SOURCE: | ||
| 132 | if (record->event.pressed) { | ||
| 133 | SEND_STRING("source .bashrc"); | ||
| 134 | SEND_STRING(SS_TAP(X_ENTER)); | ||
| 135 | } | ||
| 136 | break; | ||
| 137 | case PUSH: | ||
| 138 | if (record->event.pressed) { | ||
| 139 | SEND_STRING("ftp rossmontsinger.net"); | ||
| 140 | _delay_ms(250); | ||
| 141 | SEND_STRING(SS_TAP(X_ENTER)); | ||
| 142 | _delay_ms(2250); | ||
| 143 | SEND_STRING("met@rossmontsinger.net"); | ||
| 144 | _delay_ms(250); | ||
| 145 | SEND_STRING(SS_TAP(X_ENTER)); | ||
| 146 | _delay_ms(2500); | ||
| 147 | SEND_STRING("metboard"); | ||
| 148 | _delay_ms(250); | ||
| 149 | SEND_STRING(SS_TAP(X_ENTER)); | ||
| 150 | } | ||
| 151 | break; | ||
| 152 | case TEST: | ||
| 153 | if (record->event.pressed) { | ||
| 154 | layer_off(_NUMS); | ||
| 155 | layer_off(_ALPHA); | ||
| 156 | layer_off(_PLAYED); | ||
| 157 | layer_on(_PLAYING); | ||
| 158 | SEND_STRING(SS_LCTRL(SS_TAP(X_C))); | ||
| 159 | _delay_ms(250); | ||
| 160 | SEND_STRING("play Desktop/met/a_lazoom.mp3"); | ||
| 161 | SEND_STRING(SS_TAP(X_ENTER)); | ||
| 162 | } | ||
| 163 | case TST: | ||
| 164 | if (record->event.pressed) { | ||
| 165 | SEND_STRING("tst"); | ||
| 166 | SEND_STRING(SS_TAP(X_ENTER)); | ||
| 167 | } | ||
| 168 | break; | ||
| 169 | case ENAME: | ||
| 170 | if (record->event.pressed) { | ||
| 171 | SEND_STRING("sname "); | ||
| 172 | layer_on(_NUMS); | ||
| 173 | layer_on(_ALPHA); | ||
| 174 | } | ||
| 175 | break; | ||
| 176 | case SNAME: | ||
| 177 | if (record->event.pressed) { | ||
| 178 | SEND_STRING(SS_TAP(X_ENTER)); | ||
| 179 | layer_off(_NUMS); | ||
| 180 | layer_off(_ALPHA); | ||
| 181 | } | ||
| 182 | break; | ||
| 183 | case LNAME: | ||
| 184 | if (record->event.pressed) { | ||
| 185 | SEND_STRING("met $"); | ||
| 186 | layer_off(_NUMS); | ||
| 187 | layer_on(_ALPHA); | ||
| 188 | } | ||
| 189 | break; | ||
| 190 | case BUS: | ||
| 191 | if (record->event.pressed) { | ||
| 192 | SEND_STRING("met $bus"); | ||
| 193 | layer_off(_NUMS); | ||
| 194 | layer_off(_ALPHA); | ||
| 195 | layer_off(_PLAYED); | ||
| 196 | layer_on(_PLAYING); | ||
| 197 | SEND_STRING(SS_TAP(X_ENTER)); | ||
| 198 | } | ||
| 199 | break; | ||
| 200 | case PMERGE: | ||
| 201 | if (record->event.pressed) { | ||
| 202 | SEND_STRING(SS_TAP(X_HOME)); | ||
| 203 | SEND_STRING(SS_TAP(X_BSPACE)); | ||
| 204 | SEND_STRING(SS_TAP(X_SPACE)); | ||
| 205 | SEND_STRING(SS_LCTRL(SS_TAP(X_BSPACE))); | ||
| 206 | SEND_STRING(SS_TAP(X_SPACE)); | ||
| 207 | } | ||
| 208 | break; | ||
| 209 | case CSPEAK: | ||
| 210 | if (record->event.pressed) { | ||
| 211 | SEND_STRING(SS_TAP(X_PGDOWN)); | ||
| 212 | SEND_STRING(SS_TAP(X_ENTER)); | ||
| 213 | SEND_STRING(SS_TAP(X_ENTER)); | ||
| 214 | SEND_STRING(SS_TAP(X_PGDOWN)); | ||
| 215 | } | ||
| 216 | break; | ||
| 217 | }; | ||
| 218 | |||
| 219 | return true; | ||
| 220 | }; | ||
| 221 | |||
| 222 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
| 223 | [_BASE] = LAYOUT_ortho_5x14( | ||
| 224 | KC_NO, STOP , TST , _______, _______, _______, BUS , _______, _______, _______, _______, _______, _______, _______, \ | ||
| 225 | KC_NO, _______, SET , SET , SET , _______, _______, _______, _______, _______, _______, _______, _______, _______, \ | ||
| 226 | KC_NO, _______, SET , SET , SET , _______, _______, _______, _______, _______, _______, _______, _______, _______, \ | ||
| 227 | KC_NO, LNAME , SET , SET , SET , _______, _______, _______, _______, _______, _______, _______, _______, _______, \ | ||
| 228 | KC_NO, MO(_FN), _______, SET , _______, _______, _______, TG(_QWERTY),KC_B, _______, _______, _______, _______, _______ \ | ||
| 229 | ), | ||
| 230 | |||
| 231 | [_PLAYING] = LAYOUT_ortho_5x14( | ||
| 232 | KC_NO, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 233 | KC_NO, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 234 | KC_NO, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 235 | KC_NO, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 236 | KC_NO, _______, _______, _______, _______, _______, STOP , _______, _______, _______, _______, _______, _______, _______ | ||
| 237 | ), | ||
| 238 | |||
| 239 | [_PLAYED] = LAYOUT_ortho_5x14( | ||
| 240 | KC_NO, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 241 | KC_NO, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 242 | KC_NO, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 243 | KC_NO, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 244 | KC_NO, _______,_______, _______, _______, _______,NEWRESUME, _______, _______, _______, _______, _______, _______, _______ | ||
| 245 | ), | ||
| 246 | |||
| 247 | [_NUMS] = LAYOUT_ortho_5x14( | ||
| 248 | KC_NO, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 249 | KC_NO, _______, KC_7 , KC_8 , KC_9 , _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 250 | KC_NO, _______, KC_4 , KC_5 , KC_6 , _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 251 | KC_NO, _______, KC_1 , KC_2 , KC_3 , _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 252 | KC_NO, _______, _______, KC_0 , _______, _______, GO , _______, _______, _______, _______, _______, _______, _______ | ||
| 253 | ), | ||
| 254 | |||
| 255 | [_FN] = LAYOUT_ortho_5x14( | ||
| 256 | KC_NO, SHUTDOWN,_______, _______, _______, _______, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, | ||
| 257 | KC_NO, REBOOT , _______, _______, _______, _______, KC_VOLD, _______, _______, _______, _______, _______, _______, _______, | ||
| 258 | KC_NO, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 259 | KC_NO, ENAME , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 260 | KC_NO, _______, _______, _______, _______, _______, SOURCE , _______, _______, _______, _______, _______, _______, _______ | ||
| 261 | ), | ||
| 262 | |||
| 263 | [_TEST] = LAYOUT_ortho_5x14( | ||
| 264 | KC_NO, TST , TST , TST , TST , TST , TST , _______, _______, _______, _______, _______, _______, _______, | ||
| 265 | KC_NO, TST , TST , TST , TST , TST , TST , _______, _______, _______, _______, _______, _______, _______, | ||
| 266 | KC_NO, TST , TST , TST , TST , TST , TST , _______, _______, _______, _______, _______, _______, _______, | ||
| 267 | KC_NO, TST , TST , TST , TST , TST , TST , _______, _______, _______, _______, _______, _______, _______, | ||
| 268 | KC_NO, TST , TST , TST , TST , TST , TST , _______, _______, _______, _______, _______, _______, _______ | ||
| 269 | ), | ||
| 270 | |||
| 271 | [_ALPHA] = LAYOUT_ortho_5x14( | ||
| 272 | KC_NO, _______, KC_Y , KC_U , KC_I , KC_O , KC_P , _______, _______, _______, _______, _______, _______, _______, | ||
| 273 | KC_NO, KC_N , KC_Q , KC_W , KC_E , KC_R , KC_T , _______, _______, _______, _______, _______, _______, _______, | ||
| 274 | KC_NO, KC_M , KC_A , KC_S , KC_D , KC_F , KC_G , _______, _______, _______, _______, _______, _______, _______, | ||
| 275 | KC_NO, _______, KC_Z , KC_X , KC_C , KC_V , KC_B , _______, _______, _______, _______, _______, _______, _______, | ||
| 276 | KC_NO, _______, KC_H , KC_J , KC_K , KC_L , GO , _______, _______, _______, _______, _______, _______, _______ | ||
| 277 | ), | ||
| 278 | |||
| 279 | [_QWERTY] = LAYOUT_ortho_5x14( | ||
| 280 | KC_NO, KC_ESC , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS, KC_EQL , | ||
| 281 | KC_NO, KC_CAPS, KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_LBRC, KC_RBRC , | ||
| 282 | KC_NO, KC_CAPS, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, KC_PGUP , | ||
| 283 | KC_NO, KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_UP, KC_PGDN , | ||
| 284 | KC_NO, CTLBSP , GUIDEL , KC_ENTER, ALTSPC, TABMOD , KC_BSPC, ENTMOD , SPCMOD ,MO(_DEL), KC_BSLS, KC_LEFT, KC_DOWN, KC_RIGHT | ||
| 285 | ), | ||
| 286 | |||
| 287 | |||
| 288 | [_REV] = LAYOUT_ortho_5x14( | ||
| 289 | KC_NO , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 290 | KC_NO , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 291 | KC_NO , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 292 | KC_NO , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 293 | KC_NO , _______, _______, _______, _______, KC_TAB , KC_PGDN, _______, _______, _______, _______, _______, _______, _______ | ||
| 294 | ), | ||
| 295 | |||
| 296 | |||
| 297 | [_DEL] = LAYOUT_ortho_5x14( | ||
| 298 | KC_NO , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 299 | KC_NO , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 300 | KC_NO , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 301 | KC_NO , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 302 | KC_NO , _______, _______, _______, _______, KC_BSPC, BWORD , _______, _______, _______, _______, _______, _______, _______ | ||
| 303 | ), | ||
| 304 | |||
| 305 | [_MOD] = LAYOUT_ortho_5x14( | ||
| 306 | KC_NO , KC_GRAVE,KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , NTAB , | ||
| 307 | KC_NO , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CTAB, | ||
| 308 | KC_NO , _______, _______, _______, _______, _______, _______, KC_HOME, KC_LEFT, KC_UP ,KC_RIGHT, KC_END , _______, _______, | ||
| 309 | KC_NO , _______, _______, _______, _______, _______, _______, _______, PMERGE , KC_DOWN, _______, _______, _______, _______, | ||
| 310 | KC_NO , _______, _______, _______, _______, LWORD , RWORD , TG(_QWERTY),_______,_______,_______,_______, _______, _______ | ||
| 311 | ), | ||
| 312 | |||
| 313 | [_ENT] = LAYOUT_ortho_5x14( | ||
| 314 | KC_NO , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 315 | KC_NO , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 316 | KC_NO , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 317 | KC_NO , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 318 | KC_NO , _______, _______, _______, _______, _______, CSPEAK , _______, _______, _______, _______, _______, _______, _______ | ||
| 319 | ) | ||
| 320 | }; | ||
| 321 | |||
diff --git a/keyboards/keebio/viterbi/keymaps/met/rules.mk b/keyboards/keebio/viterbi/keymaps/met/rules.mk new file mode 100644 index 000000000..1e3cebb14 --- /dev/null +++ b/keyboards/keebio/viterbi/keymaps/met/rules.mk | |||
| @@ -0,0 +1 @@ | |||
| RGBLIGHT_ENABLE = yes | |||
diff --git a/users/rossman360/rossman360.h b/users/rossman360/rossman360.h index e5629e20e..9d6ee5981 100644 --- a/users/rossman360/rossman360.h +++ b/users/rossman360/rossman360.h | |||
| @@ -26,4 +26,3 @@ enum custom_keycodes { | |||
| 26 | PMERGE, | 26 | PMERGE, |
| 27 | REMCAPS, | 27 | REMCAPS, |
| 28 | }; | 28 | }; |
| 29 | |||
