4 files changed, 27 insertions, 27 deletions

diff --git a/layouts/community/ergodox/drashna/keymap.c b/layouts/community/ergodox/drashna/keymap.c
index 3e1460606..600e29020 100644
--- a/layouts/community/ergodox/drashna/keymap.c
+++ b/layouts/community/ergodox/drashna/keymap.c
@@ -19,7 +19,7 @@
 #ifdef UNICODEMAP_ENABLE
 #    include "drashna_unicode.h"
 #endif  // UNICODEMAP_ENABLE
-
+#include "drivers/sensors/pimoroni_trackball.h"
 enum more_custom_keycodes {
     KC_SWAP_NUM = NEW_SAFE_RANGE,
     PM_SCROLL,
@@ -317,13 +317,14 @@ void shutdown_keymap(void) {
 
 static bool mouse_button_one, trackball_button_one;
 
-void trackball_check_click(bool pressed, report_mouse_t* mouse) {
-    if (mouse_button_one | pressed) {
-        mouse->buttons |= MOUSE_BTN1;
+void trackball_register_button(bool pressed, enum mouse_buttons button) {
+    report_mouse_t currentReport = pointing_device_get_report();
+    if (pressed) {
+        currentReport.buttons |= button;
     } else {
-        mouse->buttons &= ~MOUSE_BTN1;
+        currentReport.buttons &= ~button;
     }
-    trackball_button_one = pressed;
+    pointing_device_set_report(currentReport);
 }
 #endif
 
diff --git a/layouts/community/ergodox/drashna/visualizer.c b/layouts/community/ergodox/drashna/visualizer.c_old
index 6b1c3ff49..6b1c3ff49 100644
--- a/layouts/community/ergodox/drashna/visualizer.c
+++ b/layouts/community/ergodox/drashna/visualizer.c_old
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 @@
 
 #ifdef RGBLIGHT_ENABLE
 #    undef RGBLED_NUM
-#    define RGBLED_NUM 27
+#    define RGBLED_NUM         27
 
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 5
+#    define RGBLIGHT_HUE_STEP  8
+#    define RGBLIGHT_SAT_STEP  8
+#    define RGBLIGHT_VAL_STEP  5
 #    define RGBLIGHT_LIMIT_VAL 120
 #endif
 
@@ -44,37 +44,36 @@
 #        undef RGB_DI_PIN
 #        define RGB_DI_PIN A3
 #    endif
-#    define RGB_MATRIX_KEYPRESSES  // reacts to keypresses
+#    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
 // #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
 // #   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)
 // #   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)
-#    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
-#    define RGB_MATRIX_HUE_STEP 8
-#    define RGB_MATRIX_SAT_STEP 8
-#    define RGB_MATRIX_VAL_STEP 5
-#    define RGB_MATRIX_SPD_STEP 10
+#    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
+#    define RGB_MATRIX_HUE_STEP           8
+#    define RGB_MATRIX_SAT_STEP           8
+#    define RGB_MATRIX_VAL_STEP           5
+#    define RGB_MATRIX_SPD_STEP           10
 #endif
 
 #ifdef CONVERT_TO_PROTON_C
-#    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.
+#    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 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
 
-
 #if defined(AUDIO_ENABLE) && !defined(CONVERT_TO_PROTON_C)
 #    define AUDIO_PIN B6
 #    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] = {
 // clang-format on
 
 #ifdef OLED_DRIVER_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+oled_rotation_t oled_init_keymap(oled_rotation_t rotation) {
     return OLED_ROTATION_270;
 }
 #endif