diff options
| -rw-r--r-- | keyboards/lck75/keymaps/via/keymap.c | 53 | ||||
| -rw-r--r-- | keyboards/lck75/keymaps/via/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/lck75/lck75.c | 10 | ||||
| -rw-r--r-- | users/rverst/rverst.c | 39 |
4 files changed, 67 insertions, 37 deletions
diff --git a/keyboards/lck75/keymaps/via/keymap.c b/keyboards/lck75/keymaps/via/keymap.c new file mode 100644 index 000000000..697de925b --- /dev/null +++ b/keyboards/lck75/keymaps/via/keymap.c | |||
| @@ -0,0 +1,53 @@ | |||
| 1 | /* Copyright 2021 ItsWaffle/waffle#6666 | ||
| 2 | * This program is free software: you can redistribute it and/or modify | ||
| 3 | * it under the terms of the GNU General Public License as published by | ||
| 4 | * the Free Software Foundation, either version 2 of the License, or | ||
| 5 | * (at your option) any later version. | ||
| 6 | * | ||
| 7 | * This program is distributed in the hope that it will be useful, | ||
| 8 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 9 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 10 | * GNU General Public License for more details. | ||
| 11 | * | ||
| 12 | * You should have received a copy of the GNU General Public License | ||
| 13 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 14 | */ | ||
| 15 | #include QMK_KEYBOARD_H | ||
| 16 | |||
| 17 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
| 18 | [0] = LAYOUT_lck75_ansi( | ||
| 19 | KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_MUTE, | ||
| 20 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, | ||
| 21 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, | ||
| 22 | KC_NO, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, | ||
| 23 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, | ||
| 24 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT | ||
| 25 | ), | ||
| 26 | |||
| 27 | [1] = LAYOUT_lck75_ansi( | ||
| 28 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 29 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 30 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 31 | KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 32 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 33 | KC_TRNS, KC_LGUI, KC_TRNS, KC_TRNS, KC_RALT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS | ||
| 34 | ), | ||
| 35 | |||
| 36 | [2] = LAYOUT_lck75_ansi( | ||
| 37 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 38 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 39 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 40 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 41 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 42 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS | ||
| 43 | ), | ||
| 44 | |||
| 45 | [3] = LAYOUT_lck75_ansi( | ||
| 46 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 47 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 48 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 49 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 50 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 51 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS | ||
| 52 | ) | ||
| 53 | }; | ||
diff --git a/keyboards/lck75/keymaps/via/rules.mk b/keyboards/lck75/keymaps/via/rules.mk new file mode 100644 index 000000000..541a15608 --- /dev/null +++ b/keyboards/lck75/keymaps/via/rules.mk | |||
| @@ -0,0 +1,2 @@ | |||
| 1 | VIA_ENABLE = yes | ||
| 2 | LTO_ENABLE = no | ||
diff --git a/keyboards/lck75/lck75.c b/keyboards/lck75/lck75.c index 3bcf350a1..8fc674d03 100644 --- a/keyboards/lck75/lck75.c +++ b/keyboards/lck75/lck75.c | |||
| @@ -36,10 +36,10 @@ __attribute__((weak)) oled_rotation_t oled_init_user(oled_rotation_t rotation) { | |||
| 36 | } | 36 | } |
| 37 | 37 | ||
| 38 | __attribute__((weak)) void oled_task_user(void) { | 38 | __attribute__((weak)) void oled_task_user(void) { |
| 39 | uint32_t anim_timer = 0; | 39 | static uint32_t anim_timer = 0; |
| 40 | uint32_t anim_sleep = 0; | 40 | static uint32_t anim_sleep = 0; |
| 41 | uint8_t current_idle_frame = 0; | 41 | static uint8_t current_idle_frame = 0; |
| 42 | uint8_t current_tap_frame = 0; | 42 | static uint8_t current_tap_frame = 0; |
| 43 | 43 | ||
| 44 | static const char PROGMEM idle[IDLE_FRAMES][ANIM_SIZE] = { | 44 | static const char PROGMEM idle[IDLE_FRAMES][ANIM_SIZE] = { |
| 45 | 45 | ||
| @@ -140,4 +140,4 @@ uint8_t current_tap_frame = 0; | |||
| 140 | } | 140 | } |
| 141 | 141 | ||
| 142 | } | 142 | } |
| 143 | #endif \ No newline at end of file | 143 | #endif |
diff --git a/users/rverst/rverst.c b/users/rverst/rverst.c index 0524c6011..23391caa6 100644 --- a/users/rverst/rverst.c +++ b/users/rverst/rverst.c | |||
| @@ -197,15 +197,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 197 | // Lock computer | 197 | // Lock computer |
| 198 | case RV_LOCK: | 198 | case RV_LOCK: |
| 199 | if (mode == MAC || mode == MAC_UNI) { | 199 | if (mode == MAC || mode == MAC_UNI) { |
| 200 | register_code(KC_LGUI); | 200 | tap_code16(G(C(KC_Q))); |
| 201 | register_code(KC_LCTL); | ||
| 202 | tap_code(KC_Q); | ||
| 203 | unregister_code(KC_LCTL); | ||
| 204 | unregister_code(KC_LGUI); | ||
| 205 | } else if (mode == WINDOWS || mode == WINDOWS_UNI) { | 201 | } else if (mode == WINDOWS || mode == WINDOWS_UNI) { |
| 206 | register_code(KC_LGUI); | 202 | tap_code16(G(KC_L)); |
| 207 | tap_code(KC_L); | ||
| 208 | register_code(KC_LGUI); | ||
| 209 | } | 203 | } |
| 210 | return false; | 204 | return false; |
| 211 | 205 | ||
| @@ -215,23 +209,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 215 | if (ls) unregister_code(KC_LSFT); | 209 | if (ls) unregister_code(KC_LSFT); |
| 216 | if (rs) unregister_code(KC_RSFT); | 210 | if (rs) unregister_code(KC_RSFT); |
| 217 | 211 | ||
| 218 | register_code(KC_LGUI); | 212 | tap_code16(G(S(as ? KC_4 : KC_5))); |
| 219 | register_code(KC_LSFT); | ||
| 220 | if (as) | ||
| 221 | tap_code(KC_5); | ||
| 222 | else | ||
| 223 | tap_code(KC_4); | ||
| 224 | unregister_code(KC_LSFT); | ||
| 225 | unregister_code(KC_LGUI); | ||
| 226 | 213 | ||
| 227 | if (ls) register_code(KC_LSFT); | 214 | if (ls) register_code(KC_LSFT); |
| 228 | if (rs) register_code(KC_RSFT); | 215 | if (rs) register_code(KC_RSFT); |
| 229 | } else if (mode == WINDOWS || mode == WINDOWS_UNI) { | 216 | } else if (mode == WINDOWS || mode == WINDOWS_UNI) { |
| 230 | register_code(KC_LGUI); | 217 | tap_code16(G(S(KC_S))); |
| 231 | register_code(KC_LSFT); | ||
| 232 | tap_code(KC_S); | ||
| 233 | register_code(KC_LSFT); | ||
| 234 | register_code(KC_LGUI); | ||
| 235 | } | 218 | } |
| 236 | return false; | 219 | return false; |
| 237 | 220 | ||
| @@ -260,9 +243,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 260 | if (ls) unregister_code(KC_LSFT); | 243 | if (ls) unregister_code(KC_LSFT); |
| 261 | if (rs) unregister_code(KC_RSFT); | 244 | if (rs) unregister_code(KC_RSFT); |
| 262 | 245 | ||
| 263 | register_code(KC_LALT); | 246 | tap_code16(A(KC_U)); |
| 264 | tap_code(KC_U); | ||
| 265 | unregister_code(KC_LALT); | ||
| 266 | 247 | ||
| 267 | if (as) register_code(KC_LSFT); | 248 | if (as) register_code(KC_LSFT); |
| 268 | if (keycode == RV_AUML) { | 249 | if (keycode == RV_AUML) { |
| @@ -318,11 +299,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 318 | if (is_unicode(mode)) { | 299 | if (is_unicode(mode)) { |
| 319 | send_unicode_string("€"); | 300 | send_unicode_string("€"); |
| 320 | } else if (mode == MAC) { | 301 | } else if (mode == MAC) { |
| 321 | register_code(KC_LALT); | 302 | tap_code16(S(A(KC_2))); |
| 322 | register_code(KC_LSFT); | ||
| 323 | tap_code(KC_2); | ||
| 324 | unregister_code(KC_LSFT); | ||
| 325 | unregister_code(KC_LALT); | ||
| 326 | } else if (mode == WINDOWS) { | 303 | } else if (mode == WINDOWS) { |
| 327 | register_code(KC_RALT); | 304 | register_code(KC_RALT); |
| 328 | tap_code(KC_0); | 305 | tap_code(KC_0); |
| @@ -343,9 +320,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 343 | send_unicode_string("ß"); | 320 | send_unicode_string("ß"); |
| 344 | } | 321 | } |
| 345 | } else if (mode == MAC) { | 322 | } else if (mode == MAC) { |
| 346 | register_code(KC_LALT); | 323 | tap_code16(A(KC_S)); |
| 347 | tap_code(KC_S); | ||
| 348 | unregister_code(KC_LALT); | ||
| 349 | } else if (mode == WINDOWS) { | 324 | } else if (mode == WINDOWS) { |
| 350 | register_code(KC_RALT); | 325 | register_code(KC_RALT); |
| 351 | tap_code(KC_2); | 326 | tap_code(KC_2); |
