diff options
author | Drashna Jaelre <drashna@live.com> | 2021-07-01 00:42:32 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-01 00:42:32 -0700 |
commit | b7cf9a888a607dc024d74ee72c0ebbd8e0ddfdbe (patch) | |
tree | 3510846d4d53682e5ec9b964d093ef97c0b33bc7 /layouts/community/split_3x6_3 | |
parent | bbe45185e30eb8d0e974f02b0ea809ed773221be (diff) | |
download | qmk_firmware-b7cf9a888a607dc024d74ee72c0ebbd8e0ddfdbe.tar.gz qmk_firmware-b7cf9a888a607dc024d74ee72c0ebbd8e0ddfdbe.zip |
Drashna's split updates (#13350)
Co-authored-by: Ryan <fauxpark@gmail.com>
Diffstat (limited to 'layouts/community/split_3x6_3')
-rw-r--r-- | layouts/community/split_3x6_3/drashna/config.h | 39 | ||||
-rw-r--r-- | layouts/community/split_3x6_3/drashna/keymap.c | 2 |
2 files changed, 20 insertions, 21 deletions
diff --git a/layouts/community/split_3x6_3/drashna/config.h b/layouts/community/split_3x6_3/drashna/config.h index cc53d4c36..4a094e195 100644 --- a/layouts/community/split_3x6_3/drashna/config.h +++ b/layouts/community/split_3x6_3/drashna/config.h | |||
@@ -31,11 +31,11 @@ | |||
31 | 31 | ||
32 | #ifdef RGBLIGHT_ENABLE | 32 | #ifdef RGBLIGHT_ENABLE |
33 | # undef RGBLED_NUM | 33 | # undef RGBLED_NUM |
34 | # define RGBLED_NUM 27 | 34 | # define RGBLED_NUM 27 |
35 | 35 | ||
36 | # define RGBLIGHT_HUE_STEP 8 | 36 | # define RGBLIGHT_HUE_STEP 8 |
37 | # define RGBLIGHT_SAT_STEP 8 | 37 | # define RGBLIGHT_SAT_STEP 8 |
38 | # define RGBLIGHT_VAL_STEP 5 | 38 | # define RGBLIGHT_VAL_STEP 5 |
39 | # define RGBLIGHT_LIMIT_VAL 120 | 39 | # define RGBLIGHT_LIMIT_VAL 120 |
40 | #endif | 40 | #endif |
41 | 41 | ||
@@ -44,37 +44,36 @@ | |||
44 | # undef RGB_DI_PIN | 44 | # undef RGB_DI_PIN |
45 | # define RGB_DI_PIN A3 | 45 | # define RGB_DI_PIN A3 |
46 | # endif | 46 | # endif |
47 | # define RGB_MATRIX_KEYPRESSES // reacts to keypresses | 47 | # define RGB_MATRIX_KEYPRESSES // reacts to keypresses |
48 | // # define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) | 48 | // # define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) |
49 | // # define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects | 49 | // # define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects |
50 | # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended | 50 | # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended |
51 | // # define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness) | 51 | // # define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness) |
52 | // # define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness) | 52 | // # define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness) |
53 | # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255 | 53 | # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255 |
54 | # define RGB_MATRIX_HUE_STEP 8 | 54 | # define RGB_MATRIX_HUE_STEP 8 |
55 | # define RGB_MATRIX_SAT_STEP 8 | 55 | # define RGB_MATRIX_SAT_STEP 8 |
56 | # define RGB_MATRIX_VAL_STEP 5 | 56 | # define RGB_MATRIX_VAL_STEP 5 |
57 | # define RGB_MATRIX_SPD_STEP 10 | 57 | # define RGB_MATRIX_SPD_STEP 10 |
58 | #endif | 58 | #endif |
59 | 59 | ||
60 | #ifdef CONVERT_TO_PROTON_C | 60 | #ifdef CONVERT_TO_PROTON_C |
61 | # define WS2812_PWM_DRIVER PWMD2 // default: PWMD2 | 61 | # define WS2812_PWM_DRIVER PWMD2 // default: PWMD2 |
62 | # define WS2812_PWM_CHANNEL 4 // default: 2 | 62 | # define WS2812_PWM_CHANNEL 4 // default: 2 |
63 | # define WS2812_PWM_PAL_MODE 1 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2 | 63 | # define WS2812_PWM_PAL_MODE 1 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2 |
64 | # define WS2812_DMA_STREAM STM32_DMA1_STREAM2 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. | 64 | # define WS2812_DMA_STREAM STM32_DMA1_STREAM2 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. |
65 | # define WS2812_DMA_CHANNEL 2 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. | 65 | # define WS2812_DMA_CHANNEL 2 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. |
66 | # define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM2_UP // DMAMUX configuration for TIMx_UP -- only required if your MCU has a DMAMUX peripheral, see the respective reference manual for the appropriate values for your MCU. | 66 | # define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM2_UP // DMAMUX configuration for TIMx_UP -- only required if your MCU has a DMAMUX peripheral, see the respective reference manual for the appropriate values for your MCU. |
67 | 67 | ||
68 | # undef SOFT_SERIAL_PIN | 68 | # undef SOFT_SERIAL_PIN |
69 | # define SOFT_SERIAL_PIN D3 | 69 | # define SOFT_SERIAL_PIN D3 |
70 | # define SERIAL_USART_DRIVER SD1 // USART driver of TX pin. default: SD1 | 70 | # define SERIAL_USART_DRIVER SD1 // USART driver of TX pin. default: SD1 |
71 | # define SERIAL_USART_TX_PAL_MODE 7 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7 | 71 | # define SERIAL_USART_TX_PAL_MODE 7 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7 |
72 | 72 | ||
73 | // #define INIT_EE_HANDS_LEFT | 73 | // #define INIT_EE_HANDS_LEFT |
74 | // #define INIT_EE_HANDS_RIGHT | 74 | // #define INIT_EE_HANDS_RIGHT |
75 | #endif | 75 | #endif |
76 | 76 | ||
77 | |||
78 | #if defined(AUDIO_ENABLE) && !defined(CONVERT_TO_PROTON_C) | 77 | #if defined(AUDIO_ENABLE) && !defined(CONVERT_TO_PROTON_C) |
79 | # define AUDIO_PIN B6 | 78 | # define AUDIO_PIN B6 |
80 | # define NO_MUSIC_MODE | 79 | # define NO_MUSIC_MODE |
diff --git a/layouts/community/split_3x6_3/drashna/keymap.c b/layouts/community/split_3x6_3/drashna/keymap.c index 5a2d2f2e2..e46b626ef 100644 --- a/layouts/community/split_3x6_3/drashna/keymap.c +++ b/layouts/community/split_3x6_3/drashna/keymap.c | |||
@@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
114 | // clang-format on | 114 | // clang-format on |
115 | 115 | ||
116 | #ifdef OLED_DRIVER_ENABLE | 116 | #ifdef OLED_DRIVER_ENABLE |
117 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { | 117 | oled_rotation_t oled_init_keymap(oled_rotation_t rotation) { |
118 | return OLED_ROTATION_270; | 118 | return OLED_ROTATION_270; |
119 | } | 119 | } |
120 | #endif | 120 | #endif |