diff options
| author | Drashna Jaelre <drashna@live.com> | 2021-08-21 13:34:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-21 13:34:44 -0700 |
| commit | 58a5030661b57f1dd05693053df2eddadc285f64 (patch) | |
| tree | 025a7a2d0dc6643ce806b72798c92139eafb4ca6 /layouts | |
| parent | da1c011afc67dab0049b30a4c021dc38a36cb9aa (diff) | |
| download | qmk_firmware-58a5030661b57f1dd05693053df2eddadc285f64.tar.gz qmk_firmware-58a5030661b57f1dd05693053df2eddadc285f64.zip | |
[Keymap] Drashna's Improve OLEDs and custom Split code (#14063)
* Fill the oleds with right mods
* Enable double mods on x32 oleds
* Disable forced NKRO
* Make oleds fancy only on good MCUs
* Overhaul oled display
* Further enhance oled, with kitty!
* Final oled form
* Not working transport
* Transport id of woring
* Add acceleration
* fix button placement for accel macro
* Fix accelartion location and behavior
* Remove OLED sync code
* Fix alignment issue
* Remove audio hack
* Fix up zima keymap
* Add matrix slave scan function and cleanup drashna.h
* Clean up user space
* Allow userspace sync to be disable-able
* Fix weird issue with audio
* Fix alignment issue with user split sync
* Disable second rgb matrix task
* Disable additional animations
* Change dynamic keymap settings
* Hacky fix for borked corne
* Add Blackpill (F411) support to tractyl manuform
* remove manual via eeprom reset
* Remove all references to rgblight twinkle
* Fix issues with config processing
Diffstat (limited to 'layouts')
| -rw-r--r-- | layouts/community/ergodox/drashna/rules.mk | 1 | ||||
| -rw-r--r-- | layouts/community/numpad_5x6/drashna/config.h | 2 | ||||
| -rw-r--r-- | layouts/community/numpad_5x6/drashna/rules.mk | 1 | ||||
| -rw-r--r-- | layouts/community/ortho_4x12/drashna/config.h | 1 | ||||
| -rw-r--r-- | layouts/community/ortho_4x12/drashna/rules.mk | 2 | ||||
| -rw-r--r-- | layouts/community/ortho_5x12/drashna/rules.mk | 1 | ||||
| -rw-r--r-- | layouts/community/split_3x6_3/drashna/keymap.c | 14 |
7 files changed, 10 insertions, 12 deletions
diff --git a/layouts/community/ergodox/drashna/rules.mk b/layouts/community/ergodox/drashna/rules.mk index 96a102700..4c47e0713 100644 --- a/layouts/community/ergodox/drashna/rules.mk +++ b/layouts/community/ergodox/drashna/rules.mk | |||
| @@ -7,7 +7,6 @@ SPACE_CADET_ENABLE = no | |||
| 7 | ifeq ($(strip $(KEYBOARD)), ergodox_ez) | 7 | ifeq ($(strip $(KEYBOARD)), ergodox_ez) |
| 8 | RGBLIGHT_ENABLE = yes | 8 | RGBLIGHT_ENABLE = yes |
| 9 | RGB_MATRIX_ENABLE = yes | 9 | RGB_MATRIX_ENABLE = yes |
| 10 | RGBLIGHT_TWINKLE = no | ||
| 11 | INDICATOR_LIGHTS = no | 10 | INDICATOR_LIGHTS = no |
| 12 | RGBLIGHT_STARTUP_ANIMATION = yes | 11 | RGBLIGHT_STARTUP_ANIMATION = yes |
| 13 | PIMORONI_TRACKBALL_ENABLE = yes | 12 | PIMORONI_TRACKBALL_ENABLE = yes |
diff --git a/layouts/community/numpad_5x6/drashna/config.h b/layouts/community/numpad_5x6/drashna/config.h index 1f485e193..aa0c20123 100644 --- a/layouts/community/numpad_5x6/drashna/config.h +++ b/layouts/community/numpad_5x6/drashna/config.h | |||
| @@ -28,6 +28,8 @@ | |||
| 28 | # define RGBLIGHT_EFFECT_SNAKE_LENGTH 2 | 28 | # define RGBLIGHT_EFFECT_SNAKE_LENGTH 2 |
| 29 | #endif // RGBLIGHT_ENABLE | 29 | #endif // RGBLIGHT_ENABLE |
| 30 | 30 | ||
| 31 | #define RGBLIGHT_ALL_ANIMATIONS | ||
| 32 | |||
| 31 | #if defined(KEYBOARD_primekb_prime_m) | 33 | #if defined(KEYBOARD_primekb_prime_m) |
| 32 | # undef PRODUCT | 34 | # undef PRODUCT |
| 33 | # define PRODUCT Drashna Hacked Prime_M Macro Pad | 35 | # define PRODUCT Drashna Hacked Prime_M Macro Pad |
diff --git a/layouts/community/numpad_5x6/drashna/rules.mk b/layouts/community/numpad_5x6/drashna/rules.mk index 6de3056dd..f4854716b 100644 --- a/layouts/community/numpad_5x6/drashna/rules.mk +++ b/layouts/community/numpad_5x6/drashna/rules.mk | |||
| @@ -4,6 +4,5 @@ BACKLIGHT_ENABLE = no | |||
| 4 | NO_SECRETS = yes | 4 | NO_SECRETS = yes |
| 5 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite | 5 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite |
| 6 | INDICATOR_LIGHTS = no | 6 | INDICATOR_LIGHTS = no |
| 7 | RGBLIGHT_TWINKLE = yes | ||
| 8 | MAKE_BOOTLOADER = yes | 7 | MAKE_BOOTLOADER = yes |
| 9 | RGBLIGHT_STARTUP_ANIMATION = yes | 8 | RGBLIGHT_STARTUP_ANIMATION = yes |
diff --git a/layouts/community/ortho_4x12/drashna/config.h b/layouts/community/ortho_4x12/drashna/config.h index 43143c3a3..d6197ece2 100644 --- a/layouts/community/ortho_4x12/drashna/config.h +++ b/layouts/community/ortho_4x12/drashna/config.h | |||
| @@ -75,6 +75,7 @@ | |||
| 75 | # define PRODUCT Drashna Hacked Planck Rev6 | 75 | # define PRODUCT Drashna Hacked Planck Rev6 |
| 76 | # elif defined(KEYBOARD_planck_ez) | 76 | # elif defined(KEYBOARD_planck_ez) |
| 77 | # define PRODUCT Drashna Hacked Planck EZ | 77 | # define PRODUCT Drashna Hacked Planck EZ |
| 78 | # define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 4095 | ||
| 78 | # endif | 79 | # endif |
| 79 | #endif | 80 | #endif |
| 80 | #undef NO_USB_STARTUP_CHECK | 81 | #undef NO_USB_STARTUP_CHECK |
diff --git a/layouts/community/ortho_4x12/drashna/rules.mk b/layouts/community/ortho_4x12/drashna/rules.mk index dc64fe63b..775ad8e6e 100644 --- a/layouts/community/ortho_4x12/drashna/rules.mk +++ b/layouts/community/ortho_4x12/drashna/rules.mk | |||
| @@ -11,7 +11,6 @@ ifneq ($(strip $(KEYBOARD)), planck/rev6) | |||
| 11 | ifeq ($(strip $(LAYOUT_HAS_RGB)), yes) | 11 | ifeq ($(strip $(LAYOUT_HAS_RGB)), yes) |
| 12 | RGBLIGHT_ENABLE = yes | 12 | RGBLIGHT_ENABLE = yes |
| 13 | INDICATOR_LIGHTS = yes | 13 | INDICATOR_LIGHTS = yes |
| 14 | RGBLIGHT_TWINKLE = yes | ||
| 15 | RGBLIGHT_STARTUP_ANIMATION = yes | 14 | RGBLIGHT_STARTUP_ANIMATION = yes |
| 16 | endif | 15 | endif |
| 17 | else | 16 | else |
| @@ -37,7 +36,6 @@ ifeq ($(strip $(KEYBOARD)), planck/ez) | |||
| 37 | ENCODER_MAP_ENABLE = yes | 36 | ENCODER_MAP_ENABLE = yes |
| 38 | RGB_MATRIX_ENABLE = yes | 37 | RGB_MATRIX_ENABLE = yes |
| 39 | INDICATOR_LIGHTS = yes | 38 | INDICATOR_LIGHTS = yes |
| 40 | RGBLIGHT_TWINKLE = yes | ||
| 41 | RGBLIGHT_STARTUP_ANIMATION = yes | 39 | RGBLIGHT_STARTUP_ANIMATION = yes |
| 42 | CONSOLE_ENABLE = yes | 40 | CONSOLE_ENABLE = yes |
| 43 | COMMAND_ENABLE = yes | 41 | COMMAND_ENABLE = yes |
diff --git a/layouts/community/ortho_5x12/drashna/rules.mk b/layouts/community/ortho_5x12/drashna/rules.mk index 0c2858e5e..69a025cc0 100644 --- a/layouts/community/ortho_5x12/drashna/rules.mk +++ b/layouts/community/ortho_5x12/drashna/rules.mk | |||
| @@ -12,7 +12,6 @@ ifeq ($(strip $(KEYBOARD)), fractal) | |||
| 12 | AUDIO_SUPPORTED = yes | 12 | AUDIO_SUPPORTED = yes |
| 13 | RGBLIGHT_SUPPORTED = yes | 13 | RGBLIGHT_SUPPORTED = yes |
| 14 | RGBLIGHT_ENABLE = yes | 14 | RGBLIGHT_ENABLE = yes |
| 15 | RGBLIGHT_TWINKLE = yes | ||
| 16 | RGBLIGHT_STARTUP_ANIMATION = yes | 15 | RGBLIGHT_STARTUP_ANIMATION = yes |
| 17 | BOOTLOADER = qmk-dfu | 16 | BOOTLOADER = qmk-dfu |
| 18 | endif | 17 | endif |
diff --git a/layouts/community/split_3x6_3/drashna/keymap.c b/layouts/community/split_3x6_3/drashna/keymap.c index 6e71527a4..29e41e242 100644 --- a/layouts/community/split_3x6_3/drashna/keymap.c +++ b/layouts/community/split_3x6_3/drashna/keymap.c | |||
| @@ -26,6 +26,12 @@ enum crkbd_keycodes { RGBRST = NEW_SAFE_RANGE }; | |||
| 26 | * of use. K## is a placeholder to pass through the individual keycodes | 26 | * of use. K## is a placeholder to pass through the individual keycodes |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #ifdef CONVERT_TO_PROTON_C | ||
| 30 | # define MID_TMB ET_RAIS | ||
| 31 | #else | ||
| 32 | # define MID_TMB KC_ENT | ||
| 33 | #endif | ||
| 34 | |||
| 29 | // clang-format off | 35 | // clang-format off |
| 30 | #define LAYOUT_split_3x6_3_wrapper(...) LAYOUT_split_3x6_3(__VA_ARGS__) | 36 | #define LAYOUT_split_3x6_3_wrapper(...) LAYOUT_split_3x6_3(__VA_ARGS__) |
| 31 | #define LAYOUT_split_3x6_3_base( \ | 37 | #define LAYOUT_split_3x6_3_base( \ |
| @@ -37,7 +43,7 @@ enum crkbd_keycodes { RGBRST = NEW_SAFE_RANGE }; | |||
| 37 | KC_ESC, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, KC_MINS, \ | 43 | KC_ESC, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, KC_MINS, \ |
| 38 | ALT_T(KC_TAB), K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, RALT_T(K1B), \ | 44 | ALT_T(KC_TAB), K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, RALT_T(K1B), \ |
| 39 | OS_LSFT, CTL_T(K21), K22, K23, K24, K25, K26, K27, K28, K29, RCTL_T(K2A), OS_RSFT, \ | 45 | OS_LSFT, CTL_T(K21), K22, K23, K24, K25, K26, K27, K28, K29, RCTL_T(K2A), OS_RSFT, \ |
| 40 | OS_LGUI, KC_SPC, BK_LWER, DL_RAIS, KC_ENT, OS_RGUI \ | 46 | OS_LGUI, KC_SPC, BK_LWER, DL_RAIS, MID_TMB, OS_RGUI \ |
| 41 | ) | 47 | ) |
| 42 | #define LAYOUT_base_wrapper(...) LAYOUT_split_3x6_3_base(__VA_ARGS__) | 48 | #define LAYOUT_base_wrapper(...) LAYOUT_split_3x6_3_base(__VA_ARGS__) |
| 43 | 49 | ||
| @@ -104,12 +110,6 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) { | |||
| 104 | } | 110 | } |
| 105 | #endif | 111 | #endif |
| 106 | 112 | ||
| 107 | void matrix_slave_scan_user(void) { | ||
| 108 | #ifdef RGB_MATRIX_ENABLE | ||
| 109 | rgb_matrix_task(); | ||
| 110 | #endif | ||
| 111 | } | ||
| 112 | |||
| 113 | #ifdef RGB_MATRIX_ENABLE | 113 | #ifdef RGB_MATRIX_ENABLE |
| 114 | void suspend_power_down_keymap(void) { rgb_matrix_set_suspend_state(true); } | 114 | void suspend_power_down_keymap(void) { rgb_matrix_set_suspend_state(true); } |
| 115 | 115 | ||
