diff options
| author | Drashna Jael're <drashna@live.com> | 2021-02-23 13:57:26 -0800 |
|---|---|---|
| committer | Drashna Jael're <drashna@live.com> | 2021-02-23 13:57:26 -0800 |
| commit | 146b042514569acac33b616aa278d293af594f49 (patch) | |
| tree | f169aef071affe58195f3bc992ceb89e615de633 /layouts/community/split_3x6_3/drashna/config.h | |
| parent | 2abfa624c90df49fe4f0639a54961fd54a1255ac (diff) | |
| parent | 0b69e4df818c2515cf4eee3d8b6fd4a07775b887 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'layouts/community/split_3x6_3/drashna/config.h')
| -rw-r--r-- | layouts/community/split_3x6_3/drashna/config.h | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/layouts/community/split_3x6_3/drashna/config.h b/layouts/community/split_3x6_3/drashna/config.h index 17d7b9ec73..dd950ce7bc 100644 --- a/layouts/community/split_3x6_3/drashna/config.h +++ b/layouts/community/split_3x6_3/drashna/config.h @@ -19,8 +19,10 @@ /* Select hand configuration */ // #define MASTER_LEFT -#define MASTER_RIGHT -// #define EE_HAND +// #define MASTER_RIGHT +#define EE_HANDS +#define SPLIT_MODS_ENABLE + #undef USE_I2C #undef SSD1306OLED @@ -40,7 +42,7 @@ #ifdef RGB_MATRIX_ENABLE # ifdef CONVERT_TO_PROTON_C # undef RGB_DI_PIN -# define RGB_DI_PIN PAL_LINE(GPIOA, 3) +# define RGB_DI_PIN A3 # endif # define RGB_MATRIX_KEYPRESSES // reacts to keypresses // # define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) @@ -56,24 +58,24 @@ #endif #ifdef CONVERT_TO_PROTON_C -# define WS2812_PWM_DRIVER PWMD15 // default: PWMD2 -# define WS2812_PWM_CHANNEL 2 // default: 2 -# define WS2812_PWM_PAL_MODE 9 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2 -# define WS2812_DMA_STREAM STM32_DMA1_STREAM5 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. -# define WS2812_DMA_CHANNEL 5 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. -# define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM15_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. +# define WS2812_PWM_DRIVER PWMD2 // default: PWMD2 +# define WS2812_PWM_CHANNEL 4 // default: 2 +# define WS2812_PWM_PAL_MODE 1 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2 +# define WS2812_DMA_STREAM STM32_DMA1_STREAM2 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +# define WS2812_DMA_CHANNEL 2 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +# 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. # undef SOFT_SERIAL_PIN # define SOFT_SERIAL_PIN D3 # define SERIAL_USART_DRIVER SD1 // USART driver of TX pin. default: SD1 # define SERIAL_USART_TX_PAL_MODE 7 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7 - // #define INIT_EE_HANDS_LEFT // #define INIT_EE_HANDS_RIGHT #endif -#ifdef AUDIO_ENABLE + +#if defined(AUDIO_ENABLE) && !defined(CONVERT_TO_PROTON_C) # define AUDIO_PIN B6 # define NO_MUSIC_MODE #endif @@ -88,9 +90,5 @@ #else # define PRODUCT Drashna Hacked Corne Keyboard #endif -#define OLED_FONT_H "layouts/community/split_3x6_3/drashna/glcdfont.c" -// #define OLED_FONT_WIDTH 5 -// #define OLED_FONT_HEIGHT 7 -#define OLED_DISABLE_TIMEOUT #define TAPPING_TERM_PER_KEY |