diff options
| author | Drashna Jaelre <drashna@live.com> | 2019-04-22 11:55:55 -0700 |
|---|---|---|
| committer | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2019-04-22 11:55:55 -0700 |
| commit | a2cec0594b15dc667adf7f1b0e35cb698dc1758d (patch) | |
| tree | fdfd6646aa6bdd9003125406e2dc5e2069f8ea17 /users/drashna/process_records.c | |
| parent | 6d73fe12779d6e8527d404572810ea95e714dce7 (diff) | |
| download | qmk_firmware-a2cec0594b15dc667adf7f1b0e35cb698dc1758d.tar.gz qmk_firmware-a2cec0594b15dc667adf7f1b0e35cb698dc1758d.zip | |
[Keymap] Update to Drashna Keymaps (#5594)
* Start to standardize macro timer
* Update Fractal layout
Specifically, limit the RGB Lighting, since it's too many for the power, and only have the KITT annimation on the front
* Update Iris keymap to use I2C for transport
* Remove TAP_CODE_DELAY from keyboard in favor of global setting
* Remove Woodpad
Since it\'s no longer in my possession
* Only enable LTO on AVR boards
* Run matrix_scans while doing startup light
* Run matrix_scan to get split keyboard code synced properly
* Fix rgb mode
* Remove custom debouncing settings
* Make RGB Light Startup Animation optional
* Fix opt def
* Remove extra tap code delay value
* Fix references to keebio boards
* Add support for LP Iris keyboard
* Add backlight code
* Make startup animation optional
* Update gitlab ci script
* Remove port declaration
* Revert avrgcc changes to gitlab ci file
* Don't re-set mods
* Remove MACRO_TIMER define
* Add custom name for crkbd
* Add name for Prime M pad
* Add names for ortho 4x12 boards
* Add some additional handling for rgb init
* Change thumb clusters on ergodox
* Switch Orthodox to I2C
* Fix Space in ergodox keymap
* Use OSL for ergodox layout
* Ugh, can't find a good layout
* Fix typo
* Fix up animation startup
* Cries in AVR
* Fix makefiles for ergodox ez boards
* Add support for "secret songs" in my userspace
* Reset debounce to 5ms for Ergodox EZ
* Fix gitlab CI yaml file
* More crying in AVR
* Cannot use rgb light and rgb matrix at the same time due to the WS2812 rgb matrix PR until the "Coexistance" PR is merged
* Update ODox for split common and i2c
* Add split config
* Impement Split code
* Add support for xscorpion OLED code
* Add OLED display config
* Fix OLED screen font
* Get OLED set up in vertical mode
* Remove old OLED code
* add per key support for crkbd
* Fix split changes
* RGB Tweeaks
* More OLED tweaks
* Fix rotation stuff
* Fix more OLED stuff
* Remove custom Debounce from Ergodox layout since it's no longer needed
Diffstat (limited to 'users/drashna/process_records.c')
| -rw-r--r-- | users/drashna/process_records.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/users/drashna/process_records.c b/users/drashna/process_records.c index 2d9025b37..2b6ccf510 100644 --- a/users/drashna/process_records.c +++ b/users/drashna/process_records.c | |||
| @@ -18,7 +18,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 18 | 18 | ||
| 19 | // If console is enabled, it will print the matrix position and status of each key pressed | 19 | // If console is enabled, it will print the matrix position and status of each key pressed |
| 20 | #ifdef KEYLOGGER_ENABLE | 20 | #ifdef KEYLOGGER_ENABLE |
| 21 | #if defined(KEYBOARD_ergodox_ez) || defined(KEYBOARD_iris_rev2) | 21 | #if defined(KEYBOARD_ergodox_ez) || defined(KEYBOARD_keebio_iris_rev2) |
| 22 | xprintf("KL: kc: %u, col: %u, row: %u, pressed: %u\n", keycode, record->event.key.row, record->event.key.col, record->event.pressed); | 22 | xprintf("KL: kc: %u, col: %u, row: %u, pressed: %u\n", keycode, record->event.key.row, record->event.key.col, record->event.pressed); |
| 23 | #else | 23 | #else |
| 24 | xprintf("KL: kc: %u, col: %u, row: %u, pressed: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed); | 24 | xprintf("KL: kc: %u, col: %u, row: %u, pressed: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed); |
| @@ -37,31 +37,29 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 37 | uint8_t temp_mod = get_mods(); | 37 | uint8_t temp_mod = get_mods(); |
| 38 | uint8_t temp_osm = get_oneshot_mods(); | 38 | uint8_t temp_osm = get_oneshot_mods(); |
| 39 | clear_mods(); clear_oneshot_mods(); | 39 | clear_mods(); clear_oneshot_mods(); |
| 40 | send_string_with_delay_P(PSTR("make " QMK_KEYBOARD ":" QMK_KEYMAP), MACRO_TIMER); | 40 | send_string_with_delay_P(PSTR("make " QMK_KEYBOARD ":" QMK_KEYMAP), TAP_CODE_DELAY); |
| 41 | #ifndef MAKE_BOOTLOADER | 41 | #ifndef MAKE_BOOTLOADER |
| 42 | if ( ( temp_mod | temp_osm ) & MOD_MASK_SHIFT ) | 42 | if ( ( temp_mod | temp_osm ) & MOD_MASK_SHIFT ) |
| 43 | #endif | 43 | #endif |
| 44 | { | 44 | { |
| 45 | #if defined(__arm__) | 45 | #if defined(__arm__) |
| 46 | send_string_with_delay_P(PSTR(":dfu-util"), MACRO_TIMER); | 46 | send_string_with_delay_P(PSTR(":dfu-util"), TAP_CODE_DELAY); |
| 47 | #elif defined(BOOTLOADER_DFU) | 47 | #elif defined(BOOTLOADER_DFU) |
| 48 | send_string_with_delay_P(PSTR(":dfu"), MACRO_TIMER); | 48 | send_string_with_delay_P(PSTR(":dfu"), TAP_CODE_DELAY); |
| 49 | #elif defined(BOOTLOADER_HALFKAY) | 49 | #elif defined(BOOTLOADER_HALFKAY) |
| 50 | send_string_with_delay_P(PSTR(":teensy"), MACRO_TIMER); | 50 | send_string_with_delay_P(PSTR(":teensy"), TAP_CODE_DELAY); |
| 51 | #elif defined(BOOTLOADER_CATERINA) | 51 | #elif defined(BOOTLOADER_CATERINA) |
| 52 | send_string_with_delay_P(PSTR(":avrdude"), MACRO_TIMER); | 52 | send_string_with_delay_P(PSTR(":avrdude"), TAP_CODE_DELAY); |
| 53 | #endif // bootloader options | 53 | #endif // bootloader options |
| 54 | } | 54 | } |
| 55 | if ( ( temp_mod | temp_osm ) & MOD_MASK_CTRL) { send_string_with_delay_P(PSTR(" -j8 --output-sync"), MACRO_TIMER); } | 55 | if ( ( temp_mod | temp_osm ) & MOD_MASK_CTRL) { send_string_with_delay_P(PSTR(" -j8 --output-sync"), TAP_CODE_DELAY); } |
| 56 | send_string_with_delay_P(PSTR(SS_TAP(X_ENTER)), MACRO_TIMER); | 56 | send_string_with_delay_P(PSTR(SS_TAP(X_ENTER)), TAP_CODE_DELAY); |
| 57 | set_mods(temp_mod); | ||
| 58 | set_oneshot_mods(temp_osm); | ||
| 59 | } | 57 | } |
| 60 | break; | 58 | break; |
| 61 | 59 | ||
| 62 | case VRSN: // Prints firmware version | 60 | case VRSN: // Prints firmware version |
| 63 | if (record->event.pressed) { | 61 | if (record->event.pressed) { |
| 64 | send_string_with_delay_P(PSTR(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION ", Built on: " QMK_BUILDDATE), MACRO_TIMER); | 62 | send_string_with_delay_P(PSTR(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION ", Built on: " QMK_BUILDDATE), TAP_CODE_DELAY); |
| 65 | } | 63 | } |
| 66 | break; | 64 | break; |
| 67 | 65 | ||
