summaryrefslogtreecommitdiff
path: root/layouts/community/split_3x6_3/drashna
diff options
context:
space:
mode:
Diffstat (limited to 'layouts/community/split_3x6_3/drashna')
-rw-r--r--layouts/community/split_3x6_3/drashna/chconf.h6
-rw-r--r--layouts/community/split_3x6_3/drashna/config.h9
-rw-r--r--layouts/community/split_3x6_3/drashna/halconf.h7
-rw-r--r--layouts/community/split_3x6_3/drashna/keymap.c3
-rw-r--r--layouts/community/split_3x6_3/drashna/mcuconf.h24
-rw-r--r--layouts/community/split_3x6_3/drashna/rules.mk27
6 files changed, 43 insertions, 33 deletions
diff --git a/layouts/community/split_3x6_3/drashna/chconf.h b/layouts/community/split_3x6_3/drashna/chconf.h
index ffcfb19896..9dbc78b973 100644
--- a/layouts/community/split_3x6_3/drashna/chconf.h
+++ b/layouts/community/split_3x6_3/drashna/chconf.h
@@ -1,6 +1,8 @@
-#define CH_CFG_ST_RESOLUTION 16
-#define CH_CFG_ST_FREQUENCY 10000
+#if defined(KEYBOARD_crkbd)
+# define CH_CFG_ST_RESOLUTION 16
+# define CH_CFG_ST_FREQUENCY 10000
+#endif
#if __has_include("platforms/chibios/common/configs/chconf.h")
# include_next "platforms/chibios/common/configs/chconf.h"
diff --git a/layouts/community/split_3x6_3/drashna/config.h b/layouts/community/split_3x6_3/drashna/config.h
index 0944e37077..0ef36d1f32 100644
--- a/layouts/community/split_3x6_3/drashna/config.h
+++ b/layouts/community/split_3x6_3/drashna/config.h
@@ -80,8 +80,13 @@
# define NO_MUSIC_MODE
#endif
-#ifdef HAPTIC_ENABLE
-# define SOLENOID_PIN B7
+#if defined(HAPTIC_ENABLE)
+# if defined(CONVERT_TO_PROTON_C)
+# define A13 PAL_LINE(GPIOA, 13)
+# define SOLENOID_PIN A13
+# else
+# define SOLENOID_PIN B7
+# endif
#endif
#undef PRODUCT
diff --git a/layouts/community/split_3x6_3/drashna/halconf.h b/layouts/community/split_3x6_3/drashna/halconf.h
index b099320b30..7cc1306598 100644
--- a/layouts/community/split_3x6_3/drashna/halconf.h
+++ b/layouts/community/split_3x6_3/drashna/halconf.h
@@ -15,8 +15,9 @@
*/
#pragma once
-// #define HAL_USE_DAC TRUE
-#define HAL_USE_PWM TRUE
-#define HAL_USE_SERIAL TRUE
+#if defined(KEYBOARD_crkbd)
+# define HAL_USE_PWM TRUE
+# define HAL_USE_SERIAL TRUE
+#endif
#include_next <halconf.h>
diff --git a/layouts/community/split_3x6_3/drashna/keymap.c b/layouts/community/split_3x6_3/drashna/keymap.c
index 707e688267..59f5fefb48 100644
--- a/layouts/community/split_3x6_3/drashna/keymap.c
+++ b/layouts/community/split_3x6_3/drashna/keymap.c
@@ -238,8 +238,7 @@ void render_small_kitty(void) {
void oled_driver_render_logo_right(void) {
render_small_kitty();
- oled_set_cursor(0, 4);
- render_default_layer_state();
+ render_default_layer_state(0, 4);
}
# endif
#endif
diff --git a/layouts/community/split_3x6_3/drashna/mcuconf.h b/layouts/community/split_3x6_3/drashna/mcuconf.h
index 649af5d1f4..920261476c 100644
--- a/layouts/community/split_3x6_3/drashna/mcuconf.h
+++ b/layouts/community/split_3x6_3/drashna/mcuconf.h
@@ -17,20 +17,16 @@
#include_next <mcuconf.h>
-// #undef STM32_HSE_ENABLED
-// #define STM32_HSE_ENABLED FALSE
-// #undef STM32_GPT_USE_TIM15
-// #define STM32_GPT_USE_TIM15 FALSE
+#if defined(KEYBOARD_crkbd)
-#undef STM32_PWM_USE_TIM2
-#define STM32_PWM_USE_TIM2 TRUE
-#undef STM32_PWM_USE_TIM3
-#define STM32_PWM_USE_TIM3 FALSE
+# undef STM32_PWM_USE_TIM2
+# define STM32_PWM_USE_TIM2 TRUE
+# undef STM32_PWM_USE_TIM3
+# define STM32_PWM_USE_TIM3 FALSE
-#undef STM32_SERIAL_USE_USART1
-#define STM32_SERIAL_USE_USART1 TRUE
+# undef STM32_SERIAL_USE_USART1
+# define STM32_SERIAL_USE_USART1 TRUE
-// #undef STM32_PWM_TIM15_IRQ_PRIORITY
-// #define STM32_PWM_TIM15_IRQ_PRIORITY 16
-#undef STM32_ST_USE_TIMER
-#define STM32_ST_USE_TIMER 3
+# undef STM32_ST_USE_TIMER
+# define STM32_ST_USE_TIMER 3
+#endif
diff --git a/layouts/community/split_3x6_3/drashna/rules.mk b/layouts/community/split_3x6_3/drashna/rules.mk
index 83eb699812..3fd4279bef 100644
--- a/layouts/community/split_3x6_3/drashna/rules.mk
+++ b/layouts/community/split_3x6_3/drashna/rules.mk
@@ -13,6 +13,10 @@ AUDIO_ENABLE = no # Audio output
UNICODE_ENABLE = no # Unicode
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
SWAP_HANDS_ENABLE = no # Enable one-hand typing
+OS_DETECTION_ENABLE = no
+CUSTOM_UNICODE_ENABLE = no
+CUSTOM_POINTING_DEVICE = no
+CUSTOM_SPLIT_TRANSPORT_SYNC = no
USE_ARM_CONFIG ?= no
ifeq ($(strip $(CONVERT_TO)), proton_c)
@@ -27,19 +31,26 @@ endif
ifeq ($(strip $(MCU)), STM32F401)
USE_ARM_CONFIG = yes
endif
+ifeq ($(strip $(MCU)), STM32F411)
+ USE_ARM_CONFIG = yes
+endif
+
+ifeq ($(strip $(MCU)), atmega32u4)
+ BOOTLOADER = qmk-hid
+ BOOTLOADER_SIZE = 512
+endif
ifeq ($(strip $(USE_ARM_CONFIG)), yes)
HAPTIC_ENABLE = no
WS2812_DRIVER = pwm # won't work without a patch to the ctpc mk file
SERIAL_DRIVER = usart
- SWAP_HANDS_ENABLE = yes
WPM_ENABLE = yes
- AUTOCORRECTION_ENABLE = yes
+ AUTOCORRECT_ENABLE = yes
CAPS_WORD_ENABLE = yes
-else
- CUSTOM_UNICODE_ENABLE = no
- BOOTLOADER = qmk-hid
- BOOTLOADER_SIZE = 512
+ OS_DETECTION_ENABLE = yes
+ CUSTOM_UNICODE_ENABLE = no
+ CUSTOM_POINTING_DEVICE = no
+ CUSTOM_SPLIT_TRANSPORT_SYNC = no
endif
ifeq ($(strip $(KEYBOARD)), crkbd/rev1)
@@ -47,7 +58,3 @@ ifeq ($(strip $(KEYBOARD)), crkbd/rev1)
RGB_MATRIX_ENABLE = yes
HAPTIC_ENABLE = no
endif
-
-ifeq ($(strip $(KEYBOARD)), cantor)
- SWAP_HANDS_ENABLE = no
-endif